@angular/build 21.0.0-rc.1 → 21.0.0-rc.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +10 -9
- package/src/builders/application/chunk-optimizer.js +0 -1
- package/src/builders/application/chunk-optimizer.js.map +1 -1
- package/src/builders/dev-server/vite/index.js +8 -28
- package/src/builders/dev-server/vite/index.js.map +1 -1
- package/src/builders/dev-server/vite/server.js +7 -2
- package/src/builders/dev-server/vite/server.js.map +1 -1
- package/src/builders/karma/find-tests.d.ts +2 -1
- package/src/builders/karma/find-tests.js +12 -4
- package/src/builders/karma/find-tests.js.map +1 -1
- package/src/builders/unit-test/builder.js +6 -0
- package/src/builders/unit-test/builder.js.map +1 -1
- package/src/builders/unit-test/runners/vitest/browser-provider.js +11 -3
- package/src/builders/unit-test/runners/vitest/browser-provider.js.map +1 -1
- package/src/builders/unit-test/runners/vitest/build-options.js +24 -16
- package/src/builders/unit-test/runners/vitest/build-options.js.map +1 -1
- package/src/builders/unit-test/runners/vitest/executor.d.ts +1 -0
- package/src/builders/unit-test/runners/vitest/executor.js +14 -2
- package/src/builders/unit-test/runners/vitest/executor.js.map +1 -1
- package/src/builders/unit-test/runners/vitest/index.js +12 -3
- package/src/builders/unit-test/runners/vitest/index.js.map +1 -1
- package/src/builders/unit-test/runners/vitest/plugins.d.ts +5 -3
- package/src/builders/unit-test/runners/vitest/plugins.js +60 -10
- package/src/builders/unit-test/runners/vitest/plugins.js.map +1 -1
- package/src/builders/unit-test/test-discovery.js +42 -17
- package/src/builders/unit-test/test-discovery.js.map +1 -1
- package/src/private.d.ts +2 -0
- package/src/private.js +5 -1
- package/src/private.js.map +1 -1
- package/src/tools/angular/compilation/angular-compilation.d.ts +1 -0
- package/src/tools/angular/compilation/angular-compilation.js.map +1 -1
- package/src/tools/angular/compilation/aot-compilation.d.ts +1 -0
- package/src/tools/angular/compilation/aot-compilation.js +3 -0
- package/src/tools/angular/compilation/aot-compilation.js.map +1 -1
- package/src/tools/angular/compilation/parallel-worker.d.ts +1 -0
- package/src/tools/angular/compilation/parallel-worker.js +2 -1
- package/src/tools/angular/compilation/parallel-worker.js.map +1 -1
- package/src/tools/esbuild/angular/compiler-plugin.js +2 -2
- package/src/tools/esbuild/application-code-bundle.js +5 -3
- package/src/tools/esbuild/application-code-bundle.js.map +1 -1
- package/src/tools/esbuild/i18n-inliner.js +2 -2
- package/src/tools/esbuild/lmdb-cache-store.d.ts +1 -1
- package/src/tools/esbuild/lmdb-cache-store.js +3 -3
- package/src/tools/vite/plugins/index.d.ts +1 -0
- package/src/tools/vite/plugins/index.js +3 -1
- package/src/tools/vite/plugins/index.js.map +1 -1
- package/src/tools/vite/plugins/ssr-ssl-plugin.d.ts +9 -0
- package/src/tools/vite/plugins/ssr-ssl-plugin.js +71 -0
- package/src/tools/vite/plugins/ssr-ssl-plugin.js.map +1 -0
- package/src/tools/vite/utils.d.ts +13 -0
- package/src/tools/vite/utils.js +39 -0
- package/src/tools/vite/utils.js.map +1 -1
- package/src/utils/normalize-cache.js +1 -1
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@angular/build",
|
|
3
|
-
"version": "21.0.0-rc.
|
|
3
|
+
"version": "21.0.0-rc.2",
|
|
4
4
|
"description": "Official build system for Angular",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"Angular CLI",
|
|
@@ -23,7 +23,7 @@
|
|
|
23
23
|
"builders": "builders.json",
|
|
24
24
|
"dependencies": {
|
|
25
25
|
"@ampproject/remapping": "2.3.0",
|
|
26
|
-
"@angular-devkit/architect": "0.2100.0-rc.
|
|
26
|
+
"@angular-devkit/architect": "0.2100.0-rc.2",
|
|
27
27
|
"@babel/core": "7.28.4",
|
|
28
28
|
"@babel/helper-annotate-as-pure": "7.27.3",
|
|
29
29
|
"@babel/helper-split-export-declaration": "7.24.7",
|
|
@@ -31,7 +31,7 @@
|
|
|
31
31
|
"@vitejs/plugin-basic-ssl": "2.1.0",
|
|
32
32
|
"beasties": "0.3.5",
|
|
33
33
|
"browserslist": "^4.26.0",
|
|
34
|
-
"esbuild": "0.
|
|
34
|
+
"esbuild": "0.26.0",
|
|
35
35
|
"https-proxy-agent": "7.0.6",
|
|
36
36
|
"istanbul-lib-instrument": "6.0.3",
|
|
37
37
|
"jsonc-parser": "3.3.1",
|
|
@@ -41,26 +41,27 @@
|
|
|
41
41
|
"parse5-html-rewriting-stream": "8.0.0",
|
|
42
42
|
"picomatch": "4.0.3",
|
|
43
43
|
"piscina": "5.1.3",
|
|
44
|
-
"rolldown": "1.0.0-beta.
|
|
44
|
+
"rolldown": "1.0.0-beta.47",
|
|
45
45
|
"sass": "1.93.2",
|
|
46
46
|
"semver": "7.7.3",
|
|
47
47
|
"source-map-support": "0.5.21",
|
|
48
48
|
"tinyglobby": "0.2.15",
|
|
49
|
-
"
|
|
49
|
+
"undici": "7.16.0",
|
|
50
|
+
"vite": "7.2.2",
|
|
50
51
|
"watchpack": "2.4.4"
|
|
51
52
|
},
|
|
52
53
|
"optionalDependencies": {
|
|
53
54
|
"lmdb": "3.4.3"
|
|
54
55
|
},
|
|
55
56
|
"peerDependencies": {
|
|
56
|
-
"@angular/core": "^21.0.0-next.0",
|
|
57
57
|
"@angular/compiler": "^21.0.0-next.0",
|
|
58
58
|
"@angular/compiler-cli": "^21.0.0-next.0",
|
|
59
|
+
"@angular/core": "^21.0.0-next.0",
|
|
59
60
|
"@angular/localize": "^21.0.0-next.0",
|
|
60
61
|
"@angular/platform-browser": "^21.0.0-next.0",
|
|
61
62
|
"@angular/platform-server": "^21.0.0-next.0",
|
|
62
63
|
"@angular/service-worker": "^21.0.0-next.0",
|
|
63
|
-
"@angular/ssr": "^21.0.0-rc.
|
|
64
|
+
"@angular/ssr": "^21.0.0-rc.2",
|
|
64
65
|
"karma": "^6.4.0",
|
|
65
66
|
"less": "^4.2.0",
|
|
66
67
|
"ng-packagr": "^21.0.0-next.0",
|
|
@@ -68,7 +69,7 @@
|
|
|
68
69
|
"tailwindcss": "^2.0.0 || ^3.0.0 || ^4.0.0",
|
|
69
70
|
"tslib": "^2.3.0",
|
|
70
71
|
"typescript": ">=5.9 <6.0",
|
|
71
|
-
"vitest": "^4.0.
|
|
72
|
+
"vitest": "^4.0.8"
|
|
72
73
|
},
|
|
73
74
|
"peerDependenciesMeta": {
|
|
74
75
|
"@angular/core": {
|
|
@@ -112,7 +113,7 @@
|
|
|
112
113
|
"type": "git",
|
|
113
114
|
"url": "https://github.com/angular/angular-cli.git"
|
|
114
115
|
},
|
|
115
|
-
"packageManager": "pnpm@10.
|
|
116
|
+
"packageManager": "pnpm@10.21.0",
|
|
116
117
|
"engines": {
|
|
117
118
|
"node": "^20.19.0 || ^22.12.0 || >=24.0.0",
|
|
118
119
|
"npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
|
|
@@ -199,7 +199,6 @@ async function optimizeChunks(original, sourcemap) {
|
|
|
199
199
|
});
|
|
200
200
|
const result = await bundle.generate({
|
|
201
201
|
minify: { mangle: false, compress: false },
|
|
202
|
-
advancedChunks: { minSize: 8192 },
|
|
203
202
|
sourcemap,
|
|
204
203
|
chunkFileNames: (chunkInfo) => `${chunkInfo.name.replace(/-[a-zA-Z0-9]{8}$/, '')}-[hash].js`,
|
|
205
204
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"chunk-optimizer.js","sourceRoot":"","sources":["chunk-optimizer.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;;;AAoKH,
|
|
1
|
+
{"version":3,"file":"chunk-optimizer.js","sourceRoot":"","sources":["chunk-optimizer.ts"],"names":[],"mappings":"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"}
|
|
@@ -45,17 +45,17 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
45
45
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
46
46
|
exports.serveWithVite = serveWithVite;
|
|
47
47
|
const node_assert_1 = __importDefault(require("node:assert"));
|
|
48
|
-
const node_module_1 = require("node:module");
|
|
49
48
|
const node_path_1 = require("node:path");
|
|
50
49
|
const plugins_1 = require("../../../tools/vite/plugins");
|
|
51
|
-
const utils_1 = require("../../../utils");
|
|
50
|
+
const utils_1 = require("../../../tools/vite/utils");
|
|
51
|
+
const utils_2 = require("../../../utils");
|
|
52
52
|
const environment_options_1 = require("../../../utils/environment-options");
|
|
53
53
|
const results_1 = require("../../application/results");
|
|
54
54
|
const schema_1 = require("../../application/schema");
|
|
55
55
|
const internal_1 = require("../internal");
|
|
56
56
|
const hmr_1 = require("./hmr");
|
|
57
57
|
const server_1 = require("./server");
|
|
58
|
-
const
|
|
58
|
+
const utils_3 = require("./utils");
|
|
59
59
|
/**
|
|
60
60
|
* Build options that are also present on the dev server but are only passed
|
|
61
61
|
* to the build.
|
|
@@ -118,7 +118,7 @@ async function* serveWithVite(serverOptions, builderName, builderAction, context
|
|
|
118
118
|
// When localization is enabled with a single locale, force a flat path to maintain behavior with the existing Webpack-based dev server.
|
|
119
119
|
browserOptions.forceI18nFlatOutput = true;
|
|
120
120
|
}
|
|
121
|
-
const { vendor: thirdPartySourcemaps, scripts: scriptsSourcemaps } = (0,
|
|
121
|
+
const { vendor: thirdPartySourcemaps, scripts: scriptsSourcemaps } = (0, utils_2.normalizeSourceMaps)(browserOptions.sourceMap ?? false);
|
|
122
122
|
if (scriptsSourcemaps && browserOptions.server) {
|
|
123
123
|
// https://nodejs.org/api/process.html#processsetsourcemapsenabledval
|
|
124
124
|
process.setSourceMapsEnabled(true);
|
|
@@ -210,7 +210,7 @@ async function* serveWithVite(serverOptions, builderName, builderAction, context
|
|
|
210
210
|
componentStyles.clear();
|
|
211
211
|
generatedFiles.clear();
|
|
212
212
|
for (const [outputPath, file] of Object.entries(result.files)) {
|
|
213
|
-
(0,
|
|
213
|
+
(0, utils_3.updateResultRecord)(outputPath, file, normalizePath, htmlIndexPath, generatedFiles, assetFiles, componentStyles,
|
|
214
214
|
// The initial build will not yet have a server setup
|
|
215
215
|
!server);
|
|
216
216
|
}
|
|
@@ -227,10 +227,10 @@ async function* serveWithVite(serverOptions, builderName, builderAction, context
|
|
|
227
227
|
assetFiles.delete(filePath);
|
|
228
228
|
}
|
|
229
229
|
for (const modified of result.modified) {
|
|
230
|
-
(0,
|
|
230
|
+
(0, utils_3.updateResultRecord)(modified, result.files[modified], normalizePath, htmlIndexPath, generatedFiles, assetFiles, componentStyles);
|
|
231
231
|
}
|
|
232
232
|
for (const added of result.added) {
|
|
233
|
-
(0,
|
|
233
|
+
(0, utils_3.updateResultRecord)(added, result.files[added], normalizePath, htmlIndexPath, generatedFiles, assetFiles, componentStyles);
|
|
234
234
|
}
|
|
235
235
|
break;
|
|
236
236
|
case results_1.ResultKind.ComponentUpdate:
|
|
@@ -252,27 +252,7 @@ async function* serveWithVite(serverOptions, builderName, builderAction, context
|
|
|
252
252
|
continue;
|
|
253
253
|
}
|
|
254
254
|
// To avoid disconnecting the array objects from the option, these arrays need to be mutated instead of replaced.
|
|
255
|
-
|
|
256
|
-
const { implicitBrowser, implicitServer, explicit } = result.detail['externalMetadata'];
|
|
257
|
-
const implicitServerFiltered = implicitServer.filter((m) => !(0, node_module_1.isBuiltin)(m) && !(0, utils_2.isAbsoluteUrl)(m));
|
|
258
|
-
const implicitBrowserFiltered = implicitBrowser.filter((m) => !(0, utils_2.isAbsoluteUrl)(m));
|
|
259
|
-
// Empty Arrays to avoid growing unlimited with every re-build.
|
|
260
|
-
externalMetadata.explicitBrowser.length = 0;
|
|
261
|
-
externalMetadata.explicitServer.length = 0;
|
|
262
|
-
externalMetadata.implicitServer.length = 0;
|
|
263
|
-
externalMetadata.implicitBrowser.length = 0;
|
|
264
|
-
const externalDeps = browserOptions.externalDependencies ?? [];
|
|
265
|
-
externalMetadata.explicitBrowser.push(...explicit, ...externalDeps);
|
|
266
|
-
externalMetadata.explicitServer.push(...explicit, ...externalDeps, ...node_module_1.builtinModules);
|
|
267
|
-
externalMetadata.implicitServer.push(...implicitServerFiltered);
|
|
268
|
-
externalMetadata.implicitBrowser.push(...implicitBrowserFiltered);
|
|
269
|
-
// The below needs to be sorted as Vite uses these options are part of the hashing invalidation algorithm.
|
|
270
|
-
// See: https://github.com/vitejs/vite/blob/0873bae0cfe0f0718ad2f5743dd34a17e4ab563d/packages/vite/src/node/optimizer/index.ts#L1203-L1239
|
|
271
|
-
externalMetadata.explicitBrowser.sort();
|
|
272
|
-
externalMetadata.explicitServer.sort();
|
|
273
|
-
externalMetadata.implicitServer.sort();
|
|
274
|
-
externalMetadata.implicitBrowser.sort();
|
|
275
|
-
}
|
|
255
|
+
(0, utils_1.updateExternalMetadata)(result, externalMetadata, browserOptions.externalDependencies);
|
|
276
256
|
if (server) {
|
|
277
257
|
// Update fs allow list to include any new assets from the build option.
|
|
278
258
|
server.config.server.fs.allow = [
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"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"}
|
|
@@ -175,7 +175,9 @@ async function setupServer(serverOptions, outputFiles, assets, preserveSymlinks,
|
|
|
175
175
|
preTransformRequests,
|
|
176
176
|
},
|
|
177
177
|
server: await createServerConfig(serverOptions, assets, ssrMode, preTransformRequests, cacheDir),
|
|
178
|
-
ssr:
|
|
178
|
+
ssr: ssrMode === plugins_1.ServerSsrMode.NoSsr
|
|
179
|
+
? undefined
|
|
180
|
+
: createSsrConfig(externalMetadata, serverOptions, prebundleTransformer, zoneless, target, prebundleLoaderExtensions, thirdPartySourcemaps, define),
|
|
179
181
|
plugins: [
|
|
180
182
|
(0, plugins_1.createAngularSetupMiddlewaresPlugin)({
|
|
181
183
|
outputFiles,
|
|
@@ -216,11 +218,14 @@ async function setupServer(serverOptions, outputFiles, assets, preserveSymlinks,
|
|
|
216
218
|
}),
|
|
217
219
|
};
|
|
218
220
|
if (serverOptions.ssl) {
|
|
221
|
+
configuration.plugins ??= [];
|
|
219
222
|
if (!serverOptions.sslCert || !serverOptions.sslKey) {
|
|
220
223
|
const { default: basicSslPlugin } = await Promise.resolve().then(() => __importStar(require('@vitejs/plugin-basic-ssl')));
|
|
221
|
-
configuration.plugins ??= [];
|
|
222
224
|
configuration.plugins.push(basicSslPlugin());
|
|
223
225
|
}
|
|
226
|
+
if (ssrMode !== plugins_1.ServerSsrMode.NoSsr) {
|
|
227
|
+
configuration.plugins?.push((0, plugins_1.createAngularServerSideSSLPlugin)());
|
|
228
|
+
}
|
|
224
229
|
}
|
|
225
230
|
return configuration;
|
|
226
231
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.js","sourceRoot":"","sources":["server.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"server.js","sourceRoot":"","sources":["server.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,4 +5,5 @@
|
|
|
5
5
|
* Use of this source code is governed by an MIT-style license that can be
|
|
6
6
|
* found in the LICENSE file at https://angular.dev/license
|
|
7
7
|
*/
|
|
8
|
-
export {
|
|
8
|
+
export { getTestEntrypoints } from '../unit-test/test-discovery';
|
|
9
|
+
export declare function findTests(include: string[], exclude: string[], workspaceRoot: string, projectSourceRoot: string): Promise<string[]>;
|
|
@@ -7,10 +7,18 @@
|
|
|
7
7
|
* found in the LICENSE file at https://angular.dev/license
|
|
8
8
|
*/
|
|
9
9
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
10
|
-
exports.getTestEntrypoints =
|
|
10
|
+
exports.getTestEntrypoints = void 0;
|
|
11
|
+
exports.findTests = findTests;
|
|
12
|
+
const test_discovery_1 = require("../unit-test/test-discovery");
|
|
11
13
|
// This file is a compatibility layer that re-exports the test discovery logic from its new location.
|
|
12
14
|
// This is necessary to avoid breaking the Karma builder, which still depends on this file.
|
|
13
|
-
var
|
|
14
|
-
Object.defineProperty(exports, "
|
|
15
|
-
|
|
15
|
+
var test_discovery_2 = require("../unit-test/test-discovery");
|
|
16
|
+
Object.defineProperty(exports, "getTestEntrypoints", { enumerable: true, get: function () { return test_discovery_2.getTestEntrypoints; } });
|
|
17
|
+
const removeLeadingSlash = (path) => {
|
|
18
|
+
return path.startsWith('/') ? path.substring(1) : path;
|
|
19
|
+
};
|
|
20
|
+
async function findTests(include, exclude, workspaceRoot, projectSourceRoot) {
|
|
21
|
+
// Karma has legacy support for workspace "root-relative" file paths
|
|
22
|
+
return (0, test_discovery_1.findTests)(include.map(removeLeadingSlash), exclude.map(removeLeadingSlash), workspaceRoot, projectSourceRoot);
|
|
23
|
+
}
|
|
16
24
|
//# sourceMappingURL=find-tests.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"find-tests.js","sourceRoot":"","sources":["find-tests.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;
|
|
1
|
+
{"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"}
|
|
@@ -188,6 +188,12 @@ async function* runBuildAndTest(executor, applicationBuildOptions, context, dump
|
|
|
188
188
|
catch (e) {
|
|
189
189
|
(0, error_1.assertIsError)(e);
|
|
190
190
|
context.logger.error(`An exception occurred during test execution:\n${e.stack ?? e.message}`);
|
|
191
|
+
if (e instanceof AggregateError) {
|
|
192
|
+
e.errors.forEach((inner) => {
|
|
193
|
+
(0, error_1.assertIsError)(inner);
|
|
194
|
+
context.logger.error(inner.stack ?? inner.message);
|
|
195
|
+
});
|
|
196
|
+
}
|
|
191
197
|
yield { success: false };
|
|
192
198
|
consecutiveErrorCount++;
|
|
193
199
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"builder.js","sourceRoot":"","sources":["builder.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"builder.js","sourceRoot":"","sources":["builder.ts"],"names":[],"mappings":"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"}
|
|
@@ -44,11 +44,14 @@ exports.setupBrowserConfiguration = setupBrowserConfiguration;
|
|
|
44
44
|
const node_module_1 = require("node:module");
|
|
45
45
|
const error_1 = require("../../../../utils/error");
|
|
46
46
|
function findBrowserProvider(projectResolver) {
|
|
47
|
+
const requiresPreview = !!process.versions.webcontainer;
|
|
47
48
|
// One of these must be installed in the project to use browser testing
|
|
48
|
-
const vitestBuiltinProviders =
|
|
49
|
+
const vitestBuiltinProviders = requiresPreview
|
|
50
|
+
? ['preview']
|
|
51
|
+
: ['playwright', 'webdriverio', 'preview'];
|
|
49
52
|
for (const providerName of vitestBuiltinProviders) {
|
|
50
53
|
try {
|
|
51
|
-
projectResolver(providerName);
|
|
54
|
+
projectResolver(`@vitest/browser-${providerName}`);
|
|
52
55
|
return providerName;
|
|
53
56
|
}
|
|
54
57
|
catch { }
|
|
@@ -107,12 +110,17 @@ async function setupBrowserConfiguration(browsers, debug, projectSourceRoot, vie
|
|
|
107
110
|
return { errors };
|
|
108
111
|
}
|
|
109
112
|
const isCI = !!process.env['CI'];
|
|
110
|
-
|
|
113
|
+
let headless = isCI || browsers.some((name) => name.toLowerCase().includes('headless'));
|
|
114
|
+
if (providerName === 'preview') {
|
|
115
|
+
// `preview` provider does not support headless mode
|
|
116
|
+
headless = false;
|
|
117
|
+
}
|
|
111
118
|
const browser = {
|
|
112
119
|
enabled: true,
|
|
113
120
|
provider,
|
|
114
121
|
headless,
|
|
115
122
|
ui: !headless,
|
|
123
|
+
isolate: debug,
|
|
116
124
|
viewport,
|
|
117
125
|
instances: browsers.map((browserName) => ({
|
|
118
126
|
browser: normalizeBrowserName(browserName),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"browser-provider.js","sourceRoot":"","sources":["browser-provider.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"browser-provider.js","sourceRoot":"","sources":["browser-provider.ts"],"names":[],"mappings":"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"}
|
|
@@ -45,17 +45,29 @@ function createTestBedInitVirtualFile(providersFile, projectSourceRoot, polyfill
|
|
|
45
45
|
import { getTestBed, ɵgetCleanupHook as getCleanupHook } from '@angular/core/testing';
|
|
46
46
|
import { BrowserTestingModule, platformBrowserTesting } from '@angular/platform-browser/testing';
|
|
47
47
|
${providersImport}
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
48
|
+
|
|
49
|
+
const ANGULAR_TESTBED_SETUP = Symbol.for('@angular/cli/testbed-setup');
|
|
50
|
+
if (!globalThis[ANGULAR_TESTBED_SETUP]) {
|
|
51
|
+
globalThis[ANGULAR_TESTBED_SETUP] = true;
|
|
52
|
+
|
|
53
|
+
// The Angular TestBed needs to be initialized before any tests are run.
|
|
54
|
+
// In a non-isolated environment, this setup file can be executed multiple times.
|
|
55
|
+
// The guard condition above ensures that the setup is only performed once.
|
|
56
|
+
|
|
57
|
+
// Same as https://github.com/angular/angular/blob/05a03d3f975771bb59c7eefd37c01fa127ee2229/packages/core/testing/srcs/test_hooks.ts#L21-L29
|
|
58
|
+
beforeEach(getCleanupHook(false));
|
|
59
|
+
afterEach(getCleanupHook(true));
|
|
60
|
+
|
|
61
|
+
@NgModule({
|
|
62
|
+
providers: [${usesZoneJS ? 'provideZoneChangeDetection(), ' : ''}...providers],
|
|
63
|
+
})
|
|
64
|
+
class TestModule {}
|
|
65
|
+
|
|
66
|
+
getTestBed().initTestEnvironment([BrowserTestingModule, TestModule], platformBrowserTesting(), {
|
|
67
|
+
errorOnUnknownElements: true,
|
|
68
|
+
errorOnUnknownProperties: true,
|
|
69
|
+
});
|
|
70
|
+
}
|
|
59
71
|
`;
|
|
60
72
|
}
|
|
61
73
|
function adjustOutputHashing(hashing) {
|
|
@@ -85,11 +97,7 @@ async function getVitestBuildOptions(options, baseBuildOptions) {
|
|
|
85
97
|
});
|
|
86
98
|
entryPoints.set('init-testbed', 'angular:test-bed-init');
|
|
87
99
|
const externalDependencies = new Set(['vitest']);
|
|
88
|
-
|
|
89
|
-
// Only add for non-browser setups.
|
|
90
|
-
// Comprehensive browser prebundling will be handled separately.
|
|
91
|
-
ANGULAR_PACKAGES_TO_EXTERNALIZE.forEach((dep) => externalDependencies.add(dep));
|
|
92
|
-
}
|
|
100
|
+
ANGULAR_PACKAGES_TO_EXTERNALIZE.forEach((dep) => externalDependencies.add(dep));
|
|
93
101
|
if (baseBuildOptions.externalDependencies) {
|
|
94
102
|
baseBuildOptions.externalDependencies.forEach((dep) => externalDependencies.add(dep));
|
|
95
103
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"build-options.js","sourceRoot":"","sources":["build-options.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;;;
|
|
1
|
+
{"version":3,"file":"build-options.js","sourceRoot":"","sources":["build-options.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,6 +15,7 @@ export declare class VitestExecutor implements TestExecutor {
|
|
|
15
15
|
private readonly projectName;
|
|
16
16
|
private readonly options;
|
|
17
17
|
private readonly buildResultFiles;
|
|
18
|
+
private readonly externalMetadata;
|
|
18
19
|
private readonly testFileToEntryPoint;
|
|
19
20
|
private readonly entryPointToTestFile;
|
|
20
21
|
constructor(projectName: string, options: NormalizedUnitTestBuilderOptions, testEntryPointMappings: Map<string, string> | undefined);
|
|
@@ -46,6 +46,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
46
46
|
exports.VitestExecutor = void 0;
|
|
47
47
|
const node_assert_1 = __importDefault(require("node:assert"));
|
|
48
48
|
const node_path_1 = __importDefault(require("node:path"));
|
|
49
|
+
const utils_1 = require("../../../../tools/vite/utils");
|
|
49
50
|
const error_1 = require("../../../../utils/error");
|
|
50
51
|
const results_1 = require("../../../application/results");
|
|
51
52
|
const browser_provider_1 = require("./browser-provider");
|
|
@@ -57,6 +58,12 @@ class VitestExecutor {
|
|
|
57
58
|
projectName;
|
|
58
59
|
options;
|
|
59
60
|
buildResultFiles = new Map();
|
|
61
|
+
externalMetadata = {
|
|
62
|
+
implicitBrowser: [],
|
|
63
|
+
implicitServer: [],
|
|
64
|
+
explicitBrowser: [],
|
|
65
|
+
explicitServer: [],
|
|
66
|
+
};
|
|
60
67
|
// This is a reverse map of the entry points created in `build-options.ts`.
|
|
61
68
|
// It is used by the in-memory provider plugin to map the requested test file
|
|
62
69
|
// path back to its bundled output path.
|
|
@@ -89,6 +96,7 @@ class VitestExecutor {
|
|
|
89
96
|
this.buildResultFiles.set(this.normalizePath(path), file);
|
|
90
97
|
}
|
|
91
98
|
}
|
|
99
|
+
(0, utils_1.updateExternalMetadata)(buildResult, this.externalMetadata, undefined, true);
|
|
92
100
|
// Initialize Vitest if not already present.
|
|
93
101
|
this.vitest ??= await this.initializeVitest();
|
|
94
102
|
const vitest = this.vitest;
|
|
@@ -190,14 +198,18 @@ class VitestExecutor {
|
|
|
190
198
|
watch: null,
|
|
191
199
|
},
|
|
192
200
|
plugins: [
|
|
193
|
-
(0, plugins_1.createVitestConfigPlugin)({
|
|
201
|
+
await (0, plugins_1.createVitestConfigPlugin)({
|
|
194
202
|
browser: browserOptions.browser,
|
|
195
203
|
coverage,
|
|
196
204
|
projectName,
|
|
205
|
+
projectSourceRoot: this.options.projectSourceRoot,
|
|
206
|
+
optimizeDepsInclude: this.externalMetadata.explicitBrowser,
|
|
197
207
|
reporters,
|
|
198
208
|
setupFiles: testSetupFiles,
|
|
199
209
|
projectPlugins,
|
|
200
|
-
include: [...this.testFileToEntryPoint.keys()]
|
|
210
|
+
include: [...this.testFileToEntryPoint.keys()].filter(
|
|
211
|
+
// Filter internal entries
|
|
212
|
+
(entry) => !entry.startsWith('angular:')),
|
|
201
213
|
}),
|
|
202
214
|
],
|
|
203
215
|
});
|