From 82f2b76e25a4a67e01ec67e5ebe39d14ad771ea8 Mon Sep 17 00:00:00 2001 From: Florian Dold Date: Thu, 20 Apr 2017 03:09:25 +0200 Subject: Reorganize module loading. We now use webpack instead of SystemJS, effectively bundling modules into one file (plus commons chunks) for every entry point. This results in a much smaller extension size (almost half). Furthermore we use yarn/npm even for extension run-time dependencies. This relieves us from manually vendoring and building dependencies. It's also easier to understand for new developers familiar with node. --- node_modules/systemjs/index.js | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'node_modules/systemjs/index.js') diff --git a/node_modules/systemjs/index.js b/node_modules/systemjs/index.js index 6a958ecff..f8ebe41f2 100644 --- a/node_modules/systemjs/index.js +++ b/node_modules/systemjs/index.js @@ -7,18 +7,17 @@ var isWindows = typeof process.platform != 'undefined' && process.platform.match // set transpiler paths in Node var nodeResolver = typeof process != 'undefined' && typeof require != 'undefined' && require.resolve; -function configNodePath(loader, module, nodeModule, wildcard) { +function configNodePath(loader, module, nodeModule) { if (loader.paths[module]) return; - var ext = wildcard ? '/package.json' : ''; try { - var match = nodeResolver(nodeModule + ext).replace(/\\/g, '/'); + var match = nodeResolver(nodeModule + (module[module.length - 1] === '/' ? 'package.json' : '')).replace(/\\/g, '/'); } catch(e) {} - + if (match) - loader.paths[module] = 'file://' + (isWindows ? '/' : '') + match.substr(0, match.length - ext.length) + (wildcard ? '/*.js' : ''); + loader.paths[module] = 'file://' + (isWindows ? '/' : '') + match.substr(0, match.length - (module[module.length - 1] === '/' ? 12 : 0)); } var SystemJSLoader = require('./dist/system.src').constructor; @@ -32,7 +31,7 @@ function SystemJSNodeLoader() { configNodePath(this, 'traceur-runtime', 'traceur/bin/traceur-runtime.js'); configNodePath(this, 'babel', 'babel-core/browser.js'); configNodePath(this, 'babel/external-helpers', 'babel-core/external-helpers.js'); - configNodePath(this, 'babel-runtime/*', 'babel-runtime', true); + configNodePath(this, 'babel-runtime/', 'babel-runtime/'); } } SystemJSNodeLoader.prototype = Object.create(SystemJSLoader.prototype); -- cgit v1.2.3