@angular-devkit/build-angular 0.1102.0 → 0.1102.4

package/package.json

@@ -1,16 +1,16 @@
 {
   "name": "@angular-devkit/build-angular",
-  "version": "0.1102.0",
+  "version": "0.1102.4",
   "description": "Angular Webpack Build Facade",
   "experimental": true,
   "main": "src/index.js",
   "typings": "src/index.d.ts",
   "builders": "builders.json",
   "dependencies": {
-    "@angular-devkit/architect": "0.1102.0",
-    "@angular-devkit/build-optimizer": "0.1102.0",
-    "@angular-devkit/build-webpack": "0.1102.0",
-    "@angular-devkit/core": "11.2.0",
+    "@angular-devkit/architect": "0.1102.4",
+    "@angular-devkit/build-optimizer": "0.1102.4",
+    "@angular-devkit/build-webpack": "0.1102.4",
+    "@angular-devkit/core": "11.2.4",
     "@babel/core": "7.12.10",
     "@babel/generator": "7.12.11",
     "@babel/plugin-transform-async-to-generator": "7.12.1",
@@ -19,7 +19,7 @@
     "@babel/runtime": "7.12.5",
     "@babel/template": "7.12.7",
     "@jsdevtools/coverage-istanbul-loader": "3.0.5",
-    "@ngtools/webpack": "11.2.0",
+    "@ngtools/webpack": "11.2.4",
     "ansi-colors": "4.1.1",
     "autoprefixer": "10.2.4",
     "babel-loader": "8.2.2",
@@ -29,7 +29,7 @@
     "circular-dependency-plugin": "5.2.2",
     "copy-webpack-plugin": "6.3.2",
     "core-js": "3.8.3",
-    "critters": "0.0.6",
+    "critters": "0.0.7",
     "css-loader": "5.0.1",
     "cssnano": "4.1.10",
     "file-loader": "6.2.0",
@@ -127,7 +127,7 @@
   },
   "engines": {
     "node": ">= 10.13.0",
-    "npm": "^6.11.0",
+    "npm": "^6.11.0 || ^7.5.6",
     "yarn": ">= 1.13.0"
   },
   "author": "Angular Authors",

package/src/babel/webpack-loader.js

@@ -51,51 +51,61 @@ exports.default = babel_loader_1.custom(() => {
         sourceType: 'unambiguous',
     });
     return {
-        async customOptions({ scriptTarget, ...loaderOptions }, { source }) {
+        async customOptions({ i18n, scriptTarget, ...rawOptions }, { source }) {
             // Must process file if plugins are added
-            let shouldProcess = Array.isArray(loaderOptions.plugins) && loaderOptions.plugins.length > 0;
+            let shouldProcess = Array.isArray(rawOptions.plugins) && rawOptions.plugins.length > 0;
+            const customOptions = {
+                forceAsyncTransformation: false,
+                forceES5: false,
+                shouldLink: false,
+                i18n: undefined,
+            };
             // Analyze file for linking
-            let shouldLink = false;
             const { hasLinkerSupport, requiresLinking } = await checkLinking(this.resourcePath, source);
             if (requiresLinking && !hasLinkerSupport) {
                 // Cannot link if there is no linker support
                 this.emitError('File requires the Angular linker. "@angular/compiler-cli" version 11.1.0 or greater is needed.');
             }
             else {
-                shouldLink = requiresLinking;
+                customOptions.shouldLink = requiresLinking;
             }
-            shouldProcess || (shouldProcess = shouldLink);
+            shouldProcess || (shouldProcess = customOptions.shouldLink);
             // Analyze for ES target processing
-            let forceES5 = false;
-            let forceAsyncTransformation = false;
             const esTarget = scriptTarget;
-            if (esTarget < typescript_1.ScriptTarget.ES2015) {
-                // TypeScript files will have already been downlevelled
-                forceES5 = !/\.tsx?$/.test(this.resourcePath);
+            if (esTarget !== undefined) {
+                if (esTarget < typescript_1.ScriptTarget.ES2015) {
+                    // TypeScript files will have already been downlevelled
+                    customOptions.forceES5 = !/\.tsx?$/.test(this.resourcePath);
+                }
+                else if (esTarget >= typescript_1.ScriptTarget.ES2017) {
+                    customOptions.forceAsyncTransformation = source.includes('async');
+                }
+                shouldProcess || (shouldProcess = customOptions.forceAsyncTransformation || customOptions.forceES5);
             }
-            else if (esTarget >= typescript_1.ScriptTarget.ES2017) {
-                forceAsyncTransformation = source.includes('async');
+            // Analyze for i18n inlining
+            if (i18n &&
+                !/[\\\/]@angular[\\\/](?:compiler|localize)/.test(this.resourcePath) &&
+                source.includes('$localize')) {
+                customOptions.i18n = i18n;
+                shouldProcess = true;
             }
-            shouldProcess || (shouldProcess = forceAsyncTransformation || forceES5);
             // Add provided loader options to default base options
-            const options = {
+            const loaderOptions = {
                 ...baseOptions,
-                ...loaderOptions,
+                ...rawOptions,
                 cacheIdentifier: JSON.stringify({
                     buildAngular: require('../../package.json').version,
-                    forceAsyncTransformation,
-                    forceES5,
-                    shouldLink,
+                    customOptions,
                     baseOptions,
-                    loaderOptions,
+                    rawOptions,
                 }),
             };
             // Skip babel processing if no actions are needed
             if (!shouldProcess) {
                 // Force the current file to be ignored
-                options.ignore = [() => true];
+                loaderOptions.ignore = [() => true];
             }
-            return { custom: { forceAsyncTransformation, forceES5, shouldLink }, loader: options };
+            return { custom: customOptions, loader: loaderOptions };
         },
         config(configuration, { customOptions }) {
             return {
@@ -108,6 +118,7 @@ exports.default = babel_loader_1.custom(() => {
                             angularLinker: customOptions.shouldLink,
                             forceES5: customOptions.forceES5,
                             forceAsyncTransformation: customOptions.forceAsyncTransformation,
+                            i18n: customOptions.i18n,
                             diagnosticReporter: (type, message) => {
                                 switch (type) {
                                     case 'error':

package/src/browser/index.js

@@ -514,8 +514,8 @@ function buildWebpackBrowser(options, context, transforms = {}) {
                                 spinner.fail('Index html generation failed.');
                                 return { success: false, error: mapErrorToMessage(error) };
                             }
-                            spinner.succeed('Index html generation complete.');
                         }
+                        spinner.succeed('Index html generation complete.');
                     }
                     if (options.serviceWorker) {
                         spinner.start('Generating service worker...');
@@ -527,8 +527,8 @@ function buildWebpackBrowser(options, context, transforms = {}) {
                                 spinner.fail('Service worker generation failed.');
                                 return { success: false, error: mapErrorToMessage(error) };
                             }
-                            spinner.succeed('Service worker generation complete.');
                         }
+                        spinner.succeed('Service worker generation complete.');
                     }
                 }
                 stats_1.webpackStatsLogger(context.logger, webpackStats, config, bundleInfoStats);

package/src/dev-server/index.js

@@ -27,7 +27,6 @@ const package_chunk_sort_1 = require("../utils/package-chunk-sort");
 const read_tsconfig_1 = require("../utils/read-tsconfig");
 const version_1 = require("../utils/version");
 const webpack_browser_config_1 = require("../utils/webpack-browser-config");
-const webpack_diagnostics_1 = require("../utils/webpack-diagnostics");
 const configs_1 = require("../webpack/configs");
 const index_html_webpack_plugin_1 = require("../webpack/plugins/index-html-webpack-plugin");
 const stats_1 = require("../webpack/utils/stats");
@@ -255,7 +254,6 @@ exports.serveWebpackBrowser = serveWebpackBrowser;
 async function setupLocalize(locale, i18n, browserOptions, webpackConfig) {
     var _a;
     const localeDescription = i18n.locales[locale];
-    const i18nDiagnostics = [];
     // Modify main entrypoint to include locale data
     if ((localeDescription === null || localeDescription === void 0 ? void 0 : localeDescription.dataPath) &&
         typeof webpackConfig.entry === 'object' &&
@@ -274,37 +272,24 @@ async function setupLocalize(locale, i18n, browserOptions, webpackConfig) {
         missingTranslationBehavior = 'ignore';
         translation = {};
     }
+    const i18nLoaderOptions = {
+        locale,
+        missingTranslationBehavior,
+        translation: i18n.shouldInline ? translation : undefined,
+    };
     const i18nRule = {
-        test: /\.(?:m?js|ts)$/,
+        test: /\.(?:[cm]?js|ts)$/,
         enforce: 'post',
         use: [
             {
-                loader: require.resolve('babel-loader'),
+                loader: require.resolve('../babel/webpack-loader'),
                 options: {
-                    babelrc: false,
-                    configFile: false,
-                    compact: false,
-                    cacheCompression: false,
-                    cacheDirectory: cache_path_1.findCachePath('babel-loader'),
+                    cacheDirectory: cache_path_1.findCachePath('babel-dev-server-i18n'),
                     cacheIdentifier: JSON.stringify({
-                        buildAngular: require('../../package.json').version,
                         locale,
                         translationIntegrity: localeDescription === null || localeDescription === void 0 ? void 0 : localeDescription.files.map((file) => file.integrity),
                     }),
-                    sourceType: 'unambiguous',
-                    presets: [
-                        [
-                            require.resolve('../babel/presets/application'),
-                            {
-                                i18n: {
-                                    locale,
-                                    translation: i18n.shouldInline ? translation : undefined,
-                                    missingTranslationBehavior,
-                                },
-                                diagnosticReporter: (type, message) => i18nDiagnostics.push({ type, message }),
-                            },
-                        ],
-                    ],
+                    i18n: i18nLoaderOptions,
                 },
             },
         ],
@@ -318,24 +303,5 @@ async function setupLocalize(locale, i18n, browserOptions, webpackConfig) {
         webpackConfig.module.rules = rules;
     }
     rules.push(i18nRule);
-    // Add a plugin to inject the i18n diagnostics
-    // tslint:disable-next-line: no-non-null-assertion
-    webpackConfig.plugins.push({
-        apply: (compiler) => {
-            compiler.hooks.thisCompilation.tap('build-angular', compilation => {
-                compilation.hooks.finishModules.tap('build-angular', () => {
-                    for (const diagnostic of i18nDiagnostics) {
-                        if (diagnostic.type === 'error') {
-                            webpack_diagnostics_1.addError(compilation, diagnostic.message);
-                        }
-                        else {
-                            webpack_diagnostics_1.addWarning(compilation, diagnostic.message);
-                        }
-                    }
-                    i18nDiagnostics.length = 0;
-                });
-            });
-        },
-    });
 }
 exports.default = architect_1.createBuilder(serveWebpackBrowser);

package/src/utils/index-file/inline-critical-css.js

@@ -27,6 +27,7 @@ class CrittersExtended extends Critters {
             mergeStylesheets: false,
             preload: 'media',
             noscriptFallback: true,
+            inlineFonts: true,
         });
         this.optionsExtended = optionsExtended;
         this.warnings = [];
@@ -48,7 +49,7 @@ class InlineCriticalCssProcessor {
             // Clean up value from value less attributes.
             // This is caused because parse5 always requires attributes to have a string value.
             // nomodule="" defer="" -> nomodule defer.
-            content: content.replace(/(\s[a-z]+)=""/g, '$1'),
+            content: content.replace(/(\s(?:defer|nomodule))=""/g, '$1'),
             errors: critters.errors,
             warnings: critters.warnings,
         };

package/src/utils/version.js

@@ -46,9 +46,9 @@ function assertCompatibleAngularVersion(projectRoot, logger) {
         // In this case we don't provide as many version checks.
         return;
     }
-    if (angularCliPkgJson['version'] === '0.0.0' || angularPkgJson['version'] === '0.0.0-PLACEHOLDER') {
+    if (angularCliPkgJson['version'] === '0.0.0' || angularPkgJson['version'] === '0.0.0') {
         // Internal CLI testing version or integration testing in the angular/angular
-        // repository with the generated development @angular/core npm package which is versioned "0.0.0-PLACEHOLDER".
+        // repository with the generated development @angular/core npm package which is versioned "0.0.0".
         return;
     }
     const angularVersion = new semver_1.SemVer(angularPkgJson['version']);

package/src/webpack/configs/styles.js

@@ -112,6 +112,7 @@ function getStylesConfig(wco) {
                         implementation: require('less'),
                         sourceMap: cssSourceMap,
                         lessOptions: {
+                            math: 'always',
                             javascriptEnabled: true,
                             paths: includePaths,
                         },

package/src/webpack/configs/typescript.js

@@ -31,6 +31,8 @@ function createIvyPlugin(wco, aot, tsconfig) {
     const optimize = buildOptions.optimization.scripts;
     const compilerOptions = {
         sourceMap: buildOptions.sourceMap.scripts,
+        declaration: false,
+        declarationMap: false,
     };
     if (buildOptions.preserveSymlinks !== undefined) {
         compilerOptions.preserveSymlinks = buildOptions.preserveSymlinks;