From 5f50ef5e3d959843416035ee2fe2b286ed937836 Mon Sep 17 00:00:00 2001 From: Shyam-Chen Date: Sat, 4 Jun 2016 20:08:17 +0800 Subject: [PATCH 01/12] Update typings.json --- addon/ng2/blueprints/ng2/files/typings.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addon/ng2/blueprints/ng2/files/typings.json b/addon/ng2/blueprints/ng2/files/typings.json index 21f9888ab067..d46dc6f550e7 100644 --- a/addon/ng2/blueprints/ng2/files/typings.json +++ b/addon/ng2/blueprints/ng2/files/typings.json @@ -5,7 +5,7 @@ "selenium-webdriver": "registry:dt/selenium-webdriver#2.44.0+20160317120654" }, "ambientDependencies": { - "es6-shim": "registry:dt/es6-shim#0.31.2+20160317120654"<% if (isMobile) {%>, + "core-js": "registry:dt/core-js#0.0.0+20160317120654"<% if (isMobile) {%>, "node": "registry:dt/node#4.0.0+20160509154515" <% } %> } } From 519dafbfbc40764f2452ec9805109ab685bb0146 Mon Sep 17 00:00:00 2001 From: Shyam-Chen Date: Sat, 4 Jun 2016 20:08:54 +0800 Subject: [PATCH 02/12] Update angular-cli-build.js --- addon/ng2/blueprints/ng2/files/angular-cli-build.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addon/ng2/blueprints/ng2/files/angular-cli-build.js b/addon/ng2/blueprints/ng2/files/angular-cli-build.js index dad887ff3dba..c3d479381274 100644 --- a/addon/ng2/blueprints/ng2/files/angular-cli-build.js +++ b/addon/ng2/blueprints/ng2/files/angular-cli-build.js @@ -8,7 +8,7 @@ module.exports = function(defaults) { 'systemjs/dist/system-polyfills.js', 'systemjs/dist/system.src.js', 'zone.js/dist/**/*.+(js|js.map)', - 'es6-shim/es6-shim.js', + 'core-js/client/shim.min.js' 'reflect-metadata/**/*.+(js|js.map)', 'rxjs/**/*.+(js|js.map)', '@angular/**/*.+(js|js.map)' From ebfaca6ec8017b2e0859c6b1c1f0f7c3005b1f19 Mon Sep 17 00:00:00 2001 From: Shyam-Chen Date: Sat, 4 Jun 2016 20:09:52 +0800 Subject: [PATCH 03/12] Update karma.conf.js --- addon/ng2/blueprints/ng2/files/config/karma.conf.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addon/ng2/blueprints/ng2/files/config/karma.conf.js b/addon/ng2/blueprints/ng2/files/config/karma.conf.js index d39036fa52ff..3c385a84434a 100644 --- a/addon/ng2/blueprints/ng2/files/config/karma.conf.js +++ b/addon/ng2/blueprints/ng2/files/config/karma.conf.js @@ -14,7 +14,7 @@ module.exports = function (config) { } }, files: [ - { pattern: 'dist/vendor/es6-shim/es6-shim.js', included: true, watched: false }, + { pattern: 'dist/vendor/core-js/client/shim.min.js', included: true, watched: false }, { pattern: 'dist/vendor/zone.js/dist/zone.js', included: true, watched: false }, { pattern: 'dist/vendor/reflect-metadata/Reflect.js', included: true, watched: false }, { pattern: 'dist/vendor/systemjs/dist/system-polyfills.js', included: true, watched: false }, From dbaea6cd9d6e15383e536a28e00192ca1c5bc799 Mon Sep 17 00:00:00 2001 From: Shyam-Chen Date: Sat, 4 Jun 2016 20:10:27 +0800 Subject: [PATCH 04/12] Update package.json --- addon/ng2/blueprints/ng2/files/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addon/ng2/blueprints/ng2/files/package.json b/addon/ng2/blueprints/ng2/files/package.json index 8c9823b92cfb..c382d1301672 100644 --- a/addon/ng2/blueprints/ng2/files/package.json +++ b/addon/ng2/blueprints/ng2/files/package.json @@ -20,7 +20,7 @@ "@angular/platform-browser": "2.0.0-rc.1", "@angular/platform-browser-dynamic": "2.0.0-rc.1", "@angular/router": "2.0.0-rc.1", - "es6-shim": "^0.35.0", + "core-js": "^2.4.0", "reflect-metadata": "0.1.3", "rxjs": "5.0.0-beta.6", "systemjs": "0.19.26", From dd9e95e3408ac9bac164732bcb003c0b2d79a70b Mon Sep 17 00:00:00 2001 From: Shyam-Chen Date: Sat, 4 Jun 2016 20:11:33 +0800 Subject: [PATCH 05/12] Update angular2-app.js --- lib/broccoli/angular2-app.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/broccoli/angular2-app.js b/lib/broccoli/angular2-app.js index 328163be57a3..4d4a3a5b204e 100644 --- a/lib/broccoli/angular2-app.js +++ b/lib/broccoli/angular2-app.js @@ -33,7 +33,7 @@ class Angular2App extends BroccoliPlugin { || (this.ngConfig.defaults && this.ngConfig.defaults.sourceDir) || 'src'; this._options.polyfills = this._options.polyfills || [ - 'vendor/es6-shim/es6-shim.js', + 'vendor/core-js/client/shim.min.js', 'vendor/reflect-metadata/Reflect.js', 'vendor/systemjs/dist/system.src.js', 'vendor/zone.js/dist/zone.js' From addf961499e43d29ca75c3e4051a33096c1e6d95 Mon Sep 17 00:00:00 2001 From: Shyam-Chen Date: Sat, 4 Jun 2016 20:12:06 +0800 Subject: [PATCH 06/12] Update e2e_workflow.spec.js --- tests/e2e/e2e_workflow.spec.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/e2e/e2e_workflow.spec.js b/tests/e2e/e2e_workflow.spec.js index f4ecf891a517..f717afa4809d 100644 --- a/tests/e2e/e2e_workflow.spec.js +++ b/tests/e2e/e2e_workflow.spec.js @@ -87,7 +87,7 @@ describe('Basic end-to-end Workflow', function () { // Check the index.html to have no handlebar tokens in it. const indexHtml = fs.readFileSync(path.join(process.cwd(), 'dist/index.html'), 'utf-8'); expect(indexHtml).to.not.include('{{'); - expect(indexHtml).to.include('vendor/es6-shim/es6-shim.js'); + expect(indexHtml).to.include('vendor/core-js/client/shim.min.js'); }) .then(function () { // Also does not create new things in GIT. From 2839cd0ef8ff92a9b9c00c0f9eaf4b9483b10ec0 Mon Sep 17 00:00:00 2001 From: Shyam-Chen Date: Sat, 4 Jun 2016 20:13:38 +0800 Subject: [PATCH 07/12] Update angular-cli-build.js --- addon/ng2/blueprints/ng2/files/angular-cli-build.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addon/ng2/blueprints/ng2/files/angular-cli-build.js b/addon/ng2/blueprints/ng2/files/angular-cli-build.js index c3d479381274..ffcbf4b937f0 100644 --- a/addon/ng2/blueprints/ng2/files/angular-cli-build.js +++ b/addon/ng2/blueprints/ng2/files/angular-cli-build.js @@ -8,7 +8,7 @@ module.exports = function(defaults) { 'systemjs/dist/system-polyfills.js', 'systemjs/dist/system.src.js', 'zone.js/dist/**/*.+(js|js.map)', - 'core-js/client/shim.min.js' + 'core-js/client/shim.min.js', 'reflect-metadata/**/*.+(js|js.map)', 'rxjs/**/*.+(js|js.map)', '@angular/**/*.+(js|js.map)' From 30b79f6903287ef7e0964d9d2dc08f4bef20a227 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=B3=E5=BD=A5=E6=BE=84?= Date: Thu, 23 Jun 2016 17:33:34 +0800 Subject: [PATCH 08/12] Update angular-cli-build.js --- addon/ng2/blueprints/ng2/files/angular-cli-build.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addon/ng2/blueprints/ng2/files/angular-cli-build.js b/addon/ng2/blueprints/ng2/files/angular-cli-build.js index ffcbf4b937f0..ad98af37726c 100644 --- a/addon/ng2/blueprints/ng2/files/angular-cli-build.js +++ b/addon/ng2/blueprints/ng2/files/angular-cli-build.js @@ -8,7 +8,7 @@ module.exports = function(defaults) { 'systemjs/dist/system-polyfills.js', 'systemjs/dist/system.src.js', 'zone.js/dist/**/*.+(js|js.map)', - 'core-js/client/shim.min.js', + 'core-js/client/shim.min.+(js|js.map)', 'reflect-metadata/**/*.+(js|js.map)', 'rxjs/**/*.+(js|js.map)', '@angular/**/*.+(js|js.map)' From e01abc0b35ac1ac50d09d3e9e1e37257f623c299 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=B3=E5=BD=A5=E6=BE=84?= Date: Thu, 23 Jun 2016 17:34:34 +0800 Subject: [PATCH 09/12] Update angular-cli-build.js --- addon/ng2/blueprints/ng2/files/angular-cli-build.js | 1 - 1 file changed, 1 deletion(-) diff --git a/addon/ng2/blueprints/ng2/files/angular-cli-build.js b/addon/ng2/blueprints/ng2/files/angular-cli-build.js index ad98af37726c..16a5a4f6dfb1 100644 --- a/addon/ng2/blueprints/ng2/files/angular-cli-build.js +++ b/addon/ng2/blueprints/ng2/files/angular-cli-build.js @@ -9,7 +9,6 @@ module.exports = function(defaults) { 'systemjs/dist/system.src.js', 'zone.js/dist/**/*.+(js|js.map)', 'core-js/client/shim.min.+(js|js.map)', - 'reflect-metadata/**/*.+(js|js.map)', 'rxjs/**/*.+(js|js.map)', '@angular/**/*.+(js|js.map)' ] From 424530e8a5baef34025aaa49d7b5ff5b49ac00f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=B3=E5=BD=A5=E6=BE=84?= Date: Thu, 23 Jun 2016 17:35:04 +0800 Subject: [PATCH 10/12] Update karma.conf.js --- addon/ng2/blueprints/ng2/files/config/karma.conf.js | 1 - 1 file changed, 1 deletion(-) diff --git a/addon/ng2/blueprints/ng2/files/config/karma.conf.js b/addon/ng2/blueprints/ng2/files/config/karma.conf.js index 3c385a84434a..f14020b1ccdf 100644 --- a/addon/ng2/blueprints/ng2/files/config/karma.conf.js +++ b/addon/ng2/blueprints/ng2/files/config/karma.conf.js @@ -16,7 +16,6 @@ module.exports = function (config) { files: [ { pattern: 'dist/vendor/core-js/client/shim.min.js', included: true, watched: false }, { pattern: 'dist/vendor/zone.js/dist/zone.js', included: true, watched: false }, - { pattern: 'dist/vendor/reflect-metadata/Reflect.js', included: true, watched: false }, { pattern: 'dist/vendor/systemjs/dist/system-polyfills.js', included: true, watched: false }, { pattern: 'dist/vendor/systemjs/dist/system.src.js', included: true, watched: false }, { pattern: 'dist/vendor/zone.js/dist/async-test.js', included: true, watched: false }, From 9033dee2b80f94c7ec2adb9e8565d250a29666ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=B3=E5=BD=A5=E6=BE=84?= Date: Thu, 23 Jun 2016 17:35:27 +0800 Subject: [PATCH 11/12] Update package.json --- addon/ng2/blueprints/ng2/files/package.json | 1 - 1 file changed, 1 deletion(-) diff --git a/addon/ng2/blueprints/ng2/files/package.json b/addon/ng2/blueprints/ng2/files/package.json index c382d1301672..7a32017fad42 100644 --- a/addon/ng2/blueprints/ng2/files/package.json +++ b/addon/ng2/blueprints/ng2/files/package.json @@ -21,7 +21,6 @@ "@angular/platform-browser-dynamic": "2.0.0-rc.1", "@angular/router": "2.0.0-rc.1", "core-js": "^2.4.0", - "reflect-metadata": "0.1.3", "rxjs": "5.0.0-beta.6", "systemjs": "0.19.26", "zone.js": "^0.6.12" From 538a8538383d7334df7d999cf8803ed81bcef5dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=B3=E5=BD=A5=E6=BE=84?= Date: Thu, 23 Jun 2016 17:35:47 +0800 Subject: [PATCH 12/12] Update angular2-app.js --- lib/broccoli/angular2-app.js | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/broccoli/angular2-app.js b/lib/broccoli/angular2-app.js index 4d4a3a5b204e..b6dd7ff30b34 100644 --- a/lib/broccoli/angular2-app.js +++ b/lib/broccoli/angular2-app.js @@ -34,7 +34,6 @@ class Angular2App extends BroccoliPlugin { || 'src'; this._options.polyfills = this._options.polyfills || [ 'vendor/core-js/client/shim.min.js', - 'vendor/reflect-metadata/Reflect.js', 'vendor/systemjs/dist/system.src.js', 'vendor/zone.js/dist/zone.js' ];