f96914f0d build: update webpack to version 5.35.0

Author: Angular Builds

README.md

@@ -28,7 +28,6 @@ application | Generates a new basic app definition in the "projects" subfolder o
 class | Creates a new, generic class definition in the given or default project
 component | Creates a new, generic component definition in the given or default project
 directive | Creates a new, generic directive definition in the given or default project
-e2e | Generates a new, generic end-to-end test definition for the given or default project
 enum | Generates a new, generic enum definition for the given or default project
 guard | Generates a new, generic route guard definition in the given or default project
 interceptor | Creates a new, generic interceptor definition in the given or default project
@@ -40,10 +39,9 @@ pipe | Creates a new, generic pipe definition in the given or default project
 resolver | Creates a new, generic resolver definition in the given or default project
 service | Creates a new, generic service definition in the given or default project
 service-worker | Pass this schematic to the "run" command to create a service worker
-universal | Pass this schematic to the "run" command to set up server-side rendering for an app
 web-worker | Creates a new, generic web worker definition in the given or default project
 workspace | Initializes an empty workspace and adds the necessary dependencies required by an Angular application
 
 ## Disclaimer
 
-While the schematics when executed via the Angular CLI and their associated options are considered stable, the programmatic APIs are not considered officially supported and are not subject to the breaking change guarantees of SemVer.
+While the schematics when executed via the Angular CLI and their associated options are considered stable, the programmatic APIs are not considered officially supported and are not subject to the breaking change guarantees of SemVer.

application/index.js

@@ -110,7 +110,7 @@ function addAppToWorkspaceFile(options, appDir) {
             },
         ];
     }
-    const inlineStyleLanguage = options.style && options.style !== schema_1.Style.Css && options.style !== schema_1.Style.Styl
+    const inlineStyleLanguage = (options === null || options === void 0 ? void 0 : options.style) !== schema_1.Style.Css
         ? options.style
         : undefined;
     const project = {
@@ -129,7 +129,6 @@ function addAppToWorkspaceFile(options, appDir) {
                     main: `${sourceRoot}/main.ts`,
                     polyfills: `${sourceRoot}/polyfills.ts`,
                     tsConfig: `${projectRoot}tsconfig.app.json`,
-                    aot: true,
                     inlineStyleLanguage,
                     assets: [
                         `${sourceRoot}/favicon.ico`,
@@ -147,16 +146,15 @@ function addAppToWorkspaceFile(options, appDir) {
                                 replace: `${sourceRoot}/environments/environment.ts`,
                                 with: `${sourceRoot}/environments/environment.prod.ts`,
                             }],
-                        buildOptimizer: true,
-                        optimization: true,
                         outputHashing: 'all',
-                        sourceMap: false,
-                        namedChunks: false,
-                        extractLicenses: true,
-                        vendorChunk: false,
                     },
                     development: {
+                        buildOptimizer: false,
+                        optimization: false,
                         vendorChunk: true,
+                        extractLicenses: false,
+                        sourceMap: true,
+                        namedChunks: true,
                     },
                 },
             },
@@ -243,10 +241,6 @@ function default_1(options) {
             ? core_1.normalize(options.projectRoot || '')
             : core_1.join(core_1.normalize(newProjectRoot), core_1.strings.dasherize(options.name));
         const sourceDir = `${appDir}/src/app`;
-        const e2eOptions = {
-            relatedAppName: options.name,
-            rootSelector: appRootSelector,
-        };
         return schematics_1.chain([
             addAppToWorkspaceFile(options, appDir),
             schematics_1.mergeWith(schematics_1.apply(schematics_1.url('./files'), [
@@ -296,7 +290,6 @@ function default_1(options) {
                 }),
                 schematics_1.move(sourceDir),
             ]), schematics_1.MergeStrategy.Overwrite),
-            options.minimal ? schematics_1.noop() : schematics_1.schematic('e2e', e2eOptions),
             options.skipPackageJson ? schematics_1.noop() : addDependenciesToPackageJson(options),
             options.lintFix ? lint_fix_1.applyLintFix(appDir) : schematics_1.noop(),
         ]);

