diff --git a/package.json b/package.json index 36fe6118..3779d9e3 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@angular/build", - "version": "21.0.0-next.8+sha-2ffc527", + "version": "21.0.3+sha-deb4fff", "description": "Official build system for Angular", "keywords": [ "Angular CLI", @@ -23,7 +23,7 @@ "builders": "builders.json", "dependencies": { "@ampproject/remapping": "2.3.0", - "@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#2ffc527", + "@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#deb4fff", "@babel/core": "7.28.4", "@babel/helper-annotate-as-pure": "7.27.3", "@babel/helper-split-export-declaration": "7.24.7", @@ -31,7 +31,7 @@ "@vitejs/plugin-basic-ssl": "2.1.0", "beasties": "0.3.5", "browserslist": "^4.26.0", - "esbuild": "0.25.11", + "esbuild": "0.26.0", "https-proxy-agent": "7.0.6", "istanbul-lib-instrument": "6.0.3", "jsonc-parser": "3.3.1", @@ -41,34 +41,35 @@ "parse5-html-rewriting-stream": "8.0.0", "picomatch": "4.0.3", "piscina": "5.1.3", - "rolldown": "1.0.0-beta.44", + "rolldown": "1.0.0-beta.47", "sass": "1.93.2", "semver": "7.7.3", "source-map-support": "0.5.21", "tinyglobby": "0.2.15", - "vite": "7.1.11", + "undici": "7.16.0", + "vite": "7.2.2", "watchpack": "2.4.4" }, "optionalDependencies": { "lmdb": "3.4.3" }, "peerDependencies": { - "@angular/core": "^21.0.0-next.0", - "@angular/compiler": "^21.0.0-next.0", - "@angular/compiler-cli": "^21.0.0-next.0", - "@angular/localize": "^21.0.0-next.0", - "@angular/platform-browser": "^21.0.0-next.0", - "@angular/platform-server": "^21.0.0-next.0", - "@angular/service-worker": "^21.0.0-next.0", - "@angular/ssr": "github:angular/angular-ssr-builds#2ffc527", + "@angular/compiler": "^21.0.0", + "@angular/compiler-cli": "^21.0.0", + "@angular/core": "^21.0.0", + "@angular/localize": "^21.0.0", + "@angular/platform-browser": "^21.0.0", + "@angular/platform-server": "^21.0.0", + "@angular/service-worker": "^21.0.0", + "@angular/ssr": "github:angular/angular-ssr-builds#deb4fff", "karma": "^6.4.0", "less": "^4.2.0", - "ng-packagr": "^21.0.0-next.0", + "ng-packagr": "^21.0.0", "postcss": "^8.4.0", "tailwindcss": "^2.0.0 || ^3.0.0 || ^4.0.0", "tslib": "^2.3.0", "typescript": ">=5.9 <6.0", - "vitest": "^4.0.0" + "vitest": "^4.0.8" }, "peerDependenciesMeta": { "@angular/core": { @@ -112,7 +113,7 @@ "type": "git", "url": "https://github.com/angular/angular-cli.git" }, - "packageManager": "pnpm@10.19.0", + "packageManager": "pnpm@10.25.0", "engines": { "node": "^20.19.0 || ^22.12.0 || >=24.0.0", "npm": "^6.11.0 || ^7.5.6 || >=8.0.0", diff --git a/src/builders/application/chunk-optimizer.js b/src/builders/application/chunk-optimizer.js index 6946a185..9c4813b9 100644 --- a/src/builders/application/chunk-optimizer.js +++ b/src/builders/application/chunk-optimizer.js @@ -199,7 +199,6 @@ async function optimizeChunks(original, sourcemap) { }); const result = await bundle.generate({ minify: { mangle: false, compress: false }, - advancedChunks: { minSize: 8192 }, sourcemap, chunkFileNames: (chunkInfo) => `${chunkInfo.name.replace(/-[a-zA-Z0-9]{8}$/, '')}-[hash].js`, }); diff --git a/src/builders/application/chunk-optimizer.js.map b/src/builders/application/chunk-optimizer.js.map index f4bc7ef1..6ca9ee89 100644 --- a/src/builders/application/chunk-optimizer.js.map +++ b/src/builders/application/chunk-optimizer.js.map @@ -1 +1 @@ -{"version":3,"file":"chunk-optimizer.js","sourceRoot":"","sources":["chunk-optimizer.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"chunk-optimizer.js","sourceRoot":"","sources":["chunk-optimizer.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/src/builders/application/options.js b/src/builders/application/options.js index d7d9e910..26c4c1d1 100644 --- a/src/builders/application/options.js +++ b/src/builders/application/options.js @@ -449,7 +449,14 @@ function getLocaleBaseHref(baseHref = '', i18n, locale) { return undefined; } const baseHrefSuffix = localeData.baseHref ?? localeData.subPath + '/'; - return baseHrefSuffix !== '' ? (0, url_1.urlJoin)(baseHref, baseHrefSuffix) : undefined; + let joinedBaseHref; + if (baseHrefSuffix !== '') { + joinedBaseHref = (0, url_1.addTrailingSlash)((0, url_1.joinUrlParts)(baseHref, baseHrefSuffix)); + if (baseHref && baseHref[0] !== '/') { + joinedBaseHref = (0, url_1.stripLeadingSlash)(joinedBaseHref); + } + } + return joinedBaseHref; } /** * Normalizes an array of external dependency paths by ensuring that diff --git a/src/builders/application/options.js.map b/src/builders/application/options.js.map index 6166ea3d..96dcd600 100644 --- a/src/builders/application/options.js.map +++ b/src/builders/application/options.js.map @@ -1 +1 @@ -{"version":3,"file":"options.js","sourceRoot":"","sources":["options.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"options.js","sourceRoot":"","sources":["options.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/src/builders/application/schema.d.ts b/src/builders/application/schema.d.ts index 7c48f821..6f48a1ce 100644 --- a/src/builders/application/schema.d.ts +++ b/src/builders/application/schema.d.ts @@ -136,9 +136,9 @@ export type Schema = { */ outputHashing?: OutputHashing; /** - * Defines the build output target. 'static': Generates a static site for deployment on any - * static hosting service. 'server': Produces an application designed for deployment on a - * server that supports server-side rendering (SSR). + * Defines the type of build output artifact. 'static': Generates a static site build + * artifact for deployment on any static hosting service. 'server': Generates a server + * application build artifact, required for applications using hybrid rendering or APIs. */ outputMode?: OutputMode; /** @@ -428,9 +428,9 @@ export declare enum OutputHashing { None = "none" } /** - * Defines the build output target. 'static': Generates a static site for deployment on any - * static hosting service. 'server': Produces an application designed for deployment on a - * server that supports server-side rendering (SSR). + * Defines the type of build output artifact. 'static': Generates a static site build + * artifact for deployment on any static hosting service. 'server': Generates a server + * application build artifact, required for applications using hybrid rendering or APIs. */ export declare enum OutputMode { Server = "server", diff --git a/src/builders/application/schema.js b/src/builders/application/schema.js index 0c86ad36..aad3eb0f 100644 --- a/src/builders/application/schema.js +++ b/src/builders/application/schema.js @@ -63,9 +63,9 @@ var OutputHashing; OutputHashing["None"] = "none"; })(OutputHashing || (exports.OutputHashing = OutputHashing = {})); /** - * Defines the build output target. 'static': Generates a static site for deployment on any - * static hosting service. 'server': Produces an application designed for deployment on a - * server that supports server-side rendering (SSR). + * Defines the type of build output artifact. 'static': Generates a static site build + * artifact for deployment on any static hosting service. 'server': Generates a server + * application build artifact, required for applications using hybrid rendering or APIs. */ var OutputMode; (function (OutputMode) { diff --git a/src/builders/application/schema.json b/src/builders/application/schema.json index c0a0f983..8db4e614 100644 --- a/src/builders/application/schema.json +++ b/src/builders/application/schema.json @@ -611,7 +611,7 @@ }, "outputMode": { "type": "string", - "description": "Defines the build output target. 'static': Generates a static site for deployment on any static hosting service. 'server': Produces an application designed for deployment on a server that supports server-side rendering (SSR).", + "description": "Defines the type of build output artifact. 'static': Generates a static site build artifact for deployment on any static hosting service. 'server': Generates a server application build artifact, required for applications using hybrid rendering or APIs.", "enum": ["static", "server"] } }, diff --git a/src/builders/dev-server/options.d.ts b/src/builders/dev-server/options.d.ts index ed8e1021..fff3b98f 100644 --- a/src/builders/dev-server/options.d.ts +++ b/src/builders/dev-server/options.d.ts @@ -25,6 +25,9 @@ export declare function normalizeOptions(context: BuilderContext, projectName: s poll: number | undefined; open: boolean | undefined; verbose: boolean | undefined; + define: { + [key: string]: string; + } | undefined; watch: boolean | undefined; liveReload: boolean; hmr: boolean; diff --git a/src/builders/dev-server/options.js b/src/builders/dev-server/options.js index 703bdd4b..5cd98f2f 100644 --- a/src/builders/dev-server/options.js +++ b/src/builders/dev-server/options.js @@ -73,7 +73,7 @@ async function normalizeOptions(context, projectName, options) { } } // Initial options to keep - const { host, port, poll, open, verbose, watch, liveReload, hmr, headers, proxyConfig, servePath, ssl, sslCert, sslKey, prebundle, allowedHosts, } = options; + const { host, port, poll, open, verbose, define, watch, liveReload, hmr, headers, proxyConfig, servePath, ssl, sslCert, sslKey, prebundle, allowedHosts, } = options; // Return all the normalized options return { buildTarget, @@ -82,6 +82,7 @@ async function normalizeOptions(context, projectName, options) { poll, open, verbose, + define, watch, liveReload: !!liveReload, hmr: hmr ?? !!liveReload, diff --git a/src/builders/dev-server/options.js.map b/src/builders/dev-server/options.js.map index 4c5935d5..b829c6d0 100644 --- a/src/builders/dev-server/options.js.map +++ b/src/builders/dev-server/options.js.map @@ -1 +1 @@ -{"version":3,"file":"options.js","sourceRoot":"","sources":["options.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"options.js","sourceRoot":"","sources":["options.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/src/builders/dev-server/schema.d.ts b/src/builders/dev-server/schema.d.ts index 39742e19..9fbec8d1 100644 --- a/src/builders/dev-server/schema.d.ts +++ b/src/builders/dev-server/schema.d.ts @@ -14,6 +14,15 @@ export type Schema = { * `project:target:production,staging`. */ buildTarget: string; + /** + * Defines global identifiers that will be replaced with a specified constant value when + * found in any JavaScript or TypeScript code including libraries. The value will be used + * directly. String values must be put in quotes. Identifiers within Angular metadata such + * as Component Decorators will not be replaced. + */ + define?: { + [key: string]: string; + }; /** * Custom HTTP headers to be added to all responses. */ diff --git a/src/builders/dev-server/schema.json b/src/builders/dev-server/schema.json index 41902e43..023478ff 100644 --- a/src/builders/dev-server/schema.json +++ b/src/builders/dev-server/schema.json @@ -53,6 +53,13 @@ } ] }, + "define": { + "description": "Defines global identifiers that will be replaced with a specified constant value when found in any JavaScript or TypeScript code including libraries. The value will be used directly. String values must be put in quotes. Identifiers within Angular metadata such as Component Decorators will not be replaced.", + "type": "object", + "additionalProperties": { + "type": "string" + } + }, "headers": { "type": "object", "description": "Custom HTTP headers to be added to all responses.", diff --git a/src/builders/dev-server/vite/hmr.js b/src/builders/dev-server/vite/hmr.js index a2cc8c18..aab26f87 100644 --- a/src/builders/dev-server/vite/hmr.js +++ b/src/builders/dev-server/vite/hmr.js @@ -40,9 +40,10 @@ async function invalidateUpdatedFiles(normalizePath, generatedFiles, assetFiles, updatedModules?.forEach((m) => server.moduleGraph.invalidateModule(m)); } if (serverApplicationChanged) { - // Clear the server app cache and - // trigger module evaluation before reload to initiate dependency optimization. - const { ɵdestroyAngularServerApp } = (await server.ssrLoadModule('/main.server.mjs')); + // Clear the server app cache and trigger module evaluation before reload to initiate dependency optimization. + // The querystring is needed as a workaround for: + // `ɵgetOrCreateAngularServerApp` can be undefined right after an error. + const { ɵdestroyAngularServerApp } = (await server.ssrLoadModule(`/main.server.mjs?timestamp=${Date.now()}`)); ɵdestroyAngularServerApp(); } return updatedFiles; diff --git a/src/builders/dev-server/vite/hmr.js.map b/src/builders/dev-server/vite/hmr.js.map index 005fdeb9..4cd5d116 100644 --- a/src/builders/dev-server/vite/hmr.js.map +++ b/src/builders/dev-server/vite/hmr.js.map @@ -1 +1 @@ -{"version":3,"file":"hmr.js","sourceRoot":"","sources":["hmr.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"hmr.js","sourceRoot":"","sources":["hmr.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/src/builders/dev-server/vite/index.js b/src/builders/dev-server/vite/index.js index d62cf451..64a5c130 100644 --- a/src/builders/dev-server/vite/index.js +++ b/src/builders/dev-server/vite/index.js @@ -45,22 +45,22 @@ var __importDefault = (this && this.__importDefault) || function (mod) { Object.defineProperty(exports, "__esModule", { value: true }); exports.serveWithVite = serveWithVite; const node_assert_1 = __importDefault(require("node:assert")); -const node_module_1 = require("node:module"); const node_path_1 = require("node:path"); const plugins_1 = require("../../../tools/vite/plugins"); -const utils_1 = require("../../../utils"); +const utils_1 = require("../../../tools/vite/utils"); +const utils_2 = require("../../../utils"); const environment_options_1 = require("../../../utils/environment-options"); const results_1 = require("../../application/results"); const schema_1 = require("../../application/schema"); const internal_1 = require("../internal"); const hmr_1 = require("./hmr"); const server_1 = require("./server"); -const utils_2 = require("./utils"); +const utils_3 = require("./utils"); /** * Build options that are also present on the dev server but are only passed * to the build. */ -const CONVENIENCE_BUILD_OPTIONS = ['watch', 'poll', 'verbose']; +const CONVENIENCE_BUILD_OPTIONS = ['watch', 'poll', 'verbose', 'define']; // eslint-disable-next-line max-lines-per-function async function* serveWithVite(serverOptions, builderName, builderAction, context, transformers, extensions) { // Get the browser configuration from the target name. @@ -71,7 +71,16 @@ async function* serveWithVite(serverOptions, builderName, builderAction, context for (const optionName of CONVENIENCE_BUILD_OPTIONS) { const optionValue = serverOptions[optionName]; if (optionValue !== undefined) { - rawBrowserOptions[optionName] = optionValue; + if (optionName === 'define' && rawBrowserOptions[optionName]) { + // Define has merging behavior within the application + for (const [key, value] of Object.entries(optionValue)) { + // eslint-disable-next-line @typescript-eslint/no-explicit-any + rawBrowserOptions[optionName][key] = value; + } + } + else { + rawBrowserOptions[optionName] = optionValue; + } } } // TODO: Adjust architect to not force a JsonObject derived return type @@ -109,7 +118,7 @@ async function* serveWithVite(serverOptions, builderName, builderAction, context // When localization is enabled with a single locale, force a flat path to maintain behavior with the existing Webpack-based dev server. browserOptions.forceI18nFlatOutput = true; } - const { vendor: thirdPartySourcemaps, scripts: scriptsSourcemaps } = (0, utils_1.normalizeSourceMaps)(browserOptions.sourceMap ?? false); + const { vendor: thirdPartySourcemaps, scripts: scriptsSourcemaps } = (0, utils_2.normalizeSourceMaps)(browserOptions.sourceMap ?? false); if (scriptsSourcemaps && browserOptions.server) { // https://nodejs.org/api/process.html#processsetsourcemapsenabledval process.setSourceMapsEnabled(true); @@ -193,15 +202,13 @@ async function* serveWithVite(serverOptions, builderName, builderAction, context const baseHref = result.detail['htmlBaseHref']; // Remove trailing slash serverOptions.servePath = - baseHref !== './' && baseHref[baseHref.length - 1] === '/' - ? baseHref.slice(0, -1) - : baseHref; + baseHref !== './' && baseHref.at(-1) === '/' ? baseHref.slice(0, -1) : baseHref; } assetFiles.clear(); componentStyles.clear(); generatedFiles.clear(); for (const [outputPath, file] of Object.entries(result.files)) { - (0, utils_2.updateResultRecord)(outputPath, file, normalizePath, htmlIndexPath, generatedFiles, assetFiles, componentStyles, + (0, utils_3.updateResultRecord)(outputPath, file, normalizePath, htmlIndexPath, generatedFiles, assetFiles, componentStyles, // The initial build will not yet have a server setup !server); } @@ -218,10 +225,10 @@ async function* serveWithVite(serverOptions, builderName, builderAction, context assetFiles.delete(filePath); } for (const modified of result.modified) { - (0, utils_2.updateResultRecord)(modified, result.files[modified], normalizePath, htmlIndexPath, generatedFiles, assetFiles, componentStyles); + (0, utils_3.updateResultRecord)(modified, result.files[modified], normalizePath, htmlIndexPath, generatedFiles, assetFiles, componentStyles); } for (const added of result.added) { - (0, utils_2.updateResultRecord)(added, result.files[added], normalizePath, htmlIndexPath, generatedFiles, assetFiles, componentStyles); + (0, utils_3.updateResultRecord)(added, result.files[added], normalizePath, htmlIndexPath, generatedFiles, assetFiles, componentStyles); } break; case results_1.ResultKind.ComponentUpdate: @@ -243,27 +250,7 @@ async function* serveWithVite(serverOptions, builderName, builderAction, context continue; } // To avoid disconnecting the array objects from the option, these arrays need to be mutated instead of replaced. - if (result.detail?.['externalMetadata']) { - const { implicitBrowser, implicitServer, explicit } = result.detail['externalMetadata']; - const implicitServerFiltered = implicitServer.filter((m) => !(0, node_module_1.isBuiltin)(m) && !(0, utils_2.isAbsoluteUrl)(m)); - const implicitBrowserFiltered = implicitBrowser.filter((m) => !(0, utils_2.isAbsoluteUrl)(m)); - // Empty Arrays to avoid growing unlimited with every re-build. - externalMetadata.explicitBrowser.length = 0; - externalMetadata.explicitServer.length = 0; - externalMetadata.implicitServer.length = 0; - externalMetadata.implicitBrowser.length = 0; - const externalDeps = browserOptions.externalDependencies ?? []; - externalMetadata.explicitBrowser.push(...explicit, ...externalDeps); - externalMetadata.explicitServer.push(...explicit, ...externalDeps, ...node_module_1.builtinModules); - externalMetadata.implicitServer.push(...implicitServerFiltered); - externalMetadata.implicitBrowser.push(...implicitBrowserFiltered); - // The below needs to be sorted as Vite uses these options are part of the hashing invalidation algorithm. - // See: https://github.com/vitejs/vite/blob/0873bae0cfe0f0718ad2f5743dd34a17e4ab563d/packages/vite/src/node/optimizer/index.ts#L1203-L1239 - externalMetadata.explicitBrowser.sort(); - externalMetadata.explicitServer.sort(); - externalMetadata.implicitServer.sort(); - externalMetadata.implicitBrowser.sort(); - } + (0, utils_1.updateExternalMetadata)(result, externalMetadata, browserOptions.externalDependencies); if (server) { // Update fs allow list to include any new assets from the build option. server.config.server.fs.allow = [ diff --git a/src/builders/dev-server/vite/index.js.map b/src/builders/dev-server/vite/index.js.map index 07320774..abd28696 100644 --- a/src/builders/dev-server/vite/index.js.map +++ b/src/builders/dev-server/vite/index.js.map @@ -1 +1 @@ -{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/src/builders/dev-server/vite/server.js b/src/builders/dev-server/vite/server.js index 850d6c26..7e688fbe 100644 --- a/src/builders/dev-server/vite/server.js +++ b/src/builders/dev-server/vite/server.js @@ -71,12 +71,7 @@ async function createServerConfig(serverOptions, assets, ssrMode, preTransformRe headers: serverOptions.headers, // Disable the websocket if live reload is disabled (false/undefined are the only valid values) ws: serverOptions.liveReload === false && serverOptions.hmr === false ? false : undefined, - // When server-side rendering (SSR) is enabled togather with SSL and Express is being used, - // we must configure Vite to use HTTP/1.1. - // This is necessary because Express does not support HTTP/2. - // We achieve this by defining an empty proxy. - // See: https://github.com/vitejs/vite/blob/c4b532cc900bf988073583511f57bd581755d5e3/packages/vite/src/node/http.ts#L106 - proxy: serverOptions.ssl && ssrMode === plugins_1.ServerSsrMode.ExternalSsrMiddleware ? (proxy ?? {}) : proxy, + proxy, cors: { // This will add the header `Access-Control-Allow-Origin: http://example.com`, // where `http://example.com` is the requesting origin. @@ -175,7 +170,9 @@ async function setupServer(serverOptions, outputFiles, assets, preserveSymlinks, preTransformRequests, }, server: await createServerConfig(serverOptions, assets, ssrMode, preTransformRequests, cacheDir), - ssr: createSsrConfig(externalMetadata, serverOptions, prebundleTransformer, zoneless, target, prebundleLoaderExtensions, thirdPartySourcemaps, define), + ssr: ssrMode === plugins_1.ServerSsrMode.NoSsr + ? undefined + : createSsrConfig(externalMetadata, serverOptions, prebundleTransformer, zoneless, target, prebundleLoaderExtensions, thirdPartySourcemaps, define), plugins: [ (0, plugins_1.createAngularSetupMiddlewaresPlugin)({ outputFiles, @@ -216,11 +213,14 @@ async function setupServer(serverOptions, outputFiles, assets, preserveSymlinks, }), }; if (serverOptions.ssl) { + configuration.plugins ??= []; if (!serverOptions.sslCert || !serverOptions.sslKey) { const { default: basicSslPlugin } = await Promise.resolve().then(() => __importStar(require('@vitejs/plugin-basic-ssl'))); - configuration.plugins ??= []; configuration.plugins.push(basicSslPlugin()); } + if (ssrMode !== plugins_1.ServerSsrMode.NoSsr) { + configuration.plugins?.push((0, plugins_1.createAngularServerSideSSLPlugin)()); + } } return configuration; } diff --git a/src/builders/dev-server/vite/server.js.map b/src/builders/dev-server/vite/server.js.map index 6c03bc31..2584ea6e 100644 --- a/src/builders/dev-server/vite/server.js.map +++ b/src/builders/dev-server/vite/server.js.map @@ -1 +1 @@ -{"version":3,"file":"server.js","sourceRoot":"","sources":["server.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"server.js","sourceRoot":"","sources":["server.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/src/builders/karma/find-tests.d.ts b/src/builders/karma/find-tests.d.ts index 9d884e3b..f138ce71 100644 --- a/src/builders/karma/find-tests.d.ts +++ b/src/builders/karma/find-tests.d.ts @@ -5,4 +5,5 @@ * 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 { findTests, getTestEntrypoints } from '../unit-test/test-discovery'; +export { getTestEntrypoints } from '../unit-test/test-discovery'; +export declare function findTests(include: string[], exclude: string[], workspaceRoot: string, projectSourceRoot: string): Promise; diff --git a/src/builders/karma/find-tests.js b/src/builders/karma/find-tests.js index 09150a17..66073e85 100644 --- a/src/builders/karma/find-tests.js +++ b/src/builders/karma/find-tests.js @@ -7,10 +7,18 @@ * found in the LICENSE file at https://angular.dev/license */ Object.defineProperty(exports, "__esModule", { value: true }); -exports.getTestEntrypoints = exports.findTests = void 0; +exports.getTestEntrypoints = void 0; +exports.findTests = findTests; +const test_discovery_1 = require("../unit-test/test-discovery"); // This file is a compatibility layer that re-exports the test discovery logic from its new location. // This is necessary to avoid breaking the Karma builder, which still depends on this file. -var test_discovery_1 = require("../unit-test/test-discovery"); -Object.defineProperty(exports, "findTests", { enumerable: true, get: function () { return test_discovery_1.findTests; } }); -Object.defineProperty(exports, "getTestEntrypoints", { enumerable: true, get: function () { return test_discovery_1.getTestEntrypoints; } }); +var test_discovery_2 = require("../unit-test/test-discovery"); +Object.defineProperty(exports, "getTestEntrypoints", { enumerable: true, get: function () { return test_discovery_2.getTestEntrypoints; } }); +const removeLeadingSlash = (path) => { + return path.startsWith('/') ? path.substring(1) : path; +}; +async function findTests(include, exclude, workspaceRoot, projectSourceRoot) { + // Karma has legacy support for workspace "root-relative" file paths + return (0, test_discovery_1.findTests)(include.map(removeLeadingSlash), exclude.map(removeLeadingSlash), workspaceRoot, projectSourceRoot); +} //# sourceMappingURL=find-tests.js.map \ No newline at end of file diff --git a/src/builders/karma/find-tests.js.map b/src/builders/karma/find-tests.js.map index 2022117f..38aae021 100644 --- a/src/builders/karma/find-tests.js.map +++ b/src/builders/karma/find-tests.js.map @@ -1 +1 @@ -{"version":3,"file":"find-tests.js","sourceRoot":"","sources":["find-tests.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;AAEH,qGAAqG;AACrG,2FAA2F;AAC3F,8DAA4E;AAAnE,2GAAA,SAAS,OAAA;AAAE,oHAAA,kBAAkB,OAAA"} \ No newline at end of file +{"version":3,"file":"find-tests.js","sourceRoot":"","sources":["find-tests.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;AAYH,8BAaC;AAvBD,gEAAyE;AAEzE,qGAAqG;AACrG,2FAA2F;AAC3F,8DAAiE;AAAxD,oHAAA,kBAAkB,OAAA;AAE3B,MAAM,kBAAkB,GAAG,CAAC,IAAY,EAAU,EAAE;IAClD,OAAO,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;AACzD,CAAC,CAAC;AAEK,KAAK,UAAU,SAAS,CAC7B,OAAiB,EACjB,OAAiB,EACjB,aAAqB,EACrB,iBAAyB;IAEzB,oEAAoE;IACpE,OAAO,IAAA,0BAAa,EAClB,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC,EAC/B,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC,EAC/B,aAAa,EACb,iBAAiB,CAClB,CAAC;AACJ,CAAC"} \ No newline at end of file diff --git a/src/builders/karma/progress-reporter.js b/src/builders/karma/progress-reporter.js index 60591a21..b9672564 100644 --- a/src/builders/karma/progress-reporter.js +++ b/src/builders/karma/progress-reporter.js @@ -17,6 +17,8 @@ function injectKarmaReporter(buildOptions, buildIterator, karmaConfig, controlle emitter; latestBuildFiles; static $inject = ['emitter', LATEST_BUILD_FILES_TOKEN]; + // Needed for the karma reporter interface, see https://github.com/angular/angular-cli/issues/31629 + adapters = []; constructor(emitter, latestBuildFiles) { this.emitter = emitter; this.latestBuildFiles = latestBuildFiles; diff --git a/src/builders/karma/progress-reporter.js.map b/src/builders/karma/progress-reporter.js.map index 7961ca0d..b8eeb970 100644 --- a/src/builders/karma/progress-reporter.js.map +++ b/src/builders/karma/progress-reporter.js.map @@ -1 +1 @@ -{"version":3,"file":"progress-reporter.js","sourceRoot":"","sources":["progress-reporter.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;AAkBH,kDAiFC;AA9FD,uDAAwD;AAGxD,oDAAoD;AAGpD,MAAM,wBAAwB,GAAG,yBAAyB,CAAC;AAO3D,SAAgB,mBAAmB,CACjC,YAA0B,EAC1B,aAAoC,EACpC,WAAmC,EACnC,UAAmD;IAEnD,MAAM,YAAY,GAAG,2BAA2B,CAAC;IAUjD,MAAM,wBAAwB;QAIT;QACA;QAJnB,MAAM,CAAC,OAAO,GAAG,CAAC,SAAS,EAAE,wBAAwB,CAAC,CAAC;QAEvD,YACmB,OAAqB,EACrB,gBAAkC;YADlC,YAAO,GAAP,OAAO,CAAc;YACrB,qBAAgB,GAAhB,gBAAgB,CAAkB;YAEnD,IAAI,CAAC,kBAAkB,EAAE,CAAC;QAC5B,CAAC;QAEO,kBAAkB;YACxB,KAAK,CAAC,KAAK,IAAI,EAAE;gBACf,uEAAuE;gBACvE,IAAI,MAAM,GAAG,KAAK,CAAC,CAAC,gDAAgD;gBACpE,OAAO,CAAC,MAAM,EAAE,CAAC;oBACf,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,WAAW,EAAE,GAAG,MAAM,aAAa,CAAC,IAAI,EAAE,CAAC;oBAChE,IAAI,IAAI,EAAE,CAAC;wBACT,MAAM,GAAG,IAAI,CAAC;wBACd,MAAM;oBACR,CAAC;oBAED,IAAI,WAAW,CAAC,IAAI,KAAK,oBAAU,CAAC,OAAO,EAAE,CAAC;wBAC5C,UAAU,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,cAAc,EAAE,CAAC,CAAC;oBAClE,CAAC;yBAAM,IACL,WAAW,CAAC,IAAI,KAAK,oBAAU,CAAC,WAAW;wBAC3C,WAAW,CAAC,IAAI,KAAK,oBAAU,CAAC,IAAI,EACpC,CAAC;wBACD,IAAI,WAAW,CAAC,IAAI,KAAK,oBAAU,CAAC,IAAI,EAAE,CAAC;4BACzC,IAAI,CAAC,gBAAgB,CAAC,KAAK,GAAG,WAAW,CAAC,KAAK,CAAC;wBAClD,CAAC;6BAAM,CAAC;4BACN,IAAI,CAAC,gBAAgB,CAAC,KAAK,GAAG;gCAC5B,GAAG,IAAI,CAAC,gBAAgB,CAAC,KAAK;gCAC9B,GAAG,WAAW,CAAC,KAAK;6BACrB,CAAC;wBACJ,CAAC;wBACD,MAAM,IAAA,2BAAc,EAAC,WAAW,CAAC,KAAK,EAAE,YAAY,CAAC,UAAU,CAAC,CAAC;wBACjE,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE,CAAC;oBAC9B,CAAC;gBACH,CAAC;YACH,CAAC,CAAC,EAAE,CAAC;QACP,CAAC;QAED,aAAa,GAAG,UAAU,SAAkB,EAAE,OAAwB;YACpE,IAAI,OAAO,CAAC,QAAQ,KAAK,CAAC,EAAE,CAAC;gBAC3B,UAAU,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;YACxC,CAAC;iBAAM,CAAC;gBACN,UAAU,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC;YACzC,CAAC;QACH,CAAC,CAAC;;IAGJ,WAAW,CAAC,SAAS,KAAK,EAAE,CAAC;IAC7B,WAAW,CAAC,SAAS,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IAEzC,WAAW,CAAC,OAAO,KAAK,EAAE,CAAC;IAC3B,WAAW,CAAC,OAAO,CAAC,IAAI,CAAC;QACvB,CAAC,YAAY,YAAY,EAAE,CAAC,EAAE;YAC5B,SAAS;YACT,MAAM,CAAC,MAAM,CACX,CAAC,GAAG,IAA4D,EAAE,EAAE,CAClE,IAAI,wBAAwB,CAAC,GAAG,IAAI,CAAC,EACvC,wBAAwB,CACzB;SACF;KACF,CAAC,CAAC;AACL,CAAC"} \ No newline at end of file +{"version":3,"file":"progress-reporter.js","sourceRoot":"","sources":["progress-reporter.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;AAkBH,kDAmFC;AAhGD,uDAAwD;AAGxD,oDAAoD;AAGpD,MAAM,wBAAwB,GAAG,yBAAyB,CAAC;AAO3D,SAAgB,mBAAmB,CACjC,YAA0B,EAC1B,aAAoC,EACpC,WAAmC,EACnC,UAAmD;IAEnD,MAAM,YAAY,GAAG,2BAA2B,CAAC;IAUjD,MAAM,wBAAwB;QAMT;QACA;QANnB,MAAM,CAAC,OAAO,GAAG,CAAC,SAAS,EAAE,wBAAwB,CAAC,CAAC;QACvD,mGAAmG;QACnG,QAAQ,GAAG,EAAE,CAAC;QAEd,YACmB,OAAqB,EACrB,gBAAkC;YADlC,YAAO,GAAP,OAAO,CAAc;YACrB,qBAAgB,GAAhB,gBAAgB,CAAkB;YAEnD,IAAI,CAAC,kBAAkB,EAAE,CAAC;QAC5B,CAAC;QAEO,kBAAkB;YACxB,KAAK,CAAC,KAAK,IAAI,EAAE;gBACf,uEAAuE;gBACvE,IAAI,MAAM,GAAG,KAAK,CAAC,CAAC,gDAAgD;gBACpE,OAAO,CAAC,MAAM,EAAE,CAAC;oBACf,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,WAAW,EAAE,GAAG,MAAM,aAAa,CAAC,IAAI,EAAE,CAAC;oBAChE,IAAI,IAAI,EAAE,CAAC;wBACT,MAAM,GAAG,IAAI,CAAC;wBACd,MAAM;oBACR,CAAC;oBAED,IAAI,WAAW,CAAC,IAAI,KAAK,oBAAU,CAAC,OAAO,EAAE,CAAC;wBAC5C,UAAU,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,cAAc,EAAE,CAAC,CAAC;oBAClE,CAAC;yBAAM,IACL,WAAW,CAAC,IAAI,KAAK,oBAAU,CAAC,WAAW;wBAC3C,WAAW,CAAC,IAAI,KAAK,oBAAU,CAAC,IAAI,EACpC,CAAC;wBACD,IAAI,WAAW,CAAC,IAAI,KAAK,oBAAU,CAAC,IAAI,EAAE,CAAC;4BACzC,IAAI,CAAC,gBAAgB,CAAC,KAAK,GAAG,WAAW,CAAC,KAAK,CAAC;wBAClD,CAAC;6BAAM,CAAC;4BACN,IAAI,CAAC,gBAAgB,CAAC,KAAK,GAAG;gCAC5B,GAAG,IAAI,CAAC,gBAAgB,CAAC,KAAK;gCAC9B,GAAG,WAAW,CAAC,KAAK;6BACrB,CAAC;wBACJ,CAAC;wBACD,MAAM,IAAA,2BAAc,EAAC,WAAW,CAAC,KAAK,EAAE,YAAY,CAAC,UAAU,CAAC,CAAC;wBACjE,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE,CAAC;oBAC9B,CAAC;gBACH,CAAC;YACH,CAAC,CAAC,EAAE,CAAC;QACP,CAAC;QAED,aAAa,GAAG,UAAU,SAAkB,EAAE,OAAwB;YACpE,IAAI,OAAO,CAAC,QAAQ,KAAK,CAAC,EAAE,CAAC;gBAC3B,UAAU,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;YACxC,CAAC;iBAAM,CAAC;gBACN,UAAU,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC;YACzC,CAAC;QACH,CAAC,CAAC;;IAGJ,WAAW,CAAC,SAAS,KAAK,EAAE,CAAC;IAC7B,WAAW,CAAC,SAAS,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IAEzC,WAAW,CAAC,OAAO,KAAK,EAAE,CAAC;IAC3B,WAAW,CAAC,OAAO,CAAC,IAAI,CAAC;QACvB,CAAC,YAAY,YAAY,EAAE,CAAC,EAAE;YAC5B,SAAS;YACT,MAAM,CAAC,MAAM,CACX,CAAC,GAAG,IAA4D,EAAE,EAAE,CAClE,IAAI,wBAAwB,CAAC,GAAG,IAAI,CAAC,EACvC,wBAAwB,CACzB;SACF;KACF,CAAC,CAAC;AACL,CAAC"} \ No newline at end of file diff --git a/src/builders/unit-test/builder.js b/src/builders/unit-test/builder.js index 34dceba0..47e112a0 100644 --- a/src/builders/unit-test/builder.js +++ b/src/builders/unit-test/builder.js @@ -188,6 +188,12 @@ async function* runBuildAndTest(executor, applicationBuildOptions, context, dump catch (e) { (0, error_1.assertIsError)(e); context.logger.error(`An exception occurred during test execution:\n${e.stack ?? e.message}`); + if (e instanceof AggregateError) { + e.errors.forEach((inner) => { + (0, error_1.assertIsError)(inner); + context.logger.error(inner.stack ?? inner.message); + }); + } yield { success: false }; consecutiveErrorCount++; } @@ -207,7 +213,6 @@ async function* execute(options, context, extensions) { context.logger.error(`The builder requires a target to be specified.`); return; } - context.logger.warn(`NOTE: The "unit-test" builder is currently EXPERIMENTAL and not ready for production use.`); // Initialize the test runner and normalize options let runner; let normalizedOptions; diff --git a/src/builders/unit-test/builder.js.map b/src/builders/unit-test/builder.js.map index e9eb9feb..f369bed9 100644 --- a/src/builders/unit-test/builder.js.map +++ b/src/builders/unit-test/builder.js.map @@ -1 +1 @@ -{"version":3,"file":"builder.js","sourceRoot":"","sources":["builder.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"builder.js","sourceRoot":"","sources":["builder.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/src/builders/unit-test/options.d.ts b/src/builders/unit-test/options.d.ts index 12c6254f..034668f7 100644 --- a/src/builders/unit-test/options.d.ts +++ b/src/builders/unit-test/options.d.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.dev/license */ import { type BuilderContext } from '@angular-devkit/architect'; -import type { Schema as UnitTestBuilderOptions } from './schema'; +import { Runner, type Schema as UnitTestBuilderOptions } from './schema'; export type NormalizedUnitTestBuilderOptions = Awaited>; export declare function normalizeOptions(context: BuilderContext, projectName: string, options: UnitTestBuilderOptions): Promise<{ workspaceRoot: string; @@ -17,8 +17,9 @@ export declare function normalizeOptions(context: BuilderContext, projectName: s include: string[]; exclude: string[] | undefined; filter: string | undefined; - runnerName: string; + runnerName: Runner; coverage: { + enabled: boolean | undefined; exclude: string[] | undefined; include: string[] | undefined; reporters: [string, Record][] | undefined; @@ -29,7 +30,7 @@ export declare function normalizeOptions(context: BuilderContext, projectName: s functions?: [number, number]; lines?: [number, number]; }; - } | undefined; + }; tsConfig: string | undefined; buildProgress: boolean | undefined; reporters: [string, Record][] | undefined; @@ -41,9 +42,11 @@ export declare function normalizeOptions(context: BuilderContext, projectName: s } | undefined; watch: boolean; debug: boolean; + ui: boolean; providersFile: string | undefined; setupFiles: string[]; dumpVirtualFiles: boolean | undefined; listTests: boolean | undefined; + runnerConfig: string | boolean | undefined; }>; export declare function injectTestingPolyfills(polyfills?: string[]): string[]; diff --git a/src/builders/unit-test/options.js b/src/builders/unit-test/options.js index 89c181a1..6db051b2 100644 --- a/src/builders/unit-test/options.js +++ b/src/builders/unit-test/options.js @@ -18,6 +18,7 @@ const node_path_1 = __importDefault(require("node:path")); const normalize_cache_1 = require("../../utils/normalize-cache"); const project_metadata_1 = require("../../utils/project-metadata"); const tty_1 = require("../../utils/tty"); +const schema_1 = require("./schema"); async function exists(path) { try { await node_fs_1.promises.access(path, node_fs_1.constants.F_OK); @@ -43,7 +44,10 @@ async function normalizeOptions(context, projectName, options) { // Target specifier defaults to the current project's build target using a development configuration const buildTargetSpecifier = options.buildTarget ?? `::development`; const buildTarget = (0, architect_1.targetFromTargetString)(buildTargetSpecifier, projectName, 'build'); - const { runner, browsers, progress, filter, browserViewport } = options; + const { runner, browsers, progress, filter, browserViewport, ui, runnerConfig } = options; + if (ui && runner !== schema_1.Runner.Vitest) { + throw new Error('The "ui" option is only available for the "vitest" runner.'); + } const [width, height] = browserViewport?.split('x').map(Number) ?? []; let tsConfig = options.tsConfig; if (tsConfig) { @@ -59,6 +63,11 @@ async function normalizeOptions(context, projectName, options) { tsConfig = node_path_1.default.relative(workspaceRoot, tsconfigSpecPath); } } + let watch = options.watch ?? (0, tty_1.isTTY)(); + if (options.ui && options.watch === false) { + context.logger.warn(`The '--ui' option requires watch mode. The '--no-watch' flag will be ignored.`); + watch = true; + } return { // Project/workspace information workspaceRoot, @@ -70,32 +79,37 @@ async function normalizeOptions(context, projectName, options) { include: options.include ?? ['**/*.spec.ts'], exclude: options.exclude, filter, - runnerName: runner ?? 'vitest', - coverage: options.coverage - ? { - exclude: options.coverageExclude, - include: options.coverageInclude, - reporters: normalizeReporterOption(options.coverageReporters), - thresholds: options.coverageThresholds, - // The schema generation tool doesn't support tuple types for items, but the schema validation - // does ensure that the array has exactly two numbers. - watermarks: options.coverageWatermarks, - } - : undefined, + runnerName: runner ?? schema_1.Runner.Vitest, + coverage: { + enabled: options.coverage, + exclude: options.coverageExclude, + include: options.coverageInclude, + reporters: normalizeReporterOption(options.coverageReporters), + thresholds: options.coverageThresholds, + // The schema generation tool doesn't support tuple types for items, but the schema validation + // does ensure that the array has exactly two numbers. + watermarks: options.coverageWatermarks, + }, tsConfig, buildProgress: progress, reporters: normalizeReporterOption(options.reporters), outputFile: options.outputFile, browsers, browserViewport: width && height ? { width, height } : undefined, - watch: options.watch ?? (0, tty_1.isTTY)(), + watch, debug: options.debug ?? false, + ui: options.ui ?? false, providersFile: options.providersFile && node_path_1.default.join(workspaceRoot, options.providersFile), setupFiles: options.setupFiles ? options.setupFiles.map((setupFile) => node_path_1.default.join(workspaceRoot, setupFile)) : [], dumpVirtualFiles: options.dumpVirtualFiles, listTests: options.listTests, + runnerConfig: typeof runnerConfig === 'string' + ? runnerConfig.length === 0 + ? true + : node_path_1.default.resolve(workspaceRoot, runnerConfig) + : runnerConfig, }; } function injectTestingPolyfills(polyfills = []) { diff --git a/src/builders/unit-test/options.js.map b/src/builders/unit-test/options.js.map index 1244f395..0fc5f1db 100644 --- a/src/builders/unit-test/options.js.map +++ b/src/builders/unit-test/options.js.map @@ -1 +1 @@ -{"version":3,"file":"options.js","sourceRoot":"","sources":["options.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"options.js","sourceRoot":"","sources":["options.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/src/builders/unit-test/runners/karma/executor.d.ts b/src/builders/unit-test/runners/karma/executor.d.ts index 9897c98c..cba69f9c 100644 --- a/src/builders/unit-test/runners/karma/executor.d.ts +++ b/src/builders/unit-test/runners/karma/executor.d.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.dev/license */ import type { BuilderContext, BuilderOutput } from '@angular-devkit/architect'; -import { NormalizedUnitTestBuilderOptions } from '../../options'; +import { type NormalizedUnitTestBuilderOptions } from '../../options'; import type { TestExecutor } from '../api'; export declare class KarmaExecutor implements TestExecutor { private context; diff --git a/src/builders/unit-test/runners/karma/executor.js b/src/builders/unit-test/runners/karma/executor.js index c7fb1d1a..b3a38ebb 100644 --- a/src/builders/unit-test/runners/karma/executor.js +++ b/src/builders/unit-test/runners/karma/executor.js @@ -39,8 +39,14 @@ var __importStar = (this && this.__importStar) || (function () { return result; }; })(); +var __importDefault = (this && this.__importDefault) || function (mod) { + return (mod && mod.__esModule) ? mod : { "default": mod }; +}; Object.defineProperty(exports, "__esModule", { value: true }); exports.KarmaExecutor = void 0; +const promises_1 = __importDefault(require("node:fs/promises")); +const node_path_1 = __importDefault(require("node:path")); +const options_1 = require("../../options"); class KarmaExecutor { context; options; @@ -63,9 +69,26 @@ class KarmaExecutor { context.logger.warn('The "karma" test runner does not support the "coverageInclude" option. The option will be ignored.'); } const buildTargetOptions = (await context.validateOptions(await context.getTargetOptions(unitTestOptions.buildTarget), await context.getBuilderNameForTarget(unitTestOptions.buildTarget))); + let karmaConfig; + if (typeof unitTestOptions.runnerConfig === 'string') { + karmaConfig = unitTestOptions.runnerConfig; + context.logger.info(`Using Karma configuration file: ${karmaConfig}`); + } + else if (unitTestOptions.runnerConfig) { + const potentialPath = node_path_1.default.join(unitTestOptions.projectRoot, 'karma.conf.js'); + try { + await promises_1.default.access(potentialPath); + karmaConfig = potentialPath; + context.logger.info(`Using Karma configuration file: ${karmaConfig}`); + } + catch { + context.logger.info('No Karma configuration file found. Using default configuration.'); + } + } const karmaOptions = { + karmaConfig, tsConfig: unitTestOptions.tsConfig ?? buildTargetOptions.tsConfig, - polyfills: buildTargetOptions.polyfills, + polyfills: (0, options_1.injectTestingPolyfills)(buildTargetOptions.polyfills), assets: buildTargetOptions.assets, scripts: buildTargetOptions.scripts, styles: buildTargetOptions.styles, @@ -82,8 +105,8 @@ class KarmaExecutor { poll: buildTargetOptions.poll, preserveSymlinks: buildTargetOptions.preserveSymlinks, browsers: unitTestOptions.browsers?.join(','), - codeCoverage: !!unitTestOptions.coverage, - codeCoverageExclude: unitTestOptions.coverage?.exclude, + codeCoverage: unitTestOptions.coverage.enabled, + codeCoverageExclude: unitTestOptions.coverage.exclude, fileReplacements: buildTargetOptions.fileReplacements, reporters: unitTestOptions.reporters?.map((reporter) => { // Karma only supports string reporters. @@ -111,7 +134,7 @@ class KarmaExecutor { options.client.args.push('--grep', filter); } // Add coverage options - if (unitTestOptions.coverage) { + if (unitTestOptions.coverage.enabled) { const { thresholds, watermarks } = unitTestOptions.coverage; // eslint-disable-next-line @typescript-eslint/no-explicit-any const coverageReporter = (options.coverageReporter ??= {}); diff --git a/src/builders/unit-test/runners/karma/executor.js.map b/src/builders/unit-test/runners/karma/executor.js.map index 8326c678..26679e03 100644 --- a/src/builders/unit-test/runners/karma/executor.js.map +++ b/src/builders/unit-test/runners/karma/executor.js.map @@ -1 +1 @@ -{"version":3,"file":"executor.js","sourceRoot":"","sources":["executor.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"executor.js","sourceRoot":"","sources":["executor.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/src/builders/unit-test/runners/vitest/browser-provider.js b/src/builders/unit-test/runners/vitest/browser-provider.js index c5658529..e57134ff 100644 --- a/src/builders/unit-test/runners/vitest/browser-provider.js +++ b/src/builders/unit-test/runners/vitest/browser-provider.js @@ -44,11 +44,14 @@ exports.setupBrowserConfiguration = setupBrowserConfiguration; const node_module_1 = require("node:module"); const error_1 = require("../../../../utils/error"); function findBrowserProvider(projectResolver) { + const requiresPreview = !!process.versions.webcontainer; // One of these must be installed in the project to use browser testing - const vitestBuiltinProviders = ['playwright', 'webdriverio']; + const vitestBuiltinProviders = requiresPreview + ? ['preview'] + : ['playwright', 'webdriverio', 'preview']; for (const providerName of vitestBuiltinProviders) { try { - projectResolver(providerName); + projectResolver(`@vitest/browser-${providerName}`); return providerName; } catch { } @@ -60,7 +63,11 @@ function normalizeBrowserName(browserName) { // e.g., 'ChromeHeadless' -> 'chrome', 'FirefoxHeadless' -> 'firefox' // and 'Chrome' -> 'chrome', 'Firefox' -> 'firefox'. const normalized = browserName.toLowerCase(); - return normalized.replace(/headless$/, ''); + const headless = normalized.endsWith('headless'); + return { + browser: headless ? normalized.slice(0, -8) : normalized, + headless: headless, + }; } async function setupBrowserConfiguration(browsers, debug, projectSourceRoot, viewport) { if (browsers === undefined) { @@ -78,11 +85,24 @@ async function setupBrowserConfiguration(browsers, debug, projectSourceRoot, vie if (providerName) { const providerPackage = `@vitest/browser-${providerName}`; try { - const providerModule = await Promise.resolve(`${providerPackage}`).then(s => __importStar(require(s))); + const providerModule = await Promise.resolve(`${projectResolver(providerPackage)}`).then(s => __importStar(require(s))); // Validate that the imported module has the expected structure const providerFactory = providerModule[providerName]; if (typeof providerFactory === 'function') { - provider = providerFactory(); + if (providerName === 'playwright' && + process.env['CHROME_BIN']?.includes('rules_browsers')) { + // Use the Chrome binary from the 'rules_browsers' toolchain (via CHROME_BIN) + // for Playwright when available to ensure hermetic testing, preventing reliance + // on locally installed or NPM-managed browser versions. + provider = providerFactory({ + launchOptions: { + executablePath: process.env.CHROME_BIN, + }, + }); + } + else { + provider = providerFactory(); + } } else { errors ??= []; @@ -107,16 +127,23 @@ async function setupBrowserConfiguration(browsers, debug, projectSourceRoot, vie return { errors }; } const isCI = !!process.env['CI']; - const headless = isCI || browsers.some((name) => name.toLowerCase().includes('headless')); + const instances = browsers.map(normalizeBrowserName); + if (providerName === 'preview') { + instances.forEach((instance) => { + instance.headless = false; + }); + } + else if (isCI) { + instances.forEach((instance) => { + instance.headless = true; + }); + } const browser = { enabled: true, provider, - headless, - ui: !headless, + ui: !isCI && instances.some((instance) => !instance.headless), viewport, - instances: browsers.map((browserName) => ({ - browser: normalizeBrowserName(browserName), - })), + instances, }; return { browser }; } diff --git a/src/builders/unit-test/runners/vitest/browser-provider.js.map b/src/builders/unit-test/runners/vitest/browser-provider.js.map index a19df92a..2c6994bb 100644 --- a/src/builders/unit-test/runners/vitest/browser-provider.js.map +++ b/src/builders/unit-test/runners/vitest/browser-provider.js.map @@ -1 +1 @@ -{"version":3,"file":"browser-provider.js","sourceRoot":"","sources":["browser-provider.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAqCH,8DA2EC;AA9GD,6CAA4C;AAE5C,mDAAwD;AAOxD,SAAS,mBAAmB,CAC1B,eAAsC;IAEtC,uEAAuE;IACvE,MAAM,sBAAsB,GAAG,CAAC,YAAY,EAAE,aAAa,CAAU,CAAC;IAEtE,KAAK,MAAM,YAAY,IAAI,sBAAsB,EAAE,CAAC;QAClD,IAAI,CAAC;YACH,eAAe,CAAC,YAAY,CAAC,CAAC;YAE9B,OAAO,YAAY,CAAC;QACtB,CAAC;QAAC,MAAM,CAAC,CAAA,CAAC;IACZ,CAAC;IAED,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,SAAS,oBAAoB,CAAC,WAAmB;IAC/C,sGAAsG;IACtG,qEAAqE;IACrE,oDAAoD;IACpD,MAAM,UAAU,GAAG,WAAW,CAAC,WAAW,EAAE,CAAC;IAE7C,OAAO,UAAU,CAAC,OAAO,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC;AAC7C,CAAC;AAEM,KAAK,UAAU,yBAAyB,CAC7C,QAA8B,EAC9B,KAAc,EACd,iBAAyB,EACzB,QAAuD;IAEvD,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;QAC3B,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,MAAM,eAAe,GAAG,IAAA,2BAAa,EAAC,iBAAiB,GAAG,GAAG,CAAC,CAAC,OAAO,CAAC;IACvE,IAAI,MAA4B,CAAC;IAEjC,MAAM,YAAY,GAAG,mBAAmB,CAAC,eAAe,CAAC,CAAC;IAC1D,IAAI,CAAC,YAAY,EAAE,CAAC;QAClB,MAAM,KAAK,EAAE,CAAC;QACd,MAAM,CAAC,IAAI,CACT,yGAAyG;YACvG,mEAAmE,CACtE,CAAC;IACJ,CAAC;IAED,IAAI,QAAiE,CAAC;IACtE,IAAI,YAAY,EAAE,CAAC;QACjB,MAAM,eAAe,GAAG,mBAAmB,YAAY,EAAE,CAAC;QAC1D,IAAI,CAAC;YACH,MAAM,cAAc,GAAG,yBAAa,eAAe,uCAAC,CAAC;YAErD,+DAA+D;YAC/D,MAAM,eAAe,GAAG,cAAc,CAAC,YAAY,CAAC,CAAC;YACrD,IAAI,OAAO,eAAe,KAAK,UAAU,EAAE,CAAC;gBAC1C,QAAQ,GAAG,eAAe,EAAE,CAAC;YAC/B,CAAC;iBAAM,CAAC;gBACN,MAAM,KAAK,EAAE,CAAC;gBACd,MAAM,CAAC,IAAI,CACT,QAAQ,eAAe,0DAA0D,CAClF,CAAC;YACJ,CAAC;QACH,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,IAAA,qBAAa,EAAC,CAAC,CAAC,CAAC;YACjB,MAAM,KAAK,EAAE,CAAC;YACd,wEAAwE;YACxE,IAAI,CAAC,CAAC,IAAI,KAAK,sBAAsB,EAAE,CAAC;gBACtC,MAAM,CAAC,IAAI,CACT,+BAA+B,YAAY,mBAAmB,eAAe,YAAY;oBACvF,0DAA0D,CAC7D,CAAC;YACJ,CAAC;iBAAM,CAAC;gBACN,8CAA8C;gBAC9C,MAAM,CAAC,IAAI,CACT,wCAAwC,eAAe,0BAA0B,CAAC,CAAC,OAAO,EAAE,CAC7F,CAAC;YACJ,CAAC;QACH,CAAC;IACH,CAAC;IAED,IAAI,MAAM,EAAE,CAAC;QACX,OAAO,EAAE,MAAM,EAAE,CAAC;IACpB,CAAC;IAED,MAAM,IAAI,GAAG,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IACjC,MAAM,QAAQ,GAAG,IAAI,IAAI,QAAQ,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC;IAE1F,MAAM,OAAO,GAAG;QACd,OAAO,EAAE,IAAI;QACb,QAAQ;QACR,QAAQ;QACR,EAAE,EAAE,CAAC,QAAQ;QACb,QAAQ;QACR,SAAS,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC;YACxC,OAAO,EAAE,oBAAoB,CAAC,WAAW,CAAC;SAC3C,CAAC,CAAC;KAC2B,CAAC;IAEjC,OAAO,EAAE,OAAO,EAAE,CAAC;AACrB,CAAC"} \ No newline at end of file +{"version":3,"file":"browser-provider.js","sourceRoot":"","sources":["browser-provider.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/src/builders/unit-test/runners/vitest/build-options.js b/src/builders/unit-test/runners/vitest/build-options.js index b99a4d03..6aa3c237 100644 --- a/src/builders/unit-test/runners/vitest/build-options.js +++ b/src/builders/unit-test/runners/vitest/build-options.js @@ -30,18 +30,33 @@ function createTestBedInitVirtualFile(providersFile, projectSourceRoot, polyfill import { NgModule${usesZoneJS ? ', provideZoneChangeDetection' : ''} } from '@angular/core'; import { getTestBed, ɵgetCleanupHook as getCleanupHook } from '@angular/core/testing'; import { BrowserTestingModule, platformBrowserTesting } from '@angular/platform-browser/testing'; + import { afterEach, beforeEach } from 'vitest'; ${providersImport} + + // The beforeEach and afterEach hooks are registered outside the globalThis guard. + // This ensures that the hooks are always applied, even in non-isolated browser environments. // Same as https://github.com/angular/angular/blob/05a03d3f975771bb59c7eefd37c01fa127ee2229/packages/core/testing/srcs/test_hooks.ts#L21-L29 beforeEach(getCleanupHook(false)); afterEach(getCleanupHook(true)); - @NgModule({ - providers: [${usesZoneJS ? 'provideZoneChangeDetection(), ' : ''}...providers], - }) - export class TestModule {} - getTestBed().initTestEnvironment([BrowserTestingModule, TestModule], platformBrowserTesting(), { - errorOnUnknownElements: true, - errorOnUnknownProperties: true, - }); + + const ANGULAR_TESTBED_SETUP = Symbol.for('@angular/cli/testbed-setup'); + if (!globalThis[ANGULAR_TESTBED_SETUP]) { + globalThis[ANGULAR_TESTBED_SETUP] = true; + + // The Angular TestBed needs to be initialized before any tests are run. + // In a non-isolated environment, this setup file can be executed multiple times. + // The guard condition above ensures that the setup is only performed once. + + @NgModule({ + providers: [${usesZoneJS ? 'provideZoneChangeDetection(), ' : ''}...providers], + }) + class TestModule {} + + getTestBed().initTestEnvironment([BrowserTestingModule, TestModule], platformBrowserTesting(), { + errorOnUnknownElements: true, + errorOnUnknownProperties: true, + }); + } `; } function adjustOutputHashing(hashing) { @@ -70,6 +85,11 @@ async function getVitestBuildOptions(options, baseBuildOptions) { removeTestExtension: true, }); entryPoints.set('init-testbed', 'angular:test-bed-init'); + // The 'vitest' package is always external for testing purposes + const externalDependencies = ['vitest']; + if (baseBuildOptions.externalDependencies) { + externalDependencies.push(...baseBuildOptions.externalDependencies); + } const buildOptions = { ...baseBuildOptions, watch, @@ -88,7 +108,10 @@ async function getVitestBuildOptions(options, baseBuildOptions) { outputHashing: adjustOutputHashing(baseBuildOptions.outputHashing), optimization: false, entryPoints, - externalDependencies: ['vitest', '@vitest/browser/context'], + // Enable support for vitest browser prebundling. Excludes can be controlled with a runnerConfig + // and the `optimizeDeps.exclude` option. + externalPackages: true, + externalDependencies, }; buildOptions.polyfills = (0, options_1.injectTestingPolyfills)(buildOptions.polyfills); const testBedInitContents = createTestBedInitVirtualFile(providersFile, projectSourceRoot, buildOptions.polyfills); diff --git a/src/builders/unit-test/runners/vitest/build-options.js.map b/src/builders/unit-test/runners/vitest/build-options.js.map index 732faa51..06cf76e7 100644 --- a/src/builders/unit-test/runners/vitest/build-options.js.map +++ b/src/builders/unit-test/runners/vitest/build-options.js.map @@ -1 +1 @@ -{"version":3,"file":"build-options.js","sourceRoot":"","sources":["build-options.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"build-options.js","sourceRoot":"","sources":["build-options.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/src/builders/unit-test/runners/vitest/configuration.d.ts b/src/builders/unit-test/runners/vitest/configuration.d.ts new file mode 100644 index 00000000..0c04efcb --- /dev/null +++ b/src/builders/unit-test/runners/vitest/configuration.d.ts @@ -0,0 +1,15 @@ +/** + * @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 + */ +/** + * Finds the Vitest configuration file in the given search directories. + * + * @param searchDirs An array of directories to search for the configuration file. + * @returns The path to the configuration file, or `false` if no file is found. + * Returning `false` is used to disable Vitest's default configuration file search. + */ +export declare function findVitestBaseConfig(searchDirs: string[]): Promise; diff --git a/src/builders/unit-test/runners/vitest/configuration.js b/src/builders/unit-test/runners/vitest/configuration.js new file mode 100644 index 00000000..d8e7f0b7 --- /dev/null +++ b/src/builders/unit-test/runners/vitest/configuration.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 + */ +var __importDefault = (this && this.__importDefault) || function (mod) { + return (mod && mod.__esModule) ? mod : { "default": mod }; +}; +Object.defineProperty(exports, "__esModule", { value: true }); +exports.findVitestBaseConfig = findVitestBaseConfig; +/** + * @fileoverview + * This file contains utility functions for finding the Vitest base configuration file. + */ +const promises_1 = require("node:fs/promises"); +const node_path_1 = __importDefault(require("node:path")); +/** + * A list of potential Vitest configuration filenames. + * The order of the files is important as the first one found will be used. + */ +const POTENTIAL_CONFIGS = [ + 'vitest-base.config.ts', + 'vitest-base.config.mts', + 'vitest-base.config.cts', + 'vitest-base.config.js', + 'vitest-base.config.mjs', + 'vitest-base.config.cjs', +]; +/** + * Finds the Vitest configuration file in the given search directories. + * + * @param searchDirs An array of directories to search for the configuration file. + * @returns The path to the configuration file, or `false` if no file is found. + * Returning `false` is used to disable Vitest's default configuration file search. + */ +async function findVitestBaseConfig(searchDirs) { + const uniqueDirs = new Set(searchDirs); + for (const dir of uniqueDirs) { + try { + const entries = await (0, promises_1.readdir)(dir, { withFileTypes: true }); + const files = new Set(entries.filter((e) => e.isFile()).map((e) => e.name)); + for (const potential of POTENTIAL_CONFIGS) { + if (files.has(potential)) { + return node_path_1.default.join(dir, potential); + } + } + } + catch { + // Ignore directories that cannot be read + } + } + return false; +} +//# sourceMappingURL=configuration.js.map \ No newline at end of file diff --git a/src/builders/unit-test/runners/vitest/configuration.js.map b/src/builders/unit-test/runners/vitest/configuration.js.map new file mode 100644 index 00000000..c3896441 --- /dev/null +++ b/src/builders/unit-test/runners/vitest/configuration.js.map @@ -0,0 +1 @@ +{"version":3,"file":"configuration.js","sourceRoot":"","sources":["configuration.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;;;AA8BH,oDAkBC;AA9CD;;;GAGG;AAEH,+CAA2C;AAC3C,0DAA6B;AAE7B;;;GAGG;AACH,MAAM,iBAAiB,GAAG;IACxB,uBAAuB;IACvB,wBAAwB;IACxB,wBAAwB;IACxB,uBAAuB;IACvB,wBAAwB;IACxB,wBAAwB;CACzB,CAAC;AAEF;;;;;;GAMG;AACI,KAAK,UAAU,oBAAoB,CAAC,UAAoB;IAC7D,MAAM,UAAU,GAAG,IAAI,GAAG,CAAC,UAAU,CAAC,CAAC;IACvC,KAAK,MAAM,GAAG,IAAI,UAAU,EAAE,CAAC;QAC7B,IAAI,CAAC;YACH,MAAM,OAAO,GAAG,MAAM,IAAA,kBAAO,EAAC,GAAG,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC;YAC5D,MAAM,KAAK,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;YAE5E,KAAK,MAAM,SAAS,IAAI,iBAAiB,EAAE,CAAC;gBAC1C,IAAI,KAAK,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC;oBACzB,OAAO,mBAAI,CAAC,IAAI,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;gBACnC,CAAC;YACH,CAAC;QACH,CAAC;QAAC,MAAM,CAAC;YACP,yCAAyC;QAC3C,CAAC;IACH,CAAC;IAED,OAAO,KAAK,CAAC;AACf,CAAC"} \ No newline at end of file diff --git a/src/builders/unit-test/runners/vitest/executor.d.ts b/src/builders/unit-test/runners/vitest/executor.d.ts index 4549e88a..7d655006 100644 --- a/src/builders/unit-test/runners/vitest/executor.d.ts +++ b/src/builders/unit-test/runners/vitest/executor.d.ts @@ -15,6 +15,7 @@ export declare class VitestExecutor implements TestExecutor { private readonly projectName; private readonly options; private readonly buildResultFiles; + private readonly externalMetadata; private readonly testFileToEntryPoint; private readonly entryPointToTestFile; constructor(projectName: string, options: NormalizedUnitTestBuilderOptions, testEntryPointMappings: Map | undefined); diff --git a/src/builders/unit-test/runners/vitest/executor.js b/src/builders/unit-test/runners/vitest/executor.js index 0dd85d01..d2307679 100644 --- a/src/builders/unit-test/runners/vitest/executor.js +++ b/src/builders/unit-test/runners/vitest/executor.js @@ -46,10 +46,11 @@ Object.defineProperty(exports, "__esModule", { value: true }); exports.VitestExecutor = void 0; const node_assert_1 = __importDefault(require("node:assert")); const node_path_1 = __importDefault(require("node:path")); +const utils_1 = require("../../../../tools/vite/utils"); const error_1 = require("../../../../utils/error"); -const path_1 = require("../../../../utils/path"); const results_1 = require("../../../application/results"); const browser_provider_1 = require("./browser-provider"); +const configuration_1 = require("./configuration"); const plugins_1 = require("./plugins"); class VitestExecutor { vitest; @@ -57,6 +58,12 @@ class VitestExecutor { projectName; options; buildResultFiles = new Map(); + externalMetadata = { + implicitBrowser: [], + implicitServer: [], + explicitBrowser: [], + explicitServer: [], + }; // This is a reverse map of the entry points created in `build-options.ts`. // It is used by the in-memory provider plugin to map the requested test file // path back to its bundled output path. @@ -89,6 +96,7 @@ class VitestExecutor { this.buildResultFiles.set(this.normalizePath(path), file); } } + (0, utils_1.updateExternalMetadata)(buildResult, this.externalMetadata, undefined, true); // Initialize Vitest if not already present. this.vitest ??= await this.initializeVitest(); const vitest = this.vitest; @@ -103,7 +111,7 @@ class VitestExecutor { if (source) { modifiedSourceFiles.add(source); } - vitest.invalidateFile((0, path_1.toPosixPath)(node_path_1.default.join(this.options.workspaceRoot, modifiedFile))); + vitest.invalidateFile(this.normalizePath(node_path_1.default.join(this.options.workspaceRoot, modifiedFile))); } const specsToRerun = []; for (const file of modifiedSourceFiles) { @@ -135,7 +143,8 @@ class VitestExecutor { return testSetupFiles; } async initializeVitest() { - const { coverage, reporters, outputFile, workspaceRoot, browsers, debug, watch, browserViewport, } = this.options; + const { coverage, reporters, outputFile, workspaceRoot, browsers, debug, watch, browserViewport, ui, projectRoot, runnerConfig, projectSourceRoot, cacheOptions, } = this.options; + const projectName = this.projectName; let vitestNodeModule; try { vitestNodeModule = await Promise.resolve().then(() => __importStar(require('vitest/node'))); @@ -149,18 +158,16 @@ class VitestExecutor { } const { startVitest } = vitestNodeModule; // Setup vitest browser options if configured - const browserOptions = await (0, browser_provider_1.setupBrowserConfiguration)(browsers, debug, this.options.projectSourceRoot, browserViewport); + const browserOptions = await (0, browser_provider_1.setupBrowserConfiguration)(browsers, debug, projectSourceRoot, browserViewport); if (browserOptions.errors?.length) { throw new Error(browserOptions.errors.join('\n')); } (0, node_assert_1.default)(this.buildResultFiles.size > 0, 'buildResult must be available before initializing vitest'); const testSetupFiles = this.prepareSetupFiles(); - const plugins = (0, plugins_1.createVitestPlugins)(this.options, testSetupFiles, browserOptions, { + const projectPlugins = (0, plugins_1.createVitestPlugins)({ workspaceRoot, - projectSourceRoot: this.options.projectSourceRoot, - projectName: this.projectName, - include: this.options.include, - exclude: this.options.exclude, + projectSourceRoot, + projectName, buildResultFiles: this.buildResultFiles, testFileToEntryPoint: this.testFileToEntryPoint, }); @@ -171,65 +178,44 @@ class VitestExecutor { fileParallelism: false, } : {}; + const externalConfigPath = runnerConfig === true + ? await (0, configuration_1.findVitestBaseConfig)([projectRoot, workspaceRoot]) + : runnerConfig; return startVitest('test', undefined, { - // Disable configuration file resolution/loading - config: false, + config: externalConfigPath, root: workspaceRoot, - project: ['base', this.projectName], - name: 'base', - include: [], - testNamePattern: this.options.filter, - reporters: reporters ?? ['default'], + project: projectName, outputFile, + cache: cacheOptions.enabled ? undefined : false, + testNamePattern: this.options.filter, watch, - coverage: await generateCoverageOption(coverage, this.projectName), + ui, ...debugOptions, }, { + // Note `.vitest` is auto appended to the path. + cacheDir: cacheOptions.path, server: { // Disable the actual file watcher. The boolean watch option above should still // be enabled as it controls other internal behavior related to rerunning tests. watch: null, }, - plugins, + plugins: [ + await (0, plugins_1.createVitestConfigPlugin)({ + browser: browserOptions.browser, + coverage, + projectName, + projectSourceRoot, + optimizeDepsInclude: this.externalMetadata.implicitBrowser, + reporters, + setupFiles: testSetupFiles, + projectPlugins, + include: [...this.testFileToEntryPoint.keys()].filter( + // Filter internal entries + (entry) => !entry.startsWith('angular:')), + }), + ], }); } } exports.VitestExecutor = VitestExecutor; -async function generateCoverageOption(coverage, projectName) { - if (!coverage) { - return { - enabled: false, - }; - } - let defaultExcludes = []; - if (coverage.exclude) { - try { - const vitestConfig = await Promise.resolve().then(() => __importStar(require('vitest/config'))); - defaultExcludes = vitestConfig.coverageConfigDefaults.exclude; - } - catch { } - } - return { - enabled: true, - excludeAfterRemap: true, - include: coverage.include, - reportsDirectory: (0, path_1.toPosixPath)(node_path_1.default.join('coverage', projectName)), - thresholds: coverage.thresholds, - watermarks: coverage.watermarks, - // Special handling for `exclude`/`reporters` due to an undefined value causing upstream failures - ...(coverage.exclude - ? { - exclude: [ - // Augment the default exclude https://vitest.dev/config/#coverage-exclude - // with the user defined exclusions - ...coverage.exclude, - ...defaultExcludes, - ], - } - : {}), - ...(coverage.reporters - ? { reporter: coverage.reporters } - : {}), - }; -} //# sourceMappingURL=executor.js.map \ No newline at end of file diff --git a/src/builders/unit-test/runners/vitest/executor.js.map b/src/builders/unit-test/runners/vitest/executor.js.map index 70374fc6..f60db435 100644 --- a/src/builders/unit-test/runners/vitest/executor.js.map +++ b/src/builders/unit-test/runners/vitest/executor.js.map @@ -1 +1 @@ -{"version":3,"file":"executor.js","sourceRoot":"","sources":["executor.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"executor.js","sourceRoot":"","sources":["executor.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/src/builders/unit-test/runners/vitest/index.js b/src/builders/unit-test/runners/vitest/index.js index 035fdef4..e2d7c870 100644 --- a/src/builders/unit-test/runners/vitest/index.js +++ b/src/builders/unit-test/runners/vitest/index.js @@ -23,13 +23,19 @@ const VitestTestRunner = { const checker = new dependency_checker_1.DependencyChecker(options.projectSourceRoot); checker.check('vitest'); if (options.browsers?.length) { - checker.checkAny(['playwright', 'webdriverio'], 'The "browsers" option requires either "playwright" or "webdriverio" to be installed.'); + if (process.versions.webcontainer) { + checker.check('@vitest/browser-preview'); + } + else { + checker.checkAny(['@vitest/browser-playwright', '@vitest/browser-webdriverio', '@vitest/browser-preview'], 'The "browsers" option requires either ' + + '"@vitest/browser-playwright", "@vitest/browser-webdriverio", or "@vitest/browser-preview" to be installed.'); + } } else { - // JSDOM is used when no browsers are specified - checker.check('jsdom'); + // DOM emulation is used when no browsers are specified + checker.checkAny(['jsdom', 'happy-dom'], 'A DOM environment is required for non-browser tests. Please install either "jsdom" or "happy-dom".'); } - if (options.coverage) { + if (options.coverage.enabled) { checker.check('@vitest/coverage-v8'); } checker.report(); @@ -40,6 +46,15 @@ const VitestTestRunner = { async createExecutor(context, options, testEntryPointMappings) { const projectName = context.target?.project; (0, node_assert_1.default)(projectName, 'The builder requires a target.'); + if (!!process.versions.webcontainer && options.browsers?.length) { + context.logger.info(`Webcontainer environment detected. Using '@vitest/browser-preview' for browser-based tests.`); + } + if (typeof options.runnerConfig === 'string') { + context.logger.info(`Using Vitest configuration file: ${options.runnerConfig}`); + } + else if (options.runnerConfig) { + context.logger.info('Automatically searching for and using Vitest configuration file.'); + } return new executor_1.VitestExecutor(projectName, options, testEntryPointMappings); }, }; diff --git a/src/builders/unit-test/runners/vitest/index.js.map b/src/builders/unit-test/runners/vitest/index.js.map index 46d6c46d..53530b91 100644 --- a/src/builders/unit-test/runners/vitest/index.js.map +++ b/src/builders/unit-test/runners/vitest/index.js.map @@ -1 +1 @@ -{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;;;AAEH,8DAAiC;AAEjC,8DAA0D;AAC1D,mDAAwD;AACxD,yCAA4C;AAE5C;;GAEG;AACH,MAAM,gBAAgB,GAAe;IACnC,IAAI,EAAE,QAAQ;IAEd,oBAAoB,CAAC,OAAO;QAC1B,MAAM,OAAO,GAAG,IAAI,sCAAiB,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC;QACjE,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;QAExB,IAAI,OAAO,CAAC,QAAQ,EAAE,MAAM,EAAE,CAAC;YAC7B,OAAO,CAAC,QAAQ,CACd,CAAC,YAAY,EAAE,aAAa,CAAC,EAC7B,sFAAsF,CACvF,CAAC;QACJ,CAAC;aAAM,CAAC;YACN,+CAA+C;YAC/C,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QACzB,CAAC;QAED,IAAI,OAAO,CAAC,QAAQ,EAAE,CAAC;YACrB,OAAO,CAAC,KAAK,CAAC,qBAAqB,CAAC,CAAC;QACvC,CAAC;QAED,OAAO,CAAC,MAAM,EAAE,CAAC;IACnB,CAAC;IAED,eAAe,CAAC,OAAO,EAAE,gBAAgB;QACvC,OAAO,IAAA,qCAAqB,EAAC,OAAO,EAAE,gBAAgB,CAAC,CAAC;IAC1D,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,OAAO,EAAE,OAAO,EAAE,sBAAsB;QAC3D,MAAM,WAAW,GAAG,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC;QAC5C,IAAA,qBAAM,EAAC,WAAW,EAAE,gCAAgC,CAAC,CAAC;QAEtD,OAAO,IAAI,yBAAc,CAAC,WAAW,EAAE,OAAO,EAAE,sBAAsB,CAAC,CAAC;IAC1E,CAAC;CACF,CAAC;AAEF,kBAAe,gBAAgB,CAAC"} \ No newline at end of file +{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;;;AAEH,8DAAiC;AAEjC,8DAA0D;AAC1D,mDAAwD;AACxD,yCAA4C;AAE5C;;GAEG;AACH,MAAM,gBAAgB,GAAe;IACnC,IAAI,EAAE,QAAQ;IAEd,oBAAoB,CAAC,OAAO;QAC1B,MAAM,OAAO,GAAG,IAAI,sCAAiB,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC;QACjE,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;QAExB,IAAI,OAAO,CAAC,QAAQ,EAAE,MAAM,EAAE,CAAC;YAC7B,IAAI,OAAO,CAAC,QAAQ,CAAC,YAAY,EAAE,CAAC;gBAClC,OAAO,CAAC,KAAK,CAAC,yBAAyB,CAAC,CAAC;YAC3C,CAAC;iBAAM,CAAC;gBACN,OAAO,CAAC,QAAQ,CACd,CAAC,4BAA4B,EAAE,6BAA6B,EAAE,yBAAyB,CAAC,EACxF,wCAAwC;oBACtC,4GAA4G,CAC/G,CAAC;YACJ,CAAC;QACH,CAAC;aAAM,CAAC;YACN,uDAAuD;YACvD,OAAO,CAAC,QAAQ,CACd,CAAC,OAAO,EAAE,WAAW,CAAC,EACtB,oGAAoG,CACrG,CAAC;QACJ,CAAC;QAED,IAAI,OAAO,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC;YAC7B,OAAO,CAAC,KAAK,CAAC,qBAAqB,CAAC,CAAC;QACvC,CAAC;QAED,OAAO,CAAC,MAAM,EAAE,CAAC;IACnB,CAAC;IAED,eAAe,CAAC,OAAO,EAAE,gBAAgB;QACvC,OAAO,IAAA,qCAAqB,EAAC,OAAO,EAAE,gBAAgB,CAAC,CAAC;IAC1D,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,OAAO,EAAE,OAAO,EAAE,sBAAsB;QAC3D,MAAM,WAAW,GAAG,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC;QAC5C,IAAA,qBAAM,EAAC,WAAW,EAAE,gCAAgC,CAAC,CAAC;QAEtD,IAAI,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,YAAY,IAAI,OAAO,CAAC,QAAQ,EAAE,MAAM,EAAE,CAAC;YAChE,OAAO,CAAC,MAAM,CAAC,IAAI,CACjB,6FAA6F,CAC9F,CAAC;QACJ,CAAC;QAED,IAAI,OAAO,OAAO,CAAC,YAAY,KAAK,QAAQ,EAAE,CAAC;YAC7C,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,oCAAoC,OAAO,CAAC,YAAY,EAAE,CAAC,CAAC;QAClF,CAAC;aAAM,IAAI,OAAO,CAAC,YAAY,EAAE,CAAC;YAChC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,kEAAkE,CAAC,CAAC;QAC1F,CAAC;QAED,OAAO,IAAI,yBAAc,CAAC,WAAW,EAAE,OAAO,EAAE,sBAAsB,CAAC,CAAC;IAC1E,CAAC;CACF,CAAC;AAEF,kBAAe,gBAAgB,CAAC"} \ No newline at end of file diff --git a/src/builders/unit-test/runners/vitest/plugins.d.ts b/src/builders/unit-test/runners/vitest/plugins.d.ts index c3a4cd6d..8aa64f52 100644 --- a/src/builders/unit-test/runners/vitest/plugins.d.ts +++ b/src/builders/unit-test/runners/vitest/plugins.d.ts @@ -5,19 +5,28 @@ * 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 { VitestPlugin } from 'vitest/node'; +import type { BrowserConfigOptions, UserWorkspaceConfig, VitestPlugin } from 'vitest/node'; import type { ResultFile } from '../../../application/results'; import type { NormalizedUnitTestBuilderOptions } from '../../options'; -import type { BrowserConfiguration } from './browser-provider'; type VitestPlugins = Awaited>; interface PluginOptions { workspaceRoot: string; projectSourceRoot: string; projectName: string; - include?: string[]; - exclude?: string[]; buildResultFiles: ReadonlyMap; testFileToEntryPoint: ReadonlyMap; } -export declare function createVitestPlugins(options: NormalizedUnitTestBuilderOptions, testSetupFiles: string[], browserOptions: BrowserConfiguration, pluginOptions: PluginOptions): VitestPlugins; +interface VitestConfigPluginOptions { + browser: BrowserConfigOptions | undefined; + coverage: NormalizedUnitTestBuilderOptions['coverage']; + projectName: string; + projectSourceRoot: string; + reporters?: string[] | [string, object][]; + setupFiles: string[]; + projectPlugins: Exclude; + include: string[]; + optimizeDepsInclude: string[]; +} +export declare function createVitestConfigPlugin(options: VitestConfigPluginOptions): Promise; +export declare function createVitestPlugins(pluginOptions: PluginOptions): VitestPlugins; export {}; diff --git a/src/builders/unit-test/runners/vitest/plugins.js b/src/builders/unit-test/runners/vitest/plugins.js index fd491941..545daaa9 100644 --- a/src/builders/unit-test/runners/vitest/plugins.js +++ b/src/builders/unit-test/runners/vitest/plugins.js @@ -6,127 +6,298 @@ * 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 */ +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __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.createVitestConfigPlugin = createVitestConfigPlugin; exports.createVitestPlugins = createVitestPlugins; const node_assert_1 = __importDefault(require("node:assert")); const promises_1 = require("node:fs/promises"); +const node_module_1 = require("node:module"); +const node_os_1 = require("node:os"); const node_path_1 = __importDefault(require("node:path")); const assets_middleware_1 = require("../../../../tools/vite/middlewares/assets-middleware"); const path_1 = require("../../../../utils/path"); -function createVitestPlugins(options, testSetupFiles, browserOptions, pluginOptions) { - const { workspaceRoot, projectName, buildResultFiles, testFileToEntryPoint } = pluginOptions; +async function findTestEnvironment(projectResolver) { + try { + projectResolver('happy-dom'); + return 'happy-dom'; + } + catch { + // happy-dom is not installed, fallback to jsdom + return 'jsdom'; + } +} +async function createVitestConfigPlugin(options) { + const { include, browser, projectName, reporters, setupFiles, projectPlugins, projectSourceRoot, } = options; + const { mergeConfig } = await Promise.resolve().then(() => __importStar(require('vitest/config'))); + return { + name: 'angular:vitest-configuration', + async config(config) { + const testConfig = config.test; + if (testConfig?.projects?.length) { + this.warn('The "test.projects" option in the Vitest configuration file is not supported. ' + + 'The Angular CLI Test system will construct its own project configuration.'); + delete testConfig.projects; + } + if (testConfig?.include) { + this.warn('The "test.include" option in the Vitest configuration file is not supported. ' + + 'The Angular CLI Test system will manage test file discovery.'); + delete testConfig.include; + } + // Merge user-defined plugins from the Vitest config with the CLI's internal plugins. + if (config.plugins) { + const userPlugins = config.plugins.filter((plugin) => + // Only inspect objects with a `name` property as these would be the internal injected plugins + !plugin || + typeof plugin !== 'object' || + !('name' in plugin) || + (!plugin.name.startsWith('angular:') && !plugin.name.startsWith('vitest'))); + if (userPlugins.length > 0) { + projectPlugins.push(...userPlugins); + } + delete config.plugins; + } + const projectResolver = (0, node_module_1.createRequire)(projectSourceRoot + '/').resolve; + const projectDefaults = { + test: { + setupFiles, + globals: true, + // Default to `false` to align with the Karma/Jasmine experience. + isolate: false, + sequence: { setupFiles: 'list' }, + }, + optimizeDeps: { + noDiscovery: true, + include: options.optimizeDepsInclude, + }, + resolve: { + mainFields: ['es2020', 'module', 'main'], + conditions: ['es2015', 'es2020', 'module', ...(browser ? ['browser'] : [])], + }, + }; + const { optimizeDeps, resolve } = config; + const projectOverrides = { + test: { + name: projectName, + include, + // CLI provider browser options override, if present + ...(browser ? { browser } : {}), + // If the user has not specified an environment, use a smart default. + ...(!testConfig?.environment + ? { environment: await findTestEnvironment(projectResolver) } + : {}), + }, + plugins: projectPlugins, + optimizeDeps, + resolve, + }; + const projectBase = mergeConfig(projectDefaults, testConfig ? { test: testConfig } : {}); + const projectConfig = mergeConfig(projectBase, projectOverrides); + return { + test: { + coverage: await generateCoverageOption(options.coverage, testConfig?.coverage, projectName), + // eslint-disable-next-line @typescript-eslint/no-explicit-any + ...(reporters ? { reporters } : {}), + projects: [projectConfig], + }, + }; + }, + }; +} +async function loadResultFile(file) { + if (file.origin === 'memory') { + return new TextDecoder('utf-8').decode(file.contents); + } + return (0, promises_1.readFile)(file.inputPath, 'utf-8'); +} +function createVitestPlugins(pluginOptions) { + const { workspaceRoot, buildResultFiles, testFileToEntryPoint } = pluginOptions; + const isWindows = (0, node_os_1.platform)() === 'win32'; return [ { - name: 'angular:project-init', - // Type is incorrect. This allows a Promise. - // eslint-disable-next-line @typescript-eslint/no-misused-promises - configureVitest: async (context) => { - // Create a subproject that can be configured with plugins for browser mode. - // Plugins defined directly in the vite overrides will not be present in the - // browser specific Vite instance. - await context.injectTestProjects({ - test: { - name: projectName, - root: workspaceRoot, - globals: true, - setupFiles: testSetupFiles, - // Use `jsdom` if no browsers are explicitly configured. - // `node` is effectively no "environment" and the default. - environment: browserOptions.browser ? 'node' : 'jsdom', - browser: browserOptions.browser, - include: options.include, - ...(options.exclude ? { exclude: options.exclude } : {}), - }, - plugins: [ - { - name: 'angular:test-in-memory-provider', - enforce: 'pre', - resolveId: (id, importer) => { - if (importer && (id[0] === '.' || id[0] === '/')) { - let fullPath; - if (testFileToEntryPoint.has(importer)) { - fullPath = (0, path_1.toPosixPath)(node_path_1.default.join(workspaceRoot, id)); - } - else { - fullPath = (0, path_1.toPosixPath)(node_path_1.default.join(node_path_1.default.dirname(importer), id)); - } - const relativePath = node_path_1.default.relative(workspaceRoot, fullPath); - if (buildResultFiles.has((0, path_1.toPosixPath)(relativePath))) { - return fullPath; - } - } - if (testFileToEntryPoint.has(id)) { - return id; - } - (0, node_assert_1.default)(buildResultFiles.size > 0, 'buildResult must be available for resolving.'); - const relativePath = node_path_1.default.relative(workspaceRoot, id); - if (buildResultFiles.has((0, path_1.toPosixPath)(relativePath))) { - return id; - } - }, - load: async (id) => { - (0, node_assert_1.default)(buildResultFiles.size > 0, 'buildResult must be available for in-memory loading.'); - // Attempt to load as a source test file. - const entryPoint = testFileToEntryPoint.get(id); - let outputPath; - if (entryPoint) { - outputPath = entryPoint + '.js'; - // To support coverage exclusion of the actual test file, the virtual - // test entry point only references the built and bundled intermediate file. - return { - code: `import "./${outputPath}";`, - }; - } - else { - // Attempt to load as a built artifact. - const relativePath = node_path_1.default.relative(workspaceRoot, id); - outputPath = (0, path_1.toPosixPath)(relativePath); - } - const outputFile = buildResultFiles.get(outputPath); - if (outputFile) { - const sourceMapPath = outputPath + '.map'; - const sourceMapFile = buildResultFiles.get(sourceMapPath); - const code = outputFile.origin === 'memory' - ? Buffer.from(outputFile.contents).toString('utf-8') - : await (0, promises_1.readFile)(outputFile.inputPath, 'utf-8'); - const map = sourceMapFile - ? sourceMapFile.origin === 'memory' - ? Buffer.from(sourceMapFile.contents).toString('utf-8') - : await (0, promises_1.readFile)(sourceMapFile.inputPath, 'utf-8') - : undefined; - return { - code, - map: map ? JSON.parse(map) : undefined, - }; - } - }, - configureServer: (server) => { - server.middlewares.use((0, assets_middleware_1.createBuildAssetsMiddleware)(server.config.base, buildResultFiles)); - }, - }, + name: 'angular:test-in-memory-provider', + enforce: 'pre', + resolveId: (id, importer) => { + // Fast path for test entry points. + if (testFileToEntryPoint.has(id)) { + return id; + } + // Workaround for Vitest in Windows when a fully qualified absolute path is provided with + // a superfluous leading slash. This can currently occur with the `@vitest/coverage-v8` provider + // when it uses `removeStartsWith(url, FILE_PROTOCOL)` to convert a file URL resulting in + // `/D:/tmp_dir/...` instead of `D:/tmp_dir/...`. + if (id[0] === '/' && isWindows) { + const slicedId = id.slice(1); + if (node_path_1.default.isAbsolute(slicedId)) { + return slicedId; + } + } + if (importer && (id[0] === '.' || id[0] === '/')) { + let fullPath; + if (testFileToEntryPoint.has(importer)) { + fullPath = (0, path_1.toPosixPath)(node_path_1.default.join(workspaceRoot, id)); + } + else { + fullPath = (0, path_1.toPosixPath)(node_path_1.default.join(node_path_1.default.dirname(importer), id)); + } + const relativePath = node_path_1.default.relative(workspaceRoot, fullPath); + if (buildResultFiles.has((0, path_1.toPosixPath)(relativePath))) { + return fullPath; + } + } + // Determine the base directory for resolution. + let baseDir; + if (importer) { + // If the importer is a test entry point, resolve relative to the workspace root. + // Otherwise, resolve relative to the importer's directory. + baseDir = testFileToEntryPoint.has(importer) ? workspaceRoot : node_path_1.default.dirname(importer); + } + else { + // If there's no importer, assume the id is relative to the workspace root. + baseDir = workspaceRoot; + } + // Construct the full, absolute path and normalize it to POSIX format. + const fullPath = (0, path_1.toPosixPath)(node_path_1.default.join(baseDir, id)); + // Check if the resolved path corresponds to a known build artifact. + const relativePath = node_path_1.default.relative(workspaceRoot, fullPath); + if (buildResultFiles.has((0, path_1.toPosixPath)(relativePath))) { + return fullPath; + } + // If the module cannot be resolved from the build artifacts, let other plugins handle it. + return undefined; + }, + load: async (id) => { + (0, node_assert_1.default)(buildResultFiles.size > 0, 'buildResult must be available for in-memory loading.'); + // Attempt to load as a source test file. + const entryPoint = testFileToEntryPoint.get(id); + let outputPath; + if (entryPoint) { + outputPath = entryPoint + '.js'; + // To support coverage exclusion of the actual test file, the virtual + // test entry point only references the built and bundled intermediate file. + return { + code: `import "./${outputPath}";`, + }; + } + else { + // Attempt to load as a built artifact. + const relativePath = node_path_1.default.relative(workspaceRoot, id); + outputPath = (0, path_1.toPosixPath)(relativePath); + } + const outputFile = buildResultFiles.get(outputPath); + if (outputFile) { + const code = await loadResultFile(outputFile); + const sourceMapPath = outputPath + '.map'; + const sourceMapFile = buildResultFiles.get(sourceMapPath); + const sourceMapText = sourceMapFile ? await loadResultFile(sourceMapFile) : undefined; + // Vitest will include files in the coverage report if the sourcemap contains no sources. + // For builder-internal generated code chunks, which are typically helper functions, + // a virtual source is added to the sourcemap to prevent them from being incorrectly + // included in the final coverage report. + const map = sourceMapText ? JSON.parse(sourceMapText) : undefined; + if (map) { + if (!map.sources?.length && !map.sourcesContent?.length && !map.mappings) { + map.sources = ['virtual:builder']; + } + } + return { + code, + map, + }; + } + }, + configureServer: (server) => { + server.middlewares.use((0, assets_middleware_1.createBuildAssetsMiddleware)(server.config.base, buildResultFiles)); + }, + }, + { + name: 'angular:html-index', + transformIndexHtml: () => { + // Add all global stylesheets + if (buildResultFiles.has('styles.css')) { + return [ { - name: 'angular:html-index', - transformIndexHtml: () => { - // Add all global stylesheets - if (buildResultFiles.has('styles.css')) { - return [ - { - tag: 'link', - attrs: { href: 'styles.css', rel: 'stylesheet' }, - injectTo: 'head', - }, - ]; - } - return []; - }, + tag: 'link', + attrs: { href: 'styles.css', rel: 'stylesheet' }, + injectTo: 'head', }, - ], - }); + ]; + } + return []; }, }, ]; } +async function generateCoverageOption(optionsCoverage, configCoverage, projectName) { + let defaultExcludes = []; + if (optionsCoverage.exclude) { + try { + const vitestConfig = await Promise.resolve().then(() => __importStar(require('vitest/config'))); + defaultExcludes = vitestConfig.coverageConfigDefaults.exclude; + } + catch { } + } + return { + excludeAfterRemap: true, + reportsDirectory: configCoverage?.reportsDirectory ?? (0, path_1.toPosixPath)(node_path_1.default.join('coverage', projectName)), + ...(optionsCoverage.enabled !== undefined ? { enabled: optionsCoverage.enabled } : {}), + // Vitest performs a pre-check and a post-check for sourcemaps. + // The pre-check uses the bundled files, so specific bundled entry points and chunks need to be included. + // The post-check uses the original source files, so the user's include is used. + ...(optionsCoverage.include + ? { include: ['spec-*.js', 'chunk-*.js', ...optionsCoverage.include] } + : {}), + thresholds: optionsCoverage.thresholds, + watermarks: optionsCoverage.watermarks, + // Special handling for `exclude`/`reporters` due to an undefined value causing upstream failures + ...(optionsCoverage.exclude + ? { + exclude: [ + // Augment the default exclude https://vitest.dev/config/#coverage-exclude + // with the user defined exclusions + ...optionsCoverage.exclude, + ...defaultExcludes, + ], + } + : {}), + ...(optionsCoverage.reporters + ? { reporter: optionsCoverage.reporters } + : {}), + }; +} //# sourceMappingURL=plugins.js.map \ No newline at end of file diff --git a/src/builders/unit-test/runners/vitest/plugins.js.map b/src/builders/unit-test/runners/vitest/plugins.js.map index c9694380..be4af76d 100644 --- a/src/builders/unit-test/runners/vitest/plugins.js.map +++ b/src/builders/unit-test/runners/vitest/plugins.js.map @@ -1 +1 @@ -{"version":3,"file":"plugins.js","sourceRoot":"","sources":["plugins.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"plugins.js","sourceRoot":"","sources":["plugins.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/src/builders/unit-test/schema.d.ts b/src/builders/unit-test/schema.d.ts index 2ce824fe..632ca5f5 100644 --- a/src/builders/unit-test/schema.d.ts +++ b/src/builders/unit-test/schema.d.ts @@ -106,6 +106,16 @@ export type Schema = { * Specifies the test runner to use for test execution. */ runner?: Runner; + /** + * Specifies the configuration file for the selected test runner. If a string is provided, + * it will be used as the path to the configuration file. If `true`, the builder will search + * for a default configuration file (e.g., `vitest.config.ts` or `karma.conf.js`). If + * `false`, no external configuration file will be used.\nFor Vitest, this enables advanced + * options and the use of custom plugins. Please note that while the file is loaded, the + * Angular team does not provide direct support for its specific contents or any third-party + * plugins used within it. + */ + runnerConfig?: RunnerConfig; /** * A list of paths to global setup files that are executed before the test files. The * application's polyfills and the Angular TestBed are always initialized before these files. @@ -117,6 +127,11 @@ export type Schema = { * default does not exist, the `tsConfig` from the specified `buildTarget` will be used. */ tsConfig?: string; + /** + * Enables the Vitest UI for interactive test execution. This option is only available for + * the Vitest runner. + */ + ui?: boolean; /** * Enables watch mode, which re-runs tests when source files change. Defaults to `true` in * TTY environments and `false` otherwise. @@ -196,3 +211,13 @@ export declare enum Runner { Karma = "karma", Vitest = "vitest" } +/** + * Specifies the configuration file for the selected test runner. If a string is provided, + * it will be used as the path to the configuration file. If `true`, the builder will search + * for a default configuration file (e.g., `vitest.config.ts` or `karma.conf.js`). If + * `false`, no external configuration file will be used.\nFor Vitest, this enables advanced + * options and the use of custom plugins. Please note that while the file is loaded, the + * Angular team does not provide direct support for its specific contents or any third-party + * plugins used within it. + */ +export type RunnerConfig = boolean | string; diff --git a/src/builders/unit-test/schema.js.map b/src/builders/unit-test/schema.js.map index 717e85dd..8051b4df 100644 --- a/src/builders/unit-test/schema.js.map +++ b/src/builders/unit-test/schema.js.map @@ -1 +1 @@ -{"version":3,"file":"schema.js","sourceRoot":"","sources":["schema.ts"],"names":[],"mappings":";AACA,mFAAmF;AACnF,oFAAoF;;;AAoIpF,IAAY,oBASX;AATD,WAAY,oBAAoB;IAC5B,+CAAuB,CAAA;IACvB,qCAAa,CAAA;IACb,qCAAa,CAAA;IACb,oDAA4B,CAAA;IAC5B,qCAAa,CAAA;IACb,6CAAqB,CAAA;IACrB,qCAAa,CAAA;IACb,oDAA4B,CAAA;AAChC,CAAC,EATW,oBAAoB,oCAApB,oBAAoB,QAS/B;AAwDD;;GAEG;AACH,IAAY,MAGX;AAHD,WAAY,MAAM;IACd,yBAAe,CAAA;IACf,2BAAiB,CAAA;AACrB,CAAC,EAHW,MAAM,sBAAN,MAAM,QAGjB"} \ No newline at end of file +{"version":3,"file":"schema.js","sourceRoot":"","sources":["schema.ts"],"names":[],"mappings":";AACA,mFAAmF;AACnF,oFAAoF;;;AAmJpF,IAAY,oBASX;AATD,WAAY,oBAAoB;IAC5B,+CAAuB,CAAA;IACvB,qCAAa,CAAA;IACb,qCAAa,CAAA;IACb,oDAA4B,CAAA;IAC5B,qCAAa,CAAA;IACb,6CAAqB,CAAA;IACrB,qCAAa,CAAA;IACb,oDAA4B,CAAA;AAChC,CAAC,EATW,oBAAoB,oCAApB,oBAAoB,QAS/B;AAwDD;;GAEG;AACH,IAAY,MAGX;AAHD,WAAY,MAAM;IACd,yBAAe,CAAA;IACf,2BAAiB,CAAA;AACrB,CAAC,EAHW,MAAM,sBAAN,MAAM,QAGjB"} \ No newline at end of file diff --git a/src/builders/unit-test/schema.json b/src/builders/unit-test/schema.json index d3ae766d..3b92d31a 100644 --- a/src/builders/unit-test/schema.json +++ b/src/builders/unit-test/schema.json @@ -19,6 +19,11 @@ "default": "vitest", "enum": ["karma", "vitest"] }, + "runnerConfig": { + "type": ["string", "boolean"], + "description": "Specifies the configuration file for the selected test runner. If a string is provided, it will be used as the path to the configuration file. If `true`, the builder will search for a default configuration file (e.g., `vitest.config.ts` or `karma.conf.js`). If `false`, no external configuration file will be used.\\nFor Vitest, this enables advanced options and the use of custom plugins. Please note that while the file is loaded, the Angular team does not provide direct support for its specific contents or any third-party plugins used within it.", + "default": false + }, "browsers": { "description": "Specifies the browsers to use for test execution. When not specified, tests are run in a Node.js environment using jsdom. For both Vitest and Karma, browser names ending with 'Headless' (e.g., 'ChromeHeadless') will enable headless mode.", "type": "array", @@ -60,6 +65,11 @@ "description": "Enables debugging mode for tests, allowing the use of the Node Inspector.", "default": false }, + "ui": { + "type": "boolean", + "description": "Enables the Vitest UI for interactive test execution. This option is only available for the Vitest runner.", + "default": false + }, "coverage": { "type": "boolean", "description": "Enables coverage reporting for tests.", diff --git a/src/builders/unit-test/test-discovery.d.ts b/src/builders/unit-test/test-discovery.d.ts index 443068ee..1c38afac 100644 --- a/src/builders/unit-test/test-discovery.d.ts +++ b/src/builders/unit-test/test-discovery.d.ts @@ -33,4 +33,14 @@ interface TestEntrypointsOptions { * @returns A map where keys are the generated unique bundle names and values are the original file paths. */ export declare function getTestEntrypoints(testFiles: string[], { projectSourceRoot, workspaceRoot, removeTestExtension }: TestEntrypointsOptions): Map; +/** + * Generates a unique, dash-delimited name from a file path. This is used to + * create a consistent and readable bundle name for a given test file. + * + * @param testFile The absolute path to the test file. + * @param roots An array of root paths to remove from the beginning of the test file path. + * @param removeTestExtension Whether to remove the test file infix and extension from the result. + * @returns A dash-cased name derived from the relative path of the test file. + */ +export declare function generateNameFromPath(testFile: string, roots: string[], removeTestExtension: boolean): string; export {}; diff --git a/src/builders/unit-test/test-discovery.js b/src/builders/unit-test/test-discovery.js index d61877ed..24206424 100644 --- a/src/builders/unit-test/test-discovery.js +++ b/src/builders/unit-test/test-discovery.js @@ -6,10 +6,16 @@ * 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 */ +var __importDefault = (this && this.__importDefault) || function (mod) { + return (mod && mod.__esModule) ? mod : { "default": mod }; +}; Object.defineProperty(exports, "__esModule", { value: true }); exports.findTests = findTests; exports.getTestEntrypoints = getTestEntrypoints; +exports.generateNameFromPath = generateNameFromPath; +const node_crypto_1 = require("node:crypto"); const node_fs_1 = require("node:fs"); +const node_os_1 = __importDefault(require("node:os")); const node_path_1 = require("node:path"); const tinyglobby_1 = require("tinyglobby"); const path_1 = require("../../utils/path"); @@ -18,6 +24,8 @@ const path_1 = require("../../utils/path"); * For example, `.spec` in `app.component.spec.ts`. */ const TEST_FILE_INFIXES = ['.spec', '.test']; +/** Maximum length for a generated test entrypoint name. */ +const MAX_FILENAME_LENGTH = 128; /** * Finds all test files in the project. This function implements a special handling * for static paths (non-globs) to improve developer experience. For example, if a @@ -57,7 +65,7 @@ async function findTests(include, exclude, workspaceRoot, projectSourceRoot) { ignore: ['**/node_modules/**', ...normalizedExcludes], }); for (const match of globMatches) { - resolvedTestFiles.add(match); + resolvedTestFiles.add((0, path_1.toPosixPath)(match)); } } // 3. Combine and de-duplicate results @@ -123,16 +131,52 @@ function generateNameFromPath(testFile, roots, removeTestExtension) { const char = relativePath[i]; result += char === '/' || char === '\\' ? '-' : char; } - return result; + return truncateName(result, relativePath); +} +/** + * Truncates a generated name if it exceeds the maximum allowed filename length. + * If truncation occurs, the name will be shortened by replacing a middle segment + * with an 8-character SHA256 hash of the original full path to maintain uniqueness. + * + * @param name The generated name to potentially truncate. + * @param originalPath The original full path from which the name was derived. Used for hashing. + * @returns The original name if within limits, or a truncated name with a hash. + */ +function truncateName(name, originalPath) { + if (name.length <= MAX_FILENAME_LENGTH) { + return name; + } + const hash = (0, node_crypto_1.createHash)('sha256').update(originalPath).digest('hex').substring(0, 8); + const availableLength = MAX_FILENAME_LENGTH - hash.length - 2; // 2 for '-' separators + const prefixLength = Math.floor(availableLength / 2); + const suffixLength = availableLength - prefixLength; + return `${name.substring(0, prefixLength)}-${hash}-${name.substring(name.length - suffixLength)}`; +} +/** + * Whether the current operating system's filesystem is case-insensitive. + */ +const isCaseInsensitiveFilesystem = node_os_1.default.platform() === 'win32' || node_os_1.default.platform() === 'darwin'; +/** + * Removes a prefix from the beginning of a string, with conditional case-insensitivity + * based on the operating system's filesystem characteristics. + * + * @param text The string to remove the prefix from. + * @param prefix The prefix to remove. + * @returns The string with the prefix removed, or the original string if the prefix was not found. + */ +function removePrefix(text, prefix) { + if (isCaseInsensitiveFilesystem) { + if (text.toLowerCase().startsWith(prefix.toLowerCase())) { + return text.substring(prefix.length); + } + } + else { + if (text.startsWith(prefix)) { + return text.substring(prefix.length); + } + } + return text; } -/** Removes a leading slash from a path. */ -const removeLeadingSlash = (path) => { - return path.startsWith('/') ? path.substring(1) : path; -}; -/** Removes a prefix from the beginning of a string. */ -const removePrefix = (str, prefix) => { - return str.startsWith(prefix) ? str.substring(prefix.length) : str; -}; /** * Removes potential root paths from a file path, returning a relative path. * If no root path matches, it returns the file's basename. @@ -143,8 +187,10 @@ const removePrefix = (str, prefix) => { */ function removeRoots(path, roots) { for (const root of roots) { - if (path.startsWith(root)) { - return path.substring(root.length); + const result = removePrefix(path, root); + // If the prefix was removed, the result will be a different string. + if (result !== path) { + return result; } } return (0, node_path_1.basename)(path); @@ -158,13 +204,15 @@ function removeRoots(path, roots) { * @returns A normalized glob pattern. */ function normalizePattern(pattern, projectRootPrefix) { - let normalizedPattern = (0, path_1.toPosixPath)(pattern); - normalizedPattern = removeLeadingSlash(normalizedPattern); - // Some IDEs and tools may provide patterns relative to the workspace root. - // To ensure the glob operates correctly within the project's source root, - // we remove the project's relative path from the front of the pattern. - normalizedPattern = removePrefix(normalizedPattern, projectRootPrefix); - return normalizedPattern; + const posixPattern = (0, path_1.toPosixPath)(pattern); + // Do not modify absolute paths. The globber will handle them correctly. + if ((0, node_path_1.isAbsolute)(posixPattern)) { + return posixPattern; + } + // For relative paths, ensure they are correctly relative to the project source root. + // This involves removing the project root prefix if the user provided a workspace-relative path. + const normalizedRelative = removePrefix(posixPattern, projectRootPrefix); + return normalizedRelative; } /** * Resolves a static (non-glob) path. @@ -193,13 +241,13 @@ async function resolveStaticPattern(pattern, projectSourceRoot) { for (const infix of TEST_FILE_INFIXES) { const potentialSpec = (0, node_path_1.join)((0, node_path_1.dirname)(fullPath), `${baseName}${infix}${fileExt}`); if (await exists(potentialSpec)) { - return { resolved: [potentialSpec], unresolved: [] }; + return { resolved: [(0, path_1.toPosixPath)(potentialSpec)], unresolved: [] }; } } if (await exists(fullPath)) { - return { resolved: [fullPath], unresolved: [] }; + return { resolved: [(0, path_1.toPosixPath)(fullPath)], unresolved: [] }; } - return { resolved: [], unresolved: [pattern] }; + return { resolved: [], unresolved: [(0, path_1.toPosixPath)(pattern)] }; } /** Checks if a path exists and is a directory. */ async function isDirectory(path) { diff --git a/src/builders/unit-test/test-discovery.js.map b/src/builders/unit-test/test-discovery.js.map index ebf4b3f3..77161617 100644 --- a/src/builders/unit-test/test-discovery.js.map +++ b/src/builders/unit-test/test-discovery.js.map @@ -1 +1 @@ -{"version":3,"file":"test-discovery.js","sourceRoot":"","sources":["test-discovery.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"test-discovery.js","sourceRoot":"","sources":["test-discovery.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/src/private.d.ts b/src/private.d.ts index 1f126c09..42c2040d 100644 --- a/src/private.d.ts +++ b/src/private.d.ts @@ -24,6 +24,8 @@ export { emitFilesToDisk } from './tools/esbuild/utils'; export { transformSupportedBrowsersToTargets } from './tools/esbuild/utils'; export { SassWorkerImplementation } from './tools/sass/sass-service'; export { SourceFileCache } from './tools/esbuild/angular/source-file-cache'; +export { Cache } from './tools/esbuild/cache'; +export { LmdbCacheStore } from './tools/esbuild/lmdb-cache-store'; export { createJitResourceTransformer } from './tools/angular/transformers/jit-resource-transformer'; export { JavaScriptTransformer } from './tools/esbuild/javascript-transformer'; export declare function createCompilerPlugin(pluginOptions: CompilerPluginOptions & { @@ -33,6 +35,7 @@ export declare function createCompilerPlugin(pluginOptions: CompilerPluginOption inlineStyleLanguage: string; }): import('esbuild').Plugin; export type { AngularCompilation } from './tools/angular/compilation'; +export { DiagnosticModes } from './tools/angular/compilation'; export { createAngularCompilation }; export { ComponentStylesheetBundler } from './tools/esbuild/angular/component-stylesheets'; export * from './utils/bundle-calculator'; diff --git a/src/private.js b/src/private.js index da3357fd..41712efa 100644 --- a/src/private.js +++ b/src/private.js @@ -21,7 +21,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) { for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p); }; Object.defineProperty(exports, "__esModule", { value: true }); -exports.loadPostcssConfiguration = exports.generateSearchDirectories = exports.findTailwindConfiguration = exports.getTestEntrypoints = exports.findTests = exports.assertCompatibleAngularVersion = exports.getSupportedBrowsers = exports.generateBuildStatsTable = exports.augmentAppWithServiceWorker = exports.purgeStaleBuildCache = exports.createTranslationLoader = exports.loadProxyConfiguration = exports.InlineCriticalCssProcessor = exports.IndexHtmlGenerator = exports.loadTranslations = exports.createI18nOptions = exports.deleteOutputDir = exports.checkPort = exports.ComponentStylesheetBundler = exports.createAngularCompilation = exports.JavaScriptTransformer = exports.createJitResourceTransformer = exports.SourceFileCache = exports.SassWorkerImplementation = exports.transformSupportedBrowsersToTargets = exports.emitFilesToDisk = exports.serveWithVite = exports.ResultKind = exports.buildApplicationInternal = void 0; +exports.loadPostcssConfiguration = exports.generateSearchDirectories = exports.findTailwindConfiguration = exports.getTestEntrypoints = exports.findTests = exports.assertCompatibleAngularVersion = exports.getSupportedBrowsers = exports.generateBuildStatsTable = exports.augmentAppWithServiceWorker = exports.purgeStaleBuildCache = exports.createTranslationLoader = exports.loadProxyConfiguration = exports.InlineCriticalCssProcessor = exports.IndexHtmlGenerator = exports.loadTranslations = exports.createI18nOptions = exports.deleteOutputDir = exports.checkPort = exports.ComponentStylesheetBundler = exports.createAngularCompilation = exports.DiagnosticModes = exports.JavaScriptTransformer = exports.createJitResourceTransformer = exports.LmdbCacheStore = exports.Cache = exports.SourceFileCache = exports.SassWorkerImplementation = exports.transformSupportedBrowsersToTargets = exports.emitFilesToDisk = exports.serveWithVite = exports.ResultKind = exports.buildApplicationInternal = void 0; exports.createCompilerPlugin = createCompilerPlugin; /** * @fileoverview @@ -50,6 +50,10 @@ var sass_service_1 = require("./tools/sass/sass-service"); Object.defineProperty(exports, "SassWorkerImplementation", { enumerable: true, get: function () { return sass_service_1.SassWorkerImplementation; } }); var source_file_cache_1 = require("./tools/esbuild/angular/source-file-cache"); Object.defineProperty(exports, "SourceFileCache", { enumerable: true, get: function () { return source_file_cache_1.SourceFileCache; } }); +var cache_1 = require("./tools/esbuild/cache"); +Object.defineProperty(exports, "Cache", { enumerable: true, get: function () { return cache_1.Cache; } }); +var lmdb_cache_store_1 = require("./tools/esbuild/lmdb-cache-store"); +Object.defineProperty(exports, "LmdbCacheStore", { enumerable: true, get: function () { return lmdb_cache_store_1.LmdbCacheStore; } }); var jit_resource_transformer_1 = require("./tools/angular/transformers/jit-resource-transformer"); Object.defineProperty(exports, "createJitResourceTransformer", { enumerable: true, get: function () { return jit_resource_transformer_1.createJitResourceTransformer; } }); var javascript_transformer_1 = require("./tools/esbuild/javascript-transformer"); @@ -59,6 +63,8 @@ function createCompilerPlugin(pluginOptions, styleOptions) { ? new compilation_1.NoopCompilation() : () => (0, compilation_1.createAngularCompilation)(!!pluginOptions.jit, !!pluginOptions.browserOnlyBuild), new component_stylesheets_1.ComponentStylesheetBundler(styleOptions, styleOptions.inlineStyleLanguage, pluginOptions.incremental)); } +var compilation_2 = require("./tools/angular/compilation"); +Object.defineProperty(exports, "DiagnosticModes", { enumerable: true, get: function () { return compilation_2.DiagnosticModes; } }); var component_stylesheets_2 = require("./tools/esbuild/angular/component-stylesheets"); Object.defineProperty(exports, "ComponentStylesheetBundler", { enumerable: true, get: function () { return component_stylesheets_2.ComponentStylesheetBundler; } }); // Utilities diff --git a/src/private.js.map b/src/private.js.map index c465b9de..33d4c9b6 100644 --- a/src/private.js.map +++ b/src/private.js.map @@ -1 +1 @@ -{"version":3,"file":"private.js","sourceRoot":"","sources":["private.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;;;;;;;;;;;;;;;AAkCH,oDAkBC;AAlDD;;;;;GAKG;AAEH,6DAAwF;AA8C/E,yGA9CiB,sCAAwB,OA8CjB;AA7CjC,6EAGiD;AACjD,yFAA2F;AAG3F,WAAW;AACX,sDAAkE;AAAzD,uHAAA,wBAAwB,OAAA;AAEjC,0DAA0F;AAAnD,qGAAA,UAAU,OAAA;AACjD,mDAA2D;AAAlD,qGAAA,aAAa,OAAA;AAEtB,QAAQ;AACR,wDAAsC;AAEtC,+CAAwD;AAA/C,wGAAA,eAAe,OAAA;AACxB,+CAA4E;AAAnE,4HAAA,mCAAmC,OAAA;AAC5C,0DAAqE;AAA5D,wHAAA,wBAAwB,OAAA;AAEjC,+EAA4E;AAAnE,oHAAA,eAAe,OAAA;AACxB,kGAAqG;AAA5F,wIAAA,4BAA4B,OAAA;AACrC,iFAA+E;AAAtE,+HAAA,qBAAqB,OAAA;AAE9B,SAAgB,oBAAoB,CAClC,aAGC,EACD,YAAuE;IAEvE,OAAO,IAAA,sCAA4B,EACjC,aAAa,EACb,aAAa,CAAC,yBAAyB;QACrC,CAAC,CAAC,IAAI,6BAAe,EAAE;QACvB,CAAC,CAAC,GAAG,EAAE,CAAC,IAAA,sCAAwB,EAAC,CAAC,CAAC,aAAa,CAAC,GAAG,EAAE,CAAC,CAAC,aAAa,CAAC,gBAAgB,CAAC,EACzF,IAAI,kDAA0B,CAC5B,YAAY,EACZ,YAAY,CAAC,mBAAmB,EAChC,aAAa,CAAC,WAAW,CAC1B,CACF,CAAC;AACJ,CAAC;AAID,uFAA2F;AAAlF,mIAAA,0BAA0B,OAAA;AAEnC,YAAY;AACZ,4DAA0C;AAC1C,iDAA+C;AAAtC,uGAAA,SAAS,OAAA;AAClB,+DAA4D;AAAnD,oHAAA,eAAe,OAAA;AACxB,qDAA6F;AAAlE,iHAAA,iBAAiB,OAAA;AAAE,gHAAA,gBAAgB,OAAA;AAC9D,gFAKiD;AAJ/C,0HAAA,kBAAkB,OAAA;AAMpB,8EAIgD;AAF9C,iIAAA,0BAA0B,OAAA;AAG5B,+DAAmE;AAA1D,2HAAA,sBAAsB,OAAA;AAC/B,+DAA4F;AAA3D,4HAAA,uBAAuB,OAAA;AACxD,mDAA2D;AAAlD,mHAAA,oBAAoB,OAAA;AAC7B,yDAAqE;AAA5D,6HAAA,2BAA2B,OAAA;AACpC,mDAAgF;AAArD,sHAAA,uBAAuB,OAAA;AAClD,iEAAkE;AAAzD,0HAAA,oBAAoB,OAAA;AAC7B,2CAAiE;AAAxD,yHAAA,8BAA8B,OAAA;AACvC,0DAA4E;AAAnE,uGAAA,SAAS,OAAA;AAAE,gHAAA,kBAAkB,OAAA;AACtC,uEAIuC;AAHrC,kIAAA,yBAAyB,OAAA;AACzB,kIAAA,yBAAyB,OAAA;AACzB,iIAAA,wBAAwB,OAAA"} \ No newline at end of file +{"version":3,"file":"private.js","sourceRoot":"","sources":["private.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;;;;;;;;;;;;;;;AAoCH,oDAkBC;AApDD;;;;;GAKG;AAEH,6DAAwF;AAiD/E,yGAjDiB,sCAAwB,OAiDjB;AAhDjC,6EAGiD;AACjD,yFAA2F;AAG3F,WAAW;AACX,sDAAkE;AAAzD,uHAAA,wBAAwB,OAAA;AAEjC,0DAA0F;AAAnD,qGAAA,UAAU,OAAA;AACjD,mDAA2D;AAAlD,qGAAA,aAAa,OAAA;AAEtB,QAAQ;AACR,wDAAsC;AAEtC,+CAAwD;AAA/C,wGAAA,eAAe,OAAA;AACxB,+CAA4E;AAAnE,4HAAA,mCAAmC,OAAA;AAC5C,0DAAqE;AAA5D,wHAAA,wBAAwB,OAAA;AAEjC,+EAA4E;AAAnE,oHAAA,eAAe,OAAA;AACxB,+CAA8C;AAArC,8FAAA,KAAK,OAAA;AACd,qEAAkE;AAAzD,kHAAA,cAAc,OAAA;AACvB,kGAAqG;AAA5F,wIAAA,4BAA4B,OAAA;AACrC,iFAA+E;AAAtE,+HAAA,qBAAqB,OAAA;AAE9B,SAAgB,oBAAoB,CAClC,aAGC,EACD,YAAuE;IAEvE,OAAO,IAAA,sCAA4B,EACjC,aAAa,EACb,aAAa,CAAC,yBAAyB;QACrC,CAAC,CAAC,IAAI,6BAAe,EAAE;QACvB,CAAC,CAAC,GAAG,EAAE,CAAC,IAAA,sCAAwB,EAAC,CAAC,CAAC,aAAa,CAAC,GAAG,EAAE,CAAC,CAAC,aAAa,CAAC,gBAAgB,CAAC,EACzF,IAAI,kDAA0B,CAC5B,YAAY,EACZ,YAAY,CAAC,mBAAmB,EAChC,aAAa,CAAC,WAAW,CAC1B,CACF,CAAC;AACJ,CAAC;AAGD,2DAA8D;AAArD,8GAAA,eAAe,OAAA;AAExB,uFAA2F;AAAlF,mIAAA,0BAA0B,OAAA;AAEnC,YAAY;AACZ,4DAA0C;AAC1C,iDAA+C;AAAtC,uGAAA,SAAS,OAAA;AAClB,+DAA4D;AAAnD,oHAAA,eAAe,OAAA;AACxB,qDAA6F;AAAlE,iHAAA,iBAAiB,OAAA;AAAE,gHAAA,gBAAgB,OAAA;AAC9D,gFAKiD;AAJ/C,0HAAA,kBAAkB,OAAA;AAMpB,8EAIgD;AAF9C,iIAAA,0BAA0B,OAAA;AAG5B,+DAAmE;AAA1D,2HAAA,sBAAsB,OAAA;AAC/B,+DAA4F;AAA3D,4HAAA,uBAAuB,OAAA;AACxD,mDAA2D;AAAlD,mHAAA,oBAAoB,OAAA;AAC7B,yDAAqE;AAA5D,6HAAA,2BAA2B,OAAA;AACpC,mDAAgF;AAArD,sHAAA,uBAAuB,OAAA;AAClD,iEAAkE;AAAzD,0HAAA,oBAAoB,OAAA;AAC7B,2CAAiE;AAAxD,yHAAA,8BAA8B,OAAA;AACvC,0DAA4E;AAAnE,uGAAA,SAAS,OAAA;AAAE,gHAAA,kBAAkB,OAAA;AACtC,uEAIuC;AAHrC,kIAAA,yBAAyB,OAAA;AACzB,kIAAA,yBAAyB,OAAA;AACzB,iIAAA,wBAAwB,OAAA"} \ No newline at end of file diff --git a/src/tools/angular/angular-host.d.ts b/src/tools/angular/angular-host.d.ts index cd2b588d..22326ce0 100644 --- a/src/tools/angular/angular-host.d.ts +++ b/src/tools/angular/angular-host.d.ts @@ -5,7 +5,7 @@ * 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 ng from '@angular/compiler-cli'; +import type * as ng from '@angular/compiler-cli'; import type ts from 'typescript'; export type AngularCompilerOptions = ng.CompilerOptions; export type AngularCompilerHost = ng.CompilerHost; diff --git a/src/tools/angular/compilation/angular-compilation.d.ts b/src/tools/angular/compilation/angular-compilation.d.ts index c1f4e20c..52f03567 100644 --- a/src/tools/angular/compilation/angular-compilation.d.ts +++ b/src/tools/angular/compilation/angular-compilation.d.ts @@ -5,7 +5,7 @@ * 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 ng from '@angular/compiler-cli'; +import type * as ng from '@angular/compiler-cli'; import type { PartialMessage } from 'esbuild'; import type ts from 'typescript'; import type { AngularHostOptions } from '../angular-host'; @@ -32,6 +32,7 @@ export declare abstract class AngularCompilation { referencedFiles: readonly string[]; externalStylesheets?: ReadonlyMap; templateUpdates?: ReadonlyMap; + componentResourcesDependencies?: ReadonlyMap; }>; abstract emitAffectedFiles(): Iterable | Promise>; protected abstract collectDiagnostics(modes: DiagnosticModes): Iterable | Promise>; diff --git a/src/tools/angular/compilation/angular-compilation.js.map b/src/tools/angular/compilation/angular-compilation.js.map index 19fb6103..af5e85e9 100644 --- a/src/tools/angular/compilation/angular-compilation.js.map +++ b/src/tools/angular/compilation/angular-compilation.js.map @@ -1 +1 @@ -{"version":3,"file":"angular-compilation.js","sourceRoot":"","sources":["angular-compilation.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAKH,mEAAgF;AAChF,uDAAoE;AASpE,IAAY,eAMX;AAND,WAAY,eAAe;IACzB,qDAAQ,CAAA;IACR,yDAAe,CAAA;IACf,+DAAkB,CAAA;IAClB,6DAAiB,CAAA;IACjB,mDAAmC,CAAA;AACrC,CAAC,EANW,eAAe,+BAAf,eAAe,QAM1B;AAED,MAAsB,kBAAkB;IACtC,MAAM,CAAC,yBAAyB,CAAa;IAC7C,MAAM,CAAC,iBAAiB,CAAa;IAErC,MAAM,CAAC,KAAK,CAAC,eAAe;QAC1B,kBAAkB,CAAC,yBAAyB,KAAK,wDAAa,uBAAuB,GAAC,CAAC;QAEvF,OAAO,kBAAkB,CAAC,yBAAyB,CAAC;IACtD,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,cAAc;QACzB,kBAAkB,CAAC,iBAAiB,KAAK,wDAAa,YAAY,GAAC,CAAC;QAEpE,OAAO,kBAAkB,CAAC,iBAAiB,CAAC;IAC9C,CAAC;IAES,KAAK,CAAC,iBAAiB,CAAC,QAAgB;QAChD,MAAM,EAAE,iBAAiB,EAAE,GAAG,MAAM,kBAAkB,CAAC,eAAe,EAAE,CAAC;QAEzE,OAAO,IAAA,uBAAW,EAAC,gBAAgB,EAAE,GAAG,EAAE,CACxC,iBAAiB,CAAC,QAAQ,EAAE;YAC1B,6FAA6F;YAC7F,uBAAuB,EAAE,IAAI;YAC7B,MAAM,EAAE,SAAS;YACjB,SAAS,EAAE,KAAK;YAChB,WAAW,EAAE,KAAK;YAClB,cAAc,EAAE,KAAK;YACrB,sBAAsB,EAAE,KAAK;YAC7B,aAAa,EAAE,YAAY;YAC3B,sBAAsB,EAAE,KAAK;YAC7B,cAAc,EAAE,KAAK;YACrB,cAAc,EAAE,KAAK;YACrB,4EAA4E;YAC5E,6FAA6F;YAC7F,cAAc,EAAE,KAAK;SACtB,CAAC,CACH,CAAC;IACJ,CAAC;IAoBD,KAAK,CAAC,aAAa,CACjB,KAAK,GAAG,eAAe,CAAC,GAAG;QAE3B,MAAM,MAAM,GAA+D,EAAE,CAAC;QAE9E,kDAAkD;QAClD,0GAA0G;QAC1G,MAAM,UAAU,GAAG,MAAM,kBAAkB,CAAC,cAAc,EAAE,CAAC;QAE7D,MAAM,IAAA,wBAAY,EAAC,sBAAsB,EAAE,KAAK,IAAI,EAAE;YACpD,KAAK,MAAM,UAAU,IAAI,MAAM,IAAI,CAAC,kBAAkB,CAAC,KAAK,CAAC,EAAE,CAAC;gBAC9D,MAAM,OAAO,GAAG,IAAA,yCAA2B,EAAC,UAAU,EAAE,UAAU,CAAC,CAAC;gBACpE,IAAI,UAAU,CAAC,QAAQ,KAAK,UAAU,CAAC,kBAAkB,CAAC,KAAK,EAAE,CAAC;oBAChE,CAAC,MAAM,CAAC,MAAM,KAAK,EAAE,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;gBACvC,CAAC;qBAAM,CAAC;oBACN,CAAC,MAAM,CAAC,QAAQ,KAAK,EAAE,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;gBACzC,CAAC;YACH,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,OAAO,MAAM,CAAC;IAChB,CAAC;CAKF;AAnFD,gDAmFC"} \ No newline at end of file +{"version":3,"file":"angular-compilation.js","sourceRoot":"","sources":["angular-compilation.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAKH,mEAAgF;AAChF,uDAAoE;AASpE,IAAY,eAMX;AAND,WAAY,eAAe;IACzB,qDAAQ,CAAA;IACR,yDAAe,CAAA;IACf,+DAAkB,CAAA;IAClB,6DAAiB,CAAA;IACjB,mDAAmC,CAAA;AACrC,CAAC,EANW,eAAe,+BAAf,eAAe,QAM1B;AAED,MAAsB,kBAAkB;IACtC,MAAM,CAAC,yBAAyB,CAAa;IAC7C,MAAM,CAAC,iBAAiB,CAAa;IAErC,MAAM,CAAC,KAAK,CAAC,eAAe;QAC1B,kBAAkB,CAAC,yBAAyB,KAAK,wDAAa,uBAAuB,GAAC,CAAC;QAEvF,OAAO,kBAAkB,CAAC,yBAAyB,CAAC;IACtD,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,cAAc;QACzB,kBAAkB,CAAC,iBAAiB,KAAK,wDAAa,YAAY,GAAC,CAAC;QAEpE,OAAO,kBAAkB,CAAC,iBAAiB,CAAC;IAC9C,CAAC;IAES,KAAK,CAAC,iBAAiB,CAAC,QAAgB;QAChD,MAAM,EAAE,iBAAiB,EAAE,GAAG,MAAM,kBAAkB,CAAC,eAAe,EAAE,CAAC;QAEzE,OAAO,IAAA,uBAAW,EAAC,gBAAgB,EAAE,GAAG,EAAE,CACxC,iBAAiB,CAAC,QAAQ,EAAE;YAC1B,6FAA6F;YAC7F,uBAAuB,EAAE,IAAI;YAC7B,MAAM,EAAE,SAAS;YACjB,SAAS,EAAE,KAAK;YAChB,WAAW,EAAE,KAAK;YAClB,cAAc,EAAE,KAAK;YACrB,sBAAsB,EAAE,KAAK;YAC7B,aAAa,EAAE,YAAY;YAC3B,sBAAsB,EAAE,KAAK;YAC7B,cAAc,EAAE,KAAK;YACrB,cAAc,EAAE,KAAK;YACrB,4EAA4E;YAC5E,6FAA6F;YAC7F,cAAc,EAAE,KAAK;SACtB,CAAC,CACH,CAAC;IACJ,CAAC;IAqBD,KAAK,CAAC,aAAa,CACjB,KAAK,GAAG,eAAe,CAAC,GAAG;QAE3B,MAAM,MAAM,GAA+D,EAAE,CAAC;QAE9E,kDAAkD;QAClD,0GAA0G;QAC1G,MAAM,UAAU,GAAG,MAAM,kBAAkB,CAAC,cAAc,EAAE,CAAC;QAE7D,MAAM,IAAA,wBAAY,EAAC,sBAAsB,EAAE,KAAK,IAAI,EAAE;YACpD,KAAK,MAAM,UAAU,IAAI,MAAM,IAAI,CAAC,kBAAkB,CAAC,KAAK,CAAC,EAAE,CAAC;gBAC9D,MAAM,OAAO,GAAG,IAAA,yCAA2B,EAAC,UAAU,EAAE,UAAU,CAAC,CAAC;gBACpE,IAAI,UAAU,CAAC,QAAQ,KAAK,UAAU,CAAC,kBAAkB,CAAC,KAAK,EAAE,CAAC;oBAChE,CAAC,MAAM,CAAC,MAAM,KAAK,EAAE,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;gBACvC,CAAC;qBAAM,CAAC;oBACN,CAAC,MAAM,CAAC,QAAQ,KAAK,EAAE,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;gBACzC,CAAC;YACH,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,OAAO,MAAM,CAAC;IAChB,CAAC;CAKF;AApFD,gDAoFC"} \ No newline at end of file diff --git a/src/tools/angular/compilation/aot-compilation.d.ts b/src/tools/angular/compilation/aot-compilation.d.ts index 0e8a6222..23a1f1e7 100644 --- a/src/tools/angular/compilation/aot-compilation.d.ts +++ b/src/tools/angular/compilation/aot-compilation.d.ts @@ -5,7 +5,7 @@ * 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 ng from '@angular/compiler-cli'; +import type * as ng from '@angular/compiler-cli'; import ts from 'typescript'; import { AngularHostOptions } from '../angular-host'; import { AngularCompilation, DiagnosticModes, EmitFileResult } from './angular-compilation'; @@ -19,6 +19,7 @@ export declare class AotCompilation extends AngularCompilation { referencedFiles: readonly string[]; externalStylesheets?: ReadonlyMap; templateUpdates?: ReadonlyMap; + componentResourcesDependencies?: ReadonlyMap; }>; collectDiagnostics(modes: DiagnosticModes): Iterable; emitAffectedFiles(): Iterable; diff --git a/src/tools/angular/compilation/aot-compilation.js b/src/tools/angular/compilation/aot-compilation.js index 9e989d5c..7fec386a 100644 --- a/src/tools/angular/compilation/aot-compilation.js +++ b/src/tools/angular/compilation/aot-compilation.js @@ -131,12 +131,14 @@ class AotCompilation extends angular_compilation_1.AngularCompilation { } } const affectedFiles = (0, profiling_1.profileSync)('NG_FIND_AFFECTED', () => findAffectedFiles(typeScriptProgram, angularCompiler, usingBuildInfo)); + const componentResourcesDependencies = new Map(); // Get all files referenced in the TypeScript/Angular program including component resources const referencedFiles = typeScriptProgram .getSourceFiles() .filter((sourceFile) => !angularCompiler.ignoreForEmit.has(sourceFile)) .flatMap((sourceFile) => { const resourceDependencies = angularCompiler.getResourceDependencies(sourceFile); + componentResourcesDependencies.set(sourceFile.fileName, resourceDependencies); // Also invalidate Angular diagnostics for a source file if component resources are modified if (this.#state && hostOptions.modifiedFiles?.size) { for (const resourceDependency of resourceDependencies) { @@ -156,6 +158,7 @@ class AotCompilation extends angular_compilation_1.AngularCompilation { referencedFiles, externalStylesheets: hostOptions.externalStylesheets, templateUpdates, + componentResourcesDependencies, }; } *collectDiagnostics(modes) { diff --git a/src/tools/angular/compilation/aot-compilation.js.map b/src/tools/angular/compilation/aot-compilation.js.map index 00ec7e50..fdb2dc29 100644 --- a/src/tools/angular/compilation/aot-compilation.js.map +++ b/src/tools/angular/compilation/aot-compilation.js.map @@ -1 +1 @@ -{"version":3,"file":"aot-compilation.js","sourceRoot":"","sources":["aot-compilation.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"aot-compilation.js","sourceRoot":"","sources":["aot-compilation.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/src/tools/angular/compilation/hmr-candidates.d.ts b/src/tools/angular/compilation/hmr-candidates.d.ts index d986c6b7..df8b13df 100644 --- a/src/tools/angular/compilation/hmr-candidates.d.ts +++ b/src/tools/angular/compilation/hmr-candidates.d.ts @@ -5,7 +5,7 @@ * 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 ng from '@angular/compiler-cli'; +import type * as ng from '@angular/compiler-cli'; import ts from 'typescript'; /** * Analyzes one or more modified files for changes to determine if any diff --git a/src/tools/angular/compilation/jit-compilation.d.ts b/src/tools/angular/compilation/jit-compilation.d.ts index afdf68de..22b78e09 100644 --- a/src/tools/angular/compilation/jit-compilation.d.ts +++ b/src/tools/angular/compilation/jit-compilation.d.ts @@ -5,7 +5,7 @@ * 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 ng from '@angular/compiler-cli'; +import type * as ng from '@angular/compiler-cli'; import ts from 'typescript'; import { AngularHostOptions } from '../angular-host'; import { AngularCompilation, DiagnosticModes, EmitFileResult } from './angular-compilation'; diff --git a/src/tools/angular/compilation/noop-compilation.d.ts b/src/tools/angular/compilation/noop-compilation.d.ts index f6a1f40b..9a151539 100644 --- a/src/tools/angular/compilation/noop-compilation.d.ts +++ b/src/tools/angular/compilation/noop-compilation.d.ts @@ -5,7 +5,7 @@ * 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 ng from '@angular/compiler-cli'; +import type * as ng from '@angular/compiler-cli'; import type ts from 'typescript'; import { AngularHostOptions } from '../angular-host'; import { AngularCompilation } from './angular-compilation'; diff --git a/src/tools/angular/compilation/parallel-worker.d.ts b/src/tools/angular/compilation/parallel-worker.d.ts index 456d5d48..78aa0911 100644 --- a/src/tools/angular/compilation/parallel-worker.d.ts +++ b/src/tools/angular/compilation/parallel-worker.d.ts @@ -29,6 +29,7 @@ export declare function initialize(request: InitRequest): Promise<{ sourceMap: boolean | undefined; inlineSourceMap: boolean | undefined; }; + componentResourcesDependencies: ReadonlyMap | undefined; }>; export declare function diagnose(modes: DiagnosticModes): Promise<{ errors?: PartialMessage[]; diff --git a/src/tools/angular/compilation/parallel-worker.js b/src/tools/angular/compilation/parallel-worker.js index 3b834467..83df28c1 100644 --- a/src/tools/angular/compilation/parallel-worker.js +++ b/src/tools/angular/compilation/parallel-worker.js @@ -35,7 +35,7 @@ async function initialize(request) { stylesheetRequests.get(requestId)?.[0](value); } }); - const { compilerOptions, referencedFiles, externalStylesheets, templateUpdates } = await compilation.initialize(request.tsconfig, { + const { compilerOptions, referencedFiles, externalStylesheets, templateUpdates, componentResourcesDependencies, } = await compilation.initialize(request.tsconfig, { fileReplacements: request.fileReplacements, sourceFileCache, modifiedFiles: sourceFileCache.modifiedFiles, @@ -83,6 +83,7 @@ async function initialize(request) { sourceMap: compilerOptions.sourceMap, inlineSourceMap: compilerOptions.inlineSourceMap, }, + componentResourcesDependencies, }; } async function diagnose(modes) { diff --git a/src/tools/angular/compilation/parallel-worker.js.map b/src/tools/angular/compilation/parallel-worker.js.map index 29b5a709..595bd648 100644 --- a/src/tools/angular/compilation/parallel-worker.js.map +++ b/src/tools/angular/compilation/parallel-worker.js.map @@ -1 +1 @@ -{"version":3,"file":"parallel-worker.js","sourceRoot":"","sources":["parallel-worker.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"parallel-worker.js","sourceRoot":"","sources":["parallel-worker.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/src/tools/esbuild/angular/compiler-plugin.js b/src/tools/esbuild/angular/compiler-plugin.js index acea9913..1a416c95 100644 --- a/src/tools/esbuild/angular/compiler-plugin.js +++ b/src/tools/esbuild/angular/compiler-plugin.js @@ -70,8 +70,8 @@ function createCompilerPlugin(pluginOptions, compilationOrFactory, stylesheetBun let cacheStore; if (pluginOptions.sourceFileCache?.persistentCachePath && !process.versions.webcontainer) { try { - const { LmbdCacheStore } = await Promise.resolve().then(() => __importStar(require('../lmdb-cache-store'))); - cacheStore = new LmbdCacheStore(path.join(pluginOptions.sourceFileCache.persistentCachePath, 'angular-compiler.db')); + const { LmdbCacheStore } = await Promise.resolve().then(() => __importStar(require('../lmdb-cache-store'))); + cacheStore = new LmdbCacheStore(path.join(pluginOptions.sourceFileCache.persistentCachePath, 'angular-compiler.db')); } catch (e) { setupWarnings.push({ @@ -451,6 +451,7 @@ function createCompilerPlugin(pluginOptions, compilationOrFactory, stylesheetBun build.onDispose(() => { sharedTSCompilationState?.dispose(); void compilation.close?.(); + void javascriptTransformer.close(); void cacheStore?.close(); }); /** diff --git a/src/tools/esbuild/angular/compiler-plugin.js.map b/src/tools/esbuild/angular/compiler-plugin.js.map index fbd25d8b..179f771c 100644 --- a/src/tools/esbuild/angular/compiler-plugin.js.map +++ b/src/tools/esbuild/angular/compiler-plugin.js.map @@ -1 +1 @@ -{"version":3,"file":"compiler-plugin.js","sourceRoot":"","sources":["compiler-plugin.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"compiler-plugin.js","sourceRoot":"","sources":["compiler-plugin.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/src/tools/esbuild/application-code-bundle.js b/src/tools/esbuild/application-code-bundle.js index d856dd1b..0b4a6644 100644 --- a/src/tools/esbuild/application-code-bundle.js +++ b/src/tools/esbuild/application-code-bundle.js @@ -459,7 +459,7 @@ function getEsBuildCommonOptions(options) { }; } function getEsBuildCommonPolyfillsOptions(options, namespace, tryToResolvePolyfillsAsRelative, loadResultCache) { - const { jit, workspaceRoot, i18nOptions } = options; + const { jit, workspaceRoot, i18nOptions, externalPackages } = options; const buildOptions = getEsBuildCommonOptions(options); buildOptions.splitting = false; buildOptions.plugins ??= []; @@ -472,8 +472,10 @@ function getEsBuildCommonPolyfillsOptions(options, namespace, tryToResolvePolyfi // Locale data should go first so that project provided polyfill code can augment if needed. let needLocaleDataPlugin = false; if (i18nOptions.shouldInline) { - // Remove localize polyfill as this is not needed for build time i18n. - polyfills = polyfills.filter((path) => !path.startsWith('@angular/localize')); + if (!externalPackages) { + // Remove localize polyfill when i18n inline transformation have been applied to all the packages. + polyfills = polyfills.filter((path) => !path.startsWith('@angular/localize')); + } // Add locale data for all active locales // TODO: Inject each individually within the inlining process itself for (const locale of i18nOptions.inlineLocales) { @@ -487,7 +489,7 @@ function getEsBuildCommonPolyfillsOptions(options, namespace, tryToResolvePolyfi needLocaleDataPlugin = true; } if (needLocaleDataPlugin) { - buildOptions.plugins.push((0, i18n_locale_plugin_1.createAngularLocaleDataPlugin)()); + buildOptions.plugins.unshift((0, i18n_locale_plugin_1.createAngularLocaleDataPlugin)()); } if (polyfills.length === 0) { return; diff --git a/src/tools/esbuild/application-code-bundle.js.map b/src/tools/esbuild/application-code-bundle.js.map index 3346f888..eebaa4b7 100644 --- a/src/tools/esbuild/application-code-bundle.js.map +++ b/src/tools/esbuild/application-code-bundle.js.map @@ -1 +1 @@ -{"version":3,"file":"application-code-bundle.js","sourceRoot":"","sources":["application-code-bundle.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"application-code-bundle.js","sourceRoot":"","sources":["application-code-bundle.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/src/tools/esbuild/i18n-inliner.js b/src/tools/esbuild/i18n-inliner.js index b6b730db..4f397a4c 100644 --- a/src/tools/esbuild/i18n-inliner.js +++ b/src/tools/esbuild/i18n-inliner.js @@ -251,8 +251,8 @@ class I18nInliner { } // Initialize a persistent cache for i18n transformations. try { - const { LmbdCacheStore } = await Promise.resolve().then(() => __importStar(require('./lmdb-cache-store'))); - this.#cache = new LmbdCacheStore((0, node_path_1.join)(persistentCachePath, 'angular-i18n.db')); + const { LmdbCacheStore } = await Promise.resolve().then(() => __importStar(require('./lmdb-cache-store'))); + this.#cache = new LmdbCacheStore((0, node_path_1.join)(persistentCachePath, 'angular-i18n.db')); } catch { this.#cacheInitFailed = true; diff --git a/src/tools/esbuild/javascript-transformer.js.map b/src/tools/esbuild/javascript-transformer.js.map index 04c5f60c..fa3255a4 100644 --- a/src/tools/esbuild/javascript-transformer.js.map +++ b/src/tools/esbuild/javascript-transformer.js.map @@ -1 +1 @@ -{"version":3,"file":"javascript-transformer.js","sourceRoot":"","sources":["javascript-transformer.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"javascript-transformer.js","sourceRoot":"","sources":["javascript-transformer.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/src/tools/esbuild/lmdb-cache-store.d.ts b/src/tools/esbuild/lmdb-cache-store.d.ts index 66dba9a9..14293120 100644 --- a/src/tools/esbuild/lmdb-cache-store.d.ts +++ b/src/tools/esbuild/lmdb-cache-store.d.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.dev/license */ import { Cache, CacheStore } from './cache'; -export declare class LmbdCacheStore implements CacheStore { +export declare class LmdbCacheStore implements CacheStore { #private; readonly cachePath: string; constructor(cachePath: string); diff --git a/src/tools/esbuild/lmdb-cache-store.js b/src/tools/esbuild/lmdb-cache-store.js index 6f2b492a..cf827d1f 100644 --- a/src/tools/esbuild/lmdb-cache-store.js +++ b/src/tools/esbuild/lmdb-cache-store.js @@ -7,10 +7,10 @@ * found in the LICENSE file at https://angular.dev/license */ Object.defineProperty(exports, "__esModule", { value: true }); -exports.LmbdCacheStore = void 0; +exports.LmdbCacheStore = void 0; const lmdb_1 = require("lmdb"); const cache_1 = require("./cache"); -class LmbdCacheStore { +class LmdbCacheStore { cachePath; #cacheFileUrl; #db; @@ -51,5 +51,5 @@ class LmbdCacheStore { } } } -exports.LmbdCacheStore = LmbdCacheStore; +exports.LmdbCacheStore = LmdbCacheStore; //# sourceMappingURL=lmdb-cache-store.js.map \ No newline at end of file diff --git a/src/tools/vite/middlewares/assets-middleware.js b/src/tools/vite/middlewares/assets-middleware.js index d61d97cf..82c92e17 100644 --- a/src/tools/vite/middlewares/assets-middleware.js +++ b/src/tools/vite/middlewares/assets-middleware.js @@ -25,7 +25,7 @@ function createAngularAssetsMiddleware(server, assets, outputFiles, componentSty // 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] === '/'; + const pathnameHasTrailingSlash = pathname.at(-1) === '/'; // Rewrite all build assets to a vite raw fs URL const asset = assets.get(pathname); if (asset) { diff --git a/src/tools/vite/middlewares/assets-middleware.js.map b/src/tools/vite/middlewares/assets-middleware.js.map index 8f1d26f8..ec87f88e 100644 --- a/src/tools/vite/middlewares/assets-middleware.js.map +++ b/src/tools/vite/middlewares/assets-middleware.js.map @@ -1 +1 @@ -{"version":3,"file":"assets-middleware.js","sourceRoot":"","sources":["assets-middleware.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"assets-middleware.js","sourceRoot":"","sources":["assets-middleware.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/src/tools/vite/middlewares/host-check-middleware.d.ts b/src/tools/vite/middlewares/host-check-middleware.d.ts new file mode 100644 index 00000000..f34eb331 --- /dev/null +++ b/src/tools/vite/middlewares/host-check-middleware.d.ts @@ -0,0 +1,9 @@ +/** + * @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 } from 'vite'; +export declare function patchHostValidationMiddleware(middlewares: Connect.Server): void; diff --git a/src/tools/vite/middlewares/host-check-middleware.js b/src/tools/vite/middlewares/host-check-middleware.js new file mode 100644 index 00000000..42b90294 --- /dev/null +++ b/src/tools/vite/middlewares/host-check-middleware.js @@ -0,0 +1,61 @@ +"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.patchHostValidationMiddleware = patchHostValidationMiddleware; +function patchHostValidationMiddleware(middlewares) { + const entry = middlewares.stack.find(({ handle }) => typeof handle === 'function' && handle.name.startsWith('hostValidationMiddleware')); + if (typeof entry?.handle !== 'function') { + return; + } + const originalHandle = entry.handle; + entry.handle = function angularHostValidationMiddleware(req, res, next) { + originalHandle(req, { + writeHead: (code) => { + res.writeHead(code, { 'content-type': 'text/html' }); + }, + end: () => { + const hostname = req.headers.host?.toLowerCase().split(':')[0] ?? ''; + res.end(html403(hostname)); + }, + }, next); + }; +} +function html403(hostname) { + return ` + + + + + Blocked request + + + +
+

Blocked request. This host ("${hostname}") is not allowed.

+

To allow this host, add it to allowedHosts under the serve target in angular.json.

+ 
{
+  "serve": {
+    "options": {
+      "allowedHosts": ["${hostname}"]
+    }
+  }
+}
+
+ + `; +} +//# sourceMappingURL=host-check-middleware.js.map \ No newline at end of file diff --git a/src/tools/vite/middlewares/host-check-middleware.js.map b/src/tools/vite/middlewares/host-check-middleware.js.map new file mode 100644 index 00000000..8bea0150 --- /dev/null +++ b/src/tools/vite/middlewares/host-check-middleware.js.map @@ -0,0 +1 @@ +{"version":3,"file":"host-check-middleware.js","sourceRoot":"","sources":["host-check-middleware.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;AAKH,sEA+BC;AA/BD,SAAgB,6BAA6B,CAAC,WAA2B;IACvE,MAAM,KAAK,GAAG,WAAW,CAAC,KAAK,CAAC,IAAI,CAClC,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,CACb,OAAO,MAAM,KAAK,UAAU,IAAI,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,0BAA0B,CAAC,CACrF,CAAC;IAEF,IAAI,OAAO,KAAK,EAAE,MAAM,KAAK,UAAU,EAAE,CAAC;QACxC,OAAO;IACT,CAAC;IAED,MAAM,cAAc,GAAG,KAAK,CAAC,MAAoC,CAAC;IAElE,KAAK,CAAC,MAAM,GAAG,SAAS,+BAA+B,CACrD,GAAoB,EACpB,GAAmB,EACnB,IAA6B;QAE7B,cAAc,CACZ,GAAG,EACH;YACE,SAAS,EAAE,CAAC,IAAI,EAAE,EAAE;gBAClB,GAAG,CAAC,SAAS,CAAC,IAAI,EAAE,EAAE,cAAc,EAAE,WAAW,EAAE,CAAC,CAAC;YACvD,CAAC;YACD,GAAG,EAAE,GAAG,EAAE;gBACR,MAAM,QAAQ,GAAG,GAAG,CAAC,OAAO,CAAC,IAAI,EAAE,WAAW,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;gBACrE,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC;YAC7B,CAAC;SACgB,EACnB,IAAI,CACL,CAAC;IACJ,CAAC,CAAC;AACJ,CAAC;AAED,SAAS,OAAO,CAAC,QAAgB;IAC/B,OAAO;;;;;;;;;;;;;;;;;;yCAkBgC,QAAQ;;;;;0BAKvB,QAAQ;;;;;;UAMxB,CAAC;AACX,CAAC"} \ No newline at end of file diff --git a/src/tools/vite/middlewares/index.d.ts b/src/tools/vite/middlewares/index.d.ts index e37bdc57..43756269 100644 --- a/src/tools/vite/middlewares/index.d.ts +++ b/src/tools/vite/middlewares/index.d.ts @@ -12,3 +12,4 @@ export { createAngularSsrExternalMiddleware, createAngularSsrInternalMiddleware, export { createAngularHeadersMiddleware } from './headers-middleware'; export { createAngularComponentMiddleware } from './component-middleware'; export { createChromeDevtoolsMiddleware } from './chrome-devtools-middleware'; +export { patchHostValidationMiddleware } from './host-check-middleware'; diff --git a/src/tools/vite/middlewares/index.js b/src/tools/vite/middlewares/index.js index 86b15b23..ff1b9c2f 100644 --- a/src/tools/vite/middlewares/index.js +++ b/src/tools/vite/middlewares/index.js @@ -7,7 +7,7 @@ * found in the LICENSE file at https://angular.dev/license */ Object.defineProperty(exports, "__esModule", { value: true }); -exports.createChromeDevtoolsMiddleware = exports.createAngularComponentMiddleware = exports.createAngularHeadersMiddleware = exports.createAngularSsrInternalMiddleware = exports.createAngularSsrExternalMiddleware = exports.createAngularIndexHtmlMiddleware = exports.angularHtmlFallbackMiddleware = exports.createAngularAssetsMiddleware = void 0; +exports.patchHostValidationMiddleware = exports.createChromeDevtoolsMiddleware = exports.createAngularComponentMiddleware = exports.createAngularHeadersMiddleware = exports.createAngularSsrInternalMiddleware = exports.createAngularSsrExternalMiddleware = 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"); @@ -23,4 +23,6 @@ var component_middleware_1 = require("./component-middleware"); Object.defineProperty(exports, "createAngularComponentMiddleware", { enumerable: true, get: function () { return component_middleware_1.createAngularComponentMiddleware; } }); var chrome_devtools_middleware_1 = require("./chrome-devtools-middleware"); Object.defineProperty(exports, "createChromeDevtoolsMiddleware", { enumerable: true, get: function () { return chrome_devtools_middleware_1.createChromeDevtoolsMiddleware; } }); +var host_check_middleware_1 = require("./host-check-middleware"); +Object.defineProperty(exports, "patchHostValidationMiddleware", { enumerable: true, get: function () { return host_check_middleware_1.patchHostValidationMiddleware; } }); //# sourceMappingURL=index.js.map \ No newline at end of file diff --git a/src/tools/vite/middlewares/index.js.map b/src/tools/vite/middlewares/index.js.map index 3513f054..4716a15b 100644 --- a/src/tools/vite/middlewares/index.js.map +++ b/src/tools/vite/middlewares/index.js.map @@ -1 +1 @@ -{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;AAEH,yDAA+F;AAA3D,kIAAA,6BAA6B,OAAA;AACjE,uEAA2E;AAAlE,yIAAA,6BAA6B,OAAA;AACtC,iEAA2E;AAAlE,yIAAA,gCAAgC,OAAA;AACzC,mDAG0B;AAFxB,oIAAA,kCAAkC,OAAA;AAClC,oIAAA,kCAAkC,OAAA;AAEpC,2DAAsE;AAA7D,oIAAA,8BAA8B,OAAA;AACvC,+DAA0E;AAAjE,wIAAA,gCAAgC,OAAA;AACzC,2EAA8E;AAArE,4IAAA,8BAA8B,OAAA"} \ No newline at end of file +{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;AAEH,yDAA+F;AAA3D,kIAAA,6BAA6B,OAAA;AACjE,uEAA2E;AAAlE,yIAAA,6BAA6B,OAAA;AACtC,iEAA2E;AAAlE,yIAAA,gCAAgC,OAAA;AACzC,mDAG0B;AAFxB,oIAAA,kCAAkC,OAAA;AAClC,oIAAA,kCAAkC,OAAA;AAEpC,2DAAsE;AAA7D,oIAAA,8BAA8B,OAAA;AACvC,+DAA0E;AAAjE,wIAAA,gCAAgC,OAAA;AACzC,2EAA8E;AAArE,4IAAA,8BAA8B,OAAA;AACvC,iEAAwE;AAA/D,sIAAA,6BAA6B,OAAA"} \ No newline at end of file diff --git a/src/tools/vite/middlewares/ssr-middleware.js b/src/tools/vite/middlewares/ssr-middleware.js index 1a77f3ec..1749e8a2 100644 --- a/src/tools/vite/middlewares/ssr-middleware.js +++ b/src/tools/vite/middlewares/ssr-middleware.js @@ -53,15 +53,8 @@ function createAngularSsrInternalMiddleware(server, indexHtmlTransformer) { // Load the compiler because `@angular/ssr/node` depends on `@angular/` packages, // which must be processed by the runtime linker, even if they are not used. await Promise.resolve().then(() => __importStar(require('@angular/compiler'))); - const { writeResponseToNodeResponse, createWebRequestFromNodeRequest } = (await Promise.resolve(`${ - // eslint-disable-next-line @typescript-eslint/no-explicit-any - '@angular/ssr/node'}`).then(s => __importStar(require(s)))); + const { writeResponseToNodeResponse, createWebRequestFromNodeRequest } = (await Promise.resolve(`${'@angular/ssr/node'}`).then(s => __importStar(require(s)))); const { ɵgetOrCreateAngularServerApp } = (await server.ssrLoadModule('/main.server.mjs')); - // `ɵgetOrCreateAngularServerApp` can be undefined right after an error. - // See: https://github.com/angular/angular-cli/issues/29907 - if (!ɵgetOrCreateAngularServerApp) { - return next(); - } const angularServerApp = ɵgetOrCreateAngularServerApp({ allowStaticRouteRender: true, }); @@ -91,9 +84,7 @@ async function createAngularSsrExternalMiddleware(server, indexHtmlTransformer) // Load the compiler because `@angular/ssr/node` depends on `@angular/` packages, // which must be processed by the runtime linker, even if they are not used. await Promise.resolve().then(() => __importStar(require('@angular/compiler'))); - const { createWebRequestFromNodeRequest, writeResponseToNodeResponse } = (await Promise.resolve(`${ - // eslint-disable-next-line @typescript-eslint/no-explicit-any - '@angular/ssr/node'}`).then(s => __importStar(require(s)))); + const { createWebRequestFromNodeRequest, writeResponseToNodeResponse } = (await Promise.resolve(`${'@angular/ssr/node'}`).then(s => __importStar(require(s)))); return function angularSsrExternalMiddleware(req, res, next) { (async () => { const { reqHandler, AngularAppEngine } = (await server.ssrLoadModule('./server.mjs')); diff --git a/src/tools/vite/middlewares/ssr-middleware.js.map b/src/tools/vite/middlewares/ssr-middleware.js.map index 9806f92a..3b18fb86 100644 --- a/src/tools/vite/middlewares/ssr-middleware.js.map +++ b/src/tools/vite/middlewares/ssr-middleware.js.map @@ -1 +1 @@ -{"version":3,"file":"ssr-middleware.js","sourceRoot":"","sources":["ssr-middleware.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"ssr-middleware.js","sourceRoot":"","sources":["ssr-middleware.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/src/tools/vite/plugins/index.d.ts b/src/tools/vite/plugins/index.d.ts index 2c157829..790b93e9 100644 --- a/src/tools/vite/plugins/index.d.ts +++ b/src/tools/vite/plugins/index.d.ts @@ -9,3 +9,4 @@ export { createAngularMemoryPlugin } from './angular-memory-plugin'; export { createRemoveIdPrefixPlugin } from './id-prefix-plugin'; export { createAngularSetupMiddlewaresPlugin, ServerSsrMode } from './setup-middlewares-plugin'; export { createAngularSsrTransformPlugin } from './ssr-transform-plugin'; +export { createAngularServerSideSSLPlugin } from './ssr-ssl-plugin'; diff --git a/src/tools/vite/plugins/index.js b/src/tools/vite/plugins/index.js index 24e5925e..5e58b772 100644 --- a/src/tools/vite/plugins/index.js +++ b/src/tools/vite/plugins/index.js @@ -7,7 +7,7 @@ * found in the LICENSE file at https://angular.dev/license */ Object.defineProperty(exports, "__esModule", { value: true }); -exports.createAngularSsrTransformPlugin = exports.ServerSsrMode = exports.createAngularSetupMiddlewaresPlugin = exports.createRemoveIdPrefixPlugin = exports.createAngularMemoryPlugin = void 0; +exports.createAngularServerSideSSLPlugin = exports.createAngularSsrTransformPlugin = exports.ServerSsrMode = exports.createAngularSetupMiddlewaresPlugin = exports.createRemoveIdPrefixPlugin = exports.createAngularMemoryPlugin = void 0; var angular_memory_plugin_1 = require("./angular-memory-plugin"); Object.defineProperty(exports, "createAngularMemoryPlugin", { enumerable: true, get: function () { return angular_memory_plugin_1.createAngularMemoryPlugin; } }); var id_prefix_plugin_1 = require("./id-prefix-plugin"); @@ -17,4 +17,6 @@ Object.defineProperty(exports, "createAngularSetupMiddlewaresPlugin", { enumerab Object.defineProperty(exports, "ServerSsrMode", { enumerable: true, get: function () { return setup_middlewares_plugin_1.ServerSsrMode; } }); var ssr_transform_plugin_1 = require("./ssr-transform-plugin"); Object.defineProperty(exports, "createAngularSsrTransformPlugin", { enumerable: true, get: function () { return ssr_transform_plugin_1.createAngularSsrTransformPlugin; } }); +var ssr_ssl_plugin_1 = require("./ssr-ssl-plugin"); +Object.defineProperty(exports, "createAngularServerSideSSLPlugin", { enumerable: true, get: function () { return ssr_ssl_plugin_1.createAngularServerSideSSLPlugin; } }); //# sourceMappingURL=index.js.map \ No newline at end of file diff --git a/src/tools/vite/plugins/index.js.map b/src/tools/vite/plugins/index.js.map index f3a2a520..d47c02b6 100644 --- a/src/tools/vite/plugins/index.js.map +++ b/src/tools/vite/plugins/index.js.map @@ -1 +1 @@ -{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;AAEH,iEAAoE;AAA3D,kIAAA,yBAAyB,OAAA;AAClC,uDAAgE;AAAvD,8HAAA,0BAA0B,OAAA;AACnC,uEAAgG;AAAvF,+IAAA,mCAAmC,OAAA;AAAE,yHAAA,aAAa,OAAA;AAC3D,+DAAyE;AAAhE,uIAAA,+BAA+B,OAAA"} \ No newline at end of file +{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;AAEH,iEAAoE;AAA3D,kIAAA,yBAAyB,OAAA;AAClC,uDAAgE;AAAvD,8HAAA,0BAA0B,OAAA;AACnC,uEAAgG;AAAvF,+IAAA,mCAAmC,OAAA;AAAE,yHAAA,aAAa,OAAA;AAC3D,+DAAyE;AAAhE,uIAAA,+BAA+B,OAAA;AACxC,mDAAoE;AAA3D,kIAAA,gCAAgC,OAAA"} \ No newline at end of file diff --git a/src/tools/vite/plugins/setup-middlewares-plugin.js b/src/tools/vite/plugins/setup-middlewares-plugin.js index 71e74deb..43838e79 100644 --- a/src/tools/vite/plugins/setup-middlewares-plugin.js +++ b/src/tools/vite/plugins/setup-middlewares-plugin.js @@ -89,6 +89,7 @@ function createAngularSetupMiddlewaresPlugin(options) { // before the built-in HTML middleware // eslint-disable-next-line @typescript-eslint/no-misused-promises return async () => { + (0, middlewares_1.patchHostValidationMiddleware)(server.middlewares); if (ssrMode === ServerSsrMode.ExternalSsrMiddleware) { server.middlewares.use(await (0, middlewares_1.createAngularSsrExternalMiddleware)(server, indexHtmlTransformer)); return; diff --git a/src/tools/vite/plugins/setup-middlewares-plugin.js.map b/src/tools/vite/plugins/setup-middlewares-plugin.js.map index 172ed5b5..470a29a4 100644 --- a/src/tools/vite/plugins/setup-middlewares-plugin.js.map +++ b/src/tools/vite/plugins/setup-middlewares-plugin.js.map @@ -1 +1 @@ -{"version":3,"file":"setup-middlewares-plugin.js","sourceRoot":"","sources":["setup-middlewares-plugin.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAgEH,kFAiEC;AA9HD,gDAUwB;AAGxB,IAAY,aAuBX;AAvBD,WAAY,aAAa;IACvB;;OAEG;IACH,mDAAK,CAAA;IAEL;;;;;;OAMG;IACH,mFAAqB,CAAA;IAErB;;;;;;OAMG;IACH,mFAAqB,CAAA;AACvB,CAAC,EAvBW,aAAa,6BAAb,aAAa,QAuBxB;AAcD,KAAK,UAAU,sBAAsB;IAGnC,MAAM,EAAE,gBAAgB,EAAE,GAAG,wDAAa,mBAAmB,GAAC,CAAC;IAC/D,MAAM,OAAO,GAAG,IAAI,WAAW,CAAC,OAAO,CAAC,CAAC;IAEzC,OAAO,CAAC,KAAK,EAAE,WAAW,EAAE,EAAE;QAC5B,OAAO,gBAAgB,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,WAAW,CAAC,CAAC;IAC9D,CAAC,CAAC;AACJ,CAAC;AAED,SAAgB,mCAAmC,CACjD,OAA6C;IAE7C,OAAO;QACL,IAAI,EAAE,gCAAgC;QACtC,OAAO,EAAE,KAAK;QACd,KAAK,CAAC,eAAe,CAAC,MAAM;YAC1B,MAAM,EACJ,oBAAoB,EACpB,WAAW,EACX,mBAAmB,EACnB,MAAM,EACN,eAAe,EACf,eAAe,EACf,OAAO,EACP,qBAAqB,GACtB,GAAG,OAAO,CAAC;YAEZ,kDAAkD;YAClD,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,IAAA,4CAA8B,EAAC,MAAM,CAAC,CAAC,CAAC;YAC/D,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,IAAA,8CAAgC,EAAC,MAAM,EAAE,eAAe,CAAC,CAAC,CAAC;YAClF,MAAM,CAAC,WAAW,CAAC,GAAG,CACpB,IAAA,2CAA6B,EAC3B,MAAM,EACN,MAAM,EACN,WAAW,EACX,eAAe,EACf,MAAM,sBAAsB,EAAE,CAC/B,CACF,CAAC;YAEF,MAAM,CAAC,WAAW,CAAC,GAAG,CACpB,IAAA,4CAA8B,EAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,OAAO,CAAC,WAAW,CAAC,CAC5E,CAAC;YAEF,mBAAmB,EAAE,OAAO,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC;YAEjF,oFAAoF;YACpF,sCAAsC;YACtC,kEAAkE;YAClE,OAAO,KAAK,IAAI,EAAE;gBAChB,IAAI,OAAO,KAAK,aAAa,CAAC,qBAAqB,EAAE,CAAC;oBACpD,MAAM,CAAC,WAAW,CAAC,GAAG,CACpB,MAAM,IAAA,gDAAkC,EAAC,MAAM,EAAE,oBAAoB,CAAC,CACvE,CAAC;oBAEF,OAAO;gBACT,CAAC;gBAED,IAAI,OAAO,KAAK,aAAa,CAAC,qBAAqB,EAAE,CAAC;oBACpD,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,IAAA,gDAAkC,EAAC,MAAM,EAAE,oBAAoB,CAAC,CAAC,CAAC;gBAC3F,CAAC;gBAED,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,2CAA6B,CAAC,CAAC;gBACtD,MAAM,CAAC,WAAW,CAAC,GAAG,CACpB,IAAA,8CAAgC,EAC9B,MAAM,EACN,WAAW,EACX,qBAAqB,EACrB,oBAAoB,CACrB,CACF,CAAC;YACJ,CAAC,CAAC;QACJ,CAAC;KACF,CAAC;AACJ,CAAC"} \ No newline at end of file +{"version":3,"file":"setup-middlewares-plugin.js","sourceRoot":"","sources":["setup-middlewares-plugin.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAiEH,kFAmEC;AAjID,gDAWwB;AAGxB,IAAY,aAuBX;AAvBD,WAAY,aAAa;IACvB;;OAEG;IACH,mDAAK,CAAA;IAEL;;;;;;OAMG;IACH,mFAAqB,CAAA;IAErB;;;;;;OAMG;IACH,mFAAqB,CAAA;AACvB,CAAC,EAvBW,aAAa,6BAAb,aAAa,QAuBxB;AAcD,KAAK,UAAU,sBAAsB;IAGnC,MAAM,EAAE,gBAAgB,EAAE,GAAG,wDAAa,mBAAmB,GAAC,CAAC;IAC/D,MAAM,OAAO,GAAG,IAAI,WAAW,CAAC,OAAO,CAAC,CAAC;IAEzC,OAAO,CAAC,KAAK,EAAE,WAAW,EAAE,EAAE;QAC5B,OAAO,gBAAgB,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,WAAW,CAAC,CAAC;IAC9D,CAAC,CAAC;AACJ,CAAC;AAED,SAAgB,mCAAmC,CACjD,OAA6C;IAE7C,OAAO;QACL,IAAI,EAAE,gCAAgC;QACtC,OAAO,EAAE,KAAK;QACd,KAAK,CAAC,eAAe,CAAC,MAAM;YAC1B,MAAM,EACJ,oBAAoB,EACpB,WAAW,EACX,mBAAmB,EACnB,MAAM,EACN,eAAe,EACf,eAAe,EACf,OAAO,EACP,qBAAqB,GACtB,GAAG,OAAO,CAAC;YAEZ,kDAAkD;YAClD,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,IAAA,4CAA8B,EAAC,MAAM,CAAC,CAAC,CAAC;YAC/D,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,IAAA,8CAAgC,EAAC,MAAM,EAAE,eAAe,CAAC,CAAC,CAAC;YAClF,MAAM,CAAC,WAAW,CAAC,GAAG,CACpB,IAAA,2CAA6B,EAC3B,MAAM,EACN,MAAM,EACN,WAAW,EACX,eAAe,EACf,MAAM,sBAAsB,EAAE,CAC/B,CACF,CAAC;YAEF,MAAM,CAAC,WAAW,CAAC,GAAG,CACpB,IAAA,4CAA8B,EAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,OAAO,CAAC,WAAW,CAAC,CAC5E,CAAC;YAEF,mBAAmB,EAAE,OAAO,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC;YAEjF,oFAAoF;YACpF,sCAAsC;YACtC,kEAAkE;YAClE,OAAO,KAAK,IAAI,EAAE;gBAChB,IAAA,2CAA6B,EAAC,MAAM,CAAC,WAAW,CAAC,CAAC;gBAElD,IAAI,OAAO,KAAK,aAAa,CAAC,qBAAqB,EAAE,CAAC;oBACpD,MAAM,CAAC,WAAW,CAAC,GAAG,CACpB,MAAM,IAAA,gDAAkC,EAAC,MAAM,EAAE,oBAAoB,CAAC,CACvE,CAAC;oBAEF,OAAO;gBACT,CAAC;gBAED,IAAI,OAAO,KAAK,aAAa,CAAC,qBAAqB,EAAE,CAAC;oBACpD,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,IAAA,gDAAkC,EAAC,MAAM,EAAE,oBAAoB,CAAC,CAAC,CAAC;gBAC3F,CAAC;gBAED,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,2CAA6B,CAAC,CAAC;gBACtD,MAAM,CAAC,WAAW,CAAC,GAAG,CACpB,IAAA,8CAAgC,EAC9B,MAAM,EACN,WAAW,EACX,qBAAqB,EACrB,oBAAoB,CACrB,CACF,CAAC;YACJ,CAAC,CAAC;QACJ,CAAC;KACF,CAAC;AACJ,CAAC"} \ No newline at end of file diff --git a/src/tools/vite/plugins/ssr-ssl-plugin.d.ts b/src/tools/vite/plugins/ssr-ssl-plugin.d.ts new file mode 100644 index 00000000..eff1eced --- /dev/null +++ b/src/tools/vite/plugins/ssr-ssl-plugin.d.ts @@ -0,0 +1,9 @@ +/** + * @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 { Plugin } from 'vite'; +export declare function createAngularServerSideSSLPlugin(): Plugin; diff --git a/src/tools/vite/plugins/ssr-ssl-plugin.js b/src/tools/vite/plugins/ssr-ssl-plugin.js new file mode 100644 index 00000000..b191c4ab --- /dev/null +++ b/src/tools/vite/plugins/ssr-ssl-plugin.js @@ -0,0 +1,92 @@ +"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 + */ +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); +Object.defineProperty(exports, "__esModule", { value: true }); +exports.createAngularServerSideSSLPlugin = createAngularServerSideSSLPlugin; +const promises_1 = require("node:fs/promises"); +const node_tls_1 = require("node:tls"); +function createAngularServerSideSSLPlugin() { + return { + name: 'angular-ssr-ssl-plugin', + apply: 'serve', + async configureServer({ config, httpServer }) { + const { ssr, server: { https }, } = config; + if (!ssr || !https?.cert) { + return; + } + if (httpServer && 'ALPNProtocols' in httpServer) { + // Force Vite to use HTTP/1.1 when SSR and SSL are enabled. + // This is required because the Express server used for SSR does not support HTTP/2. + // See: https://github.com/vitejs/vite/blob/46d3077f2b63771cc50230bc907c48f5773c00fb/packages/vite/src/node/http.ts#L126 + // We directly set the `ALPNProtocols` on the HTTP server to override the default behavior. + // Passing `ALPNProtocols` in the TLS options would cause Node.js to automatically include `h2`. + // Additionally, using `ALPNCallback` is not an option as it is mutually exclusive with `ALPNProtocols`. + // See: https://github.com/nodejs/node/blob/b8b4350ed3b73d225eb9e628d69151df56eaf298/lib/internal/http2/core.js#L3351 + httpServer.ALPNProtocols = ['http/1.1']; + } + const { cert } = https; + const additionalCerts = Array.isArray(cert) ? cert : [cert]; + // TODO(alanagius): Remove the `if` check once we only support Node.js 22.18.0+ and 24.5.0+. + if (node_tls_1.getCACertificates && node_tls_1.setDefaultCACertificates) { + const currentCerts = (0, node_tls_1.getCACertificates)('default'); + (0, node_tls_1.setDefaultCACertificates)([...currentCerts, ...additionalCerts]); + return; + } + // TODO(alanagius): Remove the below and `undici` dependency once we only support Node.js 22.18.0+ and 24.5.0+. + const { getGlobalDispatcher, setGlobalDispatcher, Agent } = await Promise.resolve().then(() => __importStar(require('undici'))); + const originalDispatcher = getGlobalDispatcher(); + const ca = [...node_tls_1.rootCertificates, ...additionalCerts]; + const extraNodeCerts = process.env['NODE_EXTRA_CA_CERTS']; + if (extraNodeCerts) { + ca.push(await (0, promises_1.readFile)(extraNodeCerts)); + } + setGlobalDispatcher(new Agent({ + connect: { + ca, + }, + })); + httpServer?.on('close', () => { + setGlobalDispatcher(originalDispatcher); + }); + }, + }; +} +//# sourceMappingURL=ssr-ssl-plugin.js.map \ No newline at end of file diff --git a/src/tools/vite/plugins/ssr-ssl-plugin.js.map b/src/tools/vite/plugins/ssr-ssl-plugin.js.map new file mode 100644 index 00000000..37a8799d --- /dev/null +++ b/src/tools/vite/plugins/ssr-ssl-plugin.js.map @@ -0,0 +1 @@ +{"version":3,"file":"ssr-ssl-plugin.js","sourceRoot":"","sources":["ssr-ssl-plugin.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAMH,4EA2DC;AA/DD,+CAA4C;AAC5C,uCAAyF;AAGzF,SAAgB,gCAAgC;IAC9C,OAAO;QACL,IAAI,EAAE,wBAAwB;QAC9B,KAAK,EAAE,OAAO;QACd,KAAK,CAAC,eAAe,CAAC,EAAE,MAAM,EAAE,UAAU,EAAE;YAC1C,MAAM,EACJ,GAAG,EACH,MAAM,EAAE,EAAE,KAAK,EAAE,GAClB,GAAG,MAAM,CAAC;YAEX,IAAI,CAAC,GAAG,IAAI,CAAC,KAAK,EAAE,IAAI,EAAE,CAAC;gBACzB,OAAO;YACT,CAAC;YAED,IAAI,UAAU,IAAI,eAAe,IAAI,UAAU,EAAE,CAAC;gBAChD,2DAA2D;gBAC3D,oFAAoF;gBACpF,wHAAwH;gBAExH,2FAA2F;gBAC3F,gGAAgG;gBAChG,wGAAwG;gBACxG,qHAAqH;gBACrH,UAAU,CAAC,aAAa,GAAG,CAAC,UAAU,CAAC,CAAC;YAC1C,CAAC;YAED,MAAM,EAAE,IAAI,EAAE,GAAG,KAAK,CAAC;YACvB,MAAM,eAAe,GAAG,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;YAE5D,4FAA4F;YAC5F,IAAI,4BAAiB,IAAI,mCAAwB,EAAE,CAAC;gBAClD,MAAM,YAAY,GAAG,IAAA,4BAAiB,EAAC,SAAS,CAAC,CAAC;gBAClD,IAAA,mCAAwB,EAAC,CAAC,GAAG,YAAY,EAAE,GAAG,eAAe,CAAC,CAAC,CAAC;gBAEhE,OAAO;YACT,CAAC;YAED,+GAA+G;YAC/G,MAAM,EAAE,mBAAmB,EAAE,mBAAmB,EAAE,KAAK,EAAE,GAAG,wDAAa,QAAQ,GAAC,CAAC;YACnF,MAAM,kBAAkB,GAAG,mBAAmB,EAAE,CAAC;YACjD,MAAM,EAAE,GAAG,CAAC,GAAG,2BAAgB,EAAE,GAAG,eAAe,CAAC,CAAC;YACrD,MAAM,cAAc,GAAG,OAAO,CAAC,GAAG,CAAC,qBAAqB,CAAC,CAAC;YAC1D,IAAI,cAAc,EAAE,CAAC;gBACnB,EAAE,CAAC,IAAI,CAAC,MAAM,IAAA,mBAAQ,EAAC,cAAc,CAAC,CAAC,CAAC;YAC1C,CAAC;YAED,mBAAmB,CACjB,IAAI,KAAK,CAAC;gBACR,OAAO,EAAE;oBACP,EAAE;iBACH;aACF,CAAC,CACH,CAAC;YAEF,UAAU,EAAE,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE;gBAC3B,mBAAmB,CAAC,kBAAkB,CAAC,CAAC;YAC1C,CAAC,CAAC,CAAC;QACL,CAAC;KACF,CAAC;AACJ,CAAC"} \ No newline at end of file diff --git a/src/tools/vite/utils.d.ts b/src/tools/vite/utils.d.ts index 8cedb738..e84fbec6 100644 --- a/src/tools/vite/utils.d.ts +++ b/src/tools/vite/utils.d.ts @@ -6,6 +6,7 @@ * found in the LICENSE file at https://angular.dev/license */ import type { DepOptimizationConfig } from 'vite'; +import type { ExternalResultMetadata } from '../esbuild/bundler-execution-result'; import { JavaScriptTransformer } from '../esbuild/javascript-transformer'; export type AngularMemoryOutputFiles = Map | undefined; }): DepOptimizationConfig; +export interface DevServerExternalResultMetadata { + implicitBrowser: string[]; + implicitServer: string[]; + explicitBrowser: string[]; + explicitServer: string[]; +} +export declare function isAbsoluteUrl(url: string): boolean; +export declare function updateExternalMetadata(result: { + detail?: { + externalMetadata?: ExternalResultMetadata; + }; +}, externalMetadata: DevServerExternalResultMetadata, externalDependencies: string[] | undefined, explicitPackagesOnly?: boolean): void; diff --git a/src/tools/vite/utils.js b/src/tools/vite/utils.js index b01d5165..27bfc3f6 100644 --- a/src/tools/vite/utils.js +++ b/src/tools/vite/utils.js @@ -10,7 +10,10 @@ Object.defineProperty(exports, "__esModule", { value: true }); exports.pathnameWithoutBasePath = pathnameWithoutBasePath; exports.lookupMimeTypeFromRequest = lookupMimeTypeFromRequest; exports.getDepOptimizationConfig = getDepOptimizationConfig; +exports.isAbsoluteUrl = isAbsoluteUrl; +exports.updateExternalMetadata = updateExternalMetadata; const mrmime_1 = require("mrmime"); +const node_module_1 = require("node:module"); const node_path_1 = require("node:path"); const utils_1 = require("../esbuild/utils"); function pathnameWithoutBasePath(url, basePath) { @@ -64,4 +67,40 @@ function getDepOptimizationConfig({ disabled, exclude, include, target, zoneless }, }; } +function isAbsoluteUrl(url) { + try { + new URL(url); + return true; + } + catch { + return false; + } +} +function updateExternalMetadata(result, externalMetadata, externalDependencies, explicitPackagesOnly = false) { + if (!result.detail?.['externalMetadata']) { + return; + } + const { implicitBrowser, implicitServer, explicit } = result.detail['externalMetadata']; + const implicitServerFiltered = implicitServer.filter((m) => !(0, node_module_1.isBuiltin)(m) && !isAbsoluteUrl(m)); + const implicitBrowserFiltered = implicitBrowser.filter((m) => !isAbsoluteUrl(m)); + const explicitBrowserFiltered = explicitPackagesOnly + ? explicit.filter((m) => !isAbsoluteUrl(m)) + : explicit; + // Empty Arrays to avoid growing unlimited with every re-build. + externalMetadata.explicitBrowser.length = 0; + externalMetadata.explicitServer.length = 0; + externalMetadata.implicitServer.length = 0; + externalMetadata.implicitBrowser.length = 0; + const externalDeps = externalDependencies ?? []; + externalMetadata.explicitBrowser.push(...explicitBrowserFiltered, ...externalDeps); + externalMetadata.explicitServer.push(...explicitBrowserFiltered, ...externalDeps, ...node_module_1.builtinModules); + externalMetadata.implicitServer.push(...implicitServerFiltered); + externalMetadata.implicitBrowser.push(...implicitBrowserFiltered); + // The below needs to be sorted as Vite uses these options as part of the hashing invalidation algorithm. + // See: https://github.com/vitejs/vite/blob/0873bae0cfe0f0718ad2f5743dd34a17e4ab563d/packages/vite/src/node/optimizer/index.ts#L1203-L1239 + externalMetadata.explicitBrowser.sort(); + externalMetadata.explicitServer.sort(); + externalMetadata.implicitServer.sort(); + externalMetadata.implicitBrowser.sort(); +} //# sourceMappingURL=utils.js.map \ No newline at end of file diff --git a/src/tools/vite/utils.js.map b/src/tools/vite/utils.js.map index 0ae9f40b..dfe68221 100644 --- a/src/tools/vite/utils.js.map +++ b/src/tools/vite/utils.js.map @@ -1 +1 @@ -{"version":3,"file":"utils.js","sourceRoot":"","sources":["utils.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;AAeH,0DAQC;AAED,8DAQC;AAWD,4DA4DC;AAtGD,mCAAkD;AAClD,yCAAoC;AAGpC,4CAAqD;AASrD,SAAgB,uBAAuB,CAAC,GAAW,EAAE,QAAgB;IACnE,MAAM,SAAS,GAAG,IAAI,GAAG,CAAC,GAAG,EAAE,kBAAkB,CAAC,CAAC;IACnD,MAAM,QAAQ,GAAG,kBAAkB,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;IAExD,0DAA0D;IAC1D,OAAO,QAAQ,KAAK,GAAG,IAAI,QAAQ,CAAC,UAAU,CAAC,QAAQ,CAAC;QACtD,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC;QACrC,CAAC,CAAC,QAAQ,CAAC;AACf,CAAC;AAED,SAAgB,yBAAyB,CAAC,GAAW;IACnD,MAAM,SAAS,GAAG,IAAA,mBAAO,EAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAE7C,IAAI,SAAS,KAAK,MAAM,EAAE,CAAC;QACzB,OAAO,cAAc,CAAC;IACxB,CAAC;IAED,OAAO,SAAS,IAAI,IAAA,eAAc,EAAC,SAAS,CAAC,CAAC;AAChD,CAAC;AAWD,SAAgB,wBAAwB,CAAC,EACvC,QAAQ,EACR,OAAO,EACP,OAAO,EACP,MAAM,EACN,QAAQ,EACR,oBAAoB,EACpB,GAAG,EACH,MAAM,EACN,oBAAoB,EACpB,MAAM,GAAG,EAAE,GAYZ;IACC,MAAM,OAAO,GAAwB;QACnC;YACE,IAAI,EAAE,6BAA6B,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,GAClD,oBAAoB,CAAC,CAAC,CAAC,mBAAmB,CAAC,CAAC,CAAC,EAC/C,EAAE;YACF,KAAK,CAAC,KAAK;gBACT,KAAK,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,YAAY,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;oBACpD,OAAO;wBACL,QAAQ,EAAE,MAAM,oBAAoB,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC;wBAC7D,MAAM,EAAE,IAAI;qBACb,CAAC;gBACJ,CAAC,CAAC,CAAC;YACL,CAAC;SACF;KACF,CAAC;IAEF,OAAO;QACL,kFAAkF;QAClF,OAAO;QACP,iHAAiH;QACjH,8EAA8E;QAC9E,OAAO,EAAE,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO;QACvC,WAAW,EAAE,QAAQ;QACrB,kEAAkE;QAClE,cAAc,EAAE;YACd,iCAAiC;YACjC,MAAM;YACN,SAAS,EAAE,IAAA,yBAAiB,EAAC,MAAM,EAAE,QAAQ,CAAC;YAC9C,OAAO;YACP,MAAM;YACN,MAAM,EAAE;gBACN,GAAG,MAAM;gBACT,cAAc,EAAE,GAAG,GAAG,EAAE;aACzB;YACD,iBAAiB,EAAE,CAAC,MAAM,EAAE,KAAK,EAAE,MAAM,CAAC;SAC3C;KACF,CAAC;AACJ,CAAC"} \ No newline at end of file +{"version":3,"file":"utils.js","sourceRoot":"","sources":["utils.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/src/utils/check-port.js b/src/utils/check-port.js index b34057dc..da726dfd 100644 --- a/src/utils/check-port.js +++ b/src/utils/check-port.js @@ -64,7 +64,7 @@ async function checkPort(port, host) { reject(err); return; } - if (!tty_1.isTTY) { + if (!(0, tty_1.isTTY)()) { reject(createInUseError(port)); return; } diff --git a/src/utils/check-port.js.map b/src/utils/check-port.js.map index da32b3d9..969afa1e 100644 --- a/src/utils/check-port.js.map +++ b/src/utils/check-port.js.map @@ -1 +1 @@ -{"version":3,"file":"check-port.js","sourceRoot":"","sources":["check-port.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAUH,8BAkDC;AA1DD,8DAAiC;AACjC,uCAAwC;AACxC,+BAA8B;AAE9B,SAAS,gBAAgB,CAAC,IAAY;IACpC,OAAO,IAAI,KAAK,CAAC,QAAQ,IAAI,+DAA+D,CAAC,CAAC;AAChG,CAAC;AAEM,KAAK,UAAU,SAAS,CAAC,IAAY,EAAE,IAAY;IACxD,6FAA6F;IAC7F,6CAA6C;IAC7C,oBAAoB;IACpB,cAAc;IACd,IAAI;IAEJ,OAAO,IAAI,OAAO,CAAS,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QAC7C,MAAM,MAAM,GAAG,IAAA,uBAAY,GAAE,CAAC;QAE9B,MAAM;aACH,IAAI,CAAC,OAAO,EAAE,CAAC,GAA0B,EAAE,EAAE;YAC5C,IAAI,GAAG,CAAC,IAAI,KAAK,YAAY,EAAE,CAAC;gBAC9B,MAAM,CAAC,GAAG,CAAC,CAAC;gBAEZ,OAAO;YACT,CAAC;YAED,IAAI,CAAC,WAAK,EAAE,CAAC;gBACX,MAAM,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC;gBAE/B,OAAO;YACT,CAAC;YAED,kDAAO,mBAAmB,IACvB,IAAI,CAAC,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE,EAAE,CAC7B,OAAO,CAAC;gBACN,OAAO,EAAE,QAAQ,IAAI,8DAA8D;gBACnF,OAAO,EAAE,IAAI;gBACb,KAAK,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE;aACtB,CAAC,CACH;iBACA,IAAI,CACH,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC,EACnF,GAAG,EAAE,CAAC,MAAM,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC,CACrC,CAAC;QACN,CAAC,CAAC;aACD,IAAI,CAAC,WAAW,EAAE,GAAG,EAAE;YACtB,4DAA4D;YAC5D,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,EAAE,CAAC;YACjC,IAAA,qBAAM,EACJ,OAAO,IAAI,OAAO,OAAO,KAAK,QAAQ,EACtC,uDAAuD,CACxD,CAAC;YAEF,MAAM,CAAC,KAAK,EAAE,CAAC;YACf,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QACxB,CAAC,CAAC;aACD,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IACxB,CAAC,CAAC,CAAC;AACL,CAAC"} \ No newline at end of file +{"version":3,"file":"check-port.js","sourceRoot":"","sources":["check-port.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAUH,8BAkDC;AA1DD,8DAAiC;AACjC,uCAAwC;AACxC,+BAA8B;AAE9B,SAAS,gBAAgB,CAAC,IAAY;IACpC,OAAO,IAAI,KAAK,CAAC,QAAQ,IAAI,+DAA+D,CAAC,CAAC;AAChG,CAAC;AAEM,KAAK,UAAU,SAAS,CAAC,IAAY,EAAE,IAAY;IACxD,6FAA6F;IAC7F,6CAA6C;IAC7C,oBAAoB;IACpB,cAAc;IACd,IAAI;IAEJ,OAAO,IAAI,OAAO,CAAS,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QAC7C,MAAM,MAAM,GAAG,IAAA,uBAAY,GAAE,CAAC;QAE9B,MAAM;aACH,IAAI,CAAC,OAAO,EAAE,CAAC,GAA0B,EAAE,EAAE;YAC5C,IAAI,GAAG,CAAC,IAAI,KAAK,YAAY,EAAE,CAAC;gBAC9B,MAAM,CAAC,GAAG,CAAC,CAAC;gBAEZ,OAAO;YACT,CAAC;YAED,IAAI,CAAC,IAAA,WAAK,GAAE,EAAE,CAAC;gBACb,MAAM,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC;gBAE/B,OAAO;YACT,CAAC;YAED,kDAAO,mBAAmB,IACvB,IAAI,CAAC,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE,EAAE,CAC7B,OAAO,CAAC;gBACN,OAAO,EAAE,QAAQ,IAAI,8DAA8D;gBACnF,OAAO,EAAE,IAAI;gBACb,KAAK,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE;aACtB,CAAC,CACH;iBACA,IAAI,CACH,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC,EACnF,GAAG,EAAE,CAAC,MAAM,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC,CACrC,CAAC;QACN,CAAC,CAAC;aACD,IAAI,CAAC,WAAW,EAAE,GAAG,EAAE;YACtB,4DAA4D;YAC5D,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,EAAE,CAAC;YACjC,IAAA,qBAAM,EACJ,OAAO,IAAI,OAAO,OAAO,KAAK,QAAQ,EACtC,uDAAuD,CACxD,CAAC;YAEF,MAAM,CAAC,KAAK,EAAE,CAAC;YACf,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QACxB,CAAC,CAAC;aACD,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IACxB,CAAC,CAAC,CAAC;AACL,CAAC"} \ No newline at end of file diff --git a/src/utils/normalize-cache.js b/src/utils/normalize-cache.js index c8dd3833..fa22c0b9 100644 --- a/src/utils/normalize-cache.js +++ b/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 = '21.0.0-next.8+sha-2ffc527'; +const VERSION = '21.0.3+sha-deb4fff'; function hasCacheMetadata(value) { return (!!value && typeof value === 'object' && diff --git a/src/utils/project-metadata.js b/src/utils/project-metadata.js index ec58122f..b601496d 100644 --- a/src/utils/project-metadata.js +++ b/src/utils/project-metadata.js @@ -17,7 +17,7 @@ const node_path_1 = require("node:path"); * @returns A normalized path string. */ function normalizeDirectoryPath(path) { - const last = path[path.length - 1]; + const last = path.at(-1); if (last === '/' || last === '\\') { return path.slice(0, -1); } diff --git a/src/utils/project-metadata.js.map b/src/utils/project-metadata.js.map index e5a2eec5..2b841dc9 100644 --- a/src/utils/project-metadata.js.map +++ b/src/utils/project-metadata.js.map @@ -1 +1 @@ -{"version":3,"file":"project-metadata.js","sourceRoot":"","sources":["project-metadata.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;AAUH,wDAOC;AAED,kDAWC;AA5BD,yCAAiC;AAEjC;;;;;GAKG;AACH,SAAgB,sBAAsB,CAAC,IAAY;IACjD,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IACnC,IAAI,IAAI,KAAK,GAAG,IAAI,IAAI,KAAK,IAAI,EAAE,CAAC;QAClC,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IAC3B,CAAC;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AAED,SAAgB,mBAAmB,CACjC,aAAqB,EACrB,eAAuD;IAEvD,MAAM,WAAW,GAAG,sBAAsB,CAAC,IAAA,gBAAI,EAAC,aAAa,EAAE,eAAe,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,CAAC;IAC5F,MAAM,aAAa,GAAG,eAAe,CAAC,UAAU,CAAC;IACjD,MAAM,iBAAiB,GAAG,sBAAsB,CAC9C,aAAa,KAAK,SAAS,CAAC,CAAC,CAAC,IAAA,gBAAI,EAAC,WAAW,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,IAAA,gBAAI,EAAC,aAAa,EAAE,aAAa,CAAC,CAC5F,CAAC;IAEF,OAAO,EAAE,WAAW,EAAE,iBAAiB,EAAE,CAAC;AAC5C,CAAC"} \ No newline at end of file +{"version":3,"file":"project-metadata.js","sourceRoot":"","sources":["project-metadata.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;AAUH,wDAOC;AAED,kDAWC;AA5BD,yCAAiC;AAEjC;;;;;GAKG;AACH,SAAgB,sBAAsB,CAAC,IAAY;IACjD,MAAM,IAAI,GAAG,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;IACzB,IAAI,IAAI,KAAK,GAAG,IAAI,IAAI,KAAK,IAAI,EAAE,CAAC;QAClC,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IAC3B,CAAC;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AAED,SAAgB,mBAAmB,CACjC,aAAqB,EACrB,eAAuD;IAEvD,MAAM,WAAW,GAAG,sBAAsB,CAAC,IAAA,gBAAI,EAAC,aAAa,EAAE,eAAe,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,CAAC;IAC5F,MAAM,aAAa,GAAG,eAAe,CAAC,UAAU,CAAC;IACjD,MAAM,iBAAiB,GAAG,sBAAsB,CAC9C,aAAa,KAAK,SAAS,CAAC,CAAC,CAAC,IAAA,gBAAI,EAAC,WAAW,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,IAAA,gBAAI,EAAC,aAAa,EAAE,aAAa,CAAC,CAC5F,CAAC;IAEF,OAAO,EAAE,WAAW,EAAE,iBAAiB,EAAE,CAAC;AAC5C,CAAC"} \ No newline at end of file diff --git a/src/utils/server-rendering/launch-server.js b/src/utils/server-rendering/launch-server.js index 403ffb27..720cdada 100644 --- a/src/utils/server-rendering/launch-server.js +++ b/src/utils/server-rendering/launch-server.js @@ -57,9 +57,7 @@ exports.DEFAULT_URL = new URL('http://ng-localhost/'); */ async function launchServer() { const { reqHandler } = await (0, load_esm_from_memory_1.loadEsmModuleFromMemory)('./server.mjs'); - const { createWebRequestFromNodeRequest, writeResponseToNodeResponse } = (await Promise.resolve(`${ - // eslint-disable-next-line @typescript-eslint/no-explicit-any - '@angular/ssr/node'}`).then(s => __importStar(require(s)))); + const { createWebRequestFromNodeRequest, writeResponseToNodeResponse } = (await Promise.resolve(`${'@angular/ssr/node'}`).then(s => __importStar(require(s)))); if (!(0, utils_1.isSsrNodeRequestHandler)(reqHandler) && !(0, utils_1.isSsrRequestHandler)(reqHandler)) { return exports.DEFAULT_URL; } diff --git a/src/utils/server-rendering/launch-server.js.map b/src/utils/server-rendering/launch-server.js.map index 531851b0..1f8aa62d 100644 --- a/src/utils/server-rendering/launch-server.js.map +++ b/src/utils/server-rendering/launch-server.js.map @@ -1 +1 @@ -{"version":3,"file":"launch-server.js","sourceRoot":"","sources":["launch-server.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAcH,oCA4CC;AAxDD,8DAAiC;AACjC,yCAAyC;AACzC,iEAAiE;AACjE,mCAAuE;AAE1D,QAAA,WAAW,GAAG,IAAI,GAAG,CAAC,sBAAsB,CAAC,CAAC;AAE3D;;;;GAIG;AACI,KAAK,UAAU,YAAY;IAChC,MAAM,EAAE,UAAU,EAAE,GAAG,MAAM,IAAA,8CAAuB,EAAC,cAAc,CAAC,CAAC;IACrE,MAAM,EAAE,+BAA+B,EAAE,2BAA2B,EAAE,GAAG,CAAC;IACxE,8DAA8D;IAC9D,mBAA0B,uCAC3B,CAAkF,CAAC;IAEpF,IAAI,CAAC,IAAA,+BAAuB,EAAC,UAAU,CAAC,IAAI,CAAC,IAAA,2BAAmB,EAAC,UAAU,CAAC,EAAE,CAAC;QAC7E,OAAO,mBAAW,CAAC;IACrB,CAAC;IAED,MAAM,MAAM,GAAG,IAAA,wBAAY,EAAC,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;QACvC,CAAC,KAAK,IAAI,EAAE;YACV,iBAAiB;YACjB,IAAI,IAAA,+BAAuB,EAAC,UAAU,CAAC,EAAE,CAAC;gBACxC,MAAM,UAAU,CAAC,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC,EAAE,EAAE;oBAC/B,MAAM,CAAC,IAAI,IAAI,KAAK,CAAC,8BAA8B,GAAG,CAAC,GAAG,IAAI,CAAC,CAAC;gBAClE,CAAC,CAAC,CAAC;YACL,CAAC;iBAAM,CAAC;gBACN,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,+BAA+B,CAAC,GAAG,CAAC,CAAC,CAAC;gBACtE,IAAI,MAAM,EAAE,CAAC;oBACX,MAAM,2BAA2B,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;gBACjD,CAAC;qBAAM,CAAC;oBACN,GAAG,CAAC,UAAU,GAAG,GAAG,CAAC;oBACrB,GAAG,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC;gBAC9B,CAAC;YACH,CAAC;QACH,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE;YACf,GAAG,CAAC,UAAU,GAAG,GAAG,CAAC;YACrB,GAAG,CAAC,GAAG,CAAC,wBAAwB,CAAC,CAAC;YAClC,sCAAsC;YACtC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QACnB,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,MAAM,CAAC,KAAK,EAAE,CAAC;IAEf,MAAM,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC,CAAC;IAE7E,MAAM,aAAa,GAAG,MAAM,CAAC,OAAO,EAAE,CAAC;IACvC,IAAA,qBAAM,EAAC,aAAa,EAAE,mCAAmC,CAAC,CAAC;IAC3D,IAAA,qBAAM,EAAC,OAAO,aAAa,KAAK,QAAQ,EAAE,wCAAwC,CAAC,CAAC;IAEpF,OAAO,IAAI,GAAG,CAAC,oBAAoB,aAAa,CAAC,IAAI,GAAG,CAAC,CAAC;AAC5D,CAAC"} \ No newline at end of file +{"version":3,"file":"launch-server.js","sourceRoot":"","sources":["launch-server.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAcH,oCA2CC;AAvDD,8DAAiC;AACjC,yCAAyC;AACzC,iEAAiE;AACjE,mCAAuE;AAE1D,QAAA,WAAW,GAAG,IAAI,GAAG,CAAC,sBAAsB,CAAC,CAAC;AAE3D;;;;GAIG;AACI,KAAK,UAAU,YAAY;IAChC,MAAM,EAAE,UAAU,EAAE,GAAG,MAAM,IAAA,8CAAuB,EAAC,cAAc,CAAC,CAAC;IACrE,MAAM,EAAE,+BAA+B,EAAE,2BAA2B,EAAE,GAAG,CAAC,yBACxE,mBAA6B,uCAC9B,CAAkF,CAAC;IAEpF,IAAI,CAAC,IAAA,+BAAuB,EAAC,UAAU,CAAC,IAAI,CAAC,IAAA,2BAAmB,EAAC,UAAU,CAAC,EAAE,CAAC;QAC7E,OAAO,mBAAW,CAAC;IACrB,CAAC;IAED,MAAM,MAAM,GAAG,IAAA,wBAAY,EAAC,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;QACvC,CAAC,KAAK,IAAI,EAAE;YACV,iBAAiB;YACjB,IAAI,IAAA,+BAAuB,EAAC,UAAU,CAAC,EAAE,CAAC;gBACxC,MAAM,UAAU,CAAC,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC,EAAE,EAAE;oBAC/B,MAAM,CAAC,IAAI,IAAI,KAAK,CAAC,8BAA8B,GAAG,CAAC,GAAG,IAAI,CAAC,CAAC;gBAClE,CAAC,CAAC,CAAC;YACL,CAAC;iBAAM,CAAC;gBACN,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,+BAA+B,CAAC,GAAG,CAAC,CAAC,CAAC;gBACtE,IAAI,MAAM,EAAE,CAAC;oBACX,MAAM,2BAA2B,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;gBACjD,CAAC;qBAAM,CAAC;oBACN,GAAG,CAAC,UAAU,GAAG,GAAG,CAAC;oBACrB,GAAG,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC;gBAC9B,CAAC;YACH,CAAC;QACH,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE;YACf,GAAG,CAAC,UAAU,GAAG,GAAG,CAAC;YACrB,GAAG,CAAC,GAAG,CAAC,wBAAwB,CAAC,CAAC;YAClC,sCAAsC;YACtC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QACnB,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,MAAM,CAAC,KAAK,EAAE,CAAC;IAEf,MAAM,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC,CAAC;IAE7E,MAAM,aAAa,GAAG,MAAM,CAAC,OAAO,EAAE,CAAC;IACvC,IAAA,qBAAM,EAAC,aAAa,EAAE,mCAAmC,CAAC,CAAC;IAC3D,IAAA,qBAAM,EAAC,OAAO,aAAa,KAAK,QAAQ,EAAE,wCAAwC,CAAC,CAAC;IAEpF,OAAO,IAAI,GAAG,CAAC,oBAAoB,aAAa,CAAC,IAAI,GAAG,CAAC,CAAC;AAC5D,CAAC"} \ No newline at end of file diff --git a/src/utils/server-rendering/manifest.js b/src/utils/server-rendering/manifest.js index e2d2b504..dc2931ae 100644 --- a/src/utils/server-rendering/manifest.js +++ b/src/utils/server-rendering/manifest.js @@ -65,7 +65,7 @@ function generateAngularServerAppEngineManifest(i18nOptions, baseHref) { } // Remove trailing slash but retain leading slash. let basePath = baseHref || '/'; - if (basePath.length > 1 && basePath[basePath.length - 1] === '/') { + if (basePath.length > 1 && basePath.at(-1) === '/') { basePath = basePath.slice(0, -1); } const manifestContent = ` diff --git a/src/utils/server-rendering/manifest.js.map b/src/utils/server-rendering/manifest.js.map index e8df2a51..076607b3 100644 --- a/src/utils/server-rendering/manifest.js.map +++ b/src/utils/server-rendering/manifest.js.map @@ -1 +1 @@ -{"version":3,"file":"manifest.js","sourceRoot":"","sources":["manifest.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"manifest.js","sourceRoot":"","sources":["manifest.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/src/utils/server-rendering/prerender.js b/src/utils/server-rendering/prerender.js index ea5b7ea7..cea32568 100644 --- a/src/utils/server-rendering/prerender.js +++ b/src/utils/server-rendering/prerender.js @@ -19,6 +19,7 @@ const worker_pool_1 = require("../worker-pool"); const utils_1 = require("./esm-in-memory-loader/utils"); const manifest_1 = require("./manifest"); const models_1 = require("./models"); +const utils_2 = require("./utils"); async function prerenderPages(workspaceRoot, baseHref, appShellOptions, prerenderOptions, outputFiles, assets, outputMode, sourcemap = false, maxThreads = 1) { const outputFilesForWorker = {}; const serverBundlesSourceMaps = new Map(); @@ -50,7 +51,7 @@ async function prerenderPages(workspaceRoot, baseHref, appShellOptions, prerende serverBundlesSourceMaps.clear(); const assetsReversed = {}; for (const { source, destination } of assets) { - assetsReversed[addLeadingSlash((0, path_1.toPosixPath)(destination))] = source; + assetsReversed[(0, url_1.addLeadingSlash)((0, path_1.toPosixPath)(destination))] = source; } // Get routes to prerender const { errors: extractionErrors, serializedRouteTree: serializableRouteTreeNode, appShellRoute, } = await getAllRoutes(workspaceRoot, baseHref, outputFilesForWorker, assetsReversed, appShellOptions, prerenderOptions, sourcemap, outputMode).catch((err) => { @@ -128,16 +129,16 @@ async function renderPages(baseHref, sourcemap, serializableRouteTreeNode, maxTh }); try { const renderingPromises = []; - const appShellRouteWithLeadingSlash = appShellRoute && addLeadingSlash(appShellRoute); + const appShellRouteWithLeadingSlash = appShellRoute && (0, url_1.addLeadingSlash)(appShellRoute); const baseHrefPathnameWithLeadingSlash = new URL(baseHref, 'http://localhost').pathname; for (const { route, redirectTo } of serializableRouteTreeNode) { // Remove the base href from the file output path. - const routeWithoutBaseHref = addTrailingSlash(route).startsWith(baseHrefPathnameWithLeadingSlash) - ? addLeadingSlash(route.slice(baseHrefPathnameWithLeadingSlash.length)) + const routeWithoutBaseHref = (0, url_1.addTrailingSlash)(route).startsWith(baseHrefPathnameWithLeadingSlash) + ? (0, url_1.addLeadingSlash)(route.slice(baseHrefPathnameWithLeadingSlash.length)) : route; - const outPath = node_path_1.posix.join(removeLeadingSlash(routeWithoutBaseHref), 'index.html'); + const outPath = (0, url_1.stripLeadingSlash)(node_path_1.posix.join(routeWithoutBaseHref, 'index.html')); if (typeof redirectTo === 'string') { - output[outPath] = { content: generateRedirectStaticPage(redirectTo), appShellRoute: false }; + output[outPath] = { content: (0, utils_2.generateRedirectStaticPage)(redirectTo), appShellRoute: false }; continue; } const render = renderWorker.run({ url: route }); @@ -171,7 +172,7 @@ async function getAllRoutes(workspaceRoot, baseHref, outputFilesForWorker, asset const routes = []; let appShellRoute; if (appShellOptions) { - appShellRoute = (0, url_1.urlJoin)(baseHref, appShellOptions.route); + appShellRoute = (0, url_1.joinUrlParts)(baseHref, appShellOptions.route); routes.push({ renderMode: models_1.RouteRenderMode.Prerender, route: appShellRoute, @@ -182,7 +183,7 @@ async function getAllRoutes(workspaceRoot, baseHref, outputFilesForWorker, asset for (const route of routesFromFile) { routes.push({ renderMode: models_1.RouteRenderMode.Prerender, - route: (0, url_1.urlJoin)(baseHref, route.trim()), + route: (0, url_1.joinUrlParts)(baseHref, route.trim()), }); } } @@ -232,37 +233,4 @@ async function getAllRoutes(workspaceRoot, baseHref, outputFilesForWorker, asset void renderWorker.destroy(); } } -function addLeadingSlash(value) { - return value[0] === '/' ? value : '/' + value; -} -function addTrailingSlash(url) { - return url[url.length - 1] === '/' ? url : `${url}/`; -} -function removeLeadingSlash(value) { - return value[0] === '/' ? value.slice(1) : value; -} -/** - * Generates a static HTML page with a meta refresh tag to redirect the user to a specified URL. - * - * This function creates a simple HTML page that performs a redirect using a meta tag. - * It includes a fallback link in case the meta-refresh doesn't work. - * - * @param url - The URL to which the page should redirect. - * @returns The HTML content of the static redirect page. - */ -function generateRedirectStaticPage(url) { - return ` - - - - - Redirecting - - - - 
Redirecting to ${url}
- - -`.trim(); -} //# sourceMappingURL=prerender.js.map \ No newline at end of file diff --git a/src/utils/server-rendering/prerender.js.map b/src/utils/server-rendering/prerender.js.map index c57068b8..97bfb229 100644 --- a/src/utils/server-rendering/prerender.js.map +++ b/src/utils/server-rendering/prerender.js.map @@ -1 +1 @@ -{"version":3,"file":"prerender.js","sourceRoot":"","sources":["prerender.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"prerender.js","sourceRoot":"","sources":["prerender.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/src/utils/server-rendering/render-worker.js b/src/utils/server-rendering/render-worker.js index dd830f24..016e54a5 100644 --- a/src/utils/server-rendering/render-worker.js +++ b/src/utils/server-rendering/render-worker.js @@ -44,6 +44,7 @@ const node_worker_threads_1 = require("node:worker_threads"); const fetch_patch_1 = require("./fetch-patch"); const launch_server_1 = require("./launch-server"); const load_esm_from_memory_1 = require("./load-esm-from-memory"); +const utils_1 = require("./utils"); /** * This is passed as workerData when setting up the worker via the `piscina` package. */ @@ -58,7 +59,11 @@ async function renderPage({ url }) { allowStaticRouteRender: true, }); const response = await angularServerApp.handle(new Request(new URL(url, serverURL), { signal: AbortSignal.timeout(30_000) })); - return response ? response.text() : null; + if (!response) { + return null; + } + const location = response.headers.get('Location'); + return location ? (0, utils_1.generateRedirectStaticPage)(location) : response.text(); } async function initialize() { // Load the compiler because `@angular/ssr/node` depends on `@angular/` packages, diff --git a/src/utils/server-rendering/render-worker.js.map b/src/utils/server-rendering/render-worker.js.map index c82b39d1..7c7c869f 100644 --- a/src/utils/server-rendering/render-worker.js.map +++ b/src/utils/server-rendering/render-worker.js.map @@ -1 +1 @@ -{"version":3,"file":"render-worker.js","sourceRoot":"","sources":["render-worker.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEH,6DAAiD;AAGjD,+CAA+D;AAC/D,mDAA4D;AAC5D,iEAAiE;AAYjE;;GAEG;AACH,MAAM,EAAE,UAAU,EAAE,WAAW,EAAE,GAAG,gCAGnC,CAAC;AAEF,IAAI,SAAS,GAAG,2BAAW,CAAC;AAE5B;;GAEG;AACH,KAAK,UAAU,UAAU,CAAC,EAAE,GAAG,EAAiB;IAC9C,MAAM,EAAE,4BAA4B,EAAE,2BAA2B,EAAE,GACjE,MAAM,IAAA,8CAAuB,EAAC,mBAAmB,CAAC,CAAC;IAErD,MAAM,gBAAgB,GAAG,2BAA2B,CAAC;QACnD,sBAAsB,EAAE,IAAI;KAC7B,CAAC,CAAC;IAEH,MAAM,QAAQ,GAAG,MAAM,gBAAgB,CAAC,MAAM,CAC5C,IAAI,OAAO,CAAC,IAAI,GAAG,CAAC,GAAG,EAAE,SAAS,CAAC,EAAE,EAAE,MAAM,EAAE,WAAW,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,CAC9E,CAAC;IAEF,OAAO,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;AAC3C,CAAC;AAED,KAAK,UAAU,UAAU;IACvB,iFAAiF;IACjF,4EAA4E;IAC5E,wDAAa,mBAAmB,GAAC,CAAC;IAElC,IAAI,UAAU,KAAK,SAAS,IAAI,WAAW,EAAE,CAAC;QAC5C,SAAS,GAAG,MAAM,IAAA,4BAAY,GAAE,CAAC;IACnC,CAAC;IAED,IAAA,4CAA8B,EAAC,SAAS,CAAC,CAAC;IAE1C,OAAO,UAAU,CAAC;AACpB,CAAC;AAED,kBAAe,UAAU,EAAE,CAAC"} \ No newline at end of file +{"version":3,"file":"render-worker.js","sourceRoot":"","sources":["render-worker.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEH,6DAAiD;AAGjD,+CAA+D;AAC/D,mDAA4D;AAC5D,iEAAiE;AACjE,mCAAqD;AAYrD;;GAEG;AACH,MAAM,EAAE,UAAU,EAAE,WAAW,EAAE,GAAG,gCAGnC,CAAC;AAEF,IAAI,SAAS,GAAG,2BAAW,CAAC;AAE5B;;GAEG;AACH,KAAK,UAAU,UAAU,CAAC,EAAE,GAAG,EAAiB;IAC9C,MAAM,EAAE,4BAA4B,EAAE,2BAA2B,EAAE,GACjE,MAAM,IAAA,8CAAuB,EAAC,mBAAmB,CAAC,CAAC;IAErD,MAAM,gBAAgB,GAAG,2BAA2B,CAAC;QACnD,sBAAsB,EAAE,IAAI;KAC7B,CAAC,CAAC;IAEH,MAAM,QAAQ,GAAG,MAAM,gBAAgB,CAAC,MAAM,CAC5C,IAAI,OAAO,CAAC,IAAI,GAAG,CAAC,GAAG,EAAE,SAAS,CAAC,EAAE,EAAE,MAAM,EAAE,WAAW,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,CAC9E,CAAC;IAEF,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,QAAQ,GAAG,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;IAElD,OAAO,QAAQ,CAAC,CAAC,CAAC,IAAA,kCAA0B,EAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC;AAC3E,CAAC;AAED,KAAK,UAAU,UAAU;IACvB,iFAAiF;IACjF,4EAA4E;IAC5E,wDAAa,mBAAmB,GAAC,CAAC;IAElC,IAAI,UAAU,KAAK,SAAS,IAAI,WAAW,EAAE,CAAC;QAC5C,SAAS,GAAG,MAAM,IAAA,4BAAY,GAAE,CAAC;IACnC,CAAC;IAED,IAAA,4CAA8B,EAAC,SAAS,CAAC,CAAC;IAE1C,OAAO,UAAU,CAAC;AACpB,CAAC;AAED,kBAAe,UAAU,EAAE,CAAC"} \ No newline at end of file diff --git a/src/utils/server-rendering/utils.d.ts b/src/utils/server-rendering/utils.d.ts index 01ed8946..21619d87 100644 --- a/src/utils/server-rendering/utils.d.ts +++ b/src/utils/server-rendering/utils.d.ts @@ -9,3 +9,13 @@ import type { createRequestHandler } from '@angular/ssr'; import type { createNodeRequestHandler } from '@angular/ssr/node' with { 'resolution-mode': 'import' }; export declare function isSsrNodeRequestHandler(value: unknown): value is ReturnType; export declare function isSsrRequestHandler(value: unknown): value is ReturnType; +/** + * Generates a static HTML page with a meta refresh tag to redirect the user to a specified URL. + * + * This function creates a simple HTML page that performs a redirect using a meta tag. + * It includes a fallback link in case the meta-refresh doesn't work. + * + * @param url - The URL to which the page should redirect. + * @returns The HTML content of the static redirect page. + */ +export declare function generateRedirectStaticPage(url: string): string; diff --git a/src/utils/server-rendering/utils.js b/src/utils/server-rendering/utils.js index 26c9fa3d..71accd72 100644 --- a/src/utils/server-rendering/utils.js +++ b/src/utils/server-rendering/utils.js @@ -9,10 +9,35 @@ Object.defineProperty(exports, "__esModule", { value: true }); exports.isSsrNodeRequestHandler = isSsrNodeRequestHandler; exports.isSsrRequestHandler = isSsrRequestHandler; +exports.generateRedirectStaticPage = generateRedirectStaticPage; function isSsrNodeRequestHandler(value) { return typeof value === 'function' && '__ng_node_request_handler__' in value; } function isSsrRequestHandler(value) { return typeof value === 'function' && '__ng_request_handler__' in value; } +/** + * Generates a static HTML page with a meta refresh tag to redirect the user to a specified URL. + * + * This function creates a simple HTML page that performs a redirect using a meta tag. + * It includes a fallback link in case the meta-refresh doesn't work. + * + * @param url - The URL to which the page should redirect. + * @returns The HTML content of the static redirect page. + */ +function generateRedirectStaticPage(url) { + return ` + + + + + Redirecting + + + + 
Redirecting to ${url}
+ + +`.trim(); +} //# sourceMappingURL=utils.js.map \ No newline at end of file diff --git a/src/utils/server-rendering/utils.js.map b/src/utils/server-rendering/utils.js.map index d78b5709..0f721ef6 100644 --- a/src/utils/server-rendering/utils.js.map +++ b/src/utils/server-rendering/utils.js.map @@ -1 +1 @@ -{"version":3,"file":"utils.js","sourceRoot":"","sources":["utils.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;AAKH,0DAIC;AACD,kDAIC;AATD,SAAgB,uBAAuB,CACrC,KAAc;IAEd,OAAO,OAAO,KAAK,KAAK,UAAU,IAAI,6BAA6B,IAAI,KAAK,CAAC;AAC/E,CAAC;AACD,SAAgB,mBAAmB,CACjC,KAAc;IAEd,OAAO,OAAO,KAAK,KAAK,UAAU,IAAI,wBAAwB,IAAI,KAAK,CAAC;AAC1E,CAAC"} \ No newline at end of file +{"version":3,"file":"utils.js","sourceRoot":"","sources":["utils.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;AAKH,0DAIC;AACD,kDAIC;AAWD,gEAcC;AAlCD,SAAgB,uBAAuB,CACrC,KAAc;IAEd,OAAO,OAAO,KAAK,KAAK,UAAU,IAAI,6BAA6B,IAAI,KAAK,CAAC;AAC/E,CAAC;AACD,SAAgB,mBAAmB,CACjC,KAAc;IAEd,OAAO,OAAO,KAAK,KAAK,UAAU,IAAI,wBAAwB,IAAI,KAAK,CAAC;AAC1E,CAAC;AAED;;;;;;;;GAQG;AACH,SAAgB,0BAA0B,CAAC,GAAW;IACpD,OAAO;;;;;;iDAMwC,GAAG;;;mCAGjB,GAAG,KAAK,GAAG;;;CAG7C,CAAC,IAAI,EAAE,CAAC;AACT,CAAC"} \ No newline at end of file diff --git a/src/utils/url.d.ts b/src/utils/url.d.ts index d6e19160..8c3b16db 100644 --- a/src/utils/url.d.ts +++ b/src/utils/url.d.ts @@ -5,4 +5,77 @@ * 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 declare function urlJoin(...parts: string[]): string; +/** + * Removes the trailing slash from a URL if it exists. + * + * @param url - The URL string from which to remove the trailing slash. + * @returns The URL string without a trailing slash. + * + * @example + * ```js + * stripTrailingSlash('path/'); // 'path' + * stripTrailingSlash('/path'); // '/path' + * stripTrailingSlash('/'); // '/' + * stripTrailingSlash(''); // '' + * ``` + */ +export declare function stripTrailingSlash(url: string): string; +/** + * Removes the leading slash from a URL if it exists. + * + * @param url - The URL string from which to remove the leading slash. + * @returns The URL string without a leading slash. + * + * @example + * ```js + * stripLeadingSlash('/path'); // 'path' + * stripLeadingSlash('/path/'); // 'path/' + * stripLeadingSlash('/'); // '/' + * stripLeadingSlash(''); // '' + * ``` + */ +export declare function stripLeadingSlash(url: string): string; +/** + * Adds a leading slash to a URL if it does not already have one. + * + * @param url - The URL string to which the leading slash will be added. + * @returns The URL string with a leading slash. + * + * @example + * ```js + * addLeadingSlash('path'); // '/path' + * addLeadingSlash('/path'); // '/path' + * ``` + */ +export declare function addLeadingSlash(url: string): string; +/** + * Adds a trailing slash to a URL if it does not already have one. + * + * @param url - The URL string to which the trailing slash will be added. + * @returns The URL string with a trailing slash. + * + * @example + * ```js + * addTrailingSlash('path'); // 'path/' + * addTrailingSlash('path/'); // 'path/' + * ``` + */ +export declare function addTrailingSlash(url: string): string; +/** + * Joins URL parts into a single URL string. + * + * This function takes multiple URL segments, normalizes them by removing leading + * and trailing slashes where appropriate, and then joins them into a single URL. + * + * @param parts - The parts of the URL to join. Each part can be a string with or without slashes. + * @returns The joined URL string, with normalized slashes. + * + * @example + * ```js + * joinUrlParts('path/', '/to/resource'); // '/path/to/resource' + * joinUrlParts('/path/', 'to/resource'); // '/path/to/resource' + * joinUrlParts('http://localhost/path/', 'to/resource'); // 'http://localhost/path/to/resource' + * joinUrlParts('', ''); // '/' + * ``` + */ +export declare function joinUrlParts(...parts: string[]): string; diff --git a/src/utils/url.js b/src/utils/url.js index f121b190..ddf560ed 100644 --- a/src/utils/url.js +++ b/src/utils/url.js @@ -7,12 +7,116 @@ * found in the LICENSE file at https://angular.dev/license */ Object.defineProperty(exports, "__esModule", { value: true }); -exports.urlJoin = urlJoin; -function urlJoin(...parts) { - const [p, ...rest] = parts; - // Remove trailing slash from first part - // Join all parts with `/` - // Dedupe double slashes from path names - return p.replace(/\/$/, '') + ('/' + rest.join('/')).replace(/\/\/+/g, '/'); +exports.stripTrailingSlash = stripTrailingSlash; +exports.stripLeadingSlash = stripLeadingSlash; +exports.addLeadingSlash = addLeadingSlash; +exports.addTrailingSlash = addTrailingSlash; +exports.joinUrlParts = joinUrlParts; +/** + * Removes the trailing slash from a URL if it exists. + * + * @param url - The URL string from which to remove the trailing slash. + * @returns The URL string without a trailing slash. + * + * @example + * ```js + * stripTrailingSlash('path/'); // 'path' + * stripTrailingSlash('/path'); // '/path' + * stripTrailingSlash('/'); // '/' + * stripTrailingSlash(''); // '' + * ``` + */ +function stripTrailingSlash(url) { + // Check if the last character of the URL is a slash + return url.length > 1 && url.at(-1) === '/' ? url.slice(0, -1) : url; +} +/** + * Removes the leading slash from a URL if it exists. + * + * @param url - The URL string from which to remove the leading slash. + * @returns The URL string without a leading slash. + * + * @example + * ```js + * stripLeadingSlash('/path'); // 'path' + * stripLeadingSlash('/path/'); // 'path/' + * stripLeadingSlash('/'); // '/' + * stripLeadingSlash(''); // '' + * ``` + */ +function stripLeadingSlash(url) { + // Check if the first character of the URL is a slash + return url.length > 1 && url[0] === '/' ? url.slice(1) : url; +} +/** + * Adds a leading slash to a URL if it does not already have one. + * + * @param url - The URL string to which the leading slash will be added. + * @returns The URL string with a leading slash. + * + * @example + * ```js + * addLeadingSlash('path'); // '/path' + * addLeadingSlash('/path'); // '/path' + * ``` + */ +function addLeadingSlash(url) { + // Check if the URL already starts with a slash + return url[0] === '/' ? url : `/${url}`; +} +/** + * Adds a trailing slash to a URL if it does not already have one. + * + * @param url - The URL string to which the trailing slash will be added. + * @returns The URL string with a trailing slash. + * + * @example + * ```js + * addTrailingSlash('path'); // 'path/' + * addTrailingSlash('path/'); // 'path/' + * ``` + */ +function addTrailingSlash(url) { + // Check if the URL already end with a slash + return url.at(-1) === '/' ? url : `${url}/`; +} +/** + * Joins URL parts into a single URL string. + * + * This function takes multiple URL segments, normalizes them by removing leading + * and trailing slashes where appropriate, and then joins them into a single URL. + * + * @param parts - The parts of the URL to join. Each part can be a string with or without slashes. + * @returns The joined URL string, with normalized slashes. + * + * @example + * ```js + * joinUrlParts('path/', '/to/resource'); // '/path/to/resource' + * joinUrlParts('/path/', 'to/resource'); // '/path/to/resource' + * joinUrlParts('http://localhost/path/', 'to/resource'); // 'http://localhost/path/to/resource' + * joinUrlParts('', ''); // '/' + * ``` + */ +function joinUrlParts(...parts) { + const normalizeParts = []; + for (const part of parts) { + if (part === '') { + // Skip any empty parts + continue; + } + let normalizedPart = part; + if (part[0] === '/') { + normalizedPart = normalizedPart.slice(1); + } + if (part.at(-1) === '/') { + normalizedPart = normalizedPart.slice(0, -1); + } + if (normalizedPart !== '') { + normalizeParts.push(normalizedPart); + } + } + const protocolMatch = normalizeParts.length && /^https?:\/\//.test(normalizeParts[0]); + const joinedParts = normalizeParts.join('/'); + return protocolMatch ? joinedParts : addLeadingSlash(joinedParts); } //# sourceMappingURL=url.js.map \ No newline at end of file diff --git a/src/utils/url.js.map b/src/utils/url.js.map index 89d01088..a367a75a 100644 --- a/src/utils/url.js.map +++ b/src/utils/url.js.map @@ -1 +1 @@ -{"version":3,"file":"url.js","sourceRoot":"","sources":["url.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;AAEH,0BAOC;AAPD,SAAgB,OAAO,CAAC,GAAG,KAAe;IACxC,MAAM,CAAC,CAAC,EAAE,GAAG,IAAI,CAAC,GAAG,KAAK,CAAC;IAE3B,wCAAwC;IACxC,0BAA0B;IAC1B,wCAAwC;IACxC,OAAO,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,GAAG,CAAC,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;AAC9E,CAAC"} \ No newline at end of file +{"version":3,"file":"url.js","sourceRoot":"","sources":["url.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;AAgBH,gDAGC;AAgBD,8CAGC;AAcD,0CAGC;AAcD,4CAGC;AAmBD,oCAwBC;AAjHD;;;;;;;;;;;;;GAaG;AACH,SAAgB,kBAAkB,CAAC,GAAW;IAC5C,oDAAoD;IACpD,OAAO,GAAG,CAAC,MAAM,GAAG,CAAC,IAAI,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;AACvE,CAAC;AAED;;;;;;;;;;;;;GAaG;AACH,SAAgB,iBAAiB,CAAC,GAAW;IAC3C,qDAAqD;IACrD,OAAO,GAAG,CAAC,MAAM,GAAG,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;AAC/D,CAAC;AAED;;;;;;;;;;;GAWG;AACH,SAAgB,eAAe,CAAC,GAAW;IACzC,+CAA+C;IAC/C,OAAO,GAAG,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,GAAG,EAAE,CAAC;AAC1C,CAAC;AAED;;;;;;;;;;;GAWG;AACH,SAAgB,gBAAgB,CAAC,GAAW;IAC1C,4CAA4C;IAC5C,OAAO,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,GAAG,GAAG,CAAC;AAC9C,CAAC;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,SAAgB,YAAY,CAAC,GAAG,KAAe;IAC7C,MAAM,cAAc,GAAa,EAAE,CAAC;IACpC,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,IAAI,IAAI,KAAK,EAAE,EAAE,CAAC;YAChB,uBAAuB;YACvB,SAAS;QACX,CAAC;QAED,IAAI,cAAc,GAAG,IAAI,CAAC;QAC1B,IAAI,IAAI,CAAC,CAAC,CAAC,KAAK,GAAG,EAAE,CAAC;YACpB,cAAc,GAAG,cAAc,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QAC3C,CAAC;QACD,IAAI,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,KAAK,GAAG,EAAE,CAAC;YACxB,cAAc,GAAG,cAAc,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;QAC/C,CAAC;QACD,IAAI,cAAc,KAAK,EAAE,EAAE,CAAC;YAC1B,cAAc,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QACtC,CAAC;IACH,CAAC;IAED,MAAM,aAAa,GAAG,cAAc,CAAC,MAAM,IAAI,cAAc,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC;IACtF,MAAM,WAAW,GAAG,cAAc,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAE7C,OAAO,aAAa,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,eAAe,CAAC,WAAW,CAAC,CAAC;AACpE,CAAC"} \ No newline at end of file diff --git a/src/utils/version.js b/src/utils/version.js index c0260e21..6c364f80 100644 --- a/src/utils/version.js +++ b/src/utils/version.js @@ -28,7 +28,7 @@ function assertCompatibleAngularVersion(projectRoot) { 'This likely indicates a corrupted local installation. Please try reinstalling your packages.'); process.exit(2); } - const supportedAngularSemver = '^21.0.0-next.0'; + const supportedAngularSemver = '^21.0.0'; if (angularPkgJson['version'] === '0.0.0' || supportedAngularSemver.startsWith('0.0.0')) { // Internal CLI and FW testing version. return; diff --git a/uniqueId b/uniqueId index 865f925e..6de900bb 100644 --- a/uniqueId +++ b/uniqueId @@ -1 +1 @@ -Thu Oct 23 2025 13:26:41 GMT+0000 (Coordinated Universal Time) \ No newline at end of file +Wed Dec 10 2025 21:24:55 GMT+0000 (Coordinated Universal Time) \ No newline at end of file