@schematics/angular 8.2.0-next.1 → 8.2.2

package/application/index.js

@@ -162,11 +162,18 @@ function addAppToWorkspaceFile(options, appDir) {
                         extractLicenses: true,
                         vendorChunk: false,
                         buildOptimizer: true,
-                        budgets: [{
+                        budgets: [
+                            {
                                 type: 'initial',
                                 maximumWarning: '2mb',
                                 maximumError: '5mb',
-                            }],
+                            },
+                            {
+                                type: 'anyComponentStyle',
+                                maximumWarning: '6kb',
+                                maximumError: '10kb',
+                            }
+                        ],
                     },
                 },
             },

package/application/other-files/app.component.ts.template

@@ -8,7 +8,7 @@ import { Component } from '@angular/core';
       <h1>
         Welcome to {{title}}!
       </h1>
-      <img width="300" src="data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAyNTAgMjUwIj4KICAgIDxwYXRoIGZpbGw9IiNERDAwMzEiIGQ9Ik0xMjUgMzBMMzEuOSA2My4ybDE0LjIgMTIzLjFMMTI1IDIzMGw3OC45LTQzLjcgMTQuMi0xMjMuMXoiIC8+CiAgICA8cGF0aCBmaWxsPSIjQzMwMDJGIiBkPSJNMTI1IDMwdjIyLjItLjFWMjMwbDc4LjktNDMuNyAxNC4yLTEyMy4xTDEyNSAzMHoiIC8+CiAgICA8cGF0aCAgZmlsbD0iI0ZGRkZGRiIgZD0iTTEyNSA1Mi4xTDY2LjggMTgyLjZoMjEuN2wxMS43LTI5LjJoNDkuNGwxMS43IDI5LjJIMTgzTDEyNSA1Mi4xem0xNyA4My4zaC0zNGwxNy00MC45IDE3IDQwLjl6IiAvPgogIDwvc3ZnPg==">
+      <img width="300" alt="Angular Logo" src="data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAyNTAgMjUwIj4KICAgIDxwYXRoIGZpbGw9IiNERDAwMzEiIGQ9Ik0xMjUgMzBMMzEuOSA2My4ybDE0LjIgMTIzLjFMMTI1IDIzMGw3OC45LTQzLjcgMTQuMi0xMjMuMXoiIC8+CiAgICA8cGF0aCBmaWxsPSIjQzMwMDJGIiBkPSJNMTI1IDMwdjIyLjItLjFWMjMwbDc4LjktNDMuNyAxNC4yLTEyMy4xTDEyNSAzMHoiIC8+CiAgICA8cGF0aCAgZmlsbD0iI0ZGRkZGRiIgZD0iTTEyNSA1Mi4xTDY2LjggMTgyLjZoMjEuN2wxMS43LTI5LjJoNDkuNGwxMS43IDI5LjJIMTgzTDEyNSA1Mi4xem0xNyA4My4zaC0zNGwxNy00MC45IDE3IDQwLjl6IiAvPgogIDwvc3ZnPg==">
     </div>
     <h2>Here are some links to help you start: </h2>
     <ul>

package/application/schema.json

@@ -48,7 +48,9 @@
     "routing": {
       "type": "boolean",
       "description": "When true, creates a routing NgModule.",
-      "default": false
+      "default": false,
+      "x-prompt": "Would you like to add Angular routing?",
+      "x-user-analytics": 17
     },
     "prefix": {
       "type": "string",
@@ -68,6 +70,17 @@
         "less",
         "styl"
       ],
