@angular-devkit/build-angular 20.0.0-rc.1 → 20.0.0-rc.3

package/package.json

@@ -1,16 +1,16 @@
 {
   "name": "@angular-devkit/build-angular",
-  "version": "20.0.0-rc.1",
+  "version": "20.0.0-rc.3",
   "description": "Angular Webpack Build Facade",
   "main": "src/index.js",
   "typings": "src/index.d.ts",
   "builders": "builders.json",
   "dependencies": {
     "@ampproject/remapping": "2.3.0",
-    "@angular-devkit/architect": "0.2000.0-rc.1",
-    "@angular-devkit/build-webpack": "0.2000.0-rc.1",
-    "@angular-devkit/core": "20.0.0-rc.1",
-    "@angular/build": "20.0.0-rc.1",
+    "@angular-devkit/architect": "0.2000.0-rc.3",
+    "@angular-devkit/build-webpack": "0.2000.0-rc.3",
+    "@angular-devkit/core": "20.0.0-rc.3",
+    "@angular/build": "20.0.0-rc.3",
     "@babel/core": "7.27.1",
     "@babel/generator": "7.27.1",
     "@babel/helper-annotate-as-pure": "7.27.1",
@@ -21,7 +21,7 @@
     "@babel/preset-env": "7.27.2",
     "@babel/runtime": "7.27.1",
     "@discoveryjs/json-ext": "0.6.3",
-    "@ngtools/webpack": "20.0.0-rc.1",
+    "@ngtools/webpack": "20.0.0-rc.3",
     "@vitejs/plugin-basic-ssl": "2.0.0",
     "ansi-colors": "4.1.3",
     "autoprefixer": "10.4.21",
@@ -72,7 +72,7 @@
     "@angular/platform-browser": "^20.0.0 || ^20.0.0-next.0",
     "@angular/platform-server": "^20.0.0 || ^20.0.0-next.0",
     "@angular/service-worker": "^20.0.0 || ^20.0.0-next.0",
-    "@angular/ssr": "^20.0.0-rc.1",
+    "@angular/ssr": "^20.0.0-rc.3",
     "@web/test-runner": "^0.20.0",
     "browser-sync": "^3.0.2",
     "jest": "^29.5.0",
@@ -140,7 +140,7 @@
   },
   "packageManager": "pnpm@9.15.9",
   "engines": {
-    "node": "^20.11.1 || ^22.11.0 || >=24.0.0",
+    "node": "^20.19.0 || ^22.12.0 || >=24.0.0",
     "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
     "yarn": ">= 1.13.0"
   },

package/src/builders/extract-i18n/builder.js

@@ -115,13 +115,20 @@ async function execute(options, context, transforms) {
             return node_path_1.default.relative(from, to);
         },
     };
+    const duplicateTranslationBehavior = normalizedOptions.i18nOptions.duplicateTranslationBehavior;
     const diagnostics = checkDuplicateMessages(
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    checkFileSystem, extractionResult.messages, 'warning', 
+    checkFileSystem, extractionResult.messages, duplicateTranslationBehavior, 
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     extractionResult.basePath);
-    if (diagnostics.messages.length > 0) {
-        context.logger.warn(diagnostics.formatDiagnostics(''));
+    if (diagnostics.messages.length > 0 && duplicateTranslationBehavior !== 'ignore') {
+        if (duplicateTranslationBehavior === 'error') {
+            context.logger.error(`Extraction Failed: ${diagnostics.formatDiagnostics('')}`);
+            return { success: false };
+        }
+        else {
+            context.logger.warn(diagnostics.formatDiagnostics(''));
+        }
     }
     // Serialize all extracted messages
     const serializer = await createSerializer(localizeToolsModule, normalizedOptions.format, normalizedOptions.i18nOptions.sourceLocale, extractionResult.basePath, extractionResult.useLegacyIds, diagnostics);

package/src/builders/extract-i18n/options.d.ts

@@ -5,6 +5,8 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.dev/license
  */
+import { type I18nOptions } from '@angular/build/private';
+import { type DiagnosticHandlingStrategy } from '@angular/localize/tools';
 import { BuilderContext } from '@angular-devkit/architect';
 import { Schema as ExtractI18nOptions, Format } from './schema';
 export type NormalizedExtractI18nOptions = Awaited<ReturnType<typeof normalizeOptions>>;
@@ -22,7 +24,9 @@ export declare function normalizeOptions(context: BuilderContext, projectName: s
     workspaceRoot: string;
     projectRoot: string;
     buildTarget: import("@angular-devkit/architect").Target;
-    i18nOptions: import("@angular/build/private").I18nOptions;
+    i18nOptions: I18nOptions & {
+        duplicateTranslationBehavior: DiagnosticHandlingStrategy;
+    };
     format: Format.Arb | Format.Json | Format.LegacyMigrate | Format.Xliff | Format.Xliff2 | Format.Xmb;
     outFile: string;
     progress: boolean;

package/src/builders/extract-i18n/options.js

@@ -33,7 +33,10 @@ async function normalizeOptions(context, projectName, options) {
     // Target specifier defaults to the current project's build target with no specified configuration
     const buildTargetSpecifier = options.buildTarget ?? ':';
     const buildTarget = (0, architect_1.targetFromTargetString)(buildTargetSpecifier, projectName, 'build');
-    const i18nOptions = (0, private_1.createI18nOptions)(projectMetadata, /** inline */ false, context.logger);
+    const i18nOptions = {
+        ...(0, private_1.createI18nOptions)(projectMetadata, /** inline */ false, context.logger),
+        duplicateTranslationBehavior: options.i18nDuplicateTranslation || 'warning',
+    };
     // Normalize xliff format extensions
     let format = options.format;
     switch (format) {

package/src/builders/extract-i18n/schema.d.ts

@@ -12,6 +12,10 @@ export type Schema = {
      * Output format for the generated file.
      */
     format?: Format;
+    /**
+     * How to handle duplicate translations.
+     */
+    i18nDuplicateTranslation?: I18NDuplicateTranslation;
     /**
      * Name of the file to output.
      */
@@ -39,3 +43,11 @@ export declare enum Format {
     Xliff2 = "xliff2",
     Xmb = "xmb"
 }
+/**
+ * How to handle duplicate translations.
+ */
+export declare enum I18NDuplicateTranslation {
+    Error = "error",
+    Ignore = "ignore",
+    Warning = "warning"
+}

package/src/builders/extract-i18n/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.Format = void 0;
+exports.I18NDuplicateTranslation = exports.Format = void 0;
 /**
  * Output format for the generated file.
  */
@@ -18,3 +18,12 @@ var Format;
     Format["Xliff2"] = "xliff2";
     Format["Xmb"] = "xmb";
 })(Format || (exports.Format = Format = {}));
+/**
+ * How to handle duplicate translations.
+ */
+var I18NDuplicateTranslation;
+(function (I18NDuplicateTranslation) {
+    I18NDuplicateTranslation["Error"] = "error";
+    I18NDuplicateTranslation["Ignore"] = "ignore";
+    I18NDuplicateTranslation["Warning"] = "warning";
+})(I18NDuplicateTranslation || (exports.I18NDuplicateTranslation = I18NDuplicateTranslation = {}));

package/src/builders/extract-i18n/schema.json

@@ -27,6 +27,11 @@
     "outFile": {
       "type": "string",
       "description": "Name of the file to output."
+    },
+    "i18nDuplicateTranslation": {
+      "type": "string",
+      "description": "How to handle duplicate translations.",
+      "enum": ["error", "warning", "ignore"]
     }
   },
   "additionalProperties": false

package/src/tools/webpack/configs/dev-server.js

@@ -192,7 +192,7 @@ async function addProxyConfig(root, proxyConfig) {
             // Load the ESM configuration file using the TypeScript dynamic import workaround.
             // Once TypeScript provides support for keeping the dynamic import this workaround can be
             // changed to a direct dynamic import.
-            proxyConfiguration = (await (0, load_esm_1.loadEsmModule)((0, node_url_1.pathToFileURL)(proxyPath))).default;
+            proxyConfiguration = await (0, load_esm_1.loadEsmModule)((0, node_url_1.pathToFileURL)(proxyPath));
             break;
         case '.cjs':
             proxyConfiguration = require(proxyPath);
@@ -211,9 +211,12 @@ async function addProxyConfig(root, proxyConfig) {
                 // Load the ESM configuration file using the TypeScript dynamic import workaround.
                 // Once TypeScript provides support for keeping the dynamic import this workaround can be
                 // changed to a direct dynamic import.
-                proxyConfiguration = (await (0, load_esm_1.loadEsmModule)((0, node_url_1.pathToFileURL)(proxyPath))).default;
+                proxyConfiguration = await (0, load_esm_1.loadEsmModule)((0, node_url_1.pathToFileURL)(proxyPath));
             }
     }
+    if ('default' in proxyConfiguration) {
+        proxyConfiguration = proxyConfiguration.default;
+    }
     return normalizeProxyConfiguration(proxyConfiguration);
 }
 /**

package/src/utils/normalize-cache.js

@@ -10,7 +10,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeCacheOptions = normalizeCacheOptions;
 const node_path_1 = require("node:path");
 /** Version placeholder is replaced during the build process with actual package version */
-const VERSION = '20.0.0-rc.1';
+const VERSION = '20.0.0-rc.3';
 function hasCacheMetadata(value) {
     return (!!value &&
         typeof value === 'object' &&