@angular-devkit/build-angular 13.1.4 → 13.2.0-rc.0

package/package.json

@@ -1,34 +1,34 @@
 {
   "name": "@angular-devkit/build-angular",
-  "version": "13.1.4",
+  "version": "13.2.0-rc.0",
   "description": "Angular Webpack Build Facade",
   "main": "src/index.js",
   "typings": "src/index.d.ts",
   "builders": "builders.json",
   "dependencies": {
     "@ampproject/remapping": "1.0.2",
-    "@angular-devkit/architect": "0.1301.4",
-    "@angular-devkit/build-webpack": "0.1301.4",
-    "@angular-devkit/core": "13.1.4",
-    "@babel/core": "7.16.0",
-    "@babel/generator": "7.16.0",
-    "@babel/helper-annotate-as-pure": "7.16.0",
-    "@babel/plugin-proposal-async-generator-functions": "7.16.4",
-    "@babel/plugin-transform-async-to-generator": "7.16.0",
-    "@babel/plugin-transform-runtime": "7.16.4",
-    "@babel/preset-env": "7.16.4",
-    "@babel/runtime": "7.16.3",
-    "@babel/template": "7.16.0",
+    "@angular-devkit/architect": "0.1302.0-rc.0",
+    "@angular-devkit/build-webpack": "0.1302.0-rc.0",
+    "@angular-devkit/core": "13.2.0-rc.0",
+    "@babel/core": "7.16.7",
+    "@babel/generator": "7.16.8",
+    "@babel/helper-annotate-as-pure": "7.16.7",
+    "@babel/plugin-proposal-async-generator-functions": "7.16.8",
+    "@babel/plugin-transform-async-to-generator": "7.16.8",
+    "@babel/plugin-transform-runtime": "7.16.8",
+    "@babel/preset-env": "7.16.8",
+    "@babel/runtime": "7.16.7",
+    "@babel/template": "7.16.7",
     "@discoveryjs/json-ext": "0.5.6",
-    "@ngtools/webpack": "13.1.4",
+    "@ngtools/webpack": "13.2.0-rc.0",
     "ansi-colors": "4.1.1",
     "babel-loader": "8.2.3",
     "babel-plugin-istanbul": "6.1.1",
     "browserslist": "^4.9.1",
     "cacache": "15.3.0",
     "circular-dependency-plugin": "5.2.2",
-    "copy-webpack-plugin": "10.0.0",
-    "core-js": "3.19.3",
+    "copy-webpack-plugin": "10.2.0",
+    "core-js": "3.20.3",
     "critters": "0.0.16",
     "css-loader": "6.5.1",
     "esbuild-wasm": "0.14.11",
@@ -41,45 +41,45 @@
     "less-loader": "10.2.0",
     "license-webpack-plugin": "4.0.0",
     "loader-utils": "3.2.0",
-    "mini-css-extract-plugin": "2.4.5",
+    "mini-css-extract-plugin": "2.5.2",
     "minimatch": "3.0.4",
     "open": "8.4.0",
     "ora": "5.4.1",
     "parse5-html-rewriting-stream": "6.0.1",
-    "piscina": "3.1.0",
-    "postcss": "8.4.4",
+    "piscina": "3.2.0",
+    "postcss": "8.4.5",
     "postcss-import": "14.0.2",
     "postcss-loader": "6.2.1",
     "postcss-preset-env": "7.2.3",
     "regenerator-runtime": "0.13.9",
-    "resolve-url-loader": "4.0.0",
+    "resolve-url-loader": "5.0.0",
     "rxjs": "6.6.7",
-    "sass": "1.44.0",
+    "sass": "1.49.0",
     "sass-loader": "12.4.0",
     "semver": "7.3.5",
-    "source-map-loader": "3.0.0",
+    "source-map-loader": "3.0.1",
     "source-map-support": "0.5.21",
-    "stylus": "0.55.0",
+    "stylus": "0.56.0",
     "stylus-loader": "6.2.0",
     "terser": "5.10.0",
     "text-table": "0.2.0",
     "tree-kill": "1.2.2",
     "tslib": "2.3.1",
-    "webpack": "5.65.0",
-    "webpack-dev-middleware": "5.2.2",
-    "webpack-dev-server": "4.6.0",
+    "webpack": "5.66.0",
+    "webpack-dev-middleware": "5.3.0",
+    "webpack-dev-server": "4.7.3",
     "webpack-merge": "5.8.0",
-    "webpack-subresource-integrity": "5.0.0"
+    "webpack-subresource-integrity": "5.1.0"
   },
   "optionalDependencies": {
     "esbuild": "0.14.11"
   },
   "peerDependencies": {
-    "@angular/compiler-cli": "^13.0.0 || ^13.1.0-next",
-    "@angular/localize": "^13.0.0 || ^13.1.0-next",
-    "@angular/service-worker": "^13.0.0 || ^13.1.0-next",
+    "@angular/compiler-cli": "^13.0.0 || ^13.2.0-next",
+    "@angular/localize": "^13.0.0 || ^13.2.0-next",
+    "@angular/service-worker": "^13.0.0 || ^13.2.0-next",
     "karma": "^6.3.0",
-    "ng-packagr": "^13.0.0 || ^13.1.0-next",
+    "ng-packagr": "^13.0.0 || ^13.2.0-next",
     "protractor": "^7.0.0",
     "tailwindcss": "^2.0.0 || ^3.0.0",
     "typescript": ">=4.4.3 <4.6"

package/src/builders/browser/schema.d.ts

@@ -53,10 +53,14 @@ export interface Schema {
      * Replace compilation source files with other compilation source files in the build.
      */
     fileReplacements?: FileReplacement[];
+    /**
+     * How to handle duplicate translations for i18n.
+     */
+    i18nDuplicateTranslation?: I18NTranslation;
     /**
      * How to handle missing translations for i18n.
      */
-    i18nMissingTranslation?: I18NMissingTranslation;
+    i18nMissingTranslation?: I18NTranslation;
     /**
      * Configures the generation of the application's HTML index.
      */
@@ -266,9 +270,11 @@ export interface FileReplacement {
     with?: string;
 }
 /**
+ * How to handle duplicate translations for i18n.
+ *
  * How to handle missing translations for i18n.
  */
-export declare enum I18NMissingTranslation {
+export declare enum I18NTranslation {
     Error = "error",
     Ignore = "ignore",
     Warning = "warning"

package/src/builders/browser/schema.js

@@ -2,7 +2,7 @@
 // THIS FILE IS AUTOMATICALLY GENERATED. TO UPDATE THIS FILE YOU NEED TO CHANGE THE
 // CORRESPONDING JSON SCHEMA FILE, THEN RUN devkit-admin build (or bazel build ...).
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.OutputHashing = exports.InlineStyleLanguage = exports.I18NMissingTranslation = exports.CrossOrigin = exports.Type = void 0;
+exports.OutputHashing = exports.InlineStyleLanguage = exports.I18NTranslation = exports.CrossOrigin = exports.Type = void 0;
 /**
  * The type of budget.
  */
@@ -26,14 +26,16 @@ var CrossOrigin;
     CrossOrigin["UseCredentials"] = "use-credentials";
 })(CrossOrigin = exports.CrossOrigin || (exports.CrossOrigin = {}));
 /**
+ * How to handle duplicate translations for i18n.
+ *
  * How to handle missing translations for i18n.
  */
-var I18NMissingTranslation;
-(function (I18NMissingTranslation) {
-    I18NMissingTranslation["Error"] = "error";
-    I18NMissingTranslation["Ignore"] = "ignore";
-    I18NMissingTranslation["Warning"] = "warning";
-})(I18NMissingTranslation = exports.I18NMissingTranslation || (exports.I18NMissingTranslation = {}));
+var I18NTranslation;
+(function (I18NTranslation) {
+    I18NTranslation["Error"] = "error";
+    I18NTranslation["Ignore"] = "ignore";
+    I18NTranslation["Warning"] = "warning";
+})(I18NTranslation = exports.I18NTranslation || (exports.I18NTranslation = {}));
 /**
  * The stylesheet language to use for the application's inline component styles.
  */

package/src/builders/browser/schema.json

@@ -220,6 +220,12 @@
       "enum": ["warning", "error", "ignore"],
       "default": "warning"
     },
+    "i18nDuplicateTranslation": {
+      "type": "string",
+      "description": "How to handle duplicate translations for i18n.",
+      "enum": ["warning", "error", "ignore"],
+      "default": "warning"
+    },
     "localize": {
       "description": "Translate the bundles in one or more locales.",
       "oneOf": [

package/src/builders/dev-server/index.js

@@ -195,11 +195,12 @@ function serveWebpackBrowser(options, context, transforms = {}) {
         }).pipe((0, operators_1.concatMap)(async (buildEvent, index) => {
             var _a, _b;
             // Resolve serve address.
+            const publicPath = (_b = (_a = webpackConfig.devServer) === null || _a === void 0 ? void 0 : _a.devMiddleware) === null || _b === void 0 ? void 0 : _b.publicPath;
             const serverAddress = url.format({
                 protocol: options.ssl ? 'https' : 'http',
                 hostname: options.host === '0.0.0.0' ? 'localhost' : options.host,
                 port: buildEvent.port,
-                pathname: (_b = (_a = webpackConfig.devServer) === null || _a === void 0 ? void 0 : _a.devMiddleware) === null || _b === void 0 ? void 0 : _b.publicPath,
+                pathname: typeof publicPath === 'string' ? publicPath : undefined,
             });
             if (index === 0) {
                 logger.info('\n' +
@@ -299,7 +300,7 @@ async function setupLocalize(locale, i18n, browserOptions, webpackConfig, cacheO
                         error(message) {
                             (0, webpack_diagnostics_1.addError)(compilation, message);
                         },
-                    });
+                    }, undefined, browserOptions.i18nDuplicateTranslation);
                     i18nLoaderOptions.translation = (_a = localeDescription.translation) !== null && _a !== void 0 ? _a : {};
                 }
                 compilation.hooks.finishModules.tap('build-angular', () => {

package/src/builders/server/schema.d.ts

@@ -28,10 +28,14 @@ export interface Schema {
      * Replace compilation source files with other compilation source files in the build.
      */
     fileReplacements?: FileReplacement[];
+    /**
+     * How to handle duplicate translations for i18n.
+     */
+    i18nDuplicateTranslation?: I18NTranslation;
     /**
      * How to handle missing translations for i18n.
      */
-    i18nMissingTranslation?: I18NMissingTranslation;
+    i18nMissingTranslation?: I18NTranslation;
     /**
      * The stylesheet language to use for the application's inline component styles.
      */
@@ -128,9 +132,11 @@ export interface FileReplacement {
     with?: string;
 }
 /**
+ * How to handle duplicate translations for i18n.
+ *
  * How to handle missing translations for i18n.
  */
-export declare enum I18NMissingTranslation {
+export declare enum I18NTranslation {
     Error = "error",
     Ignore = "ignore",
     Warning = "warning"

package/src/builders/server/schema.js

@@ -2,21 +2,23 @@
 // THIS FILE IS AUTOMATICALLY GENERATED. TO UPDATE THIS FILE YOU NEED TO CHANGE THE
 // CORRESPONDING JSON SCHEMA FILE, THEN RUN devkit-admin build (or bazel build ...).
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.OutputHashing = exports.InlineStyleLanguage = exports.I18NMissingTranslation = exports.BundleDependenciesEnum = void 0;
+exports.OutputHashing = exports.InlineStyleLanguage = exports.I18NTranslation = exports.BundleDependenciesEnum = void 0;
 var BundleDependenciesEnum;
 (function (BundleDependenciesEnum) {
     BundleDependenciesEnum["All"] = "all";
     BundleDependenciesEnum["None"] = "none";
 })(BundleDependenciesEnum = exports.BundleDependenciesEnum || (exports.BundleDependenciesEnum = {}));
 /**
+ * How to handle duplicate translations for i18n.
+ *
  * How to handle missing translations for i18n.
  */
-var I18NMissingTranslation;
-(function (I18NMissingTranslation) {
-    I18NMissingTranslation["Error"] = "error";
-    I18NMissingTranslation["Ignore"] = "ignore";
-    I18NMissingTranslation["Warning"] = "warning";
-})(I18NMissingTranslation = exports.I18NMissingTranslation || (exports.I18NMissingTranslation = {}));
+var I18NTranslation;
+(function (I18NTranslation) {
+    I18NTranslation["Error"] = "error";
+    I18NTranslation["Ignore"] = "ignore";
+    I18NTranslation["Warning"] = "warning";
+})(I18NTranslation = exports.I18NTranslation || (exports.I18NTranslation = {}));
 /**
  * The stylesheet language to use for the application's inline component styles.
  */

package/src/builders/server/schema.json

@@ -133,6 +133,12 @@
       "enum": ["warning", "error", "ignore"],
       "default": "warning"
     },
+    "i18nDuplicateTranslation": {
+      "type": "string",
+      "description": "How to handle duplicate translations for i18n.",
+      "enum": ["warning", "error", "ignore"],
+      "default": "warning"
+    },
     "localize": {
       "description": "Translate the bundles in one or more locales.",
       "oneOf": [

package/src/sass/sass-service.d.ts

@@ -5,11 +5,11 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import { Options, Result, SassException } from 'sass';
+import { LegacyResult as CompileResult, LegacyException as Exception, LegacyOptions as Options } from 'sass';
 /**
  * The callback type for the `dart-sass` asynchronous render function.
  */
-declare type RenderCallback = (error?: SassException, result?: Result) => void;
+declare type RenderCallback = (error?: Exception, result?: CompileResult) => void;
 /**
  * A Sass renderer implementation that provides an interface that can be used by Webpack's
  * `sass-loader`. The implementation uses a Worker thread to perform the Sass rendering
@@ -37,7 +37,7 @@ export declare class SassWorkerImplementation {
      * @param options The `dart-sass` options to use when rendering the stylesheet.
      * @param callback The function to execute when the rendering is complete.
      */
-    render(options: Options, callback: RenderCallback): void;
+    render(options: Options<'async'>, callback: RenderCallback): void;
     /**
      * Shutdown the Sass render worker.
      * Executing this method will stop any pending render requests.

package/src/utils/build-options.d.ts

@@ -7,7 +7,7 @@
  */
 import { logging } from '@angular-devkit/core';
 import type { ParsedConfiguration } from '@angular/compiler-cli';
-import { AssetPatternClass, Budget, CrossOrigin, ExtraEntryPoint, I18NMissingTranslation, IndexUnion, InlineStyleLanguage, Localize, SourceMapClass } from '../builders/browser/schema';
+import { AssetPatternClass, Budget, CrossOrigin, ExtraEntryPoint, I18NTranslation, IndexUnion, InlineStyleLanguage, Localize, SourceMapClass } from '../builders/browser/schema';
 import { Schema as DevServerSchema } from '../builders/dev-server/schema';
 import { NormalizedCachedOptions } from './normalize-cache';
 import { NormalizedFileReplacement } from './normalize-file-replacements';
@@ -26,7 +26,7 @@ export interface BuildOptions {
     verbose?: boolean;
     progress?: boolean;
     localize?: Localize;
-    i18nMissingTranslation?: I18NMissingTranslation;
+    i18nMissingTranslation?: I18NTranslation;
     bundleDependencies?: boolean;
     externalDependencies?: string[];
     watch?: boolean;

package/src/utils/i18n-options.d.ts

@@ -7,7 +7,7 @@
  */
 import { BuilderContext } from '@angular-devkit/architect';
 import { json } from '@angular-devkit/core';
-import { Schema as BrowserBuilderSchema } from '../builders/browser/schema';
+import { Schema as BrowserBuilderSchema, I18NTranslation } from '../builders/browser/schema';
 import { Schema as ServerBuilderSchema } from '../builders/server/schema';
 import { TranslationLoader } from './load-translations';
 export interface LocaleDescription {
@@ -36,4 +36,4 @@ export declare function configureI18nBuild<T extends BrowserBuilderSchema | Serv
 export declare function loadTranslations(locale: string, desc: LocaleDescription, workspaceRoot: string, loader: TranslationLoader, logger: {
     warn: (message: string) => void;
     error: (message: string) => void;
-}, usedFormats?: Set<string>): void;
+}, usedFormats?: Set<string>, duplicateTranslation?: I18NTranslation): void;

package/src/utils/i18n-options.js

@@ -16,6 +16,7 @@ const fs_1 = __importDefault(require("fs"));
 const module_1 = __importDefault(require("module"));
 const os_1 = __importDefault(require("os"));
 const path_1 = __importDefault(require("path"));
+const schema_1 = require("../builders/browser/schema");
 const read_tsconfig_1 = require("../utils/read-tsconfig");
 const load_translations_1 = require("./load-translations");
 /**
@@ -166,7 +167,7 @@ async function configureI18nBuild(context, options) {
             error(message) {
                 throw new Error(message);
             },
-        }, usedFormats);
+        }, usedFormats, buildOptions.i18nDuplicateTranslation);
         if (usedFormats.size > 1 && tsConfig.options.enableI18nLegacyMessageIdFormat !== false) {
             // This limitation is only for legacy message id support (defaults to true as of 9.0)
             throw new Error('Localization currently only supports using one type of translation file format for the entire application.');
@@ -214,7 +215,7 @@ function deleteTempDirectory(tempPath) {
     }
     catch { }
 }
-function loadTranslations(locale, desc, workspaceRoot, loader, logger, usedFormats) {
+function loadTranslations(locale, desc, workspaceRoot, loader, logger, usedFormats, duplicateTranslation) {
     let translations = undefined;
     for (const file of desc.files) {
         const loadResult = loader(path_1.default.join(workspaceRoot, file.path));
@@ -236,7 +237,18 @@ function loadTranslations(locale, desc, workspaceRoot, loader, logger, usedForma
             // Merge translations
             for (const [id, message] of Object.entries(loadResult.translations)) {
                 if (translations[id] !== undefined) {
-                    logger.warn(`WARNING [${file.path}]: Duplicate translations for message '${id}' when merging`);
+                    const duplicateTranslationMessage = `[${file.path}]: Duplicate translations for message '${id}' when merging.`;
+                    switch (duplicateTranslation) {
+                        case schema_1.I18NTranslation.Ignore:
+                            break;
+                        case schema_1.I18NTranslation.Error:
+                            logger.error(`ERROR ${duplicateTranslationMessage}`);
+                            break;
+                        case schema_1.I18NTranslation.Warning:
+                        default:
+                            logger.warn(`WARNING ${duplicateTranslationMessage}`);
+                            break;
+                    }
                 }
                 translations[id] = message;
             }

package/src/webpack/configs/styles.js

@@ -25,9 +25,13 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getStylesConfig = void 0;
 const fs = __importStar(require("fs"));
+const mini_css_extract_plugin_1 = __importDefault(require("mini-css-extract-plugin"));
 const path = __importStar(require("path"));
 const sass_service_1 = require("../../sass/sass-service");
 const plugins_1 = require("../plugins");
@@ -70,7 +74,6 @@ function resolveGlobalStyles(styleEntrypoints, root, preserveSymlinks) {
 // eslint-disable-next-line max-lines-per-function
 function getStylesConfig(wco) {
     var _a, _b, _c;
-    const MiniCssExtractPlugin = require('mini-css-extract-plugin');
     const postcssImports = require('postcss-import');
     const postcssPresetEnv = require('postcss-preset-env');
     const { root, buildOptions } = wco;
@@ -129,9 +132,6 @@ function getStylesConfig(wco) {
                 ` To enable Tailwind CSS, please install the 'tailwindcss' package.`);
         }
         if (tailwindPackagePath) {
-            if (process.env['TAILWIND_MODE'] === undefined) {
-                process.env['TAILWIND_MODE'] = buildOptions.watch ? 'watch' : 'build';
-            }
             extraPostcssPlugins.push(require(tailwindPackagePath)({ config: tailwindConfigPath }));
         }
     }
@@ -191,7 +191,7 @@ function getStylesConfig(wco) {
         // for component css.
         !buildOptions.sourceMap.hidden);
     // extract global css from js files into own css file.
-    extraPlugins.push(new MiniCssExtractPlugin({ filename: `[name]${hashFormat.extract}.css` }));
+    extraPlugins.push(new mini_css_extract_plugin_1.default({ filename: `[name]${hashFormat.extract}.css` }));
     if (!buildOptions.hmr) {
         // don't remove `.js` files for `.css` when we are using HMR these contain HMR accept codes.
         // suppress empty .js files in css only entry points.
@@ -210,7 +210,7 @@ function getStylesConfig(wco) {
     ];
     const globalStyleLoaders = [
         {
-            loader: MiniCssExtractPlugin.loader,
+            loader: mini_css_extract_plugin_1.default.loader,
         },
         {
             loader: require.resolve('css-loader'),

package/src/webpack/plugins/karma/karma.js

@@ -32,7 +32,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const path = __importStar(require("path"));
 const glob = __importStar(require("glob"));
 const webpack_1 = __importDefault(require("webpack"));
-const webpackDevMiddleware = require('webpack-dev-middleware');
+const webpack_dev_middleware_1 = __importDefault(require("webpack-dev-middleware"));
 const stats_1 = require("../../utils/stats");
 const node_1 = require("@angular-devkit/core/node");
 const index_1 = require("../../../utils/index");
@@ -172,7 +172,7 @@ const init = (config, emitter) => {
         }
         unblock();
     });
-    webpackMiddleware = webpackDevMiddleware(compiler, webpackMiddlewareConfig);
+    webpackMiddleware = (0, webpack_dev_middleware_1.default)(compiler, webpackMiddlewareConfig);
     emitter.on('exit', (done) => {
         webpackMiddleware.close();
         done();