@angular-devkit/build-angular 0.900.6 → 0.900.7

package/package.json

@@ -1,20 +1,20 @@
 {
   "name": "@angular-devkit/build-angular",
-  "version": "0.900.6",
+  "version": "0.900.7",
   "description": "Angular Webpack Build Facade",
   "experimental": true,
   "main": "src/index.js",
   "typings": "src/index.d.ts",
   "builders": "builders.json",
   "dependencies": {
-    "@angular-devkit/architect": "0.900.6",
-    "@angular-devkit/build-optimizer": "0.900.6",
-    "@angular-devkit/build-webpack": "0.900.6",
-    "@angular-devkit/core": "9.0.6",
+    "@angular-devkit/architect": "0.900.7",
+    "@angular-devkit/build-optimizer": "0.900.7",
+    "@angular-devkit/build-webpack": "0.900.7",
+    "@angular-devkit/core": "9.0.7",
     "@babel/core": "7.7.7",
     "@babel/generator": "7.7.7",
     "@babel/preset-env": "7.7.7",
-    "@ngtools/webpack": "9.0.6",
+    "@ngtools/webpack": "9.0.7",
     "ajv": "6.10.2",
     "autoprefixer": "9.7.1",
     "babel-loader": "8.0.6",

package/src/angular-cli-files/plugins/any-component-style-budget-checker.js

@@ -7,6 +7,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 Object.defineProperty(exports, "__esModule", { value: true });
+const path = require("path");
 const schema_1 = require("../../../src/browser/schema");
 const bundle_calculator_1 = require("../utilities/bundle-calculator");
 const PLUGIN_NAME = 'AnyComponentStyleBudgetChecker';
@@ -27,8 +28,15 @@ class AnyComponentStyleBudgetChecker {
                 if (!parentCompilation) {
                     return;
                 }
+                const cssExtensions = [
+                    '.css',
+                    '.scss',
+                    '.less',
+                    '.styl',
+                    '.sass',
+                ];
                 const componentStyles = Object.keys(compilation.assets)
-                    .filter((name) => name.endsWith('.css'))
+                    .filter((name) => cssExtensions.includes(path.extname(name)))
                     .map((name) => ({
                     size: compilation.assets[name].size(),
                     label: name,

package/src/angular-cli-files/utilities/bundle-calculator.js

@@ -120,16 +120,15 @@ class Calculator {
         else {
             // No differential builds, get the chunk size by summing its assets.
             return chunk.files
-                .filter((file) => !file.endsWith('.map'))
-                .map((file) => {
+                .filter(file => !file.endsWith('.map'))
+                .map(file => {
                 const asset = this.assets.find((asset) => asset.name === file);
                 if (!asset) {
                     throw new Error(`Could not find asset for file: ${file}`);
                 }
-                return asset;
+                return asset.size;
             })
-                .map((asset) => asset.size)
-                .reduce((l, r) => l + r);
+                .reduce((l, r) => l + r, 0);
         }
     }
 }
@@ -147,8 +146,8 @@ class BundleCalculator extends Calculator {
         const buildSizes = Object.values(DifferentialBuildType).map((buildType) => {
             const size = this.chunks
                 .filter(chunk => chunk.names.indexOf(budgetName) !== -1)
-                .map((chunk) => this.calculateChunkSize(chunk, buildType))
-                .reduce((l, r) => l + r);
+                .map(chunk => this.calculateChunkSize(chunk, buildType))
+                .reduce((l, r) => l + r, 0);
             return { size, label: `${this.budget.name}-${buildType}` };
         });
         // If this bundle was not actually generated by a differential build, then
@@ -171,8 +170,8 @@ class InitialCalculator extends Calculator {
                 label: `initial-${buildType}`,
                 size: this.chunks
                     .filter(chunk => chunk.initial)
-                    .map((chunk) => this.calculateChunkSize(chunk, buildType))
-                    .reduce((l, r) => l + r),
+                    .map(chunk => this.calculateChunkSize(chunk, buildType))
+                    .reduce((l, r) => l + r, 0),
             };
         });
         // If this bundle was not actually generated by a differential build, then
@@ -191,7 +190,7 @@ class InitialCalculator extends Calculator {
 class AllScriptCalculator extends Calculator {
     calculate() {
         const size = this.assets
-            .filter((asset) => asset.name.endsWith('.js'))
+            .filter(asset => asset.name.endsWith('.js'))
             .map(asset => asset.size)
             .reduce((total, size) => total + size, 0);
         return [{ size, label: 'total scripts' }];

package/src/browser/schema.json

@@ -211,7 +211,7 @@
           "minItems": 1,
           "items": {
             "type": "string",
-            "pattern": "^[a-zA-Z]{2,3}(-[a-zA-Z]{4})?(-([a-zA-Z]{2}|[0-9]{3}))?(-[a-zA-Z]{5,8})?$"
+            "pattern": "^[a-zA-Z]{2,3}(-[a-zA-Z]{4})?(-([a-zA-Z]{2}|[0-9]{3}))?(-[a-zA-Z]{5,8})?(-x(-[a-zA-Z0-9]{1,8})+)?$"
           }
         }
       ]

package/src/server/schema.json

@@ -175,7 +175,7 @@
           "minItems": 1,
           "items": {
             "type": "string",
-            "pattern": "^[a-zA-Z]{2,3}(-[a-zA-Z]{4})?(-([a-zA-Z]{2}|[0-9]{3}))?(-[a-zA-Z]{5,8})?$"
+            "pattern": "^[a-zA-Z]{2,3}(-[a-zA-Z]{4})?(-([a-zA-Z]{2}|[0-9]{3}))?(-[a-zA-Z]{5,8})?(-x(-[a-zA-Z0-9]{1,8})+)?$"
           }
         }
       ]

package/src/utils/i18n-options.js

@@ -242,9 +242,11 @@ function findLocaleDataBasePath(projectRoot) {
     }
 }
 function findLocaleDataPath(locale, basePath) {
-    const localeDataPath = path.join(basePath, locale + '.js');
+    // Remove private use subtags
+    const scrubbedLocale = locale.replace(/-x(-[a-zA-Z0-9]{1,8})+$/, '');
+    const localeDataPath = path.join(basePath, scrubbedLocale + '.js');
     if (!fs.existsSync(localeDataPath)) {
-        if (locale === 'en-US') {
+        if (scrubbedLocale === 'en-US') {
             // fallback to known existing en-US locale data as of 9.0
             return findLocaleDataPath('en-US-POSIX', basePath);
         }