@angular-devkit/build-angular 18.0.0-next.0 → 18.0.0-next.2

package/package.json

@@ -1,15 +1,15 @@
 {
   "name": "@angular-devkit/build-angular",
-  "version": "18.0.0-next.0",
+  "version": "18.0.0-next.2",
   "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": "0.1800.0-next.0",
-    "@angular-devkit/build-webpack": "0.1800.0-next.0",
-    "@angular-devkit/core": "18.0.0-next.0",
+    "@angular-devkit/architect": "0.1800.0-next.2",
+    "@angular-devkit/build-webpack": "0.1800.0-next.2",
+    "@angular-devkit/core": "18.0.0-next.2",
     "@babel/core": "7.24.3",
     "@babel/generator": "7.24.1",
     "@babel/helper-annotate-as-pure": "7.22.5",
@@ -20,10 +20,10 @@
     "@babel/preset-env": "7.24.3",
     "@babel/runtime": "7.24.1",
     "@discoveryjs/json-ext": "0.5.7",
-    "@ngtools/webpack": "18.0.0-next.0",
+    "@ngtools/webpack": "18.0.0-next.2",
     "@vitejs/plugin-basic-ssl": "1.1.0",
     "ansi-colors": "4.1.3",
-    "autoprefixer": "10.4.18",
+    "autoprefixer": "10.4.19",
     "babel-loader": "9.1.3",
     "babel-plugin-istanbul": "6.1.1",
     "browserslist": "^4.21.5",
@@ -34,7 +34,7 @@
     "fast-glob": "3.3.2",
     "https-proxy-agent": "7.0.4",
     "http-proxy-middleware": "2.0.6",
-    "inquirer": "9.2.16",
+    "inquirer": "9.2.17",
     "jsonc-parser": "3.2.1",
     "karma-source-map-support": "1.4.0",
     "less": "4.2.0",
@@ -47,9 +47,9 @@
     "open": "8.4.2",
     "ora": "5.4.1",
     "parse5-html-rewriting-stream": "7.0.0",
-    "picomatch": "4.0.1",
+    "picomatch": "4.0.2",
     "piscina": "4.4.0",
-    "postcss": "8.4.37",
+    "postcss": "8.4.38",
     "postcss-loader": "8.1.1",
     "resolve-url-loader": "5.0.0",
     "rxjs": "7.8.1",
@@ -58,14 +58,14 @@
     "semver": "7.6.0",
     "source-map-loader": "5.0.0",
     "source-map-support": "0.5.21",
-    "terser": "5.29.2",
+    "terser": "5.30.2",
     "tree-kill": "1.2.2",
     "tslib": "2.6.2",
-    "undici": "6.9.0",
-    "vite": "5.2.2",
+    "undici": "6.11.1",
+    "vite": "5.2.7",
     "watchpack": "2.4.1",
     "webpack": "5.91.0",
-    "webpack-dev-middleware": "7.1.1",
+    "webpack-dev-middleware": "7.2.1",
     "webpack-dev-server": "5.0.4",
     "webpack-merge": "5.10.0",
     "webpack-subresource-integrity": "5.1.0"
@@ -86,7 +86,7 @@
     "ng-packagr": "^18.0.0-next.0",
     "protractor": "^7.0.0",
     "tailwindcss": "^2.0.0 || ^3.0.0",
-    "typescript": ">=5.2 <5.5"
+    "typescript": ">=5.4 <5.5"
   },
   "peerDependenciesMeta": {
     "@angular/localize": {

package/src/builders/application/execute-post-bundle.js

@@ -75,7 +75,7 @@ async function executePostBundleSteps(options, outputFiles, assetFiles, initialF
     // If localization is enabled, service worker is handled in the inlining process.
     if (serviceWorker) {
         try {
-            const serviceWorkerResult = await (0, service_worker_1.augmentAppWithServiceWorkerEsbuild)(workspaceRoot, serviceWorker, options.baseHref || '/', 
+            const serviceWorkerResult = await (0, service_worker_1.augmentAppWithServiceWorkerEsbuild)(workspaceRoot, serviceWorker, options.baseHref || '/', options.indexHtmlOptions?.output, 
             // Ensure additional files recently added are used
             [...outputFiles, ...additionalOutputFiles], assetFiles);
             additionalOutputFiles.push((0, utils_1.createOutputFileFromText)('ngsw.json', serviceWorkerResult.manifest, bundler_context_1.BuildOutputFileType.Browser));

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

@@ -99,7 +99,9 @@ export declare function normalizeOptions(context: BuilderContext, projectName: s
     sourcemapOptions: import("../..").SourceMapObject;
     tsconfig: string;
     projectRoot: string;
-    assets: import("../..").AssetPatternObject[] | undefined;
+    assets: (import("../..").AssetPatternObject & {
+        output: string;
+    })[] | undefined;
     outputNames: {
         bundles: string;
         media: string;

package/src/builders/application/options.js

@@ -21,7 +21,6 @@ const environment_options_1 = require("../../utils/environment-options");
 const i18n_options_1 = require("../../utils/i18n-options");
 const normalize_cache_1 = require("../../utils/normalize-cache");
 const postcss_configuration_1 = require("../../utils/postcss-configuration");
-const tailwind_1 = require("../../utils/tailwind");
 const schema_1 = require("./schema");
 /**
  * Normalize the user provided options by creating full paths for all path based options
@@ -108,11 +107,13 @@ async function normalizeOptions(context, projectName, options, extensions) {
             loaderExtensions[extension] = value;
         }
     }
-    const postcssConfiguration = await (0, postcss_configuration_1.loadPostcssConfiguration)(workspaceRoot, projectRoot);
+    // A configuration file can exist in the project or workspace root
+    const searchDirectories = await (0, postcss_configuration_1.generateSearchDirectories)([projectRoot, workspaceRoot]);
+    const postcssConfiguration = await (0, postcss_configuration_1.loadPostcssConfiguration)(searchDirectories);
     // Skip tailwind configuration if postcss is customized
     const tailwindConfiguration = postcssConfiguration
         ? undefined
-        : await getTailwindConfig(workspaceRoot, projectRoot, context);
+        : await getTailwindConfig(searchDirectories, workspaceRoot, context);
     const globalStyles = normalizeGlobalEntries(options.styles, 'styles');
     const globalScripts = normalizeGlobalEntries(options.scripts, 'scripts');
     let indexHtmlOptions;
@@ -211,7 +212,9 @@ async function normalizeOptions(context, projectName, options, extensions) {
         fileReplacements,
         globalStyles,
         globalScripts,
-        serviceWorker: typeof serviceWorker === 'string' ? node_path_1.default.join(workspaceRoot, serviceWorker) : undefined,
+        serviceWorker: serviceWorker
+            ? node_path_1.default.join(workspaceRoot, typeof serviceWorker === 'string' ? serviceWorker : 'src/ngsw-config.json')
+            : undefined,
         indexHtmlOptions,
         tailwindConfiguration,
         postcssConfiguration,
@@ -228,13 +231,13 @@ async function normalizeOptions(context, projectName, options, extensions) {
     };
 }
 exports.normalizeOptions = normalizeOptions;
-async function getTailwindConfig(workspaceRoot, projectRoot, context) {
-    const tailwindConfigurationPath = await (0, tailwind_1.findTailwindConfigurationFile)(workspaceRoot, projectRoot);
+async function getTailwindConfig(searchDirectories, workspaceRoot, context) {
+    const tailwindConfigurationPath = (0, postcss_configuration_1.findTailwindConfiguration)(searchDirectories);
     if (!tailwindConfigurationPath) {
         return undefined;
     }
-    // Create a node resolver at the project root as a directory
-    const resolver = (0, node_module_1.createRequire)(projectRoot + '/');
+    // Create a node resolver from the configuration file
+    const resolver = (0, node_module_1.createRequire)(tailwindConfigurationPath);
     try {
         return {
             file: tailwindConfigurationPath,

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

@@ -221,7 +221,7 @@ export interface AssetPatternClass {
     /**
      * Absolute path within the output.
      */
-    output: string;
+    output?: string;
 }
 export interface Budget {
     /**

package/src/builders/application/schema.json

@@ -560,11 +560,12 @@
             },
             "output": {
               "type": "string",
+              "default": "",
               "description": "Absolute path within the output."
             }
           },
           "additionalProperties": false,
-          "required": ["glob", "input", "output"]
+          "required": ["glob", "input"]
         },
         {
           "type": "string"

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

@@ -196,7 +196,7 @@ export interface AssetPatternClass {
     /**
      * Absolute path within the output.
      */
-    output: string;
+    output?: string;
 }
 export interface Budget {
     /**

package/src/builders/browser/schema.json

@@ -454,11 +454,12 @@
             },
             "output": {
               "type": "string",
+              "default": "",
               "description": "Absolute path within the output."
             }
           },
           "additionalProperties": false,
-          "required": ["glob", "input", "output"]
+          "required": ["glob", "input"]
         },
         {
           "type": "string"

package/src/builders/browser-esbuild/schema.d.ts

@@ -201,7 +201,7 @@ export interface AssetPatternClass {
     /**
      * Absolute path within the output.
      */
-    output: string;
+    output?: string;
 }
 export interface Budget {
     /**

package/src/builders/browser-esbuild/schema.json

@@ -466,11 +466,12 @@
             },
             "output": {
               "type": "string",
+              "default": "",
               "description": "Absolute path within the output."
             }
           },
           "additionalProperties": false,
-          "required": ["glob", "input", "output"]
+          "required": ["glob", "input"]
         },
         {
           "type": "string"

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

@@ -115,7 +115,7 @@ export interface AssetPatternClass {
     /**
      * Absolute path within the output.
      */
-    output: string;
+    output?: string;
 }
 /**
  * Override which browsers tests are run against. Set to `false` to not use any browser.

package/src/builders/karma/schema.json

@@ -290,6 +290,7 @@
             },
             "output": {
               "type": "string",
+              "default": "",
               "description": "Absolute path within the output."
             },
             "ignore": {
@@ -301,7 +302,7 @@
             }
           },
           "additionalProperties": false,
-          "required": ["glob", "input", "output"]
+          "required": ["glob", "input"]
         },
         {
           "type": "string"

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

@@ -139,7 +139,7 @@ export interface AssetPatternClass {
     /**
      * Absolute path within the output.
      */
-    output: string;
+    output?: string;
 }
 export interface FileReplacement {
     replace?: string;

package/src/builders/server/schema.json

@@ -251,11 +251,12 @@
             },
             "output": {
               "type": "string",
+              "default": "",
               "description": "Absolute path within the output."
             }
           },
           "additionalProperties": false,
-          "required": ["glob", "input", "output"]
+          "required": ["glob", "input"]
         },
         {
           "type": "string"

package/src/builders/web-test-runner/schema.d.ts

@@ -107,7 +107,7 @@ export interface AssetPatternClass {
     /**
      * Absolute path within the output.
      */
-    output: string;
+    output?: string;
 }
 export interface FileReplacement {
     replace?: string;

package/src/builders/web-test-runner/schema.json

@@ -269,6 +269,7 @@
             },
             "output": {
               "type": "string",
+              "default": "",
               "description": "Absolute path within the output."
             },
             "ignore": {
@@ -280,7 +281,7 @@
             }
           },
           "additionalProperties": false,
-          "required": ["glob", "input", "output"]
+          "required": ["glob", "input"]
         },
         {
           "type": "string"

package/src/tools/babel/plugins/index.d.ts

@@ -0,0 +1,11 @@
+/**
+ * @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
+ */
+export { default as adjustStaticMembers } from './adjust-static-class-members';
+export { default as adjustTypeScriptEnums } from './adjust-typescript-enums';
+export { default as elideAngularMetadata } from './elide-angular-metadata';
+export { default as markTopLevelPure } from './pure-toplevel-functions';

package/src/tools/babel/plugins/index.js

@@ -0,0 +1,21 @@
+"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
+ */
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.markTopLevelPure = exports.elideAngularMetadata = exports.adjustTypeScriptEnums = exports.adjustStaticMembers = void 0;
+var adjust_static_class_members_1 = require("./adjust-static-class-members");
+Object.defineProperty(exports, "adjustStaticMembers", { enumerable: true, get: function () { return __importDefault(adjust_static_class_members_1).default; } });
+var adjust_typescript_enums_1 = require("./adjust-typescript-enums");
+Object.defineProperty(exports, "adjustTypeScriptEnums", { enumerable: true, get: function () { return __importDefault(adjust_typescript_enums_1).default; } });
+var elide_angular_metadata_1 = require("./elide-angular-metadata");
+Object.defineProperty(exports, "elideAngularMetadata", { enumerable: true, get: function () { return __importDefault(elide_angular_metadata_1).default; } });
+var pure_toplevel_functions_1 = require("./pure-toplevel-functions");
+Object.defineProperty(exports, "markTopLevelPure", { enumerable: true, get: function () { return __importDefault(pure_toplevel_functions_1).default; } });

package/src/tools/babel/presets/application.js

@@ -147,11 +147,12 @@ function default_1(api, options) {
         needRuntimeTransform = true;
     }
     if (options.optimize) {
+        const { adjustStaticMembers, adjustTypeScriptEnums, elideAngularMetadata, markTopLevelPure, } = require('../plugins');
         if (options.optimize.pureTopLevel) {
-            plugins.push(require('../plugins/pure-toplevel-functions').default);
+            plugins.push(markTopLevelPure);
         }
-        plugins.push(require('../plugins/elide-angular-metadata').default, [require('../plugins/adjust-typescript-enums').default, { loose: true }], [
-            require('../plugins/adjust-static-class-members').default,
+        plugins.push(elideAngularMetadata, adjustTypeScriptEnums, [
+            adjustStaticMembers,
             { wrapDecorators: options.optimize.wrapDecorators },
         ]);
     }

package/src/tools/esbuild/javascript-transformer-worker.js

@@ -34,8 +34,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const core_1 = require("@babel/core");
+const node_fs_1 = __importDefault(require("node:fs"));
+const node_path_1 = __importDefault(require("node:path"));
 const piscina_1 = __importDefault(require("piscina"));
-const application_1 = __importStar(require("../../tools/babel/presets/application"));
 const load_esm_1 = require("../../utils/load-esm");
 const textDecoder = new TextDecoder();
 const textEncoder = new TextEncoder();
@@ -47,22 +48,41 @@ async function transformJavaScript(request) {
     return piscina_1.default.move(textEncoder.encode(transformedData));
 }
 exports.default = transformJavaScript;
+/**
+ * Cached instance of the compiler-cli linker's createEs2015LinkerPlugin function.
+ */
 let linkerPluginCreator;
+/**
+ * Cached instance of the compiler-cli linker's needsLinking function.
+ */
+let needsLinking;
 async function transformWithBabel(filename, data, options) {
-    const shouldLink = !options.skipLinker && (await (0, application_1.requiresLinking)(filename, data));
+    const shouldLink = !options.skipLinker && (await requiresLinking(filename, data));
     const useInputSourcemap = options.sourcemap &&
         (!!options.thirdPartySourcemaps || !/[\\/]node_modules[\\/]/.test(filename));
+    const plugins = [];
+    // Lazy load the linker plugin only when linking is required
+    if (shouldLink) {
+        const linkerPlugin = await createLinkerPlugin(options);
+        plugins.push(linkerPlugin);
+    }
+    if (options.advancedOptimizations) {
+        const sideEffectFree = options.sideEffects === false;
+        const safeAngularPackage = sideEffectFree && /[\\/]node_modules[\\/]@angular[\\/]/.test(filename);
+        const { adjustStaticMembers, adjustTypeScriptEnums, elideAngularMetadata, markTopLevelPure } = await Promise.resolve().then(() => __importStar(require('../babel/plugins')));
+        if (safeAngularPackage) {
+            plugins.push(markTopLevelPure);
+        }
+        plugins.push(elideAngularMetadata, adjustTypeScriptEnums, [
+            adjustStaticMembers,
+            { wrapDecorators: sideEffectFree },
+        ]);
+    }
     // If no additional transformations are needed, return the data directly
-    if (!options.advancedOptimizations && !shouldLink) {
+    if (plugins.length === 0) {
         // Strip sourcemaps if they should not be used
         return useInputSourcemap ? data : data.replace(/^\/\/# sourceMappingURL=[^\r\n]*/gm, '');
     }
-    const sideEffectFree = options.sideEffects === false;
-    const safeAngularPackage = sideEffectFree && /[\\/]node_modules[\\/]@angular[\\/]/.test(filename);
-    // Lazy load the linker plugin only when linking is required
-    if (shouldLink) {
-        linkerPluginCreator ??= (await (0, load_esm_1.loadEsmModule)('@angular/compiler-cli/linker/babel')).createEs2015LinkerPlugin;
-    }
     const result = await (0, core_1.transformAsync)(data, {
         filename,
         inputSourceMap: (useInputSourcemap ? undefined : false),
@@ -71,23 +91,7 @@ async function transformWithBabel(filename, data, options) {
         configFile: false,
         babelrc: false,
         browserslistConfigFile: false,
-        plugins: [],
-        presets: [
-            [
-                application_1.default,
-                {
-                    angularLinker: linkerPluginCreator && {
-                        shouldLink,
-                        jitMode: options.jit,
-                        linkerPluginCreator,
-                    },
-                    optimize: options.advancedOptimizations && {
-                        pureTopLevel: safeAngularPackage,
-                        wrapDecorators: sideEffectFree,
-                    },
-                },
-            ],
-        ],
+        plugins,
     });
     const outputCode = result?.code ?? data;
     // Strip sourcemaps if they should not be used.
@@ -96,3 +100,55 @@ async function transformWithBabel(filename, data, options) {
         ? outputCode
         : outputCode.replace(/^\/\/# sourceMappingURL=[^\r\n]*/gm, '');
 }
+async function requiresLinking(path, source) {
+    // @angular/core and @angular/compiler will cause false positives
+    // Also, TypeScript files do not require linking
+    if (/[\\/]@angular[\\/](?:compiler|core)|\.tsx?$/.test(path)) {
+        return false;
+    }
+    if (!needsLinking) {
+        // Load ESM `@angular/compiler-cli/linker` using the TypeScript dynamic import workaround.
+        // Once TypeScript provides support for keeping the dynamic import this workaround can be
+        // changed to a direct dynamic import.
+        const linkerModule = await (0, load_esm_1.loadEsmModule)('@angular/compiler-cli/linker');
+        needsLinking = linkerModule.needsLinking;
+    }
+    return needsLinking(path, source);
+}
+async function createLinkerPlugin(options) {
+    linkerPluginCreator ??= (await (0, load_esm_1.loadEsmModule)('@angular/compiler-cli/linker/babel')).createEs2015LinkerPlugin;
+    const linkerPlugin = linkerPluginCreator({
+        linkerJitMode: options.jit,
+        // This is a workaround until https://github.com/angular/angular/issues/42769 is fixed.
+        sourceMapping: false,
+        logger: {
+            level: 1, // Info level
+            debug(...args) {
+                // eslint-disable-next-line no-console
+                console.debug(args);
+            },
+            info(...args) {
+                // eslint-disable-next-line no-console
+                console.info(args);
+            },
+            warn(...args) {
+                // eslint-disable-next-line no-console
+                console.warn(args);
+            },
+            error(...args) {
+                // eslint-disable-next-line no-console
+                console.error(args);
+            },
+        },
+        fileSystem: {
+            resolve: node_path_1.default.resolve,
+            exists: node_fs_1.default.existsSync,
+            dirname: node_path_1.default.dirname,
+            relative: node_path_1.default.relative,
+            readFile: node_fs_1.default.readFileSync,
+            // Node.JS types don't overlap the Compiler types.
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        },
+    });
+    return linkerPlugin;
+}

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

@@ -205,15 +205,25 @@ class RelativeUrlRebasingImporter extends UrlRebasingImporter {
             foundImports = [];
             cachedEntries = { files: new Set(), directories: new Set() };
             for (const entry of entries) {
-                const isDirectory = entry.isDirectory();
+                let isDirectory;
+                let isFile;
+                if (entry.isSymbolicLink()) {
+                    const stats = (0, node_fs_1.statSync)((0, node_path_1.join)(entry.path, entry.name));
+                    isDirectory = stats.isDirectory();
+                    isFile = stats.isFile();
+                }
+                else {
+                    isDirectory = entry.isDirectory();
+                    isFile = entry.isFile();
+                }
                 if (isDirectory) {
                     cachedEntries.directories.add(entry.name);
+                    // Record if the name should be checked as a directory with an index file
+                    if (checkDirectory && !hasStyleExtension && entry.name === filename) {
+                        hasPotentialIndex = true;
+                    }
                 }
-                // Record if the name should be checked as a directory with an index file
-                if (checkDirectory && !hasStyleExtension && entry.name === filename && isDirectory) {
-                    hasPotentialIndex = true;
-                }
-                if (!entry.isFile()) {
+                if (!isFile) {
                     continue;
                 }
                 cachedEntries.files.add(entry.name);

package/src/tools/webpack/utils/helpers.js

@@ -206,7 +206,7 @@ function assetPatterns(root, assets) {
     return assets.map((asset, index) => {
         // Resolve input paths relative to workspace root and add slash at the end.
         // eslint-disable-next-line prefer-const
-        let { input, output, ignore = [], glob } = asset;
+        let { input, output = '', ignore = [], glob } = asset;
         input = path.resolve(root, input).replace(/\\/g, '/');
         input = input.endsWith('/') ? input : input + '/';
         output = output.endsWith('/') ? output : output + '/';

package/src/utils/index-file/inline-fonts.d.ts

@@ -5,8 +5,6 @@
  * 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
  */
-/// <reference types="node" />
-import { URL } from 'node:url';
 import { NormalizedCachedOptions } from '../normalize-cache';
 export interface InlineFontsOptions {
     minify?: boolean;

package/src/utils/index-file/inline-fonts.js

@@ -36,8 +36,6 @@ const node_crypto_1 = require("node:crypto");
 const promises_1 = require("node:fs/promises");
 const https = __importStar(require("node:https"));
 const node_path_1 = require("node:path");
-const node_url_1 = require("node:url");
-const package_version_1 = require("../package-version");
 const html_rewriting_stream_1 = require("./html-rewriting-stream");
 const SUPPORTED_PROVIDERS = {
     'fonts.googleapis.com': {
@@ -161,7 +159,7 @@ class InlineFontsProcessor {
     async getResponse(url) {
         let cacheFile;
         if (this.cachePath) {
-            const key = (0, node_crypto_1.createHash)(CONTENT_HASH_ALGORITHM).update(`${package_version_1.VERSION}|${url}`).digest('hex');
+            const key = (0, node_crypto_1.createHash)(CONTENT_HASH_ALGORITHM).update(`${url}`).digest('hex');
             cacheFile = (0, node_path_1.join)(this.cachePath, key);
         }
         if (cacheFile) {
@@ -226,7 +224,7 @@ class InlineFontsProcessor {
         return data;
     }
     async processURL(url) {
-        const normalizedURL = url instanceof node_url_1.URL ? url : this.createNormalizedUrl(url);
+        const normalizedURL = url instanceof URL ? url : this.createNormalizedUrl(url);
         if (!normalizedURL) {
             return;
         }
@@ -255,7 +253,7 @@ class InlineFontsProcessor {
     }
     createNormalizedUrl(value) {
         // Need to convert '//' to 'https://' because the URL parser will fail with '//'.
-        const url = new node_url_1.URL(value.startsWith('//') ? `https:${value}` : value, 'resolve://');
+        const url = new URL(value.startsWith('//') ? `https:${value}` : value, 'resolve://');
         switch (url.protocol) {
             case 'http:':
             case 'https:':

package/src/utils/normalize-asset-patterns.d.ts

@@ -9,4 +9,6 @@ import { AssetPattern, AssetPatternClass } from '../builders/browser/schema';
 export declare class MissingAssetSourceRootException extends Error {
     constructor(path: string);
 }
-export declare function normalizeAssetPatterns(assetPatterns: AssetPattern[], workspaceRoot: string, projectRoot: string, projectSourceRoot: string | undefined): AssetPatternClass[];
+export declare function normalizeAssetPatterns(assetPatterns: AssetPattern[], workspaceRoot: string, projectRoot: string, projectSourceRoot: string | undefined): (AssetPatternClass & {
+    output: string;
+})[];

package/src/utils/normalize-asset-patterns.js

@@ -29,9 +29,13 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeAssetPatterns = exports.MissingAssetSourceRootException = void 0;
 const fs_1 = require("fs");
+const node_assert_1 = __importDefault(require("node:assert"));
 const path = __importStar(require("path"));
 class MissingAssetSourceRootException extends Error {
     constructor(path) {
@@ -80,8 +84,9 @@ function normalizeAssetPatterns(assetPatterns, workspaceRoot, projectRoot, proje
             assetPattern = { glob, input, output };
         }
         else {
-            assetPattern.output = path.join('.', assetPattern.output);
+            assetPattern.output = path.join('.', assetPattern.output ?? '');
         }
+        (0, node_assert_1.default)(assetPattern.output !== undefined);
         if (assetPattern.output.startsWith('..')) {
             throw new Error('An asset cannot be written to a location outside of the output path.');
         }

package/src/utils/normalize-cache.js

@@ -8,8 +8,9 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeCacheOptions = void 0;
-const path_1 = require("path");
-const package_version_1 = require("./package-version");
+const node_path_1 = require("node:path");
+/** Version placeholder is replaced during the build process with actual package version */
+const VERSION = '18.0.0-next.2';
 function hasCacheMetadata(value) {
     return (!!value &&
         typeof value === 'object' &&
@@ -33,11 +34,11 @@ function normalizeCacheOptions(projectMetadata, worspaceRoot) {
                 break;
         }
     }
-    const cacheBasePath = (0, path_1.resolve)(worspaceRoot, path);
+    const cacheBasePath = (0, node_path_1.resolve)(worspaceRoot, path);
     return {
         enabled: cacheEnabled,
         basePath: cacheBasePath,
-        path: (0, path_1.join)(cacheBasePath, package_version_1.VERSION),
+        path: (0, node_path_1.join)(cacheBasePath, VERSION),
     };
 }
 exports.normalizeCacheOptions = normalizeCacheOptions;

package/src/utils/postcss-configuration.d.ts

@@ -8,4 +8,10 @@
 export interface PostcssConfiguration {
     plugins: [name: string, options?: object | string][];
 }
-export declare function loadPostcssConfiguration(workspaceRoot: string, projectRoot: string): Promise<PostcssConfiguration | undefined>;
+export interface SearchDirectory {
+    root: string;
+    files: Set<string>;
+}
+export declare function generateSearchDirectories(roots: string[]): Promise<SearchDirectory[]>;
+export declare function findTailwindConfiguration(searchDirectories: SearchDirectory[]): string | undefined;
+export declare function loadPostcssConfiguration(searchDirectories: SearchDirectory[]): Promise<PostcssConfiguration | undefined>;

package/src/utils/postcss-configuration.js

@@ -7,16 +7,23 @@
  * found in the LICENSE file at https://angular.io/license
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.loadPostcssConfiguration = void 0;
+exports.loadPostcssConfiguration = exports.findTailwindConfiguration = exports.generateSearchDirectories = void 0;
 const promises_1 = require("node:fs/promises");
 const node_path_1 = require("node:path");
 const postcssConfigurationFiles = ['postcss.config.json', '.postcssrc.json'];
+const tailwindConfigFiles = [
+    'tailwind.config.js',
+    'tailwind.config.cjs',
+    'tailwind.config.mjs',
+    'tailwind.config.ts',
+];
 async function generateSearchDirectories(roots) {
     return await Promise.all(roots.map((root) => (0, promises_1.readdir)(root, { withFileTypes: true }).then((entries) => ({
         root,
         files: new Set(entries.filter((entry) => entry.isFile()).map((entry) => entry.name)),
     }))));
 }
+exports.generateSearchDirectories = generateSearchDirectories;
 function findFile(searchDirectories, potentialFiles) {
     for (const { root, files } of searchDirectories) {
         for (const potential of potentialFiles) {
@@ -27,14 +34,16 @@ function findFile(searchDirectories, potentialFiles) {
     }
     return undefined;
 }
+function findTailwindConfiguration(searchDirectories) {
+    return findFile(searchDirectories, tailwindConfigFiles);
+}
+exports.findTailwindConfiguration = findTailwindConfiguration;
 async function readPostcssConfiguration(configurationFile) {
     const data = await (0, promises_1.readFile)(configurationFile, 'utf-8');
     const config = JSON.parse(data);
     return config;
 }
-async function loadPostcssConfiguration(workspaceRoot, projectRoot) {
-    // A configuration file can exist in the project or workspace root
-    const searchDirectories = await generateSearchDirectories([projectRoot, workspaceRoot]);
+async function loadPostcssConfiguration(searchDirectories) {
     const configPath = findFile(searchDirectories, postcssConfigurationFiles);
     if (!configPath) {
         return undefined;

package/src/utils/service-worker.d.ts

@@ -12,7 +12,7 @@ import { promises as fsPromises } from 'node:fs';
 import { BuildOutputFile } from '../tools/esbuild/bundler-context';
 import { BuildOutputAsset } from '../tools/esbuild/bundler-execution-result';
 export declare function augmentAppWithServiceWorker(appRoot: string, workspaceRoot: string, outputPath: string, baseHref: string, ngswConfigPath?: string, inputputFileSystem?: typeof fsPromises, outputFileSystem?: typeof fsPromises): Promise<void>;
-export declare function augmentAppWithServiceWorkerEsbuild(workspaceRoot: string, configPath: string, baseHref: string, outputFiles: BuildOutputFile[], assetFiles: BuildOutputAsset[]): Promise<{
+export declare function augmentAppWithServiceWorkerEsbuild(workspaceRoot: string, configPath: string, baseHref: string, indexHtml: string | undefined, outputFiles: BuildOutputFile[], assetFiles: BuildOutputAsset[]): Promise<{
     manifest: string;
     assetFiles: BuildOutputAsset[];
 }>;

package/src/utils/service-worker.js

@@ -159,12 +159,15 @@ async function augmentAppWithServiceWorker(appRoot, workspaceRoot, outputPath, b
 }
 exports.augmentAppWithServiceWorker = augmentAppWithServiceWorker;
 // This is currently used by the esbuild-based builder
-async function augmentAppWithServiceWorkerEsbuild(workspaceRoot, configPath, baseHref, outputFiles, assetFiles) {
+async function augmentAppWithServiceWorkerEsbuild(workspaceRoot, configPath, baseHref, indexHtml, outputFiles, assetFiles) {
     // Read the configuration file
     let config;
     try {
         const configurationData = await node_fs_1.promises.readFile(configPath, 'utf-8');
         config = JSON.parse(configurationData);
+        if (indexHtml) {
+            config.index = indexHtml;
+        }
     }
     catch (error) {
         (0, error_1.assertIsError)(error);