Skip to content
This repository was archived by the owner on Dec 4, 2017. It is now read-only.

Commit 3423ad8

Browse files
wardbellwardbell
committed
chore: more conversion of es6-shim to core-js
1 parent 6e0f80c commit 3423ad8

27 files changed

+36
-42
lines changed

‎public/docs/_examples/homepage-hello-world/ts/index.1.html

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,17 @@
99

1010
<!-- 1. Load libraries -->
1111
<!-- Polyfill(s) for older browsers -->
12-
<script src="https://cdnjs.cloudflare.com/ajax/libs/es6-shim/0.35.0/es6-shim.min.js"></script>
12+
<script src="https://npmcdn.com/core-js/client/shim.min.js"></script>
1313

1414
<script src="https://npmcdn.com/[email protected]"></script>
1515
<script src="https://npmcdn.com/[email protected]"></script>
16-
<script src="https://cdnjs.cloudflare.com/ajax/libs/systemjs/0.19.27/system.js"></script>
16+
<script src="https://npmcdn.com/systemjs@0.19.27/dist/system.src.js"></script>
1717
<script src="https://npmcdn.com/[email protected]/lib/typescript.js"></script>
1818

1919
<!-- 2. Configure SystemJS -->
2020
<script src="systemjs.config.js"></script>
2121
<script>
22-
System.import('app').catch(function(err){ console.error(err); });
22+
System.import('app').catch(function(err){ console.error(err); });
2323
</script>
2424

2525
</head>

‎public/docs/_examples/homepage-tabs/ts/index.1.html

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,17 @@
1010

1111
<!-- 1. Load libraries -->
1212
<!-- Polyfill(s) for older browsers -->
13-
<script src="https://cdnjs.cloudflare.com/ajax/libs/es6-shim/0.35.0/es6-shim.min.js"></script>
13+
<script src="https://npmcdn.com/core-js/client/shim.min.js"></script>
1414

1515
<script src="https://npmcdn.com/[email protected]"></script>
1616
<script src="https://npmcdn.com/[email protected]"></script>
17-
<script src="https://cdnjs.cloudflare.com/ajax/libs/systemjs/0.19.27/system.js"></script>
17+
<script src="https://npmcdn.com/systemjs@0.19.27/dist/system.src.js"></script>
1818
<script src="https://npmcdn.com/[email protected]/lib/typescript.js"></script>
1919

2020
<!-- 2. Configure SystemJS -->
2121
<script src="systemjs.config.js"></script>
2222
<script>
23-
System.import('app').catch(function(err){ console.error(err); });
23+
System.import('app').catch(function(err){ console.error(err); });
2424
</script>
2525

2626
</head>

‎public/docs/_examples/homepage-todo/ts/index.1.html

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,17 @@
1010

1111
<!-- 1. Load libraries -->
1212
<!-- Polyfill(s) for older browsers -->
13-
<script src="https://cdnjs.cloudflare.com/ajax/libs/es6-shim/0.35.0/es6-shim.min.js"></script>
13+
<script src="https://npmcdn.com/core-js/client/shim.min.js"></script>
1414

1515
<script src="https://npmcdn.com/[email protected]"></script>
1616
<script src="https://npmcdn.com/[email protected]"></script>
17-
<script src="https://cdnjs.cloudflare.com/ajax/libs/systemjs/0.19.27/system.js"></script>
17+
<script src="https://npmcdn.com/systemjs@0.19.27/dist/system.src.js"></script>
1818
<script src="https://npmcdn.com/[email protected]/lib/typescript.js"></script>
1919

2020
<!-- 2. Configure SystemJS -->
2121
<script src="systemjs.config.js"></script>
2222
<script>
23-
System.import('app').catch(function(err){ console.error(err); });
23+
System.import('app').catch(function(err){ console.error(err); });
2424
</script>
2525

2626
</head>