application/schema.d.ts

@@ -77,8 +77,7 @@ export declare enum Style {
     Css = "css",
     Less = "less",
     Sass = "sass",
-    Scss = "scss",
-    Styl = "styl"
+    Scss = "scss"
 }
 /**
  * The view encapsulation strategy to use in the new app.

application/schema.js

@@ -12,7 +12,6 @@ var Style;
     Style["Less"] = "less";
     Style["Sass"] = "sass";
     Style["Scss"] = "scss";
-    Style["Styl"] = "styl";
 })(Style = exports.Style || (exports.Style = {}));
 /**
  * The view encapsulation strategy to use in the new app.

application/schema.json

@@ -60,8 +60,7 @@
         "css",
         "scss",
         "sass",
-        "less",
-        "styl"
+        "less"
       ],
       "x-prompt": {
         "message": "Which stylesheet format would you like to use?",
@@ -70,8 +69,7 @@
           { "value": "css",  "label": "CSS" },
           { "value": "scss", "label": "SCSS   [ https://sass-lang.com/documentation/syntax#scss                ]" },
           { "value": "sass", "label": "Sass   [ https://sass-lang.com/documentation/syntax#the-indented-syntax ]" },
-          { "value": "less", "label": "Less   [ http://lesscss.org                                             ]" },
-          { "value": "styl", "label": "Stylus [ https://stylus-lang.com                                        ]" }
+          { "value": "less", "label": "Less   [ http://lesscss.org                                             ]" }
         ]
       },
       "x-user-analytics": 5

component/schema.d.ts

@@ -97,8 +97,7 @@ export declare enum Style {
     Css = "css",
     Less = "less",
     Sass = "sass",
-    Scss = "scss",
-    Styl = "styl"
+    Scss = "scss"
 }
 /**
  * The view encapsulation strategy to use in the new component.

component/schema.js

@@ -20,7 +20,6 @@ var Style;
     Style["Less"] = "less";
     Style["Sass"] = "sass";
     Style["Scss"] = "scss";
-    Style["Styl"] = "styl";
 })(Style = exports.Style || (exports.Style = {}));
 /**
  * The view encapsulation strategy to use in the new component.

component/schema.json

@@ -84,8 +84,7 @@
         "css",
         "scss",
         "sass",
-        "less",
-        "styl"
+        "less"
       ],
       "x-user-analytics": 5
     },

e2e/index.js

@@ -9,6 +9,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
  */
 const core_1 = require("@angular-devkit/core");
 const schematics_1 = require("@angular-devkit/schematics");
+const dependencies_1 = require("../utility/dependencies");
 const json_file_1 = require("../utility/json-file");
 const paths_1 = require("../utility/paths");
 const workspace_1 = require("../utility/workspace");
@@ -57,6 +58,11 @@ function default_1(options) {
                 }),
                 schematics_1.move(root),
             ])),
+            host => dependencies_1.addPackageJsonDependency(host, {
+                type: dependencies_1.NodeDependencyType.Dev,
+                name: 'protractor',
+                version: '~7.0.0',
+            }),
             addScriptsToPackageJson(),
         ]);
     };

migrations/update-12/update-angular-config.js

@@ -8,12 +8,34 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 const workspace_1 = require("../../utility/workspace");
+const BrowserBuilderOptions = [
+    ['aot', false, true],
+    ['vendorChunk', true, false],
+    ['extractLicenses', true, false],
+    ['buildOptimizer', false, true],
+    ['sourceMap', true, false],
+    ['optimization', false, true],
+    ['namedChunks', false, true],
+];
+const ServerBuilderOptions = [
+    ['sourceMap', true, false],
+    ['optimization', false, true],
+];
 function default_1() {
     return workspace_1.updateWorkspace(workspace => {
         for (const [, target] of workspace_1.allWorkspaceTargets(workspace)) {
-            if (!target.builder.startsWith('@angular-devkit/build-angular')) {
+            if (!(target === null || target === void 0 ? void 0 : target.builder.startsWith('@angular-devkit/build-angular'))) {
                 continue;
             }
+            // Only interested in Angular Devkit browser and server builders
+            switch (target.builder) {
+                case '@angular-devkit/build-angular:server':
+                    updateOptions(target, ServerBuilderOptions);
+                    break;
+                case '@angular-devkit/build-angular:browser':
+                    updateOptions(target, BrowserBuilderOptions);
+                    break;
+            }
             for (const [, options] of workspace_1.allTargetOptions(target)) {
                 delete options.experimentalRollupPass;
                 delete options.lazyModules;
@@ -22,3 +44,23 @@ function default_1() {
     });
 }
 exports.default = default_1;
+function updateOptions(target, optionsToUpdate) {
+    if (!target.options) {
+        target.options = {};
+    }
+    const configurationOptions = target.configurations && Object.values(target.configurations);
+    for (const [optionName, oldDefault, newDefault] of optionsToUpdate) {
+        let value = target.options[optionName];
+        if (value === newDefault) {
+            // Value is same as new default
+            delete target.options[optionName];
+        }
+        else if (value === undefined) {
+            // Value is not defined, hence the default in the builder was used.
+            target.options[optionName] = oldDefault;
+            value = oldDefault;
+        }
+        // Remove overrides in configurations which are no longer needed.
+        configurationOptions === null || configurationOptions === void 0 ? void 0 : configurationOptions.filter(o => o && o[optionName] === value).forEach(o => o && delete o[optionName]);
+    }
+}

ng-new/schema.d.ts

@@ -116,8 +116,7 @@ export declare enum Style {
     Css = "css",
     Less = "less",
     Sass = "sass",
-    Scss = "scss",
-    Styl = "styl"
+    Scss = "scss"
 }
 /**
  * The view encapsulation strategy to use in the initial project.

ng-new/schema.js

@@ -22,7 +22,6 @@ var Style;
     Style["Less"] = "less";
     Style["Sass"] = "sass";
     Style["Scss"] = "scss";
-    Style["Styl"] = "styl";
 })(Style = exports.Style || (exports.Style = {}));
 /**
  * The view encapsulation strategy to use in the initial project.

ng-new/schema.json

@@ -107,7 +107,7 @@
     "style": {
       "description": "The file extension or preprocessor to use for style files.",
       "type": "string",
-      "enum": ["css", "scss", "sass", "less", "styl"],
+      "enum": ["css", "scss", "sass", "less"],
       "x-user-analytics": 5
     },
     "skipTests": {

package.json

@@ -15,8 +15,8 @@
   ],
   "schematics": "./collection.json",
   "dependencies": {
-    "@angular-devkit/core": "github:angular/angular-devkit-core-builds#c3cc50e6b",
-    "@angular-devkit/schematics": "github:angular/angular-devkit-schematics-builds#c3cc50e6b",
+    "@angular-devkit/core": "github:angular/angular-devkit-core-builds#f96914f0d",
+    "@angular-devkit/schematics": "github:angular/angular-devkit-schematics-builds#f96914f0d",
     "jsonc-parser": "3.0.0"
   },
   "repository": {

uniqueId

@@ -1 +1 @@
-Tue Apr 20 2021 16:11:19 GMT+0000 (Coordinated Universal Time)
+Wed Apr 21 2021 20:25:32 GMT+0000 (Coordinated Universal Time)

workspace/files/README.md.template

@@ -20,7 +20,7 @@ Run `ng test` to execute the unit tests via [Karma](https://karma-runner.github.
 
 ## Running end-to-end tests
 
-Run `ng e2e` to execute the end-to-end tests via [Protractor](http://www.protractortest.org/).
+Run `ng e2e` to execute the end-to-end tests via a platform of your choice.
 
 ## Further help
 

workspace/files/package.json.template

@@ -35,7 +35,6 @@
     "karma-coverage": "~2.0.3",
     "karma-jasmine": "~4.0.0",
     "karma-jasmine-html-reporter": "^1.5.0",
-    "protractor": "~7.0.0",
     "ts-node": "~9.1.1",<% } %>
     "typescript": "<%= latestVersions.TypeScript %>"
   }