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

chore(dependencies): switch from es6-shim to core-js (#10884)

This commit is contained in:
Marc Laval 2016-08-26 02:28:36 +02:00 committed by Victor Berchet
parent fc2fe00d16
commit 66df335998
22 changed files with 23 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.sh
View File

@ -21,7 +21,7 @@ cp -r ./modules/playground/favicon.ico ./dist/
#rsync -aP ./modules/playground/* ./dist/all/playground/
mkdir ./dist/all/playground/vendor
cd ./dist/all/playground/vendor
ln -s ../../../../node_modules/es6-shim/es6-shim.js .
ln -s ../../../../node_modules/core-js/client/core.js .
ln -s ../../../../node_modules/zone.js/dist/zone.js .
ln -s ../../../../node_modules/zone.js/dist/long-stack-trace-zone.js .
ln -s ../../../../node_modules/systemjs/dist/system.src.js .

2
karma-js.conf.js
View File

@ -13,7 +13,7 @@ module.exports = function(config) {
// Loaded through the System loader, in `test-main.js`.
{pattern: 'dist/all/@angular/**/*.js', included: false, watched: true},
'node_modules/es6-shim/es6-shim.js',
'node_modules/core-js/client/core.js',
// include Angular v1 for upgrade module testing
'node_modules/angular/angular.min.js',

2
modules/@angular/docs/bundles/overview.md
View File

@ -89,4 +89,4 @@ Depending on if you are using Angular bundles or not you can either use RxJS bun
## ES6 shims (optional)
Users of pre-ES6 browsers might need to add an ES6 shim (e.g. [es6-shim](https://github.com/paulmillr/es6-shim))
Users of pre-ES6 browsers might need to add an ES6 shim (e.g. [core-js](https://github.com/zloirock/core-js))

2
modules/@angular/http/src/index.ts
View File

@ -8,7 +8,7 @@
// Index to be used if Http is ever configured as a standalone npm package.
// require('reflect-metadata');
// require('es6-shim');
// require('core-js');
// import {HTTP_PROVIDERS, JSONP_PROVIDERS, Http, Jsonp} from './http';
// import {Injector} from '@angular/core';
// export * from './http';

17
modules/@angular/package.json
View File

@ -1,17 +0,0 @@
{
"name": "angular2",
"version": "<%= packageJson.version %>",
"description": "Angular 2 - a web framework for modern web apps",
"homepage": "<%= packageJson.homepage %>",
"bugs": "<%= packageJson.bugs %>",
"contributors": <%= JSON.stringify(packageJson.contributors) %>,
"license": "<%= packageJson.license %>",
"repository": <%= JSON.stringify(packageJson.repository) %>,
"devDependencies": <%= JSON.stringify(packageJson.defaultDevDependencies) %>,
"peerDependencies": {
"es6-shim": "<%= packageJson.dependencies['es6-shim'] %>",
"reflect-metadata": "<%= packageJson.dependencies['reflect-metadata'] %>",
"rxjs": "<%= packageJson.dependencies['rxjs'] %>",
"zone.js": "<%= packageJson.dependencies['zone.js'] %>"
}
}

2
modules/@angular/router/karma.conf.js
View File

@ -10,7 +10,7 @@ module.exports = function(config) {
files: [
// Polyfills.
'node_modules/es6-shim/es6-shim.js',
'node_modules/core-js/client/core.js',
'node_modules/reflect-metadata/Reflect.js',
'shims_for_IE.js',

2
modules/angular1_router/karma-router.conf.js
View File

@ -9,7 +9,7 @@ module.exports = function (config) {
frameworks: ['jasmine'],
files: [
'../../node_modules/es6-shim/es6-shim.js',
'../../node_modules/core-js/client/core.js',
'../../node_modules/angular/angular.js',
'../../node_modules/angular-animate/angular-animate.js',
'../../node_modules/angular-mocks/angular-mocks.js',

2
modules/benchpress/index.ts
View File

@ -7,7 +7,7 @@
*/
require('reflect-metadata');
require('es6-shim');
require('core-js');
module.exports = require('./benchpress.js');
// when bundling benchpress to one file, this is used
// for getting exports out of browserify's scope.

2
modules/benchpress/package.json
View File

@ -10,7 +10,7 @@
"repository": <%= JSON.stringify(packageJson.repository) %>,
"dependencies": {
"angular2": "<%= packageJson.version %>",
"es6-shim": "<%= packageJson.dependencies['es6-shim'] %>",
"core-js": "<%= packageJson.dependencies['core-js'] %>",
"reflect-metadata": "<%= packageJson.dependencies['reflect-metadata'] %>",
"rxjs": "<%= packageJson.dependencies['rxjs'] %>",
"selenium-webdriver": "<%= packageJson.dependencies['selenium-webdriver'] %>",

2
modules/benchpress/test/firefox_extension/conf.ts
View File

@ -6,7 +6,7 @@
* found in the LICENSE file at https://angular.io/license
*/
require('es6-shim/es6-shim.js');
require('core-js');
require('reflect-metadata');
var testHelper = require('../../src/firefox_extension/lib/test_helper.js');

2
modules/playground/src/bootstrap.ts
View File

@ -9,7 +9,7 @@
(function(global: any /** TODO #9100 */) {
writeScriptTag('/all/playground/vendor/es6-shim.js');
writeScriptTag('/all/playground/vendor/core.js');
writeScriptTag('/all/playground/vendor/zone.js');
writeScriptTag('/all/playground/vendor/long-stack-trace-zone.js');
writeScriptTag('/all/playground/vendor/system.src.js');

2
modules/playground/src/web_workers/images/loader.js
View File

@ -1,4 +1,4 @@
importScripts("../../../vendor/es6-shim.js",
importScripts("../../../vendor/core.js",
"../../../vendor/zone.js",
"../../../vendor/long-stack-trace-zone.js",
"../../../vendor/system.src.js",

2
modules/playground/src/web_workers/input/loader.js
View File

@ -1,4 +1,4 @@
importScripts("../../../vendor/es6-shim.js",
importScripts("../../../vendor/core.js",
"../../../vendor/zone.js",
"../../../vendor/long-stack-trace-zone.js",
"../../../vendor/system.src.js",

2
modules/playground/src/web_workers/kitchen_sink/loader.js
View File

@ -1,4 +1,4 @@
importScripts("../../../vendor/es6-shim.js",
importScripts("../../../vendor/core.js",
"../../../vendor/zone.js",
"../../../vendor/long-stack-trace-zone.js",
"../../../vendor/system.src.js",

2
modules/playground/src/web_workers/message_broker/loader.js
View File

@ -1,4 +1,4 @@
importScripts("../../../vendor/es6-shim.js",
importScripts("../../../vendor/core.js",
"../../../vendor/zone.js",
"../../../vendor/long-stack-trace-zone.js",
"../../../vendor/system.src.js",

2
modules/playground/src/web_workers/router/loader.js
View File

@ -1,4 +1,4 @@
importScripts("../../../vendor/es6-shim.js",
importScripts("../../../vendor/core.js",
"../../../vendor/zone.js",
"../../../vendor/long-stack-trace-zone.js",
"../../../vendor/system.src.js",

2
modules/playground/src/web_workers/todo/loader.js
View File

@ -1,4 +1,4 @@
importScripts("../../../vendor/es6-shim.js",
importScripts("../../../vendor/core.js",
"../../../vendor/zone.js",
"../../../vendor/long-stack-trace-zone.js",
"../../../vendor/system.src.js",

5
npm-shrinkwrap.clean.json
View File

@ -1882,7 +1882,7 @@
"version": "1.0.0"
},
"core-js": {
"version": "2.4.0"
"version": "2.4.1"
},
"core-object": {
"version": "0.0.2"
@ -2116,9 +2116,6 @@
"es6-module-loader": {
"version": "0.17.9"
},
"es6-shim": {
"version": "0.35.0"
},
"es6-symbol": {
"version": "3.0.2"
},

11
npm-shrinkwrap.json generated
View File

@ -2954,9 +2954,9 @@
"resolved": "https://registry.npmjs.org/copy-dereference/-/copy-dereference-1.0.0.tgz"
},
"core-js": {
"version": "2.4.0",
"from": "core-js@>=2.1.0 <3.0.0",
"resolved": "https://registry.npmjs.org/core-js/-/core-js-2.4.0.tgz"
"version": "2.4.1",
"from": "core-js@latest",
"resolved": "https://registry.npmjs.org/core-js/-/core-js-2.4.1.tgz"
},
"core-object": {
"version": "0.0.2",
@ -3334,11 +3334,6 @@
"from": "es6-module-loader@>=0.17.4 <0.18.0",
"resolved": "https://registry.npmjs.org/es6-module-loader/-/es6-module-loader-0.17.9.tgz"
},
"es6-shim": {
"version": "0.35.0",
"from": "es6-shim@0.35.0",
"resolved": "https://registry.npmjs.org/es6-shim/-/es6-shim-0.35.0.tgz"
},
"es6-symbol": {
"version": "3.0.2",
"from": "es6-symbol@>=3.0.2 <3.1.0",

2
package.json
View File

@ -18,7 +18,7 @@
"postinstall": "node tools/npm/copy-npm-shrinkwrap && webdriver-manager update"
},
"dependencies": {
"es6-shim": "^0.35.0",
"core-js": "^2.4.1",
"reflect-metadata": "^0.1.3",
"rxjs": "5.0.0-beta.11",
"zone.js": "^0.6.17"

2
tools/cjs-jasmine/index-tools.ts
View File

@ -4,7 +4,7 @@ var glob = require('glob');
require('zone.js/dist/zone-node.js');
var JasmineRunner = require('jasmine');
var path = require('path');
// require('es6-shim/es6-shim.js');
// require('core-js');
require('zone.js/dist/long-stack-trace-zone.js');
require('zone.js/dist/proxy.js');
require('zone.js/dist/sync-test.js');

2
tools/cjs-jasmine/index.ts
View File

@ -5,7 +5,7 @@ require('zone.js/dist/zone-node.js');
var JasmineRunner = require('jasmine');
var path = require('path');
require('source-map-support').install();
// require('es6-shim/es6-shim.js');
// require('core-js');
require('zone.js/dist/long-stack-trace-zone.js');
require('zone.js/dist/proxy.js');
require('zone.js/dist/sync-test.js');