@nx/angular-rspack 22.4.0-canary.20260115-21d1555 → 22.4.0-canary.20260116-323554b

package/dist/lib/plugins/index-html-plugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index-html-plugin.d.ts","sourceRoot":"","sources":["../../../src/lib/plugins/index-html-plugin.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,kBAAkB,EAElB,KAAK,yBAAyB,EAC/B,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,WAAW,EAAE,oBAAoB,EAAE,KAAK,QAAQ,EAAE,MAAM,cAAc,CAAC;AAEhF,OAAO,KAAK,EAAE,WAAW,EAAE,uBAAuB,EAAE,MAAM,WAAW,CAAC;AAQtE,MAAM,WAAW,sBAAuB,SAAQ,yBAAyB;IACvE,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAC;IAC7B,IAAI,EAAE,WAAW,CAAC;IAClB,KAAK,EAAE,uBAAuB,CAAC;IAC/B,KAAK,EAAE,OAAO,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;CACpB;AAID,qBAAa,eACX,SAAQ,kBACR,YAAW,oBAAoB;aAWD,OAAO,EAAE,sBAAsB;IAT7D,OAAO,CAAC,YAAY,CAA0B;IAC9C,IAAI,WAAW,IAAI,WAAW,CAM7B;gBAE6B,OAAO,EAAE,sBAAsB;IAI7D,KAAK,CAAC,QAAQ,EAAE,QAAQ;IAoET,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;cAM9B,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAsBjE,iBAAiB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;CAgBtD"}
+{"version":3,"file":"index-html-plugin.d.ts","sourceRoot":"","sources":["../../../src/lib/plugins/index-html-plugin.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,kBAAkB,EAElB,KAAK,yBAAyB,EAC/B,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,WAAW,EAAE,oBAAoB,EAAE,KAAK,QAAQ,EAAE,MAAM,cAAc,CAAC;AAEhF,OAAO,KAAK,EAAE,WAAW,EAAE,uBAAuB,EAAE,MAAM,WAAW,CAAC;AAYtE,MAAM,WAAW,sBAAuB,SAAQ,yBAAyB;IACvE,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAC;IAC7B,IAAI,EAAE,WAAW,CAAC;IAClB,KAAK,EAAE,uBAAuB,CAAC;IAC/B,KAAK,EAAE,OAAO,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;CACpB;AAID,qBAAa,eACX,SAAQ,kBACR,YAAW,oBAAoB;aAWD,OAAO,EAAE,sBAAsB;IAT7D,OAAO,CAAC,YAAY,CAA0B;IAC9C,IAAI,WAAW,IAAI,WAAW,CAM7B;gBAE6B,OAAO,EAAE,sBAAsB;IAI7D,KAAK,CAAC,QAAQ,EAAE,QAAQ;IAoET,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;cAM9B,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAsBjE,iBAAiB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;CAyBtD"}

package/dist/lib/plugins/index-html-plugin.js

@@ -8,7 +8,7 @@ const add_event_dispatch_contract_1 = require("../utils/index-file/add-event-dis
 const misc_helpers_1 = require("../utils/misc-helpers");
 const i18n_1 = require("../utils/i18n");
 const rspack_diagnostics_1 = require("../utils/rspack-diagnostics");
-const url_join_1 = require("../utils/url-join");
+const url_1 = require("../utils/url");
 const get_index_output_file_1 = require("../utils/index-file/get-index-output-file");
 const PLUGIN_NAME = 'IndexHtmlPlugin';
 class IndexHtmlPlugin extends private_1.IndexHtmlGenerator {
@@ -99,9 +99,14 @@ class IndexHtmlPlugin extends private_1.IndexHtmlGenerator {
             return undefined;
         }
         const baseHrefSuffix = localeData.baseHref ?? localeData.subPath + '/';
-        return baseHrefSuffix !== ''
-            ? (0, url_join_1.urlJoin)(this.options.baseHref || '', baseHrefSuffix)
-            : undefined;
+        let joinedBaseHref;
+        if (baseHrefSuffix !== '') {
+            joinedBaseHref = (0, url_1.addTrailingSlash)((0, url_1.joinUrlParts)(this.options.baseHref || '', baseHrefSuffix));
+            if (this.options.baseHref && this.options.baseHref[0] !== '/') {
+                joinedBaseHref = (0, url_1.stripLeadingSlash)(joinedBaseHref);
+            }
+        }
+        return joinedBaseHref;
     }
 }
 exports.IndexHtmlPlugin = IndexHtmlPlugin;

package/dist/lib/utils/get-locale-base-href.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"get-locale-base-href.d.ts","sourceRoot":"","sources":["../../../src/lib/utils/get-locale-base-href.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AAGxC,wBAAgB,iBAAiB,CAC/B,IAAI,EAAE,WAAW,EACjB,MAAM,EAAE,MAAM,EACd,QAAQ,CAAC,EAAE,MAAM,GAChB,MAAM,GAAG,SAAS,CAepB"}
+{"version":3,"file":"get-locale-base-href.d.ts","sourceRoot":"","sources":["../../../src/lib/utils/get-locale-base-href.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AAGxC,wBAAgB,iBAAiB,CAC/B,IAAI,EAAE,WAAW,EACjB,MAAM,EAAE,MAAM,EACd,QAAQ,CAAC,EAAE,MAAM,GAChB,MAAM,GAAG,SAAS,CAwBpB"}

package/dist/lib/utils/get-locale-base-href.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getLocaleBaseHref = getLocaleBaseHref;
-const url_join_1 = require("./url-join");
+const url_1 = require("./url");
 function getLocaleBaseHref(i18n, locale, baseHref) {
     if (i18n.flatOutput) {
         return undefined;
@@ -11,7 +11,12 @@ function getLocaleBaseHref(i18n, locale, baseHref) {
         return undefined;
     }
     const baseHrefSuffix = localeData.baseHref ?? localeData.subPath + '/';
-    return baseHrefSuffix !== ''
-        ? (0, url_join_1.urlJoin)(baseHref || '', baseHrefSuffix)
-        : undefined;
+    let joinedBaseHref;
+    if (baseHrefSuffix !== '') {
+        joinedBaseHref = (0, url_1.addTrailingSlash)((0, url_1.joinUrlParts)(baseHref || '', baseHrefSuffix));
+        if (baseHref && baseHref[0] !== '/') {
+            joinedBaseHref = (0, url_1.stripLeadingSlash)(joinedBaseHref);
+        }
+    }
+    return joinedBaseHref;
 }

package/dist/lib/utils/url.d.ts

@@ -0,0 +1,67 @@
+/**
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * 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
+ */
+/**
+ * Removes the leading slash from a URL if it exists.
+ *
+ * @param url - The URL string from which to remove the leading slash.
+ * @returns The URL string without a leading slash.
+ *
+ * @example
+ * ```js
+ * stripLeadingSlash('/path'); // 'path'
+ * stripLeadingSlash('/path/');  // 'path/'
+ * stripLeadingSlash('/'); // '/'
+ * stripLeadingSlash(''); // ''
+ * ```
+ */
+export declare function stripLeadingSlash(url: string): string;
+/**
+ * Adds a leading slash to a URL if it does not already have one.
+ *
+ * @param url - The URL string to which the leading slash will be added.
+ * @returns The URL string with a leading slash.
+ *
+ * @example
+ * ```js
+ * addLeadingSlash('path'); // '/path'
+ * addLeadingSlash('/path'); // '/path'
+ * ```
+ */
+export declare function addLeadingSlash(url: string): string;
+/**
+ * Adds a trailing slash to a URL if it does not already have one.
+ *
+ * @param url - The URL string to which the trailing slash will be added.
+ * @returns The URL string with a trailing slash.
+ *
+ * @example
+ * ```js
+ * addTrailingSlash('path'); // 'path/'
+ * addTrailingSlash('path/'); // 'path/'
+ * ```
+ */
+export declare function addTrailingSlash(url: string): string;
+/**
+ * Joins URL parts into a single URL string.
+ *
+ * This function takes multiple URL segments, normalizes them by removing leading
+ * and trailing slashes where appropriate, and then joins them into a single URL.
+ *
+ * @param parts - The parts of the URL to join. Each part can be a string with or without slashes.
+ * @returns The joined URL string, with normalized slashes.
+ *
+ * @example
+ * ```js
+ * joinUrlParts('path/', '/to/resource'); // '/path/to/resource'
+ * joinUrlParts('/path/', 'to/resource'); // '/path/to/resource'
+ * joinUrlParts('http://localhost/path/', 'to/resource'); // 'http://localhost/path/to/resource'
+ * joinUrlParts('', ''); // '/'
+ * ```
+ */
+export declare function joinUrlParts(...parts: string[]): string;
+//# sourceMappingURL=url.d.ts.map

package/dist/lib/utils/url.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"url.d.ts","sourceRoot":"","sources":["../../../src/lib/utils/url.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH;;;;;;;;;;;;;GAaG;AACH,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAGrD;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,eAAe,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAGnD;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAGpD;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,YAAY,CAAC,GAAG,KAAK,EAAE,MAAM,EAAE,GAAG,MAAM,CAyBvD"}

package/dist/lib/utils/url.js

@@ -0,0 +1,102 @@
+"use strict";
+/**
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * 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
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.stripLeadingSlash = stripLeadingSlash;
+exports.addLeadingSlash = addLeadingSlash;
+exports.addTrailingSlash = addTrailingSlash;
+exports.joinUrlParts = joinUrlParts;
+/**
+ * Removes the leading slash from a URL if it exists.
+ *
+ * @param url - The URL string from which to remove the leading slash.
+ * @returns The URL string without a leading slash.
+ *
+ * @example
+ * ```js
+ * stripLeadingSlash('/path'); // 'path'
+ * stripLeadingSlash('/path/');  // 'path/'
+ * stripLeadingSlash('/'); // '/'
+ * stripLeadingSlash(''); // ''
+ * ```
+ */
+function stripLeadingSlash(url) {
+    // Check if the first character of the URL is a slash
+    return url.length > 1 && url[0] === '/' ? url.slice(1) : url;
+}
+/**
+ * Adds a leading slash to a URL if it does not already have one.
+ *
+ * @param url - The URL string to which the leading slash will be added.
+ * @returns The URL string with a leading slash.
+ *
+ * @example
+ * ```js
+ * addLeadingSlash('path'); // '/path'
+ * addLeadingSlash('/path'); // '/path'
+ * ```
+ */
+function addLeadingSlash(url) {
+    // Check if the URL already starts with a slash
+    return url[0] === '/' ? url : `/${url}`;
+}
+/**
+ * Adds a trailing slash to a URL if it does not already have one.
+ *
+ * @param url - The URL string to which the trailing slash will be added.
+ * @returns The URL string with a trailing slash.
+ *
+ * @example
+ * ```js
+ * addTrailingSlash('path'); // 'path/'
+ * addTrailingSlash('path/'); // 'path/'
+ * ```
+ */
+function addTrailingSlash(url) {
+    // Check if the URL already end with a slash
+    return url.at(-1) === '/' ? url : `${url}/`;
+}
+/**
+ * Joins URL parts into a single URL string.
+ *
+ * This function takes multiple URL segments, normalizes them by removing leading
+ * and trailing slashes where appropriate, and then joins them into a single URL.
+ *
+ * @param parts - The parts of the URL to join. Each part can be a string with or without slashes.
+ * @returns The joined URL string, with normalized slashes.
+ *
+ * @example
+ * ```js
+ * joinUrlParts('path/', '/to/resource'); // '/path/to/resource'
+ * joinUrlParts('/path/', 'to/resource'); // '/path/to/resource'
+ * joinUrlParts('http://localhost/path/', 'to/resource'); // 'http://localhost/path/to/resource'
+ * joinUrlParts('', ''); // '/'
+ * ```
+ */
+function joinUrlParts(...parts) {
+    const normalizeParts = [];
+    for (const part of parts) {
+        if (part === '') {
+            // Skip any empty parts
+            continue;
+        }
+        let normalizedPart = part;
+        if (part[0] === '/') {
+            normalizedPart = normalizedPart.slice(1);
+        }
+        if (part.at(-1) === '/') {
+            normalizedPart = normalizedPart.slice(0, -1);
+        }
+        if (normalizedPart !== '') {
+            normalizeParts.push(normalizedPart);
+        }
+    }
+    const protocolMatch = normalizeParts.length && /^https?:\/\//.test(normalizeParts[0]);
+    const joinedParts = normalizeParts.join('/');
+    return protocolMatch ? joinedParts : addLeadingSlash(joinedParts);
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/angular-rspack",
-  "version": "22.4.0-canary.20260115-21d1555",
+  "version": "22.4.0-canary.20260116-323554b",
   "private": false,
   "publishConfig": {
     "access": "public"
@@ -48,8 +48,8 @@
     "@ampproject/remapping": "2.3.0",
     "@babel/core": "7.28.3",
     "@discoveryjs/json-ext": "0.6.3",
-    "@nx/angular-rspack-compiler": "22.4.0-canary.20260115-21d1555",
-    "@nx/devkit": "22.4.0-canary.20260115-21d1555",
+    "@nx/angular-rspack-compiler": "22.4.0-canary.20260116-323554b",
+    "@nx/devkit": "22.4.0-canary.20260116-323554b",
     "ansi-colors": "4.1.3",
     "autoprefixer": "10.4.21",
     "deepmerge": "^4.3.1",

package/dist/lib/utils/url-join.d.ts

@@ -1,9 +0,0 @@
-/**
- * @license
- * Copyright Google LLC All Rights Reserved.
- *
- * 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
- */
-export declare function urlJoin(...parts: string[]): string;
-//# sourceMappingURL=url-join.d.ts.map

package/dist/lib/utils/url-join.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"url-join.d.ts","sourceRoot":"","sources":["../../../src/lib/utils/url-join.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,wBAAgB,OAAO,CAAC,GAAG,KAAK,EAAE,MAAM,EAAE,GAAG,MAAM,CAOlD"}

package/dist/lib/utils/url-join.js

@@ -1,17 +0,0 @@
-"use strict";
-/**
- * @license
- * Copyright Google LLC All Rights Reserved.
- *
- * 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
- */
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.urlJoin = urlJoin;
-function urlJoin(...parts) {
-    const [p, ...rest] = parts;
-    // Remove trailing slash from first part
-    // Join all parts with `/`
-    // Dedupe double slashes from path names
-    return p.replace(/\/$/, '') + ('/' + rest.join('/')).replace(/\/\/+/g, '/');
-}