@angular/build 18.0.1 → 18.0.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular/build",
-  "version": "18.0.1",
+  "version": "18.0.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.1800.1",
+    "@angular-devkit/architect": "0.1800.3",
     "@babel/core": "7.24.5",
     "@babel/helper-annotate-as-pure": "7.22.5",
     "@babel/helper-split-export-declaration": "7.24.5",

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

@@ -110,7 +110,7 @@ export interface Schema {
      * Enables optimization of the build output. Including minification of scripts and styles,
      * tree-shaking, dead-code elimination, inlining of critical CSS and fonts inlining. For
      * more information, see
-     * https://angular.io/guide/workspace-config#optimization-configuration.
+     * https://angular.dev/reference/configs/workspace-config#optimization-configuration.
      */
     optimization?: OptimizationUnion;
     /**
@@ -158,7 +158,7 @@ export interface Schema {
     serviceWorker?: ServiceWorker;
     /**
      * Output source maps for scripts and styles. For more information, see
-     * https://angular.io/guide/workspace-config#source-map-configuration.
+     * https://angular.dev/reference/configs/workspace-config#source-map-configuration.
      */
     sourceMap?: SourceMapUnion;
     /**
@@ -333,7 +333,7 @@ export type Localize = string[] | boolean;
  * Enables optimization of the build output. Including minification of scripts and styles,
  * tree-shaking, dead-code elimination, inlining of critical CSS and fonts inlining. For
  * more information, see
- * https://angular.io/guide/workspace-config#optimization-configuration.
+ * https://angular.dev/reference/configs/workspace-config#optimization-configuration.
  */
 export type OptimizationUnion = boolean | OptimizationClass;
 export interface OptimizationClass {
@@ -455,7 +455,7 @@ export interface ScriptClass {
 export type ServiceWorker = boolean | string;
 /**
  * Output source maps for scripts and styles. For more information, see
- * https://angular.io/guide/workspace-config#source-map-configuration.
+ * https://angular.dev/reference/configs/workspace-config#source-map-configuration.
  */
 export type SourceMapUnion = boolean | SourceMapClass;
 export interface SourceMapClass {

package/src/builders/application/schema.json

@@ -143,7 +143,7 @@
       "description": "Automatically clear the terminal screen during rebuilds."
     },
     "optimization": {
-      "description": "Enables optimization of the build output. Including minification of scripts and styles, tree-shaking, dead-code elimination, inlining of critical CSS and fonts inlining. For more information, see https://angular.io/guide/workspace-config#optimization-configuration.",
+      "description": "Enables optimization of the build output. Including minification of scripts and styles, tree-shaking, dead-code elimination, inlining of critical CSS and fonts inlining. For more information, see https://angular.dev/reference/configs/workspace-config#optimization-configuration.",
       "default": true,
       "x-user-analytics": "ep.ng_optimization",
       "oneOf": [
@@ -279,7 +279,7 @@
       "default": true
     },
     "sourceMap": {
-      "description": "Output source maps for scripts and styles. For more information, see https://angular.io/guide/workspace-config#source-map-configuration.",
+      "description": "Output source maps for scripts and styles. For more information, see https://angular.dev/reference/configs/workspace-config#source-map-configuration.",
       "default": false,
       "oneOf": [
         {

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

@@ -45,7 +45,7 @@ export interface Schema {
     prebundle?: PrebundleUnion;
     /**
      * Proxy configuration file. For more information, see
-     * https://angular.io/guide/build#proxying-to-a-backend-server.
+     * https://angular.dev/tools/cli/serve#proxying-to-a-backend-server.
      */
     proxyConfig?: string;
     /**

package/src/builders/dev-server/schema.json

@@ -21,7 +21,7 @@
     },
     "proxyConfig": {
       "type": "string",
-      "description": "Proxy configuration file. For more information, see https://angular.io/guide/build#proxying-to-a-backend-server."
+      "description": "Proxy configuration file. For more information, see https://angular.dev/tools/cli/serve#proxying-to-a-backend-server."
     },
     "ssl": {
       "type": "boolean",

package/src/tools/esbuild/angular/compiler-plugin.js

@@ -53,9 +53,10 @@ function createCompilerPlugin(pluginOptions, styleOptions) {
         async setup(build) {
             let setupWarnings = [];
             const preserveSymlinks = build.initialOptions.preserveSymlinks;
-            // Initialize a worker pool for JavaScript transformations
+            // Initialize a worker pool for JavaScript transformations.
+            // Webcontainers currently do not support this persistent cache store.
             let cacheStore;
-            if (pluginOptions.sourceFileCache?.persistentCachePath) {
+            if (pluginOptions.sourceFileCache?.persistentCachePath && !process.versions.webcontainer) {
                 const { LmbdCacheStore } = await Promise.resolve().then(() => __importStar(require('../lmdb-cache-store')));
                 cacheStore = new LmbdCacheStore(path.join(pluginOptions.sourceFileCache.persistentCachePath, 'angular-compiler.db'));
             }
@@ -361,7 +362,7 @@ function createCompilerOptionsTransformer(setupWarnings, pluginOptions, preserve
                 notes: [
                     {
                         text: 'To control ECMA version and features use the Browserslist configuration. ' +
-                            'For more information, see https://angular.io/guide/build#configuring-browser-compatibility',
+                            'For more information, see https://angular.dev/tools/cli/build#configuring-browser-compatibility',
                     },
                 ],
             });

package/src/tools/esbuild/stylesheets/sass-language.js

@@ -137,7 +137,14 @@ async function compileString(data, filePath, syntax, options, resolveUrl) {
                 },
             ],
             logger: {
-                warn: (text, { deprecation, span }) => {
+                warn: (text, { deprecation, stack, span }) => {
+                    const notes = [];
+                    if (deprecation) {
+                        notes.push({ text });
+                    }
+                    if (stack && !span) {
+                        notes.push({ text: stack });
+                    }
                     warnings.push({
                         text: deprecation ? 'Deprecation' : text,
                         location: span && {
@@ -147,7 +154,7 @@ async function compileString(data, filePath, syntax, options, resolveUrl) {
                             line: span.start.line + 1,
                             column: span.start.column,
                         },
-                        notes: deprecation ? [{ text }] : undefined,
+                        notes,
                     });
                 },
             },
@@ -162,6 +169,10 @@ async function compileString(data, filePath, syntax, options, resolveUrl) {
     catch (error) {
         if (isSassException(error)) {
             const fileWithError = error.span.url ? (0, node_url_1.fileURLToPath)(error.span.url) : undefined;
+            const watchFiles = [filePath, ...extractFilesFromStack(error.sassStack)];
+            if (fileWithError) {
+                watchFiles.push(fileWithError);
+            }
             return {
                 loader: 'css',
                 errors: [
@@ -170,7 +181,7 @@ async function compileString(data, filePath, syntax, options, resolveUrl) {
                     },
                 ],
                 warnings,
-                watchFiles: fileWithError ? [filePath, fileWithError] : [filePath],
+                watchFiles,
             };
         }
         throw error;
@@ -183,3 +194,25 @@ function sourceMapToUrlComment(sourceMap, root) {
     const urlSourceMap = Buffer.from(JSON.stringify(sourceMap), 'utf-8').toString('base64');
     return `/*# sourceMappingURL=data:application/json;charset=utf-8;base64,${urlSourceMap} */`;
 }
+function* extractFilesFromStack(stack) {
+    const lines = stack.split('\n');
+    const cwd = process.cwd();
+    // Stack line has format of "<file> <location> <identifier>"
+    for (const line of lines) {
+        const segments = line.split(' ');
+        if (segments.length < 3) {
+            break;
+        }
+        // Extract path from stack line.
+        // Paths may contain spaces. All segments before location are part of the file path.
+        let path = '';
+        let index = 0;
+        while (!segments[index].match(/\d+:\d+/)) {
+            path += segments[index++];
+        }
+        if (path) {
+            // Stack paths from dart-sass are relative to the current working directory (not input file or workspace root)
+            yield (0, node_path_1.join)(cwd, path);
+        }
+    }
+}

package/src/tools/sass/lexer.js

@@ -45,9 +45,20 @@ function* findUrls(contents) {
     };
     // Based on https://www.w3.org/TR/css-syntax-3/#consume-ident-like-token
     while ((pos = contents.indexOf('url(', pos)) !== -1) {
+        width = 1;
+        // Ensure whitespace, comma, or colon before `url(`
+        if (pos > 0) {
+            pos -= 2;
+            next();
+            if (!isWhitespace(current) && current !== 0x0027 && current !== 0x003a) {
+                // Skip - not a url token
+                pos += 3;
+                continue;
+            }
+            pos += 1;
+        }
         // Set to position of the (
         pos += 3;
-        width = 1;
         // Consume all leading whitespace
         while (isWhitespace(next())) {
             /* empty */

package/src/tools/sass/rebasing-importer.js

@@ -17,25 +17,6 @@ const node_path_1 = require("node:path");
 const node_url_1 = require("node:url");
 const error_1 = require("../../utils/error");
 const lexer_1 = require("./lexer");
-/**
- * Ensures that a bare specifier URL path that is intended to be treated as
- * a relative path has a leading `./` or `../` prefix.
- *
- * @param url A bare specifier URL path that should be considered relative.
- * @returns
- */
-function ensureRelative(url) {
-    // Empty
-    if (!url) {
-        return url;
-    }
-    // Already relative
-    if (url[0] === '.' && (url[1] === '/' || (url[1] === '.' && url[2] === '/'))) {
-        return url;
-    }
-    // Needs prefix
-    return './' + url;
-}
 /**
  * A Sass Importer base class that provides the load logic to rebase all `url()` functions
  * within a stylesheet. The rebasing will ensure that the URLs in the output of the Sass compiler
@@ -84,13 +65,13 @@ class UrlRebasingImporter {
             }
             // Sass variable usage either starts with a `$` or contains a namespace and a `.$`
             const valueNormalized = value[0] === '$' || /^\w+\.\$/.test(value) ? `#{${value}}` : value;
-            const rebasedPath = (0, node_path_1.relative)(this.entryDirectory, stylesheetDirectory) + '||file:' + valueNormalized;
+            const rebasedPath = (0, node_path_1.relative)(this.entryDirectory, stylesheetDirectory);
             // Normalize path separators and escape characters
             // https://developer.mozilla.org/en-US/docs/Web/CSS/url#syntax
-            const rebasedUrl = ensureRelative(rebasedPath.replace(/\\/g, '/').replace(/[()\s'"]/g, '\\$&'));
+            const rebasedUrl = rebasedPath.replace(/\\/g, '/').replace(/[()\s'"]/g, '\\$&');
             updatedContents ??= new magic_string_1.default(contents);
             // Always quote the URL to avoid potential downstream parsing problems
-            updatedContents.update(start, end, `"${rebasedUrl}"`);
+            updatedContents.update(start, end, `"${rebasedUrl}||file:${valueNormalized}"`);
         }
         if (updatedContents) {
             contents = updatedContents.toString();

package/src/tools/sass/sass-service.js

@@ -87,6 +87,9 @@ class SassWorkerImplementation {
             filename: require.resolve('./worker'),
             minThreads: 1,
             maxThreads: this.maxThreads,
+            // Web containers do not support transferable objects with receiveOnMessagePort which
+            // is used when the Atomics based wait loop is enable.
+            useAtomics: !process.versions.webcontainer,
             // Shutdown idle threads after 1 second of inactivity
             idleTimeout: 1000,
             recordTiming: false,

package/src/utils/i18n-options.js

@@ -43,7 +43,7 @@ function createI18nOptions(projectMetadata, inline) {
     ensureObject(metadata, 'i18n');
     const i18n = {
         inlineLocales: new Set(),
-        // en-US is the default locale added to Angular applications (https://angular.io/guide/i18n#i18n-pipes)
+        // en-US is the default locale added to Angular applications (https://angular.dev/guide/i18n/format-data-locale)
         sourceLocale: 'en-US',
         locales: {},
         get shouldInline() {

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

@@ -12,23 +12,7 @@ const node_crypto_1 = require("node:crypto");
 const node_path_1 = require("node:path");
 const load_esm_1 = require("../load-esm");
 const html_rewriting_stream_1 = require("./html-rewriting-stream");
-/** A list of valid self closing HTML elements */
-const VALID_SELF_CLOSING_TAGS = new Set([
-    'area',
-    'base',
-    'br',
-    'col',
-    'embed',
-    'hr',
-    'img',
-    'input',
-    'link',
-    'meta',
-    'param',
-    'source',
-    'track',
-    'wbr',
-]);
+const valid_self_closing_tags_1 = require("./valid-self-closing-tags");
 /*
  * Helper function used by the IndexHtmlWebpackPlugin.
  * Can also be directly used by builder, e. g. in order to generate an index.html
@@ -171,7 +155,7 @@ async function augmentIndexHtml(params) {
                 }
                 break;
             default:
-                if (tag.selfClosing && !VALID_SELF_CLOSING_TAGS.has(tag.tagName)) {
+                if (tag.selfClosing && !valid_self_closing_tags_1.VALID_SELF_CLOSING_TAGS.has(tag.tagName)) {
                     errors.push(`Invalid self-closing element in index HTML file: '${rawTagHtml}'.`);
                     return;
                 }

package/src/utils/index-file/valid-self-closing-tags.d.ts

@@ -0,0 +1,9 @@
+/**
+ * @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.io/license
+ */
+/** A list of valid self closing HTML elements */
+export declare const VALID_SELF_CLOSING_TAGS: Set<string>;

package/src/utils/index-file/valid-self-closing-tags.js

@@ -0,0 +1,61 @@
+"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.io/license
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.VALID_SELF_CLOSING_TAGS = void 0;
+/** A list of valid self closing HTML elements */
+exports.VALID_SELF_CLOSING_TAGS = new Set([
+    'area',
+    'base',
+    'br',
+    'col',
+    'embed',
+    'hr',
+    'img',
+    'input',
+    'link',
+    'meta',
+    'param',
+    'source',
+    'track',
+    'wbr',
+    /** SVG tags */
+    'circle',
+    'ellipse',
+    'line',
+    'path',
+    'polygon',
+    'polyline',
+    'rect',
+    'text',
+    'tspan',
+    'linearGradient',
+    'radialGradient',
+    'stop',
+    'image',
+    'pattern',
+    'defs',
+    'g',
+    'marker',
+    'mask',
+    'style',
+    'symbol',
+    'use',
+    'view',
+    /** MathML tags */
+    'mspace',
+    'mphantom',
+    'mrow',
+    'mfrac',
+    'msqrt',
+    'mroot',
+    'mstyle',
+    'merror',
+    'mpadded',
+    'mtable',
+]);

package/src/utils/normalize-cache.js

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