+      "x-prompt": {
+        "message": "Which stylesheet format would you like to use?",
+        "type": "list",
+        "items": [
+          { "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 [ http://stylus-lang.com                                         ]" }
+        ]
+      },
       "x-user-analytics": 5
     },
     "skipTests": {

package/migrations/update-6/index.js

@@ -468,7 +468,6 @@ function extractProjectsConfig(config, tree, logger) {
             projectType: 'application',
         };
         const e2eTargets = {};
-        // tslint:disable-next-line:max-line-length
         const protractorConfig = config && config.e2e && config.e2e.protractor && config.e2e.protractor.config
             ? config.e2e.protractor.config
             : '';

package/migrations/update-8/differential-loading.js

@@ -9,7 +9,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
  */
 const core_1 = require("@angular-devkit/core");
 const json_utils_1 = require("../../utility/json-utils");
-// tslint:disable-next-line:max-line-length
 const browserslistContent = `# This file is used by the build system to adjust CSS and JS output to support the specified browsers below.
 # For additional information regarding the format and rule options, please see:
 # https://github.com/browserslist/browserslist#queries

package/migrations/update-9/update-workspace-config.d.ts

@@ -1,2 +1,6 @@
 import { Rule } from '@angular-devkit/schematics';
+export declare const ANY_COMPONENT_STYLE_BUDGET: {
+    type: string;
+    maximumWarning: string;
+};
 export declare function UpdateWorkspaceConfig(): Rule;

package/migrations/update-9/update-workspace-config.js

@@ -9,6 +9,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
  */
 const core_1 = require("@angular-devkit/core");
 const json_utils_1 = require("../../utility/json-utils");
+exports.ANY_COMPONENT_STYLE_BUDGET = {
+    type: 'anyComponentStyle',
+    maximumWarning: '6kb',
+};
 function UpdateWorkspaceConfig() {
     return (tree) => {
         let workspaceConfigPath = 'angular.json';
@@ -44,8 +48,9 @@ function UpdateWorkspaceConfig() {
                 const builder = json_utils_1.findPropertyInAstObject(buildTarget, 'builder');
                 // Projects who's build builder is not build-angular:browser
                 if (builder && builder.kind === 'string' && builder.value === '@angular-devkit/build-angular:browser') {
-                    updateOption('styles', recorder, buildTarget);
-                    updateOption('scripts', recorder, buildTarget);
+                    updateStyleOrScriptOption('styles', recorder, buildTarget);
+                    updateStyleOrScriptOption('scripts', recorder, buildTarget);
+                    addAnyComponentStyleBudget(recorder, buildTarget);
                 }
             }
             const testTarget = json_utils_1.findPropertyInAstObject(architect, 'test');
@@ -53,8 +58,8 @@ function UpdateWorkspaceConfig() {
                 const builder = json_utils_1.findPropertyInAstObject(testTarget, 'builder');
                 // Projects who's build builder is not build-angular:browser
                 if (builder && builder.kind === 'string' && builder.value === '@angular-devkit/build-angular:karma') {
-                    updateOption('styles', recorder, testTarget);
-                    updateOption('scripts', recorder, testTarget);
+                    updateStyleOrScriptOption('styles', recorder, testTarget);
+                    updateStyleOrScriptOption('scripts', recorder, testTarget);
                 }
             }
         }
@@ -66,16 +71,18 @@ exports.UpdateWorkspaceConfig = UpdateWorkspaceConfig;
 /**
  * Helper to retreive all the options in various configurations
  */
-function getAllOptions(builderConfig) {
+function getAllOptions(builderConfig, configurationsOnly = false) {
     const options = [];
     const configurations = json_utils_1.findPropertyInAstObject(builderConfig, 'configurations');
     if (configurations && configurations.kind === 'object') {
         options.push(...configurations.properties.map(x => x.value));
     }
-    options.push(json_utils_1.findPropertyInAstObject(builderConfig, 'options'));
+    if (!configurationsOnly) {
+        options.push(json_utils_1.findPropertyInAstObject(builderConfig, 'options'));
+    }
     return options.filter(o => o && o.kind === 'object');
 }
-function updateOption(property, recorder, builderConfig) {
+function updateStyleOrScriptOption(property, recorder, builderConfig) {
     const options = getAllOptions(builderConfig);
     for (const option of options) {
         const propertyOption = json_utils_1.findPropertyInAstObject(option, property);
@@ -96,3 +103,34 @@ function updateOption(property, recorder, builderConfig) {
         }
     }
 }
+function addAnyComponentStyleBudget(recorder, builderConfig) {
+    const options = getAllOptions(builderConfig, true);
+    for (const option of options) {
+        const aotOption = json_utils_1.findPropertyInAstObject(option, 'aot');
+        if (!aotOption || aotOption.kind !== 'true') {
+            // AnyComponentStyle only works for AOT
+            continue;
+        }
+        const budgetOption = json_utils_1.findPropertyInAstObject(option, 'budgets');
+        if (!budgetOption) {
+            // add
+            json_utils_1.insertPropertyInAstObjectInOrder(recorder, option, 'budgets', [exports.ANY_COMPONENT_STYLE_BUDGET], 14);
+            continue;
+        }
+        if (budgetOption.kind !== 'array') {
+            continue;
+        }
+        // if 'anyComponentStyle' budget already exists don't add.
+        const hasAnyComponentStyle = budgetOption.elements.some(node => {
+            if (!node || node.kind !== 'object') {
+                // skip non complex objects
+                return false;
+            }
+            const budget = json_utils_1.findPropertyInAstObject(node, 'type');
+            return !!budget && budget.kind === 'string' && budget.value === 'anyComponentStyle';
+        });
+        if (!hasAnyComponentStyle) {
+            json_utils_1.appendValueInAstArray(recorder, budgetOption, exports.ANY_COMPONENT_STYLE_BUDGET, 16);
+        }
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@schematics/angular",
-  "version": "8.2.0-next.1",
+  "version": "8.2.2",
   "description": "Schematics specific to Angular",
   "keywords": [
     "angular",
@@ -14,8 +14,8 @@
   ],
   "schematics": "./collection.json",
   "dependencies": {
-    "@angular-devkit/core": "8.2.0-next.1",
-    "@angular-devkit/schematics": "8.2.0-next.1"
+    "@angular-devkit/core": "8.2.2",
+    "@angular-devkit/schematics": "8.2.2"
   },
   "repository": {
     "type": "git",

package/service-worker/files/ngsw-config.json.template

@@ -9,6 +9,7 @@
         "files": [
           "/favicon.ico",
           "/index.html",
+          "/manifest.webmanifest",
           "/*.css",
           "/*.js"
         ]