0a570c0 feat(@angular/build): add support for customizing URL segments with i18n

Author: Angular Builds

package.json

@@ -1,16 +1,16 @@
 {
   "name": "@angular-devkit/build-angular",
-  "version": "19.1.0-next.0+sha-d7214e9",
+  "version": "19.1.0-next.0+sha-0a570c0",
   "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": "github:angular/angular-devkit-architect-builds#d7214e9",
-    "@angular-devkit/build-webpack": "github:angular/angular-devkit-build-webpack-builds#d7214e9",
-    "@angular-devkit/core": "github:angular/angular-devkit-core-builds#d7214e9",
-    "@angular/build": "github:angular/angular-build-builds#d7214e9",
+    "@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#0a570c0",
+    "@angular-devkit/build-webpack": "github:angular/angular-devkit-build-webpack-builds#0a570c0",
+    "@angular-devkit/core": "github:angular/angular-devkit-core-builds#0a570c0",
+    "@angular/build": "github:angular/angular-build-builds#0a570c0",
     "@babel/core": "7.26.0",
     "@babel/generator": "7.26.3",
     "@babel/helper-annotate-as-pure": "7.25.9",
@@ -21,7 +21,7 @@
     "@babel/preset-env": "7.26.0",
     "@babel/runtime": "7.26.0",
     "@discoveryjs/json-ext": "0.6.3",
-    "@ngtools/webpack": "github:angular/ngtools-webpack-builds#d7214e9",
+    "@ngtools/webpack": "github:angular/ngtools-webpack-builds#0a570c0",
     "@vitejs/plugin-basic-ssl": "1.2.0",
     "ansi-colors": "4.1.3",
     "autoprefixer": "10.4.20",
@@ -70,7 +70,7 @@
     "@angular/localize": "^19.0.0 || ^19.1.0-next.0",
     "@angular/platform-server": "^19.0.0 || ^19.1.0-next.0",
     "@angular/service-worker": "^19.0.0 || ^19.1.0-next.0",
-    "@angular/ssr": "github:angular/angular-ssr-builds#d7214e9",
+    "@angular/ssr": "github:angular/angular-ssr-builds#0a570c0",
     "@web/test-runner": "^0.19.0",
     "browser-sync": "^3.0.2",
     "jest": "^29.5.0",
@@ -91,7 +91,7 @@
     "@angular/service-worker": {
       "optional": true
     },
-    "@angular/ssr": "github:angular/angular-ssr-builds#d7214e9",
+    "@angular/ssr": "github:angular/angular-ssr-builds#0a570c0",
     "@web/test-runner": {
       "optional": true
     },

src/builders/browser/index.js

@@ -316,10 +316,15 @@ function buildWebpackBrowser(options, context, transforms = {}) {
         })));
     }));
     function getLocaleBaseHref(i18n, locale) {
-        if (i18n.locales[locale] && i18n.locales[locale]?.baseHref !== '') {
-            return (0, utils_1.urlJoin)(options.baseHref || '', i18n.locales[locale].baseHref ?? `/${locale}/`);
+        if (i18n.flatOutput) {
+            return undefined;
         }
-        return undefined;
+        const localeData = i18n.locales[locale];
+        if (!localeData) {
+            return undefined;
+        }
+        const baseHrefSuffix = localeData.baseHref ?? localeData.subPath + '/';
+        return baseHrefSuffix !== '' ? (0, utils_1.urlJoin)(options.baseHref || '', baseHrefSuffix) : undefined;
     }
 }
 function assertNever(input) {

src/builders/extract-i18n/options.js

@@ -33,7 +33,7 @@ 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);
+    const i18nOptions = (0, private_1.createI18nOptions)(projectMetadata, /** inline */ false, context.logger);
     // Normalize xliff format extensions
     let format = options.format;
     switch (format) {

src/utils/i18n-webpack.js

@@ -30,7 +30,7 @@ async function configureI18nBuild(context, options) {
     const buildOptions = { ...options };
     const tsConfig = await (0, read_tsconfig_1.readTsconfig)(buildOptions.tsConfig, context.workspaceRoot);
     const metadata = await context.getProjectMetadata(context.target);
-    const i18n = (0, private_1.createI18nOptions)(metadata, buildOptions.localize);
+    const i18n = (0, private_1.createI18nOptions)(metadata, buildOptions.localize, context.logger);
     // No additional processing needed if no inlining requested and no source locale defined.
     if (!i18n.shouldInline && !i18n.hasDefinedSourceLocale) {
         return { buildOptions, i18n };

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 = '19.1.0-next.0+sha-d7214e9';
+const VERSION = '19.1.0-next.0+sha-0a570c0';
 function hasCacheMetadata(value) {
     return (!!value &&
         typeof value === 'object' &&

src/utils/output-paths.js

@@ -14,7 +14,7 @@ function ensureOutputPaths(baseOutputPath, i18n) {
     const outputPaths = i18n.shouldInline
         ? [...i18n.inlineLocales].map((l) => [
             l,
-            i18n.flatOutput ? baseOutputPath : (0, path_1.join)(baseOutputPath, l),
+            i18n.flatOutput ? baseOutputPath : (0, path_1.join)(baseOutputPath, i18n.locales[l].subPath),
         ])
         : [['', baseOutputPath]];
     for (const [, outputPath] of outputPaths) {

uniqueId

@@ -1 +1 @@
-Sat Dec 07 2024 17:50:48 GMT+0000 (Coordinated Universal Time)
+Sat Dec 07 2024 18:04:56 GMT+0000 (Coordinated Universal Time)