Merge remote-tracking branch 'origin/release/2.1' into dev
This commit is contained in:
commit
0eb2b96c45
|
|
@ -22,31 +22,13 @@ export default function(rootDir, moduleGlobals) {
|
||||||
banner: "/* @license\r\n" +
|
banner: "/* @license\r\n" +
|
||||||
" * Copyright (c) .NET Foundation. All rights reserved.\r\n" +
|
" * Copyright (c) .NET Foundation. All rights reserved.\r\n" +
|
||||||
" * Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.\r\n" +
|
" * Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.\r\n" +
|
||||||
"*/",
|
" */",
|
||||||
globals: moduleGlobals,
|
globals: moduleGlobals,
|
||||||
},
|
},
|
||||||
external: function (m) {
|
|
||||||
let match = m.match(/node_modules/);
|
|
||||||
if (match) {
|
|
||||||
let moduleName = m.substring(match.index + "node_modules".length + 1);
|
|
||||||
let slashIndex = moduleName.indexOf('/');
|
|
||||||
if(slashIndex < 0) {
|
|
||||||
slashIndex = moduleName.indexOf('\\');
|
|
||||||
}
|
|
||||||
moduleName = moduleName.substring(0, slashIndex);
|
|
||||||
|
|
||||||
if(polyfills.indexOf(moduleName) >= 0) {
|
// Mark everything in the dependencies list as external
|
||||||
// This is a polyfill
|
external: Object.keys(pkg.dependencies || {}),
|
||||||
console.log(`Importing polyfill: ${m}`);
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
else if(!allowed_externals.indexOf(moduleName)) {
|
|
||||||
console.log(`WARNING: External module '${m}' in use.`);
|
|
||||||
}
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
return false;
|
|
||||||
},
|
|
||||||
plugins: [
|
plugins: [
|
||||||
commonjs(),
|
commonjs(),
|
||||||
resolve({
|
resolve({
|
||||||
|
|
|
||||||
|
|
@ -36,7 +36,7 @@ connection.start()
|
||||||
### Example (NodeJS)
|
### Example (NodeJS)
|
||||||
|
|
||||||
```JavaScript
|
```JavaScript
|
||||||
const signalR = require("@aspnet/signalR");
|
const signalR = require("@aspnet/signalr");
|
||||||
|
|
||||||
let connection = new signalR.HubConnection('/chat');
|
let connection = new signalR.HubConnection('/chat');
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue