Skip to content

Commit 633065a

Browse files
hanslfilipesilva
authored andcommitted
perf: move es6-shim to core-js (new stuff only)
Fixes #851. Close #853.
1 parent 9de90e1 commit 633065a

File tree

5 files changed

+5
-5
lines changed

5 files changed

+5
-5
lines changed

addon/ng2/blueprints/ng2/files/angular-cli-build.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ module.exports = function(defaults) {
88
'systemjs/dist/system-polyfills.js',
99
'systemjs/dist/system.src.js',
1010
'zone.js/dist/**/*.+(js|js.map)',
11-
'es6-shim/es6-shim.js',
11+
'core-js/client/shim.min.+(js|js.map)',
1212
'reflect-metadata/**/*.+(js|js.map)',
1313
'rxjs/**/*.+(js|js.map)',
1414
'@angular/**/*.+(js|js.map)'

addon/ng2/blueprints/ng2/files/config/karma.conf.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ module.exports = function (config) {
1414
}
1515
},
1616
files: [
17-
{ pattern: 'dist/vendor/es6-shim/es6-shim.js', included: true, watched: false },
17+
{ pattern: 'dist/vendor/core-js/client/shim.min.js', included: true, watched: false },
1818
{ pattern: 'dist/vendor/zone.js/dist/zone.js', included: true, watched: false },
1919
{ pattern: 'dist/vendor/reflect-metadata/Reflect.js', included: true, watched: false },
2020
{ pattern: 'dist/vendor/systemjs/dist/system-polyfills.js', included: true, watched: false },

addon/ng2/blueprints/ng2/files/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"@angular/platform-browser": "2.0.0-rc.1",
2121
"@angular/platform-browser-dynamic": "2.0.0-rc.1",
2222
"@angular/router": "2.0.0-rc.1",
23-
"es6-shim": "^0.35.0",
23+
"core-js": "2.4.0",
2424
"reflect-metadata": "0.1.3",
2525
"rxjs": "5.0.0-beta.6",
2626
"systemjs": "0.19.26",

lib/broccoli/angular2-app.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ class Angular2App extends BroccoliPlugin {
3333
|| (this.ngConfig.defaults && this.ngConfig.defaults.sourceDir)
3434
|| 'src';
3535
this._options.polyfills = this._options.polyfills || [
36-
'vendor/es6-shim/es6-shim.js',
36+
'vendor/core-js/client/shim.min.js',
3737
'vendor/reflect-metadata/Reflect.js',
3838
'vendor/systemjs/dist/system.src.js',
3939
'vendor/zone.js/dist/zone.js'

tests/e2e/e2e_workflow.spec.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ describe('Basic end-to-end Workflow', function () {
8787
// Check the index.html to have no handlebar tokens in it.
8888
const indexHtml = fs.readFileSync(path.join(process.cwd(), 'dist/index.html'), 'utf-8');
8989
expect(indexHtml).to.not.include('{{');
90-
expect(indexHtml).to.include('vendor/es6-shim/es6-shim.js');
90+
expect(indexHtml).to.include('vendor/core-js/client/shim.min.js');
9191
})
9292
.then(function () {
9393
// Also does not create new things in GIT.

0 commit comments

Comments
 (0)