@angular/build 18.1.1 → 18.1.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular/build",
-  "version": "18.1.1",
+  "version": "18.1.3",
   "description": "Official build system for Angular",
   "keywords": [
     "Angular CLI",
@@ -23,7 +23,7 @@
   "builders": "builders.json",
   "dependencies": {
     "@ampproject/remapping": "2.3.0",
-    "@angular-devkit/architect": "0.1801.1",
+    "@angular-devkit/architect": "0.1801.3",
     "@babel/core": "7.24.7",
     "@babel/helper-annotate-as-pure": "7.24.7",
     "@babel/helper-split-export-declaration": "7.24.7",

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

@@ -50,6 +50,12 @@ async function execute(options, context, extensions) {
         context.logger.error(`The 'extract-i18n' builder requires a target to be specified.`);
         return { success: false };
     }
+    const { projectType } = (await context.getProjectMetadata(projectName));
+    if (projectType !== 'application') {
+        context.logger.error(`Tried to extract from ${projectName} with 'projectType' ${projectType}, which is not supported.` +
+            ` The 'extract-i18n' builder can only extract from applications.`);
+        return { success: false };
+    }
     // Check Angular version.
     (0, version_1.assertCompatibleAngularVersion)(context.workspaceRoot);
     // Load the Angular localize package.

package/src/tools/esbuild/stylesheets/bundle-options.js

@@ -35,7 +35,7 @@ function createStylesheetBundleOptions(options, cache, inlineComponentData) {
         (0, css_resource_plugin_1.createCssResourcePlugin)(cache),
     ];
     if (options.inlineFonts) {
-        plugins.push((0, css_inline_fonts_plugin_1.createCssInlineFontsPlugin)({ cache, cacheOptions: options.cacheOptions }));
+        plugins.unshift((0, css_inline_fonts_plugin_1.createCssInlineFontsPlugin)({ cache, cacheOptions: options.cacheOptions }));
     }
     return {
         absWorkingDir: options.workspaceRoot,

package/src/tools/esbuild/stylesheets/stylesheet-plugin-factory.js

@@ -112,7 +112,7 @@ class StylesheetPluginFactory {
                     return processStylesheet(language, data, filename, format, options, build, postcssProcessor);
                 }));
                 // Add a load callback to support files from disk
-                build.onLoad({ filter: language.fileFilter }, (0, load_result_cache_1.createCachedLoad)(cache, async (args) => {
+                build.onLoad({ filter: language.fileFilter, namespace: 'file' }, (0, load_result_cache_1.createCachedLoad)(cache, async (args) => {
                     const data = await (0, promises_1.readFile)(args.path, 'utf-8');
                     return processStylesheet(language, data, args.path, (0, node_path_1.extname)(args.path).toLowerCase().slice(1), options, build, postcssProcessor);
                 }));

package/src/tools/sass/lexer.js

@@ -50,7 +50,7 @@ function* findUrls(contents) {
         if (pos > 0) {
             pos -= 2;
             next();
-            if (!isWhitespace(current) && current !== 0x0027 && current !== 0x003a) {
+            if (!isWhitespace(current) && current !== 0x002c && current !== 0x003a) {
                 // Skip - not a url token
                 pos += 3;
                 continue;

package/src/tools/vite/id-prefix-plugin.js

@@ -10,7 +10,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createRemoveIdPrefixPlugin = void 0;
 // NOTE: the implementation for this Vite plugin is roughly based on:
 // https://github.com/MilanKovacic/vite-plugin-externalize-dependencies
-const VITE_ID_PREFIX = '/@id/';
+const VITE_ID_PREFIX = '@id/';
 const escapeRegexSpecialChars = (inputString) => {
     return inputString.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'); // $& means the whole matched string
 };
@@ -23,7 +23,7 @@ const createRemoveIdPrefixPlugin = (externals) => ({
             return;
         }
         const escapedExternals = externals.map(escapeRegexSpecialChars);
-        const prefixedExternalRegex = new RegExp(`${VITE_ID_PREFIX}(${escapedExternals.join('|')})`, 'g');
+        const prefixedExternalRegex = new RegExp(`${resolvedConfig.base}${VITE_ID_PREFIX}(${escapedExternals.join('|')})`, 'g');
         // @ts-expect-error: Property 'push' does not exist on type 'readonly Plugin<any>[]'
         // Reasoning:
         //  since the /@id/ prefix is added by Vite's import-analysis plugin,

package/src/tools/vite/middlewares/assets-middleware.js

@@ -69,7 +69,8 @@ function createAngularAssetsMiddleware(server, assets, outputFiles) {
         if (!pathnameHasTrailingSlash) {
             for (const assetPath of assets.keys()) {
                 if (pathname === assetPath.substring(0, assetPath.lastIndexOf('/'))) {
-                    const location = req.url + '/';
+                    const { pathname, search, hash } = new URL(req.url, 'http://localhost');
+                    const location = [pathname, '/', search, hash].join('');
                     res.statusCode = 301;
                     res.setHeader('Content-Type', 'text/html');
                     res.setHeader('Location', location);

package/src/tools/vite/middlewares/index-html-middleware.js

@@ -8,6 +8,7 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createAngularIndexHtmlMiddleware = createAngularIndexHtmlMiddleware;
+const node_path_1 = require("node:path");
 const utils_1 = require("../utils");
 function createAngularIndexHtmlMiddleware(server, outputFiles, indexHtmlTransformer) {
     return function (req, res, next) {
@@ -18,11 +19,12 @@ function createAngularIndexHtmlMiddleware(server, outputFiles, indexHtmlTransfor
         // Parse the incoming request.
         // The base of the URL is unused but required to parse the URL.
         const pathname = (0, utils_1.pathnameWithoutBasePath)(req.url, server.config.base);
-        if (pathname !== '/' && pathname !== '/index.html') {
+        const extension = (0, node_path_1.extname)(pathname);
+        if (extension !== '.html') {
             next();
             return;
         }
-        const rawHtml = outputFiles.get('/index.html')?.contents;
+        const rawHtml = outputFiles.get(pathname)?.contents;
         if (!rawHtml) {
             next();
             return;

package/src/utils/index-file/index-html-generator.js

@@ -32,6 +32,7 @@ class IndexHtmlGenerator {
         if (options?.optimization?.styles?.inlineCritical) {
             this.csrPlugins.push(inlineCriticalCssPlugin(this));
         }
+        this.csrPlugins.push(addNoncePlugin());
         // SSR plugins
         if (options.generateDedicatedSSRContent) {
             this.ssrPlugins.push(addEventDispatchContractPlugin(), addNoncePlugin());

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 = '18.1.1';
+const VERSION = '18.1.3';
 function hasCacheMetadata(value) {
     return (!!value &&
         typeof value === 'object' &&