@angular/build 18.1.0-rc.0 → 18.1.0

package/src/tools/vite/angular-memory-plugin.js

@@ -12,14 +12,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createAngularMemoryPlugin = createAngularMemoryPlugin;
 const remapping_1 = __importDefault(require("@ampproject/remapping"));
-const mrmime_1 = require("mrmime");
 const node_assert_1 = __importDefault(require("node:assert"));
 const promises_1 = require("node:fs/promises");
 const node_path_1 = require("node:path");
-const render_page_1 = require("../../utils/server-rendering/render-page");
-// eslint-disable-next-line max-lines-per-function
+const middlewares_1 = require("./middlewares");
 function createAngularMemoryPlugin(options) {
-    const { workspaceRoot, virtualProjectRoot, outputFiles, assets, external, ssr, extensionMiddleware, extraHeaders, indexHtmlTransformer, normalizePath, } = options;
+    const { workspaceRoot, virtualProjectRoot, outputFiles, assets, external, ssr, extensionMiddleware, indexHtmlTransformer, normalizePath, } = options;
     return {
         name: 'vite:angular-memory',
         // Ensures plugin hooks run before built-in Vite hooks
@@ -31,7 +29,7 @@ function createAngularMemoryPlugin(options) {
                 // `/@id/${source}` but is currently closer to a raw external than a resolved file path.
                 return source;
             }
-            if (importer && source[0] === '.' && importer.startsWith(virtualProjectRoot)) {
+            if (importer && source[0] === '.' && normalizePath(importer).startsWith(virtualProjectRoot)) {
                 // Remove query if present
                 const [importerFile] = importer.split('?', 1);
                 source =
@@ -77,143 +75,19 @@ function createAngularMemoryPlugin(options) {
                 };
             };
             // Assets and resources get handled first
-            server.middlewares.use(function angularAssetsMiddleware(req, res, next) {
-                if (req.url === undefined || res.writableEnded) {
-                    return;
-                }
-                // Parse the incoming request.
-                // The base of the URL is unused but required to parse the URL.
-                const pathname = pathnameWithoutBasePath(req.url, server.config.base);
-                const extension = (0, node_path_1.extname)(pathname);
-                // Rewrite all build assets to a vite raw fs URL
-                const assetSourcePath = assets.get(pathname);
-                if (assetSourcePath !== undefined) {
-                    // Workaround to disable Vite transformer middleware.
-                    // See: https://github.com/vitejs/vite/blob/746a1daab0395f98f0afbdee8f364cb6cf2f3b3f/packages/vite/src/node/server/middlewares/transform.ts#L201 and
-                    // https://github.com/vitejs/vite/blob/746a1daab0395f98f0afbdee8f364cb6cf2f3b3f/packages/vite/src/node/server/transformRequest.ts#L204-L206
-                    req.headers.accept = 'text/html';
-                    // The encoding needs to match what happens in the vite static middleware.
-                    // ref: https://github.com/vitejs/vite/blob/d4f13bd81468961c8c926438e815ab6b1c82735e/packages/vite/src/node/server/middlewares/static.ts#L163
-                    req.url = `${server.config.base}@fs/${encodeURI(assetSourcePath)}`;
-                    next();
-                    return;
-                }
-                // HTML fallbacking
-                // This matches what happens in the vite html fallback middleware.
-                // ref: https://github.com/vitejs/vite/blob/main/packages/vite/src/node/server/middlewares/htmlFallback.ts#L9
-                const htmlAssetSourcePath = pathname[pathname.length - 1] === '/'
-                    ? // Trailing slash check for `index.html`.
-                        assets.get(pathname + 'index.html')
-                    : // Non-trailing slash check for fallback `.html`
-                        assets.get(pathname + '.html');
-                if (htmlAssetSourcePath) {
-                    req.url = `${server.config.base}@fs/${encodeURI(htmlAssetSourcePath)}`;
-                    next();
-                    return;
-                }
-                // Resource files are handled directly.
-                // Global stylesheets (CSS files) are currently considered resources to workaround
-                // dev server sourcemap issues with stylesheets.
-                if (extension !== '.js' && extension !== '.html') {
-                    const outputFile = outputFiles.get(pathname);
-                    if (outputFile?.servable) {
-                        const mimeType = (0, mrmime_1.lookup)(extension);
-                        if (mimeType) {
-                            res.setHeader('Content-Type', mimeType);
-                        }
-                        res.setHeader('Cache-Control', 'no-cache');
-                        if (extraHeaders) {
-                            Object.entries(extraHeaders).forEach(([name, value]) => res.setHeader(name, value));
-                        }
-                        res.end(outputFile.contents);
-                        return;
-                    }
-                }
-                next();
-            });
+            server.middlewares.use((0, middlewares_1.createAngularAssetsMiddleware)(server, assets, outputFiles));
             if (extensionMiddleware?.length) {
                 extensionMiddleware.forEach((middleware) => server.middlewares.use(middleware));
             }
             // Returning a function, installs middleware after the main transform middleware but
             // before the built-in HTML middleware
             return () => {
-                server.middlewares.use(angularHtmlFallbackMiddleware);
-                function angularSSRMiddleware(req, res, next) {
-                    const url = req.originalUrl;
-                    if (!req.url ||
-                        // Skip if path is not defined.
-                        !url ||
-                        // Skip if path is like a file.
-                        // NOTE: We use a mime type lookup to mitigate against matching requests like: /browse/pl.0ef59752c0cd457dbf1391f08cbd936f
-                        lookupMimeTypeFromRequest(url)) {
-                        next();
-                        return;
-                    }
-                    const rawHtml = outputFiles.get('/index.server.html')?.contents;
-                    if (!rawHtml) {
-                        next();
-                        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 ?? '/', baseUrl).toString(),
-                            serverContext: 'ssr',
-                            loadBundle: (uri) => 
-                            // eslint-disable-next-line @typescript-eslint/no-explicit-any
-                            server.ssrLoadModule(uri.slice(1)),
-                            // Files here are only needed for critical CSS inlining.
-                            outputFiles: {},
-                            // TODO: add support for critical css inlining.
-                            inlineCriticalCss: false,
-                        });
-                        return indexHtmlTransformer && content ? await indexHtmlTransformer(content) : content;
-                    });
-                }
+                server.middlewares.use(middlewares_1.angularHtmlFallbackMiddleware);
                 if (ssr) {
-                    server.middlewares.use(angularSSRMiddleware);
+                    server.middlewares.use((0, middlewares_1.createAngularSSRMiddleware)(server, outputFiles, indexHtmlTransformer));
                 }
-                server.middlewares.use(function angularIndexMiddleware(req, res, next) {
-                    if (!req.url) {
-                        next();
-                        return;
-                    }
-                    // Parse the incoming request.
-                    // The base of the URL is unused but required to parse the URL.
-                    const pathname = pathnameWithoutBasePath(req.url, server.config.base);
-                    if (pathname === '/' || pathname === `/index.html`) {
-                        const rawHtml = outputFiles.get('/index.html')?.contents;
-                        if (rawHtml) {
-                            transformIndexHtmlAndAddHeaders(req.url, rawHtml, res, next, indexHtmlTransformer);
-                            return;
-                        }
-                    }
-                    next();
-                });
+                server.middlewares.use((0, middlewares_1.createAngularIndexHtmlMiddleware)(server, outputFiles, indexHtmlTransformer));
             };
-            function transformIndexHtmlAndAddHeaders(url, rawHtml, res, next, additionalTransformer) {
-                server
-                    .transformIndexHtml(url, Buffer.from(rawHtml).toString('utf-8'))
-                    .then(async (processedHtml) => {
-                    if (additionalTransformer) {
-                        const content = await additionalTransformer(processedHtml);
-                        if (!content) {
-                            next();
-                            return;
-                        }
-                        processedHtml = content;
-                    }
-                    res.setHeader('Content-Type', 'text/html');
-                    res.setHeader('Cache-Control', 'no-cache');
-                    if (extraHeaders) {
-                        Object.entries(extraHeaders).forEach(([name, value]) => res.setHeader(name, value));
-                    }
-                    res.end(processedHtml);
-                })
-                    .catch((error) => next(error));
-            }
         },
     };
 }
@@ -237,31 +111,3 @@ async function loadViteClientCode(file) {
     (0, node_assert_1.default)(originalContents !== updatedContents, 'Failed to update Vite client error overlay text.');
     return updatedContents;
 }
-function pathnameWithoutBasePath(url, basePath) {
-    const parsedUrl = new URL(url, 'http://localhost');
-    const pathname = decodeURIComponent(parsedUrl.pathname);
-    // slice(basePath.length - 1) to retain the trailing slash
-    return basePath !== '/' && pathname.startsWith(basePath)
-        ? pathname.slice(basePath.length - 1)
-        : pathname;
-}
-function angularHtmlFallbackMiddleware(req, res, next) {
-    // Similar to how it is handled in vite
-    // https://github.com/vitejs/vite/blob/main/packages/vite/src/node/server/middlewares/htmlFallback.ts#L15C19-L15C45
-    if ((req.method === 'GET' || req.method === 'HEAD') &&
-        (!req.url || !lookupMimeTypeFromRequest(req.url)) &&
-        (!req.headers.accept ||
-            req.headers.accept.includes('text/html') ||
-            req.headers.accept.includes('text/*') ||
-            req.headers.accept.includes('*/*'))) {
-        req.url = '/index.html';
-    }
-    next();
-}
-function lookupMimeTypeFromRequest(url) {
-    const extension = (0, node_path_1.extname)(url.split('?')[0]);
-    if (extension === '.ico') {
-        return 'image/x-icon';
-    }
-    return extension && (0, mrmime_1.lookup)(extension);
-}

package/src/tools/vite/middlewares/assets-middleware.d.ts

@@ -0,0 +1,10 @@
+/**
+ * @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.dev/license
+ */
+import type { Connect, ViteDevServer } from 'vite';
+import { AngularMemoryOutputFiles } from '../utils';
+export declare function createAngularAssetsMiddleware(server: ViteDevServer, assets: Map<string, string>, outputFiles: AngularMemoryOutputFiles): Connect.NextHandleFunction;

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

@@ -0,0 +1,94 @@
+"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.dev/license
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createAngularAssetsMiddleware = createAngularAssetsMiddleware;
+const mrmime_1 = require("mrmime");
+const node_path_1 = require("node:path");
+const utils_1 = require("../utils");
+function createAngularAssetsMiddleware(server, assets, outputFiles) {
+    return function (req, res, next) {
+        if (req.url === undefined || res.writableEnded) {
+            return;
+        }
+        // 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);
+        const extension = (0, node_path_1.extname)(pathname);
+        const pathnameHasTrailingSlash = pathname[pathname.length - 1] === '/';
+        // Rewrite all build assets to a vite raw fs URL
+        const assetSourcePath = assets.get(pathname);
+        if (assetSourcePath !== undefined) {
+            // Workaround to disable Vite transformer middleware.
+            // See: https://github.com/vitejs/vite/blob/746a1daab0395f98f0afbdee8f364cb6cf2f3b3f/packages/vite/src/node/server/middlewares/transform.ts#L201 and
+            // https://github.com/vitejs/vite/blob/746a1daab0395f98f0afbdee8f364cb6cf2f3b3f/packages/vite/src/node/server/transformRequest.ts#L204-L206
+            req.headers.accept = 'text/html';
+            // The encoding needs to match what happens in the vite static middleware.
+            // ref: https://github.com/vitejs/vite/blob/d4f13bd81468961c8c926438e815ab6b1c82735e/packages/vite/src/node/server/middlewares/static.ts#L163
+            req.url = `${server.config.base}@fs/${encodeURI(assetSourcePath)}`;
+            next();
+            return;
+        }
+        // HTML fallbacking
+        // This matches what happens in the vite html fallback middleware.
+        // ref: https://github.com/vitejs/vite/blob/main/packages/vite/src/node/server/middlewares/htmlFallback.ts#L9
+        const htmlAssetSourcePath = pathnameHasTrailingSlash
+            ? // Trailing slash check for `index.html`.
+                assets.get(pathname + 'index.html')
+            : // Non-trailing slash check for fallback `.html`
+                assets.get(pathname + '.html');
+        if (htmlAssetSourcePath) {
+            req.url = `${server.config.base}@fs/${encodeURI(htmlAssetSourcePath)}`;
+            next();
+            return;
+        }
+        // Resource files are handled directly.
+        // Global stylesheets (CSS files) are currently considered resources to workaround
+        // dev server sourcemap issues with stylesheets.
+        if (extension !== '.js' && extension !== '.html') {
+            const outputFile = outputFiles.get(pathname);
+            if (outputFile?.servable) {
+                const mimeType = (0, mrmime_1.lookup)(extension);
+                if (mimeType) {
+                    res.setHeader('Content-Type', mimeType);
+                }
+                res.setHeader('Cache-Control', 'no-cache');
+                (0, utils_1.appendServerConfiguredHeaders)(server, res);
+                res.end(outputFile.contents);
+                return;
+            }
+        }
+        // If the path has no trailing slash and it matches a servable directory redirect to the same path with slash.
+        // This matches the default express static behaviour.
+        // See: https://github.com/expressjs/serve-static/blob/89fc94567fae632718a2157206c52654680e9d01/index.js#L182
+        if (!pathnameHasTrailingSlash) {
+            for (const assetPath of assets.keys()) {
+                if (pathname === assetPath.substring(0, assetPath.lastIndexOf('/'))) {
+                    const location = req.url + '/';
+                    res.statusCode = 301;
+                    res.setHeader('Content-Type', 'text/html');
+                    res.setHeader('Location', location);
+                    res.end(`
+            <!DOCTYPE html>
+            <html lang="en">
+              <head>
+                <meta charset="utf-8">
+                <title>Redirecting</title>
+              </head>
+              <body>
+                <pre>Redirecting to <a href="${location}">${location}</a></pre>
+              </body>
+            </html>
+            `);
+                    return;
+                }
+            }
+        }
+        next();
+    };
+}

package/src/tools/vite/middlewares/html-fallback-middleware.d.ts

@@ -0,0 +1,10 @@
+/**
+ * @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.dev/license
+ */
+import type { ServerResponse } from 'node:http';
+import type { Connect } from 'vite';
+export declare function angularHtmlFallbackMiddleware(req: Connect.IncomingMessage, res: ServerResponse, next: Connect.NextFunction): void;

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

@@ -0,0 +1,24 @@
+"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.dev/license
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.angularHtmlFallbackMiddleware = angularHtmlFallbackMiddleware;
+const utils_1 = require("../utils");
+function angularHtmlFallbackMiddleware(req, res, next) {
+    // Similar to how it is handled in vite
+    // https://github.com/vitejs/vite/blob/main/packages/vite/src/node/server/middlewares/htmlFallback.ts#L15C19-L15C45
+    if ((req.method === 'GET' || req.method === 'HEAD') &&
+        (!req.url || !(0, utils_1.lookupMimeTypeFromRequest)(req.url)) &&
+        (!req.headers.accept ||
+            req.headers.accept.includes('text/html') ||
+            req.headers.accept.includes('text/*') ||
+            req.headers.accept.includes('*/*'))) {
+        req.url = '/index.html';
+    }
+    next();
+}

package/src/tools/vite/middlewares/index-html-middleware.d.ts

@@ -0,0 +1,10 @@
+/**
+ * @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.dev/license
+ */
+import type { Connect, ViteDevServer } from 'vite';
+import { AngularMemoryOutputFiles } from '../utils';
+export declare function createAngularIndexHtmlMiddleware(server: ViteDevServer, outputFiles: AngularMemoryOutputFiles, indexHtmlTransformer: ((content: string) => Promise<string>) | undefined): Connect.NextHandleFunction;

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

@@ -0,0 +1,43 @@
+"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.dev/license
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createAngularIndexHtmlMiddleware = createAngularIndexHtmlMiddleware;
+const utils_1 = require("../utils");
+function createAngularIndexHtmlMiddleware(server, outputFiles, indexHtmlTransformer) {
+    return function (req, res, next) {
+        if (!req.url) {
+            next();
+            return;
+        }
+        // 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') {
+            next();
+            return;
+        }
+        const rawHtml = outputFiles.get('/index.html')?.contents;
+        if (!rawHtml) {
+            next();
+            return;
+        }
+        server
+            .transformIndexHtml(req.url, Buffer.from(rawHtml).toString('utf-8'))
+            .then(async (processedHtml) => {
+            if (indexHtmlTransformer) {
+                processedHtml = await indexHtmlTransformer(processedHtml);
+            }
+            res.setHeader('Content-Type', 'text/html');
+            res.setHeader('Cache-Control', 'no-cache');
+            (0, utils_1.appendServerConfiguredHeaders)(server, res);
+            res.end(processedHtml);
+        })
+            .catch((error) => next(error));
+    };
+}

package/src/tools/vite/middlewares/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.dev/license
+ */
+export { createAngularAssetsMiddleware } from './assets-middleware';
+export { angularHtmlFallbackMiddleware } from './html-fallback-middleware';
+export { createAngularIndexHtmlMiddleware } from './index-html-middleware';
+export { createAngularSSRMiddleware } from './ssr-middleware';

package/src/tools/vite/middlewares/index.js

@@ -0,0 +1,18 @@
+"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.dev/license
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createAngularSSRMiddleware = exports.createAngularIndexHtmlMiddleware = exports.angularHtmlFallbackMiddleware = exports.createAngularAssetsMiddleware = void 0;
+var assets_middleware_1 = require("./assets-middleware");
+Object.defineProperty(exports, "createAngularAssetsMiddleware", { enumerable: true, get: function () { return assets_middleware_1.createAngularAssetsMiddleware; } });
+var html_fallback_middleware_1 = require("./html-fallback-middleware");
+Object.defineProperty(exports, "angularHtmlFallbackMiddleware", { enumerable: true, get: function () { return html_fallback_middleware_1.angularHtmlFallbackMiddleware; } });
+var index_html_middleware_1 = require("./index-html-middleware");
+Object.defineProperty(exports, "createAngularIndexHtmlMiddleware", { enumerable: true, get: function () { return index_html_middleware_1.createAngularIndexHtmlMiddleware; } });
+var ssr_middleware_1 = require("./ssr-middleware");
+Object.defineProperty(exports, "createAngularSSRMiddleware", { enumerable: true, get: function () { return ssr_middleware_1.createAngularSSRMiddleware; } });

package/src/tools/vite/middlewares/ssr-middleware.d.ts

@@ -0,0 +1,12 @@
+/**
+ * @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.dev/license
+ */
+import type { Connect, ViteDevServer } from 'vite';
+export declare function createAngularSSRMiddleware(server: ViteDevServer, outputFiles: Map<string, {
+    contents: Uint8Array;
+    servable: boolean;
+}>, indexHtmlTransformer?: (content: string) => Promise<string>): Connect.NextHandleFunction;

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

@@ -0,0 +1,57 @@
+"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.dev/license
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createAngularSSRMiddleware = createAngularSSRMiddleware;
+const render_page_1 = require("../../../utils/server-rendering/render-page");
+const utils_1 = require("../utils");
+function createAngularSSRMiddleware(server, outputFiles, indexHtmlTransformer) {
+    return function (req, res, next) {
+        const url = req.originalUrl;
+        if (!req.url ||
+            // Skip if path is not defined.
+            !url ||
+            // Skip if path is like a file.
+            // NOTE: We use a mime type lookup to mitigate against matching requests like: /browse/pl.0ef59752c0cd457dbf1391f08cbd936f
+            (0, utils_1.lookupMimeTypeFromRequest)(url)) {
+            next();
+            return;
+        }
+        const rawHtml = outputFiles.get('/index.server.html')?.contents;
+        if (!rawHtml) {
+            next();
+            return;
+        }
+        server
+            .transformIndexHtml(req.url, Buffer.from(rawHtml).toString('utf-8'))
+            .then(async (processedHtml) => {
+            const resolvedUrls = server.resolvedUrls;
+            const baseUrl = resolvedUrls?.local[0] ?? resolvedUrls?.network[0];
+            if (indexHtmlTransformer) {
+                processedHtml = await indexHtmlTransformer(processedHtml);
+            }
+            const { content: ssrContent } = await (0, render_page_1.renderPage)({
+                document: processedHtml,
+                route: new URL(req.originalUrl ?? '/', baseUrl).toString(),
+                serverContext: 'ssr',
+                loadBundle: (uri) => 
+                // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                server.ssrLoadModule(uri.slice(1)),
+                // Files here are only needed for critical CSS inlining.
+                outputFiles: {},
+                // TODO: add support for critical css inlining.
+                inlineCriticalCss: false,
+            });
+            res.setHeader('Content-Type', 'text/html');
+            res.setHeader('Cache-Control', 'no-cache');
+            (0, utils_1.appendServerConfiguredHeaders)(server, res);
+            res.end(ssrContent);
+        })
+            .catch((error) => next(error));
+    };
+}

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

@@ -0,0 +1,16 @@
+/**
+ * @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.dev/license
+ */
+import type { IncomingMessage, ServerResponse } from 'node:http';
+import type { ViteDevServer } from 'vite';
+export type AngularMemoryOutputFiles = Map<string, {
+    contents: Uint8Array;
+    servable: boolean;
+}>;
+export declare function pathnameWithoutBasePath(url: string, basePath: string): string;
+export declare function lookupMimeTypeFromRequest(url: string): string | undefined;
+export declare function appendServerConfiguredHeaders(server: ViteDevServer, res: ServerResponse<IncomingMessage>): void;

package/src/tools/vite/utils.js

@@ -0,0 +1,40 @@
+"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.dev/license
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.pathnameWithoutBasePath = pathnameWithoutBasePath;
+exports.lookupMimeTypeFromRequest = lookupMimeTypeFromRequest;
+exports.appendServerConfiguredHeaders = appendServerConfiguredHeaders;
+const mrmime_1 = require("mrmime");
+const node_path_1 = require("node:path");
+function pathnameWithoutBasePath(url, basePath) {
+    const parsedUrl = new URL(url, 'http://localhost');
+    const pathname = decodeURIComponent(parsedUrl.pathname);
+    // slice(basePath.length - 1) to retain the trailing slash
+    return basePath !== '/' && pathname.startsWith(basePath)
+        ? pathname.slice(basePath.length - 1)
+        : pathname;
+}
+function lookupMimeTypeFromRequest(url) {
+    const extension = (0, node_path_1.extname)(url.split('?')[0]);
+    if (extension === '.ico') {
+        return 'image/x-icon';
+    }
+    return extension && (0, mrmime_1.lookup)(extension);
+}
+function appendServerConfiguredHeaders(server, res) {
+    const headers = server.config.server.headers;
+    if (!headers) {
+        return;
+    }
+    for (const [name, value] of Object.entries(headers)) {
+        if (value !== undefined) {
+            res.setHeader(name, value);
+        }
+    }
+}

package/src/utils/environment-options.d.ts

@@ -14,3 +14,4 @@ export declare const debugPerformance: boolean;
 export declare const shouldWatchRoot: boolean;
 export declare const useTypeChecking: boolean;
 export declare const useJSONBuildLogs: boolean;
+export declare const shouldOptimizeChunks: boolean;

package/src/utils/environment-options.js

@@ -7,7 +7,7 @@
  * found in the LICENSE file at https://angular.dev/license
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.useJSONBuildLogs = exports.useTypeChecking = exports.shouldWatchRoot = exports.debugPerformance = exports.useParallelTs = exports.maxWorkers = exports.allowMinify = exports.shouldBeautify = exports.allowMangle = void 0;
+exports.shouldOptimizeChunks = exports.useJSONBuildLogs = exports.useTypeChecking = exports.shouldWatchRoot = exports.debugPerformance = exports.useParallelTs = exports.maxWorkers = exports.allowMinify = exports.shouldBeautify = exports.allowMangle = void 0;
 const node_os_1 = require("node:os");
 function isDisabled(variable) {
     return variable === '0' || variable.toLowerCase() === 'false';
@@ -69,7 +69,7 @@ exports.allowMinify = debugOptimize.minify;
 const maxWorkersVariable = process.env['NG_BUILD_MAX_WORKERS'];
 exports.maxWorkers = isPresent(maxWorkersVariable)
     ? +maxWorkersVariable
-    : Math.min(4, (0, node_os_1.availableParallelism)());
+    : Math.min(4, Math.max((0, node_os_1.availableParallelism)() - 1, 1));
 const parallelTsVariable = process.env['NG_BUILD_PARALLEL_TS'];
 exports.useParallelTs = !isPresent(parallelTsVariable) || !isDisabled(parallelTsVariable);
 const debugPerfVariable = process.env['NG_BUILD_DEBUG_PERF'];
@@ -80,3 +80,5 @@ const typeCheckingVariable = process.env['NG_BUILD_TYPE_CHECK'];
 exports.useTypeChecking = !isPresent(typeCheckingVariable) || !isDisabled(typeCheckingVariable);
 const buildLogsJsonVariable = process.env['NG_BUILD_LOGS_JSON'];
 exports.useJSONBuildLogs = isPresent(buildLogsJsonVariable) && isEnabled(buildLogsJsonVariable);
+const optimizeChunksVariable = process.env['NG_BUILD_OPTIMIZE_CHUNKS'];
+exports.shouldOptimizeChunks = isPresent(optimizeChunksVariable) && isEnabled(optimizeChunksVariable);

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