chore: more conversion of es6-shim to core-js

2016-05-19 23:18:18 -07:00 · 2016-05-19 23:18:18 -07:00 · 3423ad8491
parent 6e0f80c673
commit 3423ad8491
27 changed files with 36 additions and 42 deletions
--- a/public/docs/_examples/homepage-hello-world/ts/index.1.html
+++ b/public/docs/_examples/homepage-hello-world/ts/index.1.html
@ -9,17 +9,17 @@

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

    <script src="https://npmcdn.com/zone.js@0.6.12"></script>
    <script src="https://npmcdn.com/reflect-metadata@0.1.3"></script>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/systemjs/0.19.27/system.js"></script>
+    <script src="https://npmcdn.com/systemjs@0.19.27/dist/system.src.js"></script>
    <script src="https://npmcdn.com/typescript@1.8.10/lib/typescript.js"></script>

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

  </head>
--- a/public/docs/_examples/homepage-tabs/ts/index.1.html
+++ b/public/docs/_examples/homepage-tabs/ts/index.1.html
@ -10,17 +10,17 @@

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

    <script src="https://npmcdn.com/zone.js@0.6.12"></script>
    <script src="https://npmcdn.com/reflect-metadata@0.1.3"></script>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/systemjs/0.19.27/system.js"></script>
+    <script src="https://npmcdn.com/systemjs@0.19.27/dist/system.src.js"></script>
    <script src="https://npmcdn.com/typescript@1.8.10/lib/typescript.js"></script>

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

  </head>
--- a/public/docs/_examples/homepage-todo/ts/index.1.html
+++ b/public/docs/_examples/homepage-todo/ts/index.1.html
@ -10,17 +10,17 @@

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

    <script src="https://npmcdn.com/zone.js@0.6.12"></script>
    <script src="https://npmcdn.com/reflect-metadata@0.1.3"></script>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/systemjs/0.19.27/system.js"></script>
+    <script src="https://npmcdn.com/systemjs@0.19.27/dist/system.src.js"></script>
    <script src="https://npmcdn.com/typescript@1.8.10/lib/typescript.js"></script>

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

  </head>
--- a/public/docs/_examples/karma.conf.js
+++ b/public/docs/_examples/karma.conf.js
@ -22,7 +22,7 @@ module.exports = function(config) {
    },
    files: [
      // Polyfills.
-      'node_modules/es6-shim/es6-shim.js',
+      'node_modules/code-js/client/shim.min.js',

      // Zone.js dependencies
      // Note - do not include zone.js itself here, it is already
--- a/public/docs/_examples/package.json
+++ b/public/docs/_examples/package.json
@ -38,7 +38,7 @@
    "rxjs": "5.0.0-beta.6",
    "zone.js": "^0.6.12",

-    "angular2-in-memory-web-api": "0.0.8",
+    "angular2-in-memory-web-api": "0.0.9",
    "bootstrap": "^3.3.6"
  },
  "devDependencies": {
--- a/public/docs/_examples/quickstart/ts/package.1.json
+++ b/public/docs/_examples/quickstart/ts/package.1.json
@ -27,7 +27,7 @@
    "rxjs": "5.0.0-beta.6",
    "zone.js": "^0.6.12",

-    "angular2-in-memory-web-api": "0.0.8",
+    "angular2-in-memory-web-api": "0.0.9",
    "bootstrap": "^3.3.6"
  },
  "devDependencies": {
--- a/public/docs/_examples/styleguide/package.1.json
+++ b/public/docs/_examples/styleguide/package.1.json
@ -11,8 +11,7 @@
  "dependencies": {
    "angular2": "2.0.0-beta.0",
    "systemjs": "0.19.6",
-    "es6-promise": "^3.0.2",
-    "es6-shim": "^0.35.0",
+    "core-js": "^2.4.0",
    "reflect-metadata": "0.1.2",
    "rxjs": "5.0.0-beta.0",
    "zone.js": "0.5.10"
--- a/public/docs/_examples/upgrade-adapter/ts/index-1-2-hybrid-bootstrap.html
+++ b/public/docs/_examples/upgrade-adapter/ts/index-1-2-hybrid-bootstrap.html
@ -17,7 +17,7 @@

    <script src="systemjs.config.js"></script>
    <script>
-      System.import('app').catch(function(err){ console.error(err);  });
+      System.import('app').catch(function(err){ console.error(err); });
    </script>
    <script>
    System.import('app/1-2-hybrid-bootstrap/app.module')
--- a/public/docs/_examples/upgrade-adapter/ts/index-1-2-hybrid-shared-adapter-bootstrap.html
+++ b/public/docs/_examples/upgrade-adapter/ts/index-1-2-hybrid-shared-adapter-bootstrap.html
@ -17,7 +17,7 @@

    <script src="systemjs.config.js"></script>
    <script>
-      System.import('app').catch(function(err){ console.error(err);  });
+      System.import('app').catch(function(err){ console.error(err); });
    </script>
    <script>
      System.import('app/1-2-hybrid-shared-adapter-bootstrap/app.module')
--- a/public/docs/_examples/upgrade-adapter/ts/index-1-to-2-projection.html
+++ b/public/docs/_examples/upgrade-adapter/ts/index-1-to-2-projection.html
@ -17,7 +17,7 @@

    <script src="systemjs.config.js"></script>
    <script>
-      System.import('app').catch(function(err){ console.error(err);  });
+      System.import('app').catch(function(err){ console.error(err); });
    </script>
    <script>
      System.import('app/1-to-2-projection/app.module')
--- a/public/docs/_examples/upgrade-adapter/ts/index-1-to-2-providers.html
+++ b/public/docs/_examples/upgrade-adapter/ts/index-1-to-2-providers.html
@ -17,7 +17,7 @@

    <script src="systemjs.config.js"></script>
    <script>
-      System.import('app').catch(function(err){ console.error(err);  });
+      System.import('app').catch(function(err){ console.error(err); });
    </script>
    <script>
      System.import('app/1-to-2-providers/app.module')
--- a/public/docs/_examples/upgrade-adapter/ts/index-2-to-1-providers.html
+++ b/public/docs/_examples/upgrade-adapter/ts/index-2-to-1-providers.html
@ -17,7 +17,7 @@

    <script src="systemjs.config.js"></script>
    <script>
-      System.import('app').catch(function(err){ console.error(err);  });
+      System.import('app').catch(function(err){ console.error(err); });
    </script>
    <script>
      System.import('app/2-to-1-providers/app.module')
--- a/public/docs/_examples/upgrade-adapter/ts/index-2-to-1-transclusion.html
+++ b/public/docs/_examples/upgrade-adapter/ts/index-2-to-1-transclusion.html
@ -17,7 +17,7 @@

    <script src="systemjs.config.js"></script>
    <script>
-      System.import('app').catch(function(err){ console.error(err);  });
+      System.import('app').catch(function(err){ console.error(err); });
    </script>
    <script>
      System.import('app/2-to-1-transclusion/app.module')
--- a/public/docs/_examples/upgrade-adapter/ts/index-downgrade-io.html
+++ b/public/docs/_examples/upgrade-adapter/ts/index-downgrade-io.html
@ -17,7 +17,7 @@

    <script src="systemjs.config.js"></script>
    <script>
-      System.import('app').catch(function(err){ console.error(err);  });
+      System.import('app').catch(function(err){ console.error(err); });
    </script>
    <script>
      System.import('app/downgrade-io/app.module')
--- a/public/docs/_examples/upgrade-adapter/ts/index-downgrade-static.html
+++ b/public/docs/_examples/upgrade-adapter/ts/index-downgrade-static.html
@ -17,7 +17,7 @@

    <script src="systemjs.config.js"></script>
    <script>
-      System.import('app').catch(function(err){ console.error(err);  });
+      System.import('app').catch(function(err){ console.error(err); });
    </script>
    <script>
      System.import('app/downgrade-static/app.module')
--- a/public/docs/_examples/upgrade-adapter/ts/index-upgrade-io.html
+++ b/public/docs/_examples/upgrade-adapter/ts/index-upgrade-io.html
@ -17,7 +17,7 @@

    <script src="systemjs.config.js"></script>
    <script>
-      System.import('app').catch(function(err){ console.error(err);  });
+      System.import('app').catch(function(err){ console.error(err); });
    </script>
    <script>
      System.import('app/upgrade-io/app.module')
--- a/public/docs/_examples/upgrade-adapter/ts/index-upgrade-static.html
+++ b/public/docs/_examples/upgrade-adapter/ts/index-upgrade-static.html
@ -17,7 +17,7 @@

    <script src="systemjs.config.js"></script>
    <script>
-      System.import('app').catch(function(err){ console.error(err);  });
+      System.import('app').catch(function(err){ console.error(err); });
    </script>
    <script>
      System.import('app/upgrade-static/app.module')
--- a/public/docs/_examples/upgrade-phonecat/ts/ng2_components/package.1.json
+++ b/public/docs/_examples/upgrade-phonecat/ts/ng2_components/package.1.json
@ -16,7 +16,7 @@
    "@angular/router-deprecated":  "2.0.0-rc.1",
    "@angular/upgrade":  "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",
    "zone.js": "0.6.12",
--- a/public/docs/_examples/upgrade-phonecat/ts/ng2_components/test/karma.conf.1.js
+++ b/public/docs/_examples/upgrade-phonecat/ts/ng2_components/test/karma.conf.1.js
@ -12,7 +12,7 @@ module.exports = function(config){
      'app/bower_components/angular-animate/angular-animate.js',
      'app/bower_components/angular-mocks/angular-mocks.js',
      'node_modules/systemjs/dist/system-polyfills.js',
-      'node_modules/es6-shim/es6-shim.js',
+      'node_modules/core-js/client/shim.min.js',
      'node_modules/zone.js/dist/zone.js',
      'node_modules/reflect-metadata/Reflect.js',
      'node_modules/systemjs/dist/system.src.js',
--- a/public/docs/_examples/upgrade-phonecat/ts/ng2_final/package.1.json
+++ b/public/docs/_examples/upgrade-phonecat/ts/ng2_final/package.1.json
@ -16,7 +16,7 @@
    "@angular/router-deprecated":  "2.0.0-rc.1",
    "@angular/upgrade":  "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",
    "zone.js": "0.6.12",
--- a/public/docs/_examples/upgrade-phonecat/ts/ng2_final/test/karma.conf.1.js
+++ b/public/docs/_examples/upgrade-phonecat/ts/ng2_final/test/karma.conf.1.js
@ -6,7 +6,7 @@ module.exports = function(config){

    files : [
      'node_modules/systemjs/dist/system-polyfills.js',
-      'node_modules/es6-shim/es6-shim.js',
+      'node_modules/core-js/client/shim.min.js',
      'node_modules/zone.js/dist/zone.js',
      'node_modules/reflect-metadata/Reflect.js',
      'node_modules/systemjs/dist/system.src.js',
--- a/public/docs/_examples/upgrade-phonecat/ts/ng2_initial/package.1.json
+++ b/public/docs/_examples/upgrade-phonecat/ts/ng2_initial/package.1.json
@ -16,7 +16,7 @@
    "@angular/router-deprecated":  "2.0.0-rc.1",
    "@angular/upgrade":  "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",
    "zone.js": "0.6.12",
--- a/public/docs/_examples/upgrade-phonecat/ts/ng2_initial/test/karma.conf.1.js
+++ b/public/docs/_examples/upgrade-phonecat/ts/ng2_initial/test/karma.conf.1.js
@ -14,7 +14,7 @@ module.exports = function(config){
      'node_modules/systemjs/dist/system-polyfills.js',
      'node_modules/systemjs/dist/system.src.js',
      // #docregion ng2
-      'node_modules/es6-shim/es6-shim.js',
+      'node_modules/core-js/client/shim.min.js',
      'node_modules/zone.js/dist/zone.js',
      'node_modules/reflect-metadata/Reflect.js',
      {pattern: 'node_modules/rxjs/**/*.js', included: false, watched: false},
--- a/public/docs/_examples/wallaby.js
+++ b/public/docs/_examples/wallaby.js
@ -10,7 +10,7 @@ module.exports = function () {
      {pattern: 'node_modules/systemjs/dist/system.js', instrument: false},

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

      // Zone.js dependencies
--- a/public/docs/ts/latest/guide/typescript-configuration.jade
+++ b/public/docs/ts/latest/guide/typescript-configuration.jade
@ -97,7 +97,7 @@ a(id="typings")
 :marked
  We identified three *typings* file in the QuickStart, the *d.ts* files for
  
-  * [es6-shim](https://github.com/paulmillr/es6-shim/blob/master/README.md)
+  * [core-js](https://github.com/zloirock/core-js/blob/master/README.md)
  that brings ES2015/ES6 capabilities to our ES5 browsers
  
  * [jasmine](http://jasmine.github.io/) typings for the Jasmine test framework
@ -145,7 +145,7 @@ code-example(format="").
    .children
      .file ambient
        .children
-          .file es6-shim
+          .file core-js
          .children
            .file index.d.ts
          .file ...
@ -155,7 +155,7 @@ code-example(format="").
    .children
      .file ambient
        .children
-          .file es6-shim
+          .file core-js
          .children
            .file index.d.ts
          .file ...            
@ -163,7 +163,7 @@ code-example(format="").
     .file browser.d.ts
     .file main.d.ts
 :marked
-  The `es6-shim` typings are duplicated and the `browser.d.ts` and `main.d.ts` have overlapping content.
+  The `core-js` typings are duplicated and the `browser.d.ts` and `main.d.ts` have overlapping content.
  
  We must tell the compiler to ignore one or the other. 
  We removed the `main` set from consideration in the `exclude` section of our `tsconfig.json` file:
--- a/public/docs/ts/latest/quickstart.jade
+++ b/public/docs/ts/latest/quickstart.jade
@ -362,7 +362,7 @@ h2#index Step 4: Add #[code index.html]
      We loaded the following scripts
    +makeExcerpt('index.html', 'libraries')
    :marked
-      We begin with core-js's es6-shim which monkey patches the global context (window) with essential features of ES2015 (ES6).
+      We begin with `core-js`'s ES2015/ES6 shim which monkey patches the global context (window) with essential features of ES2015 (ES6).
      Next are the polyfills for Angular2, `zone.js` and `reflect-metadata`.
      Then the [SystemJS](#systemjs) library for module loading.

--- a/tools/plunker-builder/indexHtmlTranslator.js
+++ b/tools/plunker-builder/indexHtmlTranslator.js
@ -33,15 +33,10 @@ var _rxData = [
  {
    pattern: 'basehref',
  },
-  {
-    pattern: 'script',
-    from: 'node_modules/es6-shim/es6-shim.min.js',
-    to:   'https://npmcdn.com/es6-shim@0.35.0/es6-shim.min.js'
-  },
  {
    pattern: 'script',
    from: 'node_modules/core-js/client/shim.min.js',
-    to:   'https://npmcdn.com/core-js@2.4.0/client/shim.min.js'
+    to:   'https://npmcdn.com/core-js/client/shim.min.js'
  },
  {
    pattern: 'script',