@angular-devkit/build-angular 17.3.0 → 17.3.2

package/package.json

@@ -1,15 +1,15 @@
 {
   "name": "@angular-devkit/build-angular",
-  "version": "17.3.0",
+  "version": "17.3.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.1703.0",
-    "@angular-devkit/build-webpack": "0.1703.0",
-    "@angular-devkit/core": "17.3.0",
+    "@angular-devkit/architect": "0.1703.2",
+    "@angular-devkit/build-webpack": "0.1703.2",
+    "@angular-devkit/core": "17.3.2",
     "@babel/core": "7.24.0",
     "@babel/generator": "7.23.6",
     "@babel/helper-annotate-as-pure": "7.22.5",
@@ -20,7 +20,7 @@
     "@babel/preset-env": "7.24.0",
     "@babel/runtime": "7.24.0",
     "@discoveryjs/json-ext": "0.5.7",
-    "@ngtools/webpack": "17.3.0",
+    "@ngtools/webpack": "17.3.2",
     "@vitejs/plugin-basic-ssl": "1.1.0",
     "ansi-colors": "4.1.3",
     "autoprefixer": "10.4.18",
@@ -65,7 +65,7 @@
     "vite": "5.1.5",
     "watchpack": "2.4.0",
     "webpack": "5.90.3",
-    "webpack-dev-middleware": "6.1.1",
+    "webpack-dev-middleware": "6.1.2",
     "webpack-dev-server": "4.15.1",
     "webpack-merge": "5.10.0",
     "webpack-subresource-integrity": "5.1.0"

package/src/builders/application/build-action.d.ts

@@ -11,6 +11,7 @@ import { BuildOutputFile } from '../../tools/esbuild/bundler-context';
 import { ExecutionResult, RebuildState } from '../../tools/esbuild/bundler-execution-result';
 import { NormalizedCachedOptions } from '../../utils/normalize-cache';
 import { NormalizedOutputOptions } from './options';
+type BuildActionOutput = (ExecutionResult['outputWithFiles'] | ExecutionResult['output']) & BuilderOutput;
 export declare function runEsBuildBuildAction(action: (rebuildState?: RebuildState) => Promise<ExecutionResult>, options: {
     workspaceRoot: string;
     projectRoot: string;
@@ -29,4 +30,5 @@ export declare function runEsBuildBuildAction(action: (rebuildState?: RebuildSta
     clearScreen?: boolean;
     colors?: boolean;
     jsonLogs?: boolean;
-}): AsyncIterable<(ExecutionResult['outputWithFiles'] | ExecutionResult['output']) & BuilderOutput>;
+}): AsyncIterable<BuildActionOutput>;
+export {};

package/src/builders/application/build-action.js

@@ -117,16 +117,7 @@ async function* runEsBuildBuildAction(action, options) {
     // Output the first build results after setting up the watcher to ensure that any code executed
     // higher in the iterator call stack will trigger the watcher. This is particularly relevant for
     // unit tests which execute the builder and modify the file system programmatically.
-    if (writeToFileSystem) {
-        // Write output files
-        await (0, utils_1.writeResultFiles)(result.outputFiles, result.assetFiles, outputOptions);
-        yield result.output;
-    }
-    else {
-        // Requires casting due to unneeded `JsonObject` requirement. Remove once fixed.
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        yield result.outputWithFiles;
-    }
+    yield await writeAndEmitOutput(writeToFileSystem, result, outputOptions, writeToFileSystemFilter);
     // Finish if watch mode is not enabled
     if (!watcher) {
         return;
@@ -165,19 +156,7 @@ async function* runEsBuildBuildAction(action, options) {
             if (staleWatchFiles?.size) {
                 watcher.remove([...staleWatchFiles]);
             }
-            if (writeToFileSystem) {
-                // Write output files
-                const filesToWrite = writeToFileSystemFilter
-                    ? result.outputFiles.filter(writeToFileSystemFilter)
-                    : result.outputFiles;
-                await (0, utils_1.writeResultFiles)(filesToWrite, result.assetFiles, outputOptions);
-                yield result.output;
-            }
-            else {
-                // Requires casting due to unneeded `JsonObject` requirement. Remove once fixed.
-                // eslint-disable-next-line @typescript-eslint/no-explicit-any
-                yield result.outputWithFiles;
-            }
+            yield await writeAndEmitOutput(writeToFileSystem, result, outputOptions, writeToFileSystemFilter);
         }
     }
     finally {
@@ -187,3 +166,18 @@ async function* runEsBuildBuildAction(action, options) {
     }
 }
 exports.runEsBuildBuildAction = runEsBuildBuildAction;
+async function writeAndEmitOutput(writeToFileSystem, { outputFiles, output, outputWithFiles, assetFiles }, outputOptions, writeToFileSystemFilter) {
+    if (writeToFileSystem) {
+        // Write output files
+        const outputFilesToWrite = writeToFileSystemFilter
+            ? outputFiles.filter(writeToFileSystemFilter)
+            : outputFiles;
+        await (0, utils_1.writeResultFiles)(outputFilesToWrite, assetFiles, outputOptions);
+        return output;
+    }
+    else {
+        // Requires casting due to unneeded `JsonObject` requirement. Remove once fixed.
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        return outputWithFiles;
+    }
+}

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.js

@@ -211,7 +211,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,

package/src/builders/dev-server/builder.js

@@ -68,7 +68,7 @@ function execute(options, context, transforms = {}, extensions) {
                 context.logger.warn(`Prebundling has been configured but will not be used because caching has been disabled.`);
             }
             if (options.allowedHosts?.length) {
-                context.logger.warn(`The "allowedHost" option will not be used because it is not supported by the "${builderName}" builder.`);
+                context.logger.warn(`The "allowedHosts" option will not be used because it is not supported by the "${builderName}" builder.`);
             }
             if (options.publicHost) {
                 context.logger.warn(`The "publicHost" option will not be used because it is not supported by the "${builderName}" builder.`);

package/src/builders/ssr-dev-server/index.js

@@ -156,7 +156,7 @@ exports.log = log;
 function startNodeServer(serverOutput, port, logger, inspectMode = false) {
     const outputPath = serverOutput.outputPath;
     const path = (0, path_1.join)(outputPath, 'main.js');
-    const env = { ...process.env, PORT: '' + port };
+    const env = { ...process.env, SSR_PORT: '' + port, PORT: '' + port };
     const args = ['--enable-source-maps', `"${path}"`];
     if (inspectMode) {
         args.unshift('--inspect-brk');

package/src/tools/esbuild/angular/angular-host.js

@@ -45,6 +45,10 @@ function createAngularCompilerHost(compilerOptions, hostOptions) {
         if (context.type !== 'style') {
             return null;
         }
+        // No transformation required if the resource is empty
+        if (data.trim().length === 0) {
+            return { content: '' };
+        }
         const result = await hostOptions.transformStylesheet(data, context.containingFile, context.resourceFile ?? undefined);
         return typeof result === 'string' ? { content: result } : null;
     };

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

@@ -307,8 +307,11 @@ function createCompilerPlugin(pluginOptions, styleOptions) {
                     }
                     // Combine additional metafiles with main metafile
                     if (result.metafile && metafile) {
-                        result.metafile.inputs = { ...result.metafile.inputs, ...metafile.inputs };
-                        result.metafile.outputs = { ...result.metafile.outputs, ...metafile.outputs };
+                        // Append the existing object, by appending to it we prevent unnecessary new objections creations with spread
+                        // mitigating significant performance overhead for large apps.
+                        // See: https://bugs.chromium.org/p/v8/issues/detail?id=11536
+                        Object.assign(result.metafile.inputs, metafile.inputs);
+                        Object.assign(result.metafile.outputs, metafile.outputs);
                     }
                 }
                 (0, profiling_1.logCumulativeDurations)();

package/src/tools/esbuild/bundler-context.js

@@ -85,8 +85,8 @@ class BundlerContext {
             }
             // Combine metafiles used for the stats option as well as bundle budgets and console output
             if (result.metafile) {
-                metafile.inputs = { ...metafile.inputs, ...result.metafile.inputs };
-                metafile.outputs = { ...metafile.outputs, ...result.metafile.outputs };
+                Object.assign(metafile.inputs, result.metafile.inputs);
+                Object.assign(metafile.outputs, result.metafile.outputs);
             }
             result.initialFiles.forEach((value, key) => initialFiles.set(key, value));
             outputFiles.push(...result.outputFiles);

package/src/tools/esbuild/utils.d.ts

@@ -22,7 +22,7 @@ export declare function withNoProgress<T>(text: string, action: () => T | Promis
  * @returns An object that can be used with the esbuild build `supported` option.
  */
 export declare function getFeatureSupport(target: string[]): BuildOptions['supported'];
-export declare function writeResultFiles(outputFiles: BuildOutputFile[], assetFiles: BuildOutputAsset[] | undefined, { base, browser, media, server }: NormalizedOutputOptions): Promise<void>;
+export declare function writeResultFiles(outputFiles: BuildOutputFile[], assetFiles: BuildOutputAsset[] | undefined, { base, browser, server }: NormalizedOutputOptions): Promise<void>;
 export declare function emitFilesToDisk<T = BuildOutputAsset | BuildOutputFile>(files: T[], writeFileCallback: (file: T) => Promise<void>): Promise<void>;
 export declare function createOutputFileFromText(path: string, text: string, type: BuildOutputFileType): BuildOutputFile;
 export declare function createOutputFileFromData(path: string, data: Uint8Array, type: BuildOutputFileType): BuildOutputFile;

package/src/tools/esbuild/utils.js

@@ -179,7 +179,7 @@ function getFeatureSupport(target) {
     return supported;
 }
 exports.getFeatureSupport = getFeatureSupport;
-async function writeResultFiles(outputFiles, assetFiles, { base, browser, media, server }) {
+async function writeResultFiles(outputFiles, assetFiles, { base, browser, server }) {
     const directoryExists = new Set();
     const ensureDirectoryExists = async (destPath) => {
         const basePath = (0, node_path_1.dirname)(destPath);

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/vite/angular-memory-plugin.js

@@ -159,9 +159,11 @@ function createAngularMemoryPlugin(options) {
                         return;
                     }
                     transformIndexHtmlAndAddHeaders(req.url, rawHtml, res, next, async (html) => {
+                        const resolvedUrls = server.resolvedUrls;
+                        const baseUrl = resolvedUrls?.local[0] ?? resolvedUrls?.network[0];
                         const { content } = await (0, render_page_1.renderPage)({
                             document: html,
-                            route: new URL(req.originalUrl ?? '/', server.resolvedUrls?.local[0]).toString(),
+                            route: new URL(req.originalUrl ?? '/', baseUrl).toString(),
                             serverContext: 'ssr',
                             loadBundle: (uri) => 
                             // eslint-disable-next-line @typescript-eslint/no-explicit-any

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);