Skip to content

Commit e68c978

Browse files
ttowncompiledttowncompiled
committed
chore(npm): Upgrades systemjs to 0.18.3.
1 parent 272ad61 commit e68c978

7 files changed

Lines changed: 48 additions & 45 deletions

File tree

‎karma-js.conf.js‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@ module.exports = function(config) {
2121
'node_modules/es6-module-loader/dist/es6-module-loader-sans-promises.src.js',
2222
// Including systemjs because it defines `__eval`, which produces correct stack traces.
2323
'node_modules/systemjs/dist/system.src.js',
24-
'node_modules/systemjs/lib/extension-register.js',
25-
'node_modules/systemjs/lib/extension-cjs.js',
2624
'node_modules/rx/dist/rx.js',
2725
'node_modules/reflect-metadata/Reflect.js',
2826
'tools/build/file2modulename.js',

‎modules/angular2/src/facade/async.ts‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -101,15 +101,8 @@ export class EventEmitter extends Observable {
101101

102102
constructor() {
103103
super();
104-
105-
// System creates a different object for import * than Typescript es5 emit.
106-
if (Rx.hasOwnProperty('default')) {
107-
this._subject = new (<any>Rx).default.Rx.Subject();
108-
this._immediateScheduler = (<any>Rx).default.Rx.Scheduler.immediate;
109-
} else {
110-
this._subject = new Rx.Subject<any>();
111-
this._immediateScheduler = (<any>Rx.Scheduler).immediate;
112-
}
104+
this._subject = new Rx.Subject<any>();
105+
this._immediateScheduler = (<any>Rx.Scheduler).immediate;
113106
}
114107

115108
observer(generator: any): Rx.IDisposable {

‎npm-shrinkwrap.clean.json‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33
"angular": {
44
"version": "1.3.5"
55
},
6+
"base64-js": {
7+
"version": "0.0.8"
8+
},
69
"bower": {
710
"version": "1.4.1",
811
"dependencies": {
@@ -1542,9 +1545,6 @@
15421545
"buffer": {
15431546
"version": "3.2.2",
15441547
"dependencies": {
1545-
"base64-js": {
1546-
"version": "0.0.8"
1547-
},
15481548
"ieee754": {
15491549
"version": "1.1.6"
15501550
},
@@ -9926,7 +9926,15 @@
99269926
}
99279927
},
99289928
"systemjs": {
9929-
"version": "0.9.3"
9929+
"version": "0.18.3",
9930+
"dependencies": {
9931+
"es6-module-loader": {
9932+
"version": "0.17.6"
9933+
},
9934+
"when": {
9935+
"version": "3.7.3"
9936+
}
9937+
}
99309938
},
99319939
"systemjs-builder": {
99329940
"version": "0.10.6",

‎npm-shrinkwrap.json‎

Lines changed: 22 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@
121121
"string": "^3.1.1",
122122
"strip-ansi": "^2.0.1",
123123
"symlink-or-copy": "^1.0.1",
124-
"systemjs": "^0.9.1",
124+
"systemjs": "^0.18.3",
125125
"systemjs-builder": "^0.10.3",
126126
"temp": "^0.8.1",
127127
"ternary-stream": "^1.2.3",

‎test-main.js‎

Lines changed: 11 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,23 @@
11
// Tun on full stack traces in errors to help debugging
22
Error.stackTraceLimit=Infinity;
33

4-
// Use "register" extension from systemjs.
5-
// That's what Traceur outputs: `System.register()`.
6-
register(System);
7-
cjs(System);
8-
94
jasmine.DEFAULT_TIMEOUT_INTERVAL = 100;
105

116
// Cancel Karma's synchronous start,
127
// we will call `__karma__.start()` later, once all the specs are loaded.
138
__karma__.loaded = function() {};
149

15-
System.baseURL = '/base/';
16-
17-
// So that we can import packages like `core/foo`, instead of `core/src/foo`.
18-
System.paths = {
19-
'*': './*.js',
20-
'benchpress/*': 'dist/js/dev/es5/benchpress/*.js',
21-
'angular2/*': 'dist/js/dev/es5/angular2/*.js',
22-
'http/*': 'dist/js/dev/es5/http/*.js',
23-
'rtts_assert/*': 'dist/js/dev/es5/rtts_assert/*.js',
24-
'rx': 'node_modules/rx/dist/rx.js'
25-
};
10+
System.config({
11+
baseURL: '/base/',
12+
defaultJSExtensions: true,
13+
paths: {
14+
'benchpress/*': 'dist/js/dev/es5/benchpress/*.js',
15+
'angular2/*': 'dist/js/dev/es5/angular2/*.js',
16+
'http/*': 'dist/js/dev/es5/http/*.js',
17+
'rtts_assert/*': 'dist/js/dev/es5/rtts_assert/*.js',
18+
'rx': 'node_modules/rx/dist/rx.js'
19+
}
20+
});
2621

2722
// Import all the specs, execute their `main()` method and kick off Karma (Jasmine).
2823
System.import('angular2/src/dom/browser_adapter').then(function(browser_adapter) {

‎tools/broccoli/trees/browser_tree.ts‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -127,12 +127,9 @@ module.exports = function makeBrowserTree(options, destinationPath) {
127127
'node_modules/zone.js/dist/long-stack-trace-zone.js',
128128
'node_modules/es6-module-loader/dist/es6-module-loader-sans-promises.src.js',
129129
'node_modules/systemjs/dist/system.src.js',
130-
'node_modules/systemjs/lib/extension-register.js',
131-
'node_modules/systemjs/lib/extension-cjs.js',
132130
'node_modules/rx/dist/rx.js',
133131
'node_modules/base64-js/lib/b64.js',
134132
'node_modules/reflect-metadata/Reflect.js',
135-
'tools/build/snippets/runtime_paths.js',
136133
path.relative(projectRootDir, TRACEUR_RUNTIME_PATH)
137134
]
138135
}));

0 commit comments

Comments
 (0)