0.8.0

systemjs · Aug 11, 2014 · b1456e4 · b1456e4
1 parent e05a6fd
commit b1456e4
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 72 deletions.
diff --git a/README.md b/README.md
@@ -23,7 +23,7 @@ Basic Configuration
 
 ### Setup
 
-Download [`es6-module-loader.js`](https://github.com/ModuleLoader/es6-module-loader/blob/v0.8.0/dist/es6-module-loader.js) and [`traceur.js`](https://raw.githubusercontent.com/jmcriffey/bower-traceur/0.0.55/traceur.js) and locate them in the same folder as `system.js` from this repo.
+Download [`es6-module-loader.js`](https://github.com/ModuleLoader/es6-module-loader/blob/v0.8.1/dist/es6-module-loader.js) and [`traceur.js`](https://raw.githubusercontent.com/jmcriffey/bower-traceur/0.0.56/traceur.js) and locate them in the same folder as `system.js` from this repo.
 
 We then include `dist/system.js` with a script tag in the page.
 
@@ -334,7 +334,7 @@ This will compile all ES6 files in the directory `app` into corresponding ES5 `S
 
 The `instantiate` modules option writes the modules out using a `System.register` call, which is supported by SystemJS.
 
-Then include [`traceur-runtime.js`](https://raw.githubusercontent.com/jmcriffey/bower-traceur/0.0.55/traceur-runtimr.js) (also found inside traceur's `bin` folder when installed via npm) before es6-module-loader.js:
+Then include [`traceur-runtime.js`](https://raw.githubusercontent.com/jmcriffey/bower-traceur/0.0.56/traceur-runtimr.js) (also found inside traceur's `bin` folder when installed via npm) before es6-module-loader.js:
 
 ```html
   <script src="traceur-runtime.js"></script>

diff --git a/bower.json b/bower.json
@@ -1,9 +1,9 @@
 {
   "name": "system.js",
-  "version": "0.7.0",
+  "version": "0.8.0",
   "main": "dist/system.js",
   "dependencies": {
-    "es6-module-loader": "~0.8.0"
+    "es6-module-loader": "~0.8.1"
   },
   "devDependencies": {
     "qunit": "~1.12.0"

diff --git a/dist/system-production-csp.js b/dist/system-production-csp.js
@@ -525,6 +525,10 @@ function register(loader) {
       if (depModule) {
         depExports = depModule.exports;
       }
+      // dynamic, already linked in our registry
+      else if (depEntry && !depEntry.declarative) {
+        depExports = { 'default': depEntry.module.exports, '__useDefault': true };
+      }
       // in the loader registry
       else if (!depEntry) {
         depExports = loader.get(depName);
@@ -1082,32 +1086,6 @@ function cjs(loader) {
     return deps;
   }
 
-  var noop = function() {}
-  var nodeProcess = {
-    nextTick: function(f) {
-      setTimeout(f, 7);
-    },
-    browser: typeof window != 'undefined',
-    env: {},
-    argv: [],
-    on: noop,
-    once: noop,
-    off: noop,
-    emit: noop,
-    cwd: function() { return '/' }
-  };
-
-  if (!loader.has('@@nodeProcess'))
-    loader.set('@@nodeProcess', loader.newModule({ 'default': nodeProcess, __useDefault: true }));
-
-  var loaderTranslate = loader.translate;
-  loader.translate = function(load) {
-    var loader = this;
-    if (!loader.has('@@nodeProcess'))
-      loader.set('@@nodeProcess', loader.newModule({ 'default': nodeProcess, __useDefault: true }));
-    return loaderTranslate.call(loader, load);
-  }
-
   var loaderInstantiate = loader.instantiate;
   loader.instantiate = function(load) {
 
@@ -1132,17 +1110,13 @@ function cjs(loader) {
           global: loader.global,
           exports: exports,
           module: module,
-          process: nodeProcess,
           require: require,
           __filename: load.address,
           __dirname: dirname
         };
 
-        var glString = '';
-        for (var _g in globals)
-          glString += 'var ' + _g + ' = _g.' + _g + ';';
-
-        load.source = '(function() { ' + glString + '(function() { ' + load.source + '\n}).call(exports); })();';
+        load.source = '(function(global, exports, module, require, __filename, __dirname) { ' + load.source 
+          + '\n}).call(_g.exports, _g.global, _g.exports, _g.module, _g.require, _g.__filename, _g.__dirname);';
 
         // disable AMD detection
         var define = loader.global.define;

diff --git a/dist/system-production-csp.min.js b/dist/system-production-csp.min.js
diff --git a/dist/system.js b/dist/system.js
@@ -463,6 +463,10 @@ function register(loader) {
       if (depModule) {
         depExports = depModule.exports;
       }
+      // dynamic, already linked in our registry
+      else if (depEntry && !depEntry.declarative) {
+        depExports = { 'default': depEntry.module.exports, '__useDefault': true };
+      }
       // in the loader registry
       else if (!depEntry) {
         depExports = loader.get(depName);
@@ -1020,32 +1024,6 @@ function cjs(loader) {
     return deps;
   }
 
-  var noop = function() {}
-  var nodeProcess = {
-    nextTick: function(f) {
-      setTimeout(f, 7);
-    },
-    browser: typeof window != 'undefined',
-    env: {},
-    argv: [],
-    on: noop,
-    once: noop,
-    off: noop,
-    emit: noop,
-    cwd: function() { return '/' }
-  };
-
-  if (!loader.has('@@nodeProcess'))
-    loader.set('@@nodeProcess', loader.newModule({ 'default': nodeProcess, __useDefault: true }));
-
-  var loaderTranslate = loader.translate;
-  loader.translate = function(load) {
-    var loader = this;
-    if (!loader.has('@@nodeProcess'))
-      loader.set('@@nodeProcess', loader.newModule({ 'default': nodeProcess, __useDefault: true }));
-    return loaderTranslate.call(loader, load);
-  }
-
   var loaderInstantiate = loader.instantiate;
   loader.instantiate = function(load) {
 
@@ -1070,17 +1048,13 @@ function cjs(loader) {
           global: loader.global,
           exports: exports,
           module: module,
-          process: nodeProcess,
           require: require,
           __filename: load.address,
           __dirname: dirname
         };
 
-        var glString = '';
-        for (var _g in globals)
-          glString += 'var ' + _g + ' = _g.' + _g + ';';
-
-        load.source = '(function() { ' + glString + '(function() { ' + load.source + '\n}).call(exports); })();';
+        load.source = '(function(global, exports, module, require, __filename, __dirname) { ' + load.source 
+          + '\n}).call(_g.exports, _g.global, _g.exports, _g.module, _g.require, _g.__filename, _g.__dirname);';
 
         // disable AMD detection
         var define = loader.global.define;

diff --git a/dist/system.min.js b/dist/system.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "systemjs",
-  "version": "0.7.0",
+  "version": "0.8.0",
   "description": "System loader extension for flexible AMD & CommonJS support",
   "main": "dist/system.js",
   "repository": {
@@ -10,7 +10,7 @@
   "author": "Guy Bedford",
   "license": "MIT",
   "dependencies": {
-    "es6-module-loader": "~0.8.0"
+    "es6-module-loader": "~0.8.1"
   },
   "devDependencies": {
     "qunit": "^0.6.2",