‎public/docs/_examples/karma.conf.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ module.exports = function(config) {
2222
},
2323
files: [
2424
// Polyfills.
25-
'node_modules/es6-shim/es6-shim.js',
25+
'node_modules/code-js/client/shim.min.js',
2626

2727
// Zone.js dependencies
2828
// Note - do not include zone.js itself here, it is already

‎public/docs/_examples/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
"rxjs": "5.0.0-beta.6",
3939
"zone.js": "^0.6.12",
4040

41-
"angular2-in-memory-web-api": "0.0.8",
41+
"angular2-in-memory-web-api": "0.0.9",
4242
"bootstrap": "^3.3.6"
4343
},
4444
"devDependencies": {

‎public/docs/_examples/quickstart/ts/package.1.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
"rxjs": "5.0.0-beta.6",
2828
"zone.js": "^0.6.12",
2929

30-
"angular2-in-memory-web-api": "0.0.8",
30+
"angular2-in-memory-web-api": "0.0.9",
3131
"bootstrap": "^3.3.6"
3232
},
3333
"devDependencies": {

‎public/docs/_examples/styleguide/package.1.json

+1-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@
1111
"dependencies": {
1212
"angular2": "2.0.0-beta.0",
1313
"systemjs": "0.19.6",
14-
"es6-promise": "^3.0.2",
15-
"es6-shim": "^0.35.0",
14+
"core-js": "^2.4.0",
1615
"reflect-metadata": "0.1.2",
1716
"rxjs": "5.0.0-beta.0",
1817
"zone.js": "0.5.10"

‎public/docs/_examples/upgrade-adapter/ts/index-1-2-hybrid-bootstrap.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
<script src="systemjs.config.js"></script>
1919
<script>
20-
System.import('app').catch(function(err){ console.error(err); });
20+
System.import('app').catch(function(err){ console.error(err); });
2121
</script>
2222
<script>
2323
System.import('app/1-2-hybrid-bootstrap/app.module')

‎public/docs/_examples/upgrade-adapter/ts/index-1-2-hybrid-shared-adapter-bootstrap.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
<script src="systemjs.config.js"></script>
1919
<script>
20-
System.import('app').catch(function(err){ console.error(err); });
20+
System.import('app').catch(function(err){ console.error(err); });
2121
</script>
2222
<script>
2323
System.import('app/1-2-hybrid-shared-adapter-bootstrap/app.module')

‎public/docs/_examples/upgrade-adapter/ts/index-1-to-2-projection.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
<script src="systemjs.config.js"></script>
1919
<script>
20-
System.import('app').catch(function(err){ console.error(err); });
20+
System.import('app').catch(function(err){ console.error(err); });
2121
</script>
2222
<script>
2323
System.import('app/1-to-2-projection/app.module')

‎public/docs/_examples/upgrade-adapter/ts/index-1-to-2-providers.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
<script src="systemjs.config.js"></script>
1919
<script>
20-
System.import('app').catch(function(err){ console.error(err); });
20+
System.import('app').catch(function(err){ console.error(err); });
2121
</script>
2222
<script>
2323
System.import('app/1-to-2-providers/app.module')

‎public/docs/_examples/upgrade-adapter/ts/index-2-to-1-providers.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
<script src="systemjs.config.js"></script>
1919
<script>
20-
System.import('app').catch(function(err){ console.error(err); });
20+
System.import('app').catch(function(err){ console.error(err); });
2121
</script>
2222
<script>
2323
System.import('app/2-to-1-providers/app.module')

‎public/docs/_examples/upgrade-adapter/ts/index-2-to-1-transclusion.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
<script src="systemjs.config.js"></script>
1919
<script>
20-
System.import('app').catch(function(err){ console.error(err); });
20+
System.import('app').catch(function(err){ console.error(err); });
2121
</script>
2222
<script>
2323
System.import('app/2-to-1-transclusion/app.module')

‎public/docs/_examples/upgrade-adapter/ts/index-downgrade-io.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
<script src="systemjs.config.js"></script>
1919
<script>
20-
System.import('app').catch(function(err){ console.error(err); });
20+
System.import('app').catch(function(err){ console.error(err); });
2121
</script>
2222
<script>
2323
System.import('app/downgrade-io/app.module')

‎public/docs/_examples/upgrade-adapter/ts/index-downgrade-static.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
<script src="systemjs.config.js"></script>
1919
<script>
20-
System.import('app').catch(function(err){ console.error(err); });
20+
System.import('app').catch(function(err){ console.error(err); });
2121
</script>
2222
<script>
2323
System.import('app/downgrade-static/app.module')

‎public/docs/_examples/upgrade-adapter/ts/index-upgrade-io.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
<script src="systemjs.config.js"></script>
1919
<script>
20-
System.import('app').catch(function(err){ console.error(err); });
20+
System.import('app').catch(function(err){ console.error(err); });
2121
</script>
2222
<script>
2323
System.import('app/upgrade-io/app.module')

‎public/docs/_examples/upgrade-adapter/ts/index-upgrade-static.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
<script src="systemjs.config.js"></script>
1919
<script>
20-
System.import('app').catch(function(err){ console.error(err); });
20+
System.import('app').catch(function(err){ console.error(err); });
2121
</script>
2222
<script>
2323
System.import('app/upgrade-static/app.module')

‎public/docs/_examples/upgrade-phonecat/ts/ng2_components/package.1.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"@angular/router-deprecated": "2.0.0-rc.1",
1717
"@angular/upgrade": "2.0.0-rc.1",
1818

19-
"es6-shim": "^0.35.0",
19+
"core-js": "^2.4.0",
2020
"reflect-metadata": "0.1.3",
2121
"rxjs": "5.0.0-beta.6",
2222
"zone.js": "0.6.12",

‎public/docs/_examples/upgrade-phonecat/ts/ng2_components/test/karma.conf.1.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ module.exports = function(config){
1212
'app/bower_components/angular-animate/angular-animate.js',
1313
'app/bower_components/angular-mocks/angular-mocks.js',
1414
'node_modules/systemjs/dist/system-polyfills.js',
15-
'node_modules/es6-shim/es6-shim.js',
15+
'node_modules/core-js/client/shim.min.js',
1616
'node_modules/zone.js/dist/zone.js',
1717
'node_modules/reflect-metadata/Reflect.js',
1818
'node_modules/systemjs/dist/system.src.js',

‎public/docs/_examples/upgrade-phonecat/ts/ng2_final/package.1.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"@angular/router-deprecated": "2.0.0-rc.1",
1717
"@angular/upgrade": "2.0.0-rc.1",
1818

19-
"es6-shim": "^0.35.0",
19+
"core-js": "^2.4.0",
2020
"reflect-metadata": "0.1.3",
2121
"rxjs": "5.0.0-beta.6",
2222
"zone.js": "0.6.12",

‎public/docs/_examples/upgrade-phonecat/ts/ng2_final/test/karma.conf.1.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ module.exports = function(config){
66

77
files : [
88
'node_modules/systemjs/dist/system-polyfills.js',
9-
'node_modules/es6-shim/es6-shim.js',
9+
'node_modules/core-js/client/shim.min.js',
1010
'node_modules/zone.js/dist/zone.js',
1111
'node_modules/reflect-metadata/Reflect.js',
1212
'node_modules/systemjs/dist/system.src.js',

‎public/docs/_examples/upgrade-phonecat/ts/ng2_initial/package.1.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"@angular/router-deprecated": "2.0.0-rc.1",
1717
"@angular/upgrade": "2.0.0-rc.1",
1818

19-
"es6-shim": "^0.35.0",
19+
"core-js": "^2.4.0",
2020
"reflect-metadata": "0.1.3",
2121
"rxjs": "5.0.0-beta.6",
2222
"zone.js": "0.6.12",

‎public/docs/_examples/upgrade-phonecat/ts/ng2_initial/test/karma.conf.1.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ module.exports = function(config){
1414
'node_modules/systemjs/dist/system-polyfills.js',
1515
'node_modules/systemjs/dist/system.src.js',
1616
// #docregion ng2
17-
'node_modules/es6-shim/es6-shim.js',
17+
'node_modules/core-js/client/shim.min.js',
1818
'node_modules/zone.js/dist/zone.js',
1919
'node_modules/reflect-metadata/Reflect.js',
2020
{pattern: 'node_modules/rxjs/**/*.js', included: false, watched: false},

‎public/docs/_examples/wallaby.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ module.exports = function () {
1010
{pattern: 'node_modules/systemjs/dist/system.js', instrument: false},
1111

1212
// Polyfills
13-
{pattern: 'node_modules/es6-shim/es6-shim.js', instrument: false},
13+
{pattern: 'node_modules/code-js/client/shim.min.js', instrument: false},
1414
{pattern: 'node_modules/angular2/bundles/angular2-polyfills.js', instrument: false},
1515

1616
// Zone.js dependencies

‎public/docs/ts/latest/guide/typescript-configuration.jade

+4-4
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ a(id="typings")
9797
:marked
9898
We identified three *typings* file in the QuickStart, the *d.ts* files for
9999

100-
* [es6-shim](https://github.com/paulmillr/es6-shim/blob/master/README.md)
100+
* [core-js](https://github.com/zloirock/core-js/blob/master/README.md)
101101
that brings ES2015/ES6 capabilities to our ES5 browsers
102102

103103
* [jasmine](http://jasmine.github.io/) typings for the Jasmine test framework
@@ -145,7 +145,7 @@ code-example(format="").
145145
.children
146146
.file ambient
147147
.children
148-
.file es6-shim
148+
.file core-js
149149
.children
150150
.file index.d.ts
151151
.file ...
@@ -155,15 +155,15 @@ code-example(format="").
155155
.children
156156
.file ambient
157157
.children
158-
.file es6-shim
158+
.file core-js
159159
.children
160160
.file index.d.ts
161161
.file ...
162162
.children
163163
.file browser.d.ts
164164
.file main.d.ts
165165
:marked
166-
The `es6-shim` typings are duplicated and the `browser.d.ts` and `main.d.ts` have overlapping content.
166+
The `core-js` typings are duplicated and the `browser.d.ts` and `main.d.ts` have overlapping content.
167167

168168
We must tell the compiler to ignore one or the other.
169169
We removed the `main` set from consideration in the `exclude` section of our `tsconfig.json` file:

‎public/docs/ts/latest/quickstart.jade

+1-1
Original file line numberDiff line numberDiff line change
@@ -362,7 +362,7 @@ h2#index Step 4: Add #[code index.html]
362362
We loaded the following scripts
363363
+makeExcerpt('index.html', 'libraries')
364364
:marked
365-
We begin with core-js's es6-shim which monkey patches the global context (window) with essential features of ES2015 (ES6).
365+
We begin with `core-js`'s ES2015/ES6 shim which monkey patches the global context (window) with essential features of ES2015 (ES6).
366366
Next are the polyfills for Angular2, `zone.js` and `reflect-metadata`.
367367
Then the [SystemJS](#systemjs) library for module loading.
368368

‎tools/plunker-builder/indexHtmlTranslator.js

+1-6
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,10 @@ var _rxData = [
3333
{
3434
pattern: 'basehref',
3535
},
36-
{
37-
pattern: 'script',
38-
from: 'node_modules/es6-shim/es6-shim.min.js',
39-
to: 'https://npmcdn.com/[email protected]/es6-shim.min.js'
40-
},
4136
{
4237
pattern: 'script',
4338
from: 'node_modules/core-js/client/shim.min.js',
44-
to: 'https://npmcdn.com/core-js@2.4.0/client/shim.min.js'
39+
to: 'https://npmcdn.com/core-js/client/shim.min.js'
4540
},
4641
{
4742
pattern: 'script',

0 commit comments

Comments
 (0)