5fc1f24 feat(@angular-devkit/build-angular): deprecate es5BrowserSupport option in browser builder

Author: Angular Builds

package.json

@@ -1,17 +1,17 @@
 {
   "name": "@angular-devkit/build-angular",
-  "version": "0.800.0-beta.14+3.86b23d7",
+  "version": "0.800.0-beta.15+1.5fc1f24",
   "description": "Angular Webpack Build Facade",
   "experimental": true,
   "main": "src/index.js",
   "typings": "src/index.d.ts",
   "builders": "builders.json",
   "dependencies": {
-    "@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#86b23d7",
-    "@angular-devkit/build-optimizer": "github:angular/angular-devkit-build-optimizer-builds#86b23d7",
-    "@angular-devkit/build-webpack": "github:angular/angular-devkit-build-webpack-builds#86b23d7",
-    "@angular-devkit/core": "github:angular/angular-devkit-core-builds#86b23d7",
-    "@ngtools/webpack": "github:angular/ngtools-webpack-builds#86b23d7",
+    "@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#5fc1f24",
+    "@angular-devkit/build-optimizer": "github:angular/angular-devkit-build-optimizer-builds#5fc1f24",
+    "@angular-devkit/build-webpack": "github:angular/angular-devkit-build-webpack-builds#5fc1f24",
+    "@angular-devkit/core": "github:angular/angular-devkit-core-builds#5fc1f24",
+    "@ngtools/webpack": "github:angular/ngtools-webpack-builds#5fc1f24",
     "ajv": "6.10.0",
     "autoprefixer": "9.5.1",
     "browserslist": "4.5.4",

src/angular-cli-files/models/webpack-configs/common.js

@@ -12,6 +12,7 @@ const CopyWebpackPlugin = require("copy-webpack-plugin");
 const path = require("path");
 const ts = require("typescript");
 const webpack_1 = require("webpack");
+const differential_loading_1 = require("../../../utils/differential-loading");
 const bundle_budget_1 = require("../../plugins/bundle-budget");
 const cleancss_webpack_plugin_1 = require("../../plugins/cleancss-webpack-plugin");
 const scripts_webpack_plugin_1 = require("../../plugins/scripts-webpack-plugin");
@@ -44,20 +45,26 @@ function getCommonConfig(wco) {
         entryPoints['main'] = [path.resolve(root, buildOptions.main)];
     }
     const es5Polyfills = path.join(__dirname, '..', 'es5-polyfills.js');
-    if (buildOptions.es5BrowserSupport) {
-        entryPoints['polyfills.es5'] = [es5Polyfills];
-        if (!buildOptions.aot) {
-            entryPoints['polyfills.es5'].push(path.join(__dirname, '..', 'es5-jit-polyfills.js'));
-        }
-    }
-    if (buildOptions.es5BrowserSupport === undefined) {
+    const es5JitPolyfills = path.join(__dirname, '..', 'es5-jit-polyfills.js');
+    if (targetInFileName) {
+        // For differential loading we don't need to have 2 polyfill bundles
         if (buildOptions.scriptTargetOverride === ts.ScriptTarget.ES2015) {
             entryPoints['polyfills'] = [path.join(__dirname, '..', 'safari-nomodule.js')];
         }
         else {
             entryPoints['polyfills'] = [es5Polyfills];
             if (!buildOptions.aot) {
-                entryPoints['polyfills'].push(path.join(__dirname, '..', 'es5-jit-polyfills.js'));
+                entryPoints['polyfills'].push(es5JitPolyfills);
+            }
+        }
+    }
+    else {
+        // For NON differential loading we want to have 2 polyfill bundles
+        if (buildOptions.es5BrowserSupport
+            || (buildOptions.es5BrowserSupport === undefined && differential_loading_1.isEs5SupportNeeded(projectRoot))) {
+            entryPoints['polyfills.es5'] = [es5Polyfills];
+            if (!buildOptions.aot) {
+                entryPoints['polyfills.es5'].push(es5JitPolyfills);
             }
         }
     }

src/browser/schema.d.ts

@@ -37,6 +37,8 @@ export interface Schema {
     deployUrl?: string;
     /**
      * Enables conditionally loaded ES2015 polyfills.
+     * @deprecated This will be determined from the list of supported browsers specified in the
+     * 'browserslist' file.
      */
     es5BrowserSupport?: boolean;
     /**

src/browser/schema.json

@@ -308,7 +308,7 @@
     "es5BrowserSupport": {
       "description": "Enables conditionally loaded ES2015 polyfills.",
       "type": "boolean",
-      "default": false
+      "x-deprecated": "This will be determined from the list of supported browsers specified in the 'browserslist' file."
     },
     "rebaseRootRelativeCssUrls": {
       "description": "Change root relative URLs in stylesheets to include base HREF and deploy URL. Use only for compatibility and transition. The behavior of this option is non-standard and will be removed in the next major release.",

src/utils/index.d.ts

@@ -7,6 +7,7 @@
  */
 export * from './default-progress';
 export * from './delete-output-dir';
+export * from './differential-loading';
 export * from './run-module-as-observable-fork';
 export * from './normalize-file-replacements';
 export * from './normalize-asset-patterns';

src/utils/index.js

@@ -12,6 +12,7 @@ function __export(m) {
 Object.defineProperty(exports, "__esModule", { value: true });
 __export(require("./default-progress"));
 __export(require("./delete-output-dir"));
+__export(require("./differential-loading"));
 __export(require("./run-module-as-observable-fork"));
 __export(require("./normalize-file-replacements"));
 __export(require("./normalize-asset-patterns"));

uniqueId

@@ -1 +1 @@
-Tue Apr 16 2019 14:23:33 GMT+0000 (Coordinated Universal Time)
+Tue Apr 16 2019 16:12:12 GMT+0000 (Coordinated Universal Time)