chore(npm): Upgrades systemjs to 0.18.3.

ttowncompiled · ttowncompiled · commit e68c978202ba · 2015-08-18T21:45:12.000Z
diff --git a/karma-js.conf.js b/karma-js.conf.js
@@ -21,8 +21,6 @@ module.exports = function(config) {
       'node_modules/es6-module-loader/dist/es6-module-loader-sans-promises.src.js',
       // Including systemjs because it defines `__eval`, which produces correct stack traces.
       'node_modules/systemjs/dist/system.src.js',
-      'node_modules/systemjs/lib/extension-register.js',
-      'node_modules/systemjs/lib/extension-cjs.js',
       'node_modules/rx/dist/rx.js',
       'node_modules/reflect-metadata/Reflect.js',
       'tools/build/file2modulename.js',
diff --git a/modules/angular2/src/facade/async.ts b/modules/angular2/src/facade/async.ts
@@ -101,15 +101,8 @@ export class EventEmitter extends Observable {
 
   constructor() {
     super();
-
-    // System creates a different object for import * than Typescript es5 emit.
-    if (Rx.hasOwnProperty('default')) {
-      this._subject = new (<any>Rx).default.Rx.Subject();
-      this._immediateScheduler = (<any>Rx).default.Rx.Scheduler.immediate;
-    } else {
-      this._subject = new Rx.Subject<any>();
-      this._immediateScheduler = (<any>Rx.Scheduler).immediate;
-    }
+    this._subject = new Rx.Subject<any>();
+    this._immediateScheduler = (<any>Rx.Scheduler).immediate;
   }
 
   observer(generator: any): Rx.IDisposable {
diff --git a/npm-shrinkwrap.clean.json b/npm-shrinkwrap.clean.json
@@ -3,6 +3,9 @@
     "angular": {
       "version": "1.3.5"
     },
+    "base64-js": {
+      "version": "0.0.8"
+    },
     "bower": {
       "version": "1.4.1",
       "dependencies": {
@@ -1542,9 +1545,6 @@
         "buffer": {
           "version": "3.2.2",
           "dependencies": {
-            "base64-js": {
-              "version": "0.0.8"
-            },
             "ieee754": {
               "version": "1.1.6"
             },
@@ -9926,7 +9926,15 @@
       }
     },
     "systemjs": {
-      "version": "0.9.3"
+      "version": "0.18.3",
+      "dependencies": {
+        "es6-module-loader": {
+          "version": "0.17.6"
+        },
+        "when": {
+          "version": "3.7.3"
+        }
+      }
     },
     "systemjs-builder": {
       "version": "0.10.6",
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
diff --git a/package.json b/package.json
@@ -121,7 +121,7 @@
     "string": "^3.1.1",
     "strip-ansi": "^2.0.1",
     "symlink-or-copy": "^1.0.1",
-    "systemjs": "^0.9.1",
+    "systemjs": "^0.18.3",
     "systemjs-builder": "^0.10.3",
     "temp": "^0.8.1",
     "ternary-stream": "^1.2.3",
diff --git a/test-main.js b/test-main.js
@@ -1,28 +1,23 @@
 // Tun on full stack traces in errors to help debugging
 Error.stackTraceLimit=Infinity;
 
-// Use "register" extension from systemjs.
-// That's what Traceur outputs: `System.register()`.
-register(System);
-cjs(System);
-
 jasmine.DEFAULT_TIMEOUT_INTERVAL = 100;
 
 // Cancel Karma's synchronous start,
 // we will call `__karma__.start()` later, once all the specs are loaded.
 __karma__.loaded = function() {};
 
-System.baseURL = '/base/';
-
-// So that we can import packages like `core/foo`, instead of `core/src/foo`.
-System.paths = {
-  '*': './*.js',
-  'benchpress/*': 'dist/js/dev/es5/benchpress/*.js',
-  'angular2/*': 'dist/js/dev/es5/angular2/*.js',
-  'http/*': 'dist/js/dev/es5/http/*.js',
-  'rtts_assert/*': 'dist/js/dev/es5/rtts_assert/*.js',
-  'rx': 'node_modules/rx/dist/rx.js'
-};
+System.config({
+  baseURL: '/base/',
+  defaultJSExtensions: true,
+  paths: {
+    'benchpress/*': 'dist/js/dev/es5/benchpress/*.js',
+    'angular2/*': 'dist/js/dev/es5/angular2/*.js',
+    'http/*': 'dist/js/dev/es5/http/*.js',
+    'rtts_assert/*': 'dist/js/dev/es5/rtts_assert/*.js',
+    'rx': 'node_modules/rx/dist/rx.js'
+  }
+});
 
 // Import all the specs, execute their `main()` method and kick off Karma (Jasmine).
 System.import('angular2/src/dom/browser_adapter').then(function(browser_adapter) {
diff --git a/tools/broccoli/trees/browser_tree.ts b/tools/broccoli/trees/browser_tree.ts
@@ -127,12 +127,9 @@ module.exports = function makeBrowserTree(options, destinationPath) {
       'node_modules/zone.js/dist/long-stack-trace-zone.js',
       'node_modules/es6-module-loader/dist/es6-module-loader-sans-promises.src.js',
       'node_modules/systemjs/dist/system.src.js',
-      'node_modules/systemjs/lib/extension-register.js',
-      'node_modules/systemjs/lib/extension-cjs.js',
       'node_modules/rx/dist/rx.js',
       'node_modules/base64-js/lib/b64.js',
       'node_modules/reflect-metadata/Reflect.js',
-      'tools/build/snippets/runtime_paths.js',
       path.relative(projectRootDir, TRACEUR_RUNTIME_PATH)
     ]
   }));
