@angular/build 18.0.2 → 18.0.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular/build",
-  "version": "18.0.2",
+  "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.2",
+    "@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/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'));
             }

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

@@ -169,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: [
@@ -177,7 +181,7 @@ async function compileString(data, filePath, syntax, options, resolveUrl) {
                     },
                 ],
                 warnings,
-                watchFiles: fileWithError ? [filePath, fileWithError] : [filePath],
+                watchFiles,
             };
         }
         throw error;
@@ -190,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/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.2';
+const VERSION = '18.0.3';
 function hasCacheMetadata(value) {
     return (!!value &&
         typeof value === 'object' &&