Skip to content

Commit 388f55c

Browse files
devversionjelbourn
authored andcommitted
chore(): use core-js instead of es6-shim (#505)
Replace es6-shim, es6-promise and reflect-metadata with core-js, because it coveres all required dependencies / shims in one single dependency / library. Closes #477.
1 parent 7d822ee commit 388f55c

File tree

4 files changed

+5
-10
lines changed

4 files changed

+5
-10
lines changed

angular-cli-build.js

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,7 @@ function _buildAppTree(defaults) {
8484
return new Angular2App(defaults, inputNode, {
8585
sourceDir: sourceDir,
8686
polyfills: [
87-
'vendor/es6-shim/es6-shim.js',
88-
'vendor/reflect-metadata/Reflect.js',
87+
'vendor/core-js/client/core.js',
8988
'vendor/systemjs/dist/system.src.js',
9089
'vendor/zone.js/dist/zone.js',
9190
'vendor/hammerjs/hammer.min.js'
@@ -100,8 +99,7 @@ function _buildAppTree(defaults) {
10099
'systemjs/dist/system-polyfills.js',
101100
'systemjs/dist/system.src.js',
102101
'zone.js/dist/*.js',
103-
'es6-shim/es6-shim.js',
104-
'reflect-metadata/*.js',
102+
'core-js/client/core.js',
105103
'rxjs/**/*.js',
106104
'@angular/**/*.js',
107105
'hammerjs/*.min.+(js|js.map)'

package.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,8 @@
3232
"@angular/platform-browser": "2.0.0-rc.1",
3333
"@angular/platform-browser-dynamic": "2.0.0-rc.1",
3434
"@angular/router": "2.0.0-rc.1",
35-
"es6-promise": "^3.0.2",
36-
"es6-shim": "^0.35.0",
35+
"core-js": "^2.4.0",
3736
"hammerjs": "^2.0.8",
38-
"reflect-metadata": "0.1.3",
3937
"rxjs": "5.0.0-beta.6",
4038
"systemjs": "0.19.26",
4139
"zone.js": "0.6.12"

test/karma.config.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@ export function config(config) {
1919
require('karma-firefox-launcher'),
2020
],
2121
files: [
22-
{pattern: 'dist/vendor/es6-shim/es6-shim.js', included: true, watched: false},
23-
{pattern: 'dist/vendor/reflect-metadata/Reflect.js', included: true, watched: false},
22+
{pattern: 'dist/vendor/core-js/client/core.js', included: true, watched: false},
2423
{pattern: 'dist/vendor/systemjs/dist/system-polyfills.js', included: true, watched: false},
2524
{pattern: 'dist/vendor/systemjs/dist/system.src.js', included: true, watched: false},
2625
{pattern: 'dist/vendor/zone.js/dist/zone.js', included: true, watched: false},

typings.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"jasmine": "github:DefinitelyTyped/DefinitelyTyped/jasmine/jasmine.d.ts#26c98c8a9530c44f8c801ccc3b2057e2101187ee"
77
},
88
"ambientDependencies": {
9-
"es6-shim": "github:DefinitelyTyped/DefinitelyTyped/es6-shim/es6-shim.d.ts#6697d6f7dadbf5773cb40ecda35a76027e0783b2",
9+
"core-js": "registry:dt/core-js#0.0.0+20160317120654",
1010
"hammerjs": "github:DefinitelyTyped/DefinitelyTyped/hammerjs/hammerjs.d.ts#de8e80dfe5360fef44d00c41257d5ef37add000a"
1111
}
1212
}

0 commit comments

Comments
 (0)