@angular-devkit/build-angular 17.1.0 → 17.2.0-next.0

package/package.json

@@ -1,15 +1,15 @@
 {
   "name": "@angular-devkit/build-angular",
-  "version": "17.1.0",
+  "version": "17.2.0-next.0",
   "description": "Angular Webpack Build Facade",
   "main": "src/index.js",
   "typings": "src/index.d.ts",
   "builders": "builders.json",
   "dependencies": {
     "@ampproject/remapping": "2.2.1",
-    "@angular-devkit/architect": "0.1701.0",
-    "@angular-devkit/build-webpack": "0.1701.0",
-    "@angular-devkit/core": "17.1.0",
+    "@angular-devkit/architect": "0.1702.0-next.0",
+    "@angular-devkit/build-webpack": "0.1702.0-next.0",
+    "@angular-devkit/core": "17.2.0-next.0",
     "@babel/core": "7.23.7",
     "@babel/generator": "7.23.6",
     "@babel/helper-annotate-as-pure": "7.22.5",
@@ -17,53 +17,53 @@
     "@babel/plugin-transform-async-generator-functions": "7.23.7",
     "@babel/plugin-transform-async-to-generator": "7.23.3",
     "@babel/plugin-transform-runtime": "7.23.7",
-    "@babel/preset-env": "7.23.7",
-    "@babel/runtime": "7.23.7",
+    "@babel/preset-env": "7.23.8",
+    "@babel/runtime": "7.23.8",
     "@discoveryjs/json-ext": "0.5.7",
-    "@ngtools/webpack": "17.1.0",
-    "@vitejs/plugin-basic-ssl": "1.0.2",
+    "@ngtools/webpack": "17.2.0-next.0",
+    "@vitejs/plugin-basic-ssl": "1.1.0",
     "ansi-colors": "4.1.3",
-    "autoprefixer": "10.4.16",
+    "autoprefixer": "10.4.17",
     "babel-loader": "9.1.3",
     "babel-plugin-istanbul": "6.1.1",
     "browserslist": "^4.21.5",
-    "copy-webpack-plugin": "11.0.0",
+    "copy-webpack-plugin": "12.0.2",
     "critters": "0.0.20",
-    "css-loader": "6.8.1",
-    "esbuild-wasm": "0.19.11",
+    "css-loader": "6.9.1",
+    "esbuild-wasm": "0.19.12",
     "fast-glob": "3.3.2",
     "https-proxy-agent": "7.0.2",
     "http-proxy-middleware": "2.0.6",
     "inquirer": "9.2.12",
-    "jsonc-parser": "3.2.0",
+    "jsonc-parser": "3.2.1",
     "karma-source-map-support": "1.4.0",
     "less": "4.2.0",
     "less-loader": "11.1.0",
     "license-webpack-plugin": "4.0.2",
     "loader-utils": "3.2.1",
     "magic-string": "0.30.5",
-    "mini-css-extract-plugin": "2.7.6",
+    "mini-css-extract-plugin": "2.7.7",
     "mrmime": "2.0.0",
     "open": "8.4.2",
     "ora": "5.4.1",
     "parse5-html-rewriting-stream": "7.0.0",
     "picomatch": "3.0.1",
-    "piscina": "4.2.1",
+    "piscina": "4.3.0",
     "postcss": "8.4.33",
-    "postcss-loader": "7.3.4",
+    "postcss-loader": "8.0.0",
     "resolve-url-loader": "5.0.0",
     "rxjs": "7.8.1",
-    "sass": "1.69.7",
-    "sass-loader": "13.3.3",
+    "sass": "1.70.0",
+    "sass-loader": "14.0.0",
     "semver": "7.5.4",
     "source-map-loader": "5.0.0",
     "source-map-support": "0.5.21",
-    "terser": "5.26.0",
+    "terser": "5.27.0",
     "text-table": "0.2.0",
     "tree-kill": "1.2.2",
     "tslib": "2.6.2",
-    "undici": "6.2.1",
-    "vite": "5.0.11",
+    "undici": "6.4.0",
+    "vite": "5.0.12",
     "watchpack": "2.4.0",
     "webpack": "5.89.0",
     "webpack-dev-middleware": "6.1.1",
@@ -72,19 +72,19 @@
     "webpack-subresource-integrity": "5.1.0"
   },
   "optionalDependencies": {
-    "esbuild": "0.19.11"
+    "esbuild": "0.19.12"
   },
   "peerDependencies": {
-    "@angular/compiler-cli": "^17.0.0",
-    "@angular/localize": "^17.0.0",
-    "@angular/platform-server": "^17.0.0",
-    "@angular/service-worker": "^17.0.0",
+    "@angular/compiler-cli": "^17.0.0 || ^17.2.0-next.0",
+    "@angular/localize": "^17.0.0 || ^17.2.0-next.0",
+    "@angular/platform-server": "^17.0.0 || ^17.2.0-next.0",
+    "@angular/service-worker": "^17.0.0 || ^17.2.0-next.0",
     "@web/test-runner": "^0.18.0",
     "browser-sync": "^3.0.2",
     "jest": "^29.5.0",
     "jest-environment-jsdom": "^29.5.0",
     "karma": "^6.3.0",
-    "ng-packagr": "^17.0.0",
+    "ng-packagr": "^17.0.0 || ^17.2.0-next.0",
     "protractor": "^7.0.0",
     "tailwindcss": "^2.0.0 || ^3.0.0",
     "typescript": ">=5.2 <5.4"

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

@@ -29,8 +29,9 @@ async function normalizeOptions(context, projectName, options) {
     const projectMetadata = await context.getProjectMetadata(projectName);
     const projectRoot = node_path_1.default.join(workspaceRoot, projectMetadata.root ?? '');
     const cacheOptions = (0, normalize_cache_1.normalizeCacheOptions)(projectMetadata, workspaceRoot);
-    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-    const buildTarget = (0, architect_1.targetFromTargetString)(options.buildTarget ?? options.browserTarget);
+    // Target specifier defaults to the current project's build target using a development configuration
+    const buildTargetSpecifier = options.buildTarget ?? options.browserTarget ?? `::development`;
+    const buildTarget = (0, architect_1.targetFromTargetString)(buildTargetSpecifier, projectName, 'build');
     // Initial options to keep
     const { host, port, poll, open, verbose, watch, allowedHosts, disableHostCheck, liveReload, hmr, headers, proxyConfig, servePath, publicHost, ssl, sslCert, sslKey, forceEsbuild, } = options;
     // Return all the normalized options

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

@@ -13,7 +13,7 @@
     "buildTarget": {
       "type": "string",
       "description": "A build builder target to serve in the format of `project:target[:configuration]`. You can also pass in more than one configuration name as a comma-separated list. Example: `project:target:production,staging`.",
-      "pattern": "^[^:\\s]+:[^:\\s]+(:[^\\s]+)?$"
+      "pattern": "^[^:\\s]*:[^:\\s]*(:[^\\s]+)?$"
     },
     "port": {
       "type": "number",

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

@@ -34,8 +34,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.setupServer = exports.serveWithVite = void 0;
-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");
@@ -43,10 +41,10 @@ const bundler_context_1 = require("../../tools/esbuild/bundler-context");
 const javascript_transformer_1 = require("../../tools/esbuild/javascript-transformer");
 const rxjs_esm_resolution_plugin_1 = require("../../tools/esbuild/rxjs-esm-resolution-plugin");
 const utils_1 = require("../../tools/esbuild/utils");
+const angular_memory_plugin_1 = require("../../tools/vite/angular-memory-plugin");
 const i18n_locale_plugin_1 = require("../../tools/vite/i18n-locale-plugin");
 const utils_2 = require("../../utils");
 const load_esm_1 = require("../../utils/load-esm");
-const render_page_1 = require("../../utils/server-rendering/render-page");
 const supported_browsers_1 = require("../../utils/supported-browsers");
 const webpack_browser_config_1 = require("../../utils/webpack-browser-config");
 const application_1 = require("../application");
@@ -324,7 +322,6 @@ function analyzeResultFiles(normalizePath, htmlIndexPath, resultFiles, generated
         }
     }
 }
-// eslint-disable-next-line max-lines-per-function
 async function setupServer(serverOptions, outputFiles, assets, preserveSymlinks, externalMetadata, ssr, prebundleTransformer, target, prebundleLoaderExtensions, extensionMiddleware, indexHtmlTransformer, thirdPartySourcemaps = false) {
     const proxy = await (0, utils_2.loadProxyConfiguration)(serverOptions.workspaceRoot, serverOptions.proxyConfig, true);
     // dynamically import Vite for ESM compatibility
@@ -344,7 +341,7 @@ async function setupServer(serverOptions, outputFiles, assets, preserveSymlinks,
         publicDir: false,
         esbuild: false,
         mode: 'development',
-        appType: 'spa',
+        appType: 'mpa',
         css: {
             devSourcemap: true,
         },
@@ -409,189 +406,18 @@ async function setupServer(serverOptions, outputFiles, assets, preserveSymlinks,
         },
         plugins: [
             (0, i18n_locale_plugin_1.createAngularLocaleDataPlugin)(),
-            {
-                name: 'vite:angular-memory',
-                // Ensures plugin hooks run before built-in Vite hooks
-                enforce: 'pre',
-                async resolveId(source, importer) {
-                    // Prevent vite from resolving an explicit external dependency (`externalDependencies` option)
-                    if (externalMetadata.explicit.includes(source)) {
-                        // This is still not ideal since Vite will still transform the import specifier to
-                        // `/@id/${source}` but is currently closer to a raw external than a resolved file path.
-                        return source;
-                    }
-                    if (importer && source[0] === '.' && importer.startsWith(virtualProjectRoot)) {
-                        // Remove query if present
-                        const [importerFile] = importer.split('?', 1);
-                        source =
-                            '/' +
-                                normalizePath((0, node_path_1.join)((0, node_path_1.dirname)((0, node_path_1.relative)(virtualProjectRoot, importerFile)), source));
-                    }
-                    const [file] = source.split('?', 1);
-                    if (outputFiles.has(file)) {
-                        return (0, node_path_1.join)(virtualProjectRoot, source);
-                    }
-                },
-                load(id) {
-                    const [file] = id.split('?', 1);
-                    const relativeFile = '/' + normalizePath((0, node_path_1.relative)(virtualProjectRoot, file));
-                    const codeContents = outputFiles.get(relativeFile)?.contents;
-                    if (codeContents === undefined) {
-                        if (relativeFile.endsWith('/node_modules/vite/dist/client/client.mjs')) {
-                            return loadViteClientCode(file);
-                        }
-                        return;
-                    }
-                    const code = Buffer.from(codeContents).toString('utf-8');
-                    const mapContents = outputFiles.get(relativeFile + '.map')?.contents;
-                    return {
-                        // Remove source map URL comments from the code if a sourcemap is present.
-                        // Vite will inline and add an additional sourcemap URL for the sourcemap.
-                        code: mapContents ? code.replace(/^\/\/# sourceMappingURL=[^\r\n]*/gm, '') : code,
-                        map: mapContents && Buffer.from(mapContents).toString('utf-8'),
-                    };
-                },
-                configureServer(server) {
-                    const originalssrTransform = server.ssrTransform;
-                    server.ssrTransform = async (code, map, url, originalCode) => {
-                        const result = await originalssrTransform(code, null, url, originalCode);
-                        if (!result || !result.map || !map) {
-                            return result;
-                        }
-                        const remappedMap = (0, remapping_1.default)([result.map, map], () => null);
-                        // Set the sourcemap root to the workspace root. This is needed since we set a virtual path as root.
-                        remappedMap.sourceRoot = normalizePath(serverOptions.workspaceRoot) + '/';
-                        return {
-                            ...result,
-                            map: remappedMap,
-                        };
-                    };
-                    // 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;
-                        }
-                        // 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 (serverOptions.headers) {
-                                    Object.entries(serverOptions.headers).forEach(([name, value]) => res.setHeader(name, value));
-                                }
-                                res.end(outputFile.contents);
-                                return;
-                            }
-                        }
-                        next();
-                    });
-                    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 () => {
-                        function angularSSRMiddleware(req, res, next) {
-                            const url = req.originalUrl;
-                            if (
-                            // Skip if path is not defined.
-                            !url ||
-                                // Skip if path is like a file.
-                                // NOTE: We use a regexp to mitigate against matching requests like: /browse/pl.0ef59752c0cd457dbf1391f08cbd936f
-                                /^\.[a-z]{2,4}$/i.test((0, node_path_1.extname)(url.split('?')[0]))) {
-                                next();
-                                return;
-                            }
-                            const rawHtml = outputFiles.get('/index.server.html')?.contents;
-                            if (!rawHtml) {
-                                next();
-                                return;
-                            }
-                            transformIndexHtmlAndAddHeaders(url, rawHtml, res, next, async (html) => {
-                                const { content } = await (0, render_page_1.renderPage)({
-                                    document: html,
-                                    route: new URL(req.originalUrl ?? '/', server.resolvedUrls?.local[0]).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;
-                            });
-                        }
-                        if (ssr) {
-                            server.middlewares.use(angularSSRMiddleware);
-                        }
-                        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();
-                        });
-                    };
-                    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 (serverOptions.headers) {
-                                Object.entries(serverOptions.headers).forEach(([name, value]) => res.setHeader(name, value));
-                            }
-                            res.end(processedHtml);
-                        })
-                            .catch((error) => next(error));
-                    }
-                },
-            },
+            (0, angular_memory_plugin_1.createAngularMemoryPlugin)({
+                workspaceRoot: serverOptions.workspaceRoot,
+                virtualProjectRoot,
+                outputFiles,
+                assets,
+                ssr,
+                external: externalMetadata.explicit,
+                indexHtmlTransformer,
+                extensionMiddleware,
+                extraHeaders: serverOptions.headers,
+                normalizePath,
+            }),
         ],
         // Browser only optimizeDeps. (This does not run for SSR dependencies).
         optimizeDeps: getDepOptimizationConfig({
@@ -627,31 +453,6 @@ async function setupServer(serverOptions, outputFiles, assets, preserveSymlinks,
     return configuration;
 }
 exports.setupServer = setupServer;
-/**
- * Reads the resolved Vite client code from disk and updates the content to remove
- * an unactionable suggestion to update the Vite configuration file to disable the
- * error overlay. The Vite configuration file is not present when used in the Angular
- * CLI.
- * @param file The absolute path to the Vite client code.
- * @returns
- */
-async function loadViteClientCode(file) {
-    const originalContents = await (0, promises_1.readFile)(file, 'utf-8');
-    let contents = originalContents.replace('You can also disable this overlay by setting', '');
-    contents = contents.replace(
-    // eslint-disable-next-line max-len
-    '<code part="config-option-name">server.hmr.overlay</code> to <code part="config-option-value">false</code> in <code part="config-file-name">vite.config.js.</code>', '');
-    (0, node_assert_1.default)(originalContents !== contents, 'Failed to update Vite client error overlay text.');
-    return contents;
-}
-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 getDepOptimizationConfig({ disabled, exclude, include, target, prebundleTransformer, ssr, loader, thirdPartySourcemaps, }) {
     const plugins = [
         {

package/src/builders/extract-i18n/options.js

@@ -30,8 +30,9 @@ async function normalizeOptions(context, projectName, options) {
     const workspaceRoot = context.workspaceRoot;
     const projectMetadata = await context.getProjectMetadata(projectName);
     const projectRoot = node_path_1.default.join(workspaceRoot, projectMetadata.root ?? '');
-    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-    const buildTarget = (0, architect_1.targetFromTargetString)(options.buildTarget ?? options.browserTarget);
+    // Target specifier defaults to the current project's build target with no specified configuration
+    const buildTargetSpecifier = options.buildTarget ?? options.browserTarget ?? ':';
+    const buildTarget = (0, architect_1.targetFromTargetString)(buildTargetSpecifier, projectName, 'build');
     const i18nOptions = (0, i18n_options_1.createI18nOptions)(projectMetadata);
     // Normalize xliff format extensions
     let format = options.format;

package/src/builders/extract-i18n/schema.json

@@ -13,7 +13,7 @@
     "buildTarget": {
       "type": "string",
       "description": "A builder target to extract i18n messages in the format of `project:target[:configuration]`. You can also pass in more than one configuration name as a comma-separated list. Example: `project:target:production,staging`.",
-      "pattern": "^[^:\\s]+:[^:\\s]+(:[^\\s]+)?$"
+      "pattern": "^[^:\\s]*:[^:\\s]*(:[^\\s]+)?$"
     },
     "format": {
       "type": "string",

package/src/builders/jest/index.js

@@ -31,15 +31,16 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const architect_1 = require("@angular-devkit/architect");
-const child_process_1 = require("child_process");
-const path = __importStar(require("path"));
-const util_1 = require("util");
+const node_child_process_1 = require("node:child_process");
+const fs = __importStar(require("node:fs/promises"));
+const path = __importStar(require("node:path"));
+const node_util_1 = require("node:util");
 const color_1 = require("../../utils/color");
 const test_files_1 = require("../../utils/test-files");
 const application_1 = require("../application");
 const schema_1 = require("../browser-esbuild/schema");
 const options_1 = require("./options");
-const execFile = (0, util_1.promisify)(child_process_1.execFile);
+const execFile = (0, node_util_1.promisify)(node_child_process_1.execFile);
 /** Main execution function for the Jest builder. */
 exports.default = (0, architect_1.createBuilder)(async (schema, context) => {
     context.logger.warn('NOTE: The Jest builder is currently EXPERIMENTAL and not ready for production use.');
@@ -65,8 +66,21 @@ exports.default = (0, architect_1.createBuilder)(async (schema, context) => {
             error: '`jest-environment-jsdom` is not installed. Install it with `npm install jest-environment-jsdom --save-dev`.',
         };
     }
+    const [testFiles, customConfig] = await Promise.all([
+        (0, test_files_1.findTestFiles)(options.include, options.exclude, context.workspaceRoot),
+        findCustomJestConfig(context.workspaceRoot),
+    ]);
+    // Warn if a custom Jest configuration is found. We won't use it, so if a developer is trying to use a custom config, this hopefully
+    // makes a better experience than silently ignoring the configuration.
+    // Ideally, this would be a hard error. However a Jest config could exist for testing other files in the workspace outside of Angular
+    // CLI, so we likely can't produce a hard error in this situation without an opt-out.
+    if (customConfig) {
+        context.logger.warn('A custom Jest config was found, but this is not supported by `@angular-devkit/build-angular:jest` and will be' +
+            ` ignored: ${customConfig}. This is an experiment to see if completely abstracting away Jest's configuration is viable. Please` +
+            ` consider if your use case can be met without directly modifying the Jest config. If this is a major obstacle for your use` +
+            ` case, please post it in this issue so we can collect feedback and evaluate: https://github.com/angular/angular-cli/issues/25434.`);
+    }
     // Build all the test files.
-    const testFiles = await (0, test_files_1.findTestFiles)(options.include, options.exclude, context.workspaceRoot);
     const jestGlobal = path.join(__dirname, 'jest-global.mjs');
     const initTestBed = path.join(__dirname, 'init-test-bed.mjs');
     const buildResult = await build(context, {
@@ -94,6 +108,7 @@ exports.default = (0, architect_1.createBuilder)(async (schema, context) => {
         '--experimental-vm-modules',
         jest,
         `--rootDir="${path.join(testOut, 'browser')}"`,
+        `--config=${path.join(__dirname, 'jest.config.mjs')}`,
         '--testEnvironment=jsdom',
         // TODO(dgp1130): Enable cache once we have a mechanism for properly clearing / disabling it.
         '--no-cache',
@@ -158,3 +173,27 @@ function resolveModule(module) {
         return undefined;
     }
 }
+/** Returns whether or not the provided directory includes a Jest configuration file. */
+async function findCustomJestConfig(dir) {
+    const entries = await fs.readdir(dir, { withFileTypes: true });
+    // Jest supports many file extensions (`js`, `ts`, `cjs`, `cts`, `json`, etc.) Just look
+    // for anything with that prefix.
+    const config = entries.find((entry) => entry.isFile() && entry.name.startsWith('jest.config.'));
+    if (config) {
+        return path.join(dir, config.name);
+    }
+    // Jest also supports a `jest` key in `package.json`, look for a config there.
+    const packageJsonPath = path.join(dir, 'package.json');
+    let packageJson;
+    try {
+        packageJson = await fs.readFile(packageJsonPath, 'utf8');
+    }
+    catch {
+        return undefined; // No package.json, therefore no Jest configuration in it.
+    }
+    const json = JSON.parse(packageJson);
+    if ('jest' in json) {
+        return packageJsonPath;
+    }
+    return undefined;
+}

package/src/builders/jest/jest.config.mjs

@@ -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
+ */
+
+// Empty config file, everything is specified via CLI options right now.
+// This file is used just so Jest doesn't accidentally inherit a custom user-specified Jest config.
+export default {};

package/src/builders/prerender/routes-extractor-worker.js

@@ -43,7 +43,7 @@ async function extract() {
     const browserIndexInputPath = path.join(outputPath, indexFile);
     const document = await fs.promises.readFile(browserIndexInputPath, 'utf8');
     const bootstrapAppFnOrModule = bootstrapAppFn || AppServerModule;
-    (0, node_assert_1.default)(bootstrapAppFnOrModule, `Neither an AppServerModule nor a bootstrapping function was exported from: ${serverBundlePath}.`);
+    (0, node_assert_1.default)(bootstrapAppFnOrModule, `The file "${serverBundlePath}" does not have a default export for an AppServerModule or a bootstrapping function.`);
     const routes = [];
     for await (const { route, success } of extractRoutes(bootstrapAppFnOrModule, document)) {
         if (success) {

package/src/tools/esbuild/angular/compilation/angular-compilation.d.ts

@@ -14,6 +14,13 @@ export interface EmitFileResult {
     contents: string;
     dependencies?: readonly string[];
 }
+export declare enum DiagnosticModes {
+    None = 0,
+    Option = 1,
+    Syntactic = 2,
+    Semantic = 4,
+    All = 7
+}
 export declare abstract class AngularCompilation {
     #private;
     static loadCompilerCli(): Promise<typeof ng>;
@@ -25,8 +32,8 @@ export declare abstract class AngularCompilation {
         referencedFiles: readonly string[];
     }>;
     abstract emitAffectedFiles(): Iterable<EmitFileResult> | Promise<Iterable<EmitFileResult>>;
-    protected abstract collectDiagnostics(): Iterable<ts.Diagnostic> | Promise<Iterable<ts.Diagnostic>>;
-    diagnoseFiles(): Promise<{
+    protected abstract collectDiagnostics(modes: DiagnosticModes): Iterable<ts.Diagnostic> | Promise<Iterable<ts.Diagnostic>>;
+    diagnoseFiles(modes?: DiagnosticModes): Promise<{
         errors?: PartialMessage[];
         warnings?: PartialMessage[];
     }>;

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

@@ -30,10 +30,18 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AngularCompilation = void 0;
+exports.AngularCompilation = exports.DiagnosticModes = void 0;
 const load_esm_1 = require("../../../../utils/load-esm");
 const profiling_1 = require("../../profiling");
 const diagnostics_1 = require("../diagnostics");
+var DiagnosticModes;
+(function (DiagnosticModes) {
+    DiagnosticModes[DiagnosticModes["None"] = 0] = "None";
+    DiagnosticModes[DiagnosticModes["Option"] = 1] = "Option";
+    DiagnosticModes[DiagnosticModes["Syntactic"] = 2] = "Syntactic";
+    DiagnosticModes[DiagnosticModes["Semantic"] = 4] = "Semantic";
+    DiagnosticModes[DiagnosticModes["All"] = 7] = "All";
+})(DiagnosticModes || (exports.DiagnosticModes = DiagnosticModes = {}));
 class AngularCompilation {
     static #angularCompilerCliModule;
     static #typescriptModule;
@@ -64,13 +72,13 @@ class AngularCompilation {
             supportJitMode: false,
         }));
     }
-    async diagnoseFiles() {
+    async diagnoseFiles(modes = DiagnosticModes.All) {
         const result = {};
         // Avoid loading typescript until actually needed.
         // This allows for avoiding the load of typescript in the main thread when using the parallel compilation.
         const typescript = await AngularCompilation.loadTypescript();
         await (0, profiling_1.profileAsync)('NG_DIAGNOSTICS_TOTAL', async () => {
-            for (const diagnostic of await this.collectDiagnostics()) {
+            for (const diagnostic of await this.collectDiagnostics(modes)) {
                 const message = (0, diagnostics_1.convertTypeScriptDiagnostic)(typescript, diagnostic);
                 if (diagnostic.category === typescript.DiagnosticCategory.Error) {
                     (result.errors ??= []).push(message);

package/src/tools/esbuild/angular/compilation/aot-compilation.d.ts

@@ -8,7 +8,7 @@
 import type ng from '@angular/compiler-cli';
 import ts from 'typescript';
 import { AngularHostOptions } from '../angular-host';
-import { AngularCompilation, EmitFileResult } from './angular-compilation';
+import { AngularCompilation, DiagnosticModes, EmitFileResult } from './angular-compilation';
 export declare class AotCompilation extends AngularCompilation {
     #private;
     initialize(tsconfig: string, hostOptions: AngularHostOptions, compilerOptionsTransformer?: (compilerOptions: ng.CompilerOptions) => ng.CompilerOptions): Promise<{
@@ -16,6 +16,6 @@ export declare class AotCompilation extends AngularCompilation {
         compilerOptions: ng.CompilerOptions;
         referencedFiles: readonly string[];
     }>;
-    collectDiagnostics(): Iterable<ts.Diagnostic>;
+    collectDiagnostics(modes: DiagnosticModes): Iterable<ts.Diagnostic>;
     emitAffectedFiles(): Iterable<EmitFileResult>;
 }