honeymoose
/
angular-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chore(npm): Upgrades systemjs to 0.18.3.

This commit is contained in:
Ian Riley 2015-08-14 15:05:56 -07:00 committed by Ian Riley
parent 272ad61ab1
commit e68c978202
7 changed files with 48 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
karma-js.conf.js
View File

@ -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',

11
modules/angular2/src/facade/async.ts
View File

@ -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 {

16
npm-shrinkwrap.clean.json
View File

@ -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",

32
npm-shrinkwrap.json generated
View File

@ -7,6 +7,11 @@
"from": "https://registry.npmjs.org/angular/-/angular-1.3.5.tgz",
"resolved": "https://registry.npmjs.org/angular/-/angular-1.3.5.tgz"
},
"base64-js": {
"version": "0.0.8",
"from": "base64-js@>=0.0.8 <0.0.9",
"resolved": "https://registry.npmjs.org/base64-js/-/base64-js-0.0.8.tgz"
},
"bower": {
"version": "1.4.1",
"from": "https://registry.npmjs.org/bower/-/bower-1.4.1.tgz",
@ -2381,11 +2386,6 @@
"from": "https://registry.npmjs.org/buffer/-/buffer-3.2.2.tgz",
"resolved": "https://registry.npmjs.org/buffer/-/buffer-3.2.2.tgz",
"dependencies": {
"base64-js": {
"version": "0.0.8",
"from": "https://registry.npmjs.org/base64-js/-/base64-js-0.0.8.tgz",
"resolved": "https://registry.npmjs.org/base64-js/-/base64-js-0.0.8.tgz"
},
"ieee754": {
"version": "1.1.6",
"from": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.6.tgz",
@ -15348,9 +15348,21 @@
}
},
"systemjs": {
"version": "0.9.3",
"from": "https://registry.npmjs.org/systemjs/-/systemjs-0.9.3.tgz",
"resolved": "https://registry.npmjs.org/systemjs/-/systemjs-0.9.3.tgz"
"version": "0.18.3",
"from": "systemjs@0.18.3",
"resolved": "https://registry.npmjs.org/systemjs/-/systemjs-0.18.3.tgz",
"dependencies": {
"es6-module-loader": {
"version": "0.17.6",
"from": "es6-module-loader@>=0.17.3 <0.18.0",
"resolved": "https://registry.npmjs.org/es6-module-loader/-/es6-module-loader-0.17.6.tgz"
},
"when": {
"version": "3.7.3",
"from": "when@>=3.7.2 <4.0.0",
"resolved": "https://registry.npmjs.org/when/-/when-3.7.3.tgz"
}
}
},
"systemjs-builder": {
"version": "0.10.6",
@ -15752,7 +15764,7 @@
},
"ts2dart": {
"version": "0.7.1",
"from": "ts2dart@0.7.1",
"from": "https://registry.npmjs.org/ts2dart/-/ts2dart-0.7.1.tgz",
"resolved": "https://registry.npmjs.org/ts2dart/-/ts2dart-0.7.1.tgz",
"dependencies": {
"source-map": {
@ -16675,7 +16687,7 @@
},
"typescript": {
"version": "1.5.3",
"from": "alexeagle/TypeScript#1.5_error_is_class",
"from": "git://github.com/alexeagle/TypeScript.git#d5acfd6ddd05801e48c2af1aed6f0360d1be55ac",
"resolved": "git://github.com/alexeagle/TypeScript.git#d5acfd6ddd05801e48c2af1aed6f0360d1be55ac"
},
"vinyl": {

2
package.json
View File

@ -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",

27
test-main.js
View File

@ -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) {

3
tools/broccoli/trees/browser_tree.ts
View File

@ -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)
]
}));