@angular/build 21.2.0 → 22.0.0-next.0
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 +18 -19
- package/src/builders/application/i18n.js +27 -27
- package/src/builders/application/i18n.js.map +1 -1
- package/src/builders/application/index.js +4 -13
- package/src/builders/application/index.js.map +1 -1
- package/src/builders/karma/progress-reporter.js +1 -3
- package/src/builders/karma/progress-reporter.js.map +1 -1
- package/src/builders/unit-test/builder.js +9 -12
- package/src/builders/unit-test/builder.js.map +1 -1
- package/src/builders/unit-test/options.js +1 -1
- package/src/builders/unit-test/options.js.map +1 -1
- package/src/builders/unit-test/runners/vitest/browser-provider.js +7 -16
- package/src/builders/unit-test/runners/vitest/browser-provider.js.map +1 -1
- package/src/builders/unit-test/runners/vitest/build-options.js +62 -13
- package/src/builders/unit-test/runners/vitest/build-options.js.map +1 -1
- package/src/builders/unit-test/runners/vitest/executor.d.ts +2 -0
- package/src/builders/unit-test/runners/vitest/executor.js +68 -4
- package/src/builders/unit-test/runners/vitest/executor.js.map +1 -1
- package/src/tools/esbuild/application-code-bundle.js +8 -8
- package/src/tools/esbuild/application-code-bundle.js.map +1 -1
- package/src/tools/esbuild/i18n-inliner-worker.js +3 -1
- package/src/tools/esbuild/i18n-inliner-worker.js.map +1 -1
- package/src/tools/esbuild/utils.js +1 -1
- package/src/tools/vite/middlewares/ssr-middleware.js +4 -0
- package/src/tools/vite/middlewares/ssr-middleware.js.map +1 -1
- package/src/tools/vite/plugins/ssr-ssl-plugin.js +2 -56
- package/src/tools/vite/plugins/ssr-ssl-plugin.js.map +1 -1
- package/src/utils/normalize-asset-patterns.js +1 -1
- package/src/utils/normalize-asset-patterns.js.map +1 -1
- package/src/utils/normalize-cache.js +1 -1
- package/src/utils/service-worker.d.ts +3 -1
- package/src/utils/service-worker.js +2 -2
- package/src/utils/service-worker.js.map +1 -1
- package/src/utils/version.js +1 -1
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@angular/build",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "22.0.0-next.0",
|
|
4
4
|
"description": "Official build system for Angular",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"Angular CLI",
|
|
@@ -23,11 +23,11 @@
|
|
|
23
23
|
"builders": "builders.json",
|
|
24
24
|
"dependencies": {
|
|
25
25
|
"@ampproject/remapping": "2.3.0",
|
|
26
|
-
"@angular-devkit/architect": "0.
|
|
26
|
+
"@angular-devkit/architect": "0.2200.0-next.0",
|
|
27
27
|
"@babel/core": "7.29.0",
|
|
28
28
|
"@babel/helper-annotate-as-pure": "7.27.3",
|
|
29
29
|
"@babel/helper-split-export-declaration": "7.24.7",
|
|
30
|
-
"@inquirer/confirm": "
|
|
30
|
+
"@inquirer/confirm": "6.0.8",
|
|
31
31
|
"@vitejs/plugin-basic-ssl": "2.1.4",
|
|
32
32
|
"beasties": "0.4.1",
|
|
33
33
|
"browserslist": "^4.26.0",
|
|
@@ -35,18 +35,17 @@
|
|
|
35
35
|
"https-proxy-agent": "7.0.6",
|
|
36
36
|
"istanbul-lib-instrument": "6.0.3",
|
|
37
37
|
"jsonc-parser": "3.3.1",
|
|
38
|
-
"listr2": "
|
|
38
|
+
"listr2": "10.1.2",
|
|
39
39
|
"magic-string": "0.30.21",
|
|
40
40
|
"mrmime": "2.0.1",
|
|
41
41
|
"parse5-html-rewriting-stream": "8.0.0",
|
|
42
42
|
"picomatch": "4.0.3",
|
|
43
43
|
"piscina": "5.1.4",
|
|
44
|
-
"rolldown": "1.0.0-rc.
|
|
44
|
+
"rolldown": "1.0.0-rc.6",
|
|
45
45
|
"sass": "1.97.3",
|
|
46
46
|
"semver": "7.7.4",
|
|
47
47
|
"source-map-support": "0.5.21",
|
|
48
48
|
"tinyglobby": "0.2.15",
|
|
49
|
-
"undici": "7.22.0",
|
|
50
49
|
"vite": "7.3.1",
|
|
51
50
|
"watchpack": "2.5.1"
|
|
52
51
|
},
|
|
@@ -54,21 +53,21 @@
|
|
|
54
53
|
"lmdb": "3.5.1"
|
|
55
54
|
},
|
|
56
55
|
"peerDependencies": {
|
|
57
|
-
"@angular/compiler": "^
|
|
58
|
-
"@angular/compiler-cli": "^
|
|
59
|
-
"@angular/core": "^
|
|
60
|
-
"@angular/localize": "^
|
|
61
|
-
"@angular/platform-browser": "^
|
|
62
|
-
"@angular/platform-server": "^
|
|
63
|
-
"@angular/service-worker": "^
|
|
64
|
-
"@angular/ssr": "^
|
|
56
|
+
"@angular/compiler": "^22.0.0-next.0",
|
|
57
|
+
"@angular/compiler-cli": "^22.0.0-next.0",
|
|
58
|
+
"@angular/core": "^22.0.0-next.0",
|
|
59
|
+
"@angular/localize": "^22.0.0-next.0",
|
|
60
|
+
"@angular/platform-browser": "^22.0.0-next.0",
|
|
61
|
+
"@angular/platform-server": "^22.0.0-next.0",
|
|
62
|
+
"@angular/service-worker": "^22.0.0-next.0",
|
|
63
|
+
"@angular/ssr": "^22.0.0-next.0",
|
|
65
64
|
"karma": "^6.4.0",
|
|
66
65
|
"less": "^4.2.0",
|
|
67
|
-
"ng-packagr": "^
|
|
66
|
+
"ng-packagr": "^22.0.0-next.0",
|
|
68
67
|
"postcss": "^8.4.0",
|
|
69
68
|
"tailwindcss": "^2.0.0 || ^3.0.0 || ^4.0.0",
|
|
70
69
|
"tslib": "^2.3.0",
|
|
71
|
-
"typescript": ">=5.9 <6.
|
|
70
|
+
"typescript": ">=5.9 <6.1",
|
|
72
71
|
"vitest": "^4.0.8"
|
|
73
72
|
},
|
|
74
73
|
"peerDependenciesMeta": {
|
|
@@ -111,11 +110,11 @@
|
|
|
111
110
|
},
|
|
112
111
|
"repository": {
|
|
113
112
|
"type": "git",
|
|
114
|
-
"url": "https://github.com/angular/angular-cli.git"
|
|
113
|
+
"url": "git+https://github.com/angular/angular-cli.git"
|
|
115
114
|
},
|
|
116
|
-
"packageManager": "pnpm@10.30.
|
|
115
|
+
"packageManager": "pnpm@10.30.3",
|
|
117
116
|
"engines": {
|
|
118
|
-
"node": "^
|
|
117
|
+
"node": "^22.22.0 || >=24.13.1",
|
|
119
118
|
"npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
|
|
120
119
|
"yarn": ">= 1.13.0"
|
|
121
120
|
},
|
|
@@ -77,37 +77,37 @@ async function inlineI18n(metafile, options, executionResult, initialFiles) {
|
|
|
77
77
|
inlineResult.prerenderedRoutes = { ...inlineResult.prerenderedRoutes, ...generatedRoutes };
|
|
78
78
|
updatedOutputFiles.push(...localeOutputFiles);
|
|
79
79
|
}
|
|
80
|
+
// Update the result with all localized files.
|
|
81
|
+
executionResult.outputFiles = [
|
|
82
|
+
// Root and SSR entry files are not modified.
|
|
83
|
+
...unModifiedOutputFiles,
|
|
84
|
+
// Updated files for each locale.
|
|
85
|
+
...updatedOutputFiles,
|
|
86
|
+
];
|
|
87
|
+
// Assets are only changed if not using the flat output option
|
|
88
|
+
if (!i18nOptions.flatOutput) {
|
|
89
|
+
executionResult.assetFiles = updatedAssetFiles;
|
|
90
|
+
}
|
|
91
|
+
// Inline any template updates if present
|
|
92
|
+
if (executionResult.templateUpdates?.size) {
|
|
93
|
+
// The development server only allows a single locale but issue a warning if used programmatically (experimental)
|
|
94
|
+
// with multiple locales and template HMR.
|
|
95
|
+
if (i18nOptions.inlineLocales.size > 1) {
|
|
96
|
+
inlineResult.warnings.push(`Component HMR updates can only be inlined with a single locale. The first locale will be used.`);
|
|
97
|
+
}
|
|
98
|
+
const firstLocale = [...i18nOptions.inlineLocales][0];
|
|
99
|
+
for (const [id, content] of executionResult.templateUpdates) {
|
|
100
|
+
const templateUpdateResult = await inliner.inlineTemplateUpdate(firstLocale, i18nOptions.locales[firstLocale].translation, content, id);
|
|
101
|
+
executionResult.templateUpdates.set(id, templateUpdateResult.code);
|
|
102
|
+
inlineResult.errors.push(...templateUpdateResult.errors);
|
|
103
|
+
inlineResult.warnings.push(...templateUpdateResult.warnings);
|
|
104
|
+
}
|
|
105
|
+
}
|
|
106
|
+
return inlineResult;
|
|
80
107
|
}
|
|
81
108
|
finally {
|
|
82
109
|
await inliner.close();
|
|
83
110
|
}
|
|
84
|
-
// Update the result with all localized files.
|
|
85
|
-
executionResult.outputFiles = [
|
|
86
|
-
// Root and SSR entry files are not modified.
|
|
87
|
-
...unModifiedOutputFiles,
|
|
88
|
-
// Updated files for each locale.
|
|
89
|
-
...updatedOutputFiles,
|
|
90
|
-
];
|
|
91
|
-
// Assets are only changed if not using the flat output option
|
|
92
|
-
if (!i18nOptions.flatOutput) {
|
|
93
|
-
executionResult.assetFiles = updatedAssetFiles;
|
|
94
|
-
}
|
|
95
|
-
// Inline any template updates if present
|
|
96
|
-
if (executionResult.templateUpdates?.size) {
|
|
97
|
-
// The development server only allows a single locale but issue a warning if used programmatically (experimental)
|
|
98
|
-
// with multiple locales and template HMR.
|
|
99
|
-
if (i18nOptions.inlineLocales.size > 1) {
|
|
100
|
-
inlineResult.warnings.push(`Component HMR updates can only be inlined with a single locale. The first locale will be used.`);
|
|
101
|
-
}
|
|
102
|
-
const firstLocale = [...i18nOptions.inlineLocales][0];
|
|
103
|
-
for (const [id, content] of executionResult.templateUpdates) {
|
|
104
|
-
const templateUpdateResult = await inliner.inlineTemplateUpdate(firstLocale, i18nOptions.locales[firstLocale].translation, content, id);
|
|
105
|
-
executionResult.templateUpdates.set(id, templateUpdateResult.code);
|
|
106
|
-
inlineResult.errors.push(...templateUpdateResult.errors);
|
|
107
|
-
inlineResult.warnings.push(...templateUpdateResult.warnings);
|
|
108
|
-
}
|
|
109
|
-
}
|
|
110
|
-
return inlineResult;
|
|
111
111
|
}
|
|
112
112
|
/**
|
|
113
113
|
* Loads all active translations using the translation loaders from the `@angular/localize` package.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"i18n.js","sourceRoot":"","sources":["i18n.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"i18n.js","sourceRoot":"","sources":["i18n.ts"],"names":[],"mappings":"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"}
|
|
@@ -60,7 +60,6 @@ const build_action_1 = require("./build-action");
|
|
|
60
60
|
const execute_build_1 = require("./execute-build");
|
|
61
61
|
const options_1 = require("./options");
|
|
62
62
|
const results_1 = require("./results");
|
|
63
|
-
const isNodeV22orHigher = Number(process.versions.node.split('.', 1)[0]) >= 22;
|
|
64
63
|
async function* buildApplicationInternal(options,
|
|
65
64
|
// TODO: Integrate abort signal support into builder system
|
|
66
65
|
context, extensions) {
|
|
@@ -203,18 +202,10 @@ async function* buildApplication(options, context, extensions) {
|
|
|
203
202
|
}
|
|
204
203
|
else {
|
|
205
204
|
// Copy file contents
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
preserveTimestamps: true,
|
|
211
|
-
});
|
|
212
|
-
}
|
|
213
|
-
else {
|
|
214
|
-
// For Node.js 20 use `copyFile` (`cp` is not stable for v20)
|
|
215
|
-
// TODO: Remove when Node.js 20 is no longer supported
|
|
216
|
-
await promises_1.default.copyFile(file.inputPath, fullFilePath, promises_1.default.constants.COPYFILE_FICLONE);
|
|
217
|
-
}
|
|
205
|
+
await promises_1.default.cp(file.inputPath, fullFilePath, {
|
|
206
|
+
mode: promises_1.default.constants.COPYFILE_FICLONE,
|
|
207
|
+
preserveTimestamps: true,
|
|
208
|
+
});
|
|
218
209
|
}
|
|
219
210
|
});
|
|
220
211
|
// Delete any removed files if incremental
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"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"}
|
|
@@ -27,11 +27,9 @@ function injectKarmaReporter(buildOptions, buildIterator, karmaConfig, controlle
|
|
|
27
27
|
startWatchingBuild() {
|
|
28
28
|
void (async () => {
|
|
29
29
|
// This is effectively "for await of but skip what's already consumed".
|
|
30
|
-
|
|
31
|
-
while (!isDone) {
|
|
30
|
+
while (true) {
|
|
32
31
|
const { done, value: buildOutput } = await buildIterator.next();
|
|
33
32
|
if (done) {
|
|
34
|
-
isDone = true;
|
|
35
33
|
break;
|
|
36
34
|
}
|
|
37
35
|
if (buildOutput.kind === results_1.ResultKind.Failure) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"progress-reporter.js","sourceRoot":"","sources":["progress-reporter.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;AAkBH,
|
|
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;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,OAAO,IAAI,EAAE,CAAC;oBACZ,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,WAAW,EAAE,GAAG,MAAM,aAAa,CAAC,IAAI,EAAE,CAAC;oBAChE,IAAI,IAAI,EAAE,CAAC;wBACT,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"}
|
|
@@ -120,10 +120,9 @@ async function loadTestRunner(runnerName) {
|
|
|
120
120
|
catch (e) {
|
|
121
121
|
(0, error_1.assertIsError)(e);
|
|
122
122
|
if (e.code === 'ERR_MODULE_NOT_FOUND') {
|
|
123
|
-
throw new Error(`Unknown test runner "${runnerName}"
|
|
123
|
+
throw new Error(`Unknown test runner "${runnerName}".`, { cause: e });
|
|
124
124
|
}
|
|
125
|
-
throw new Error(`Failed to load the '${runnerName}' test runner. The package may be corrupted or improperly installed
|
|
126
|
-
`Error: ${e.message}`);
|
|
125
|
+
throw new Error(`Failed to load the '${runnerName}' test runner. The package may be corrupted or improperly installed.`, { cause: e });
|
|
127
126
|
}
|
|
128
127
|
const runner = runnerModule.default;
|
|
129
128
|
if (!runner ||
|
|
@@ -363,18 +362,16 @@ async function transformNgPackagrOptions(context, options, projectRoot) {
|
|
|
363
362
|
}
|
|
364
363
|
catch (e) {
|
|
365
364
|
(0, error_1.assertIsError)(e);
|
|
366
|
-
throw new Error(`Could not read ng-package.json at ${ngPackagePath}
|
|
365
|
+
throw new Error(`Could not read ng-package.json at ${ngPackagePath}`, {
|
|
366
|
+
cause: e,
|
|
367
|
+
});
|
|
367
368
|
}
|
|
368
|
-
const lib =
|
|
369
|
-
const
|
|
370
|
-
const assets = ngPackageJson['assets'] || [];
|
|
371
|
-
const inlineStyleLanguage = ngPackageJson['inlineStyleLanguage'];
|
|
369
|
+
const { lib: { styleIncludePaths = [] } = {}, assets = [], inlineStyleLanguage } = ngPackageJson;
|
|
370
|
+
const includePaths = styleIncludePaths.map((includePath) => node_path_1.default.resolve(node_path_1.default.dirname(ngPackagePath), includePath));
|
|
372
371
|
return {
|
|
373
|
-
stylePreprocessorOptions:
|
|
374
|
-
? { includePaths: styleIncludePaths }
|
|
375
|
-
: undefined,
|
|
372
|
+
stylePreprocessorOptions: includePaths.length ? { includePaths } : undefined,
|
|
376
373
|
assets: assets.length ? assets : undefined,
|
|
377
|
-
inlineStyleLanguage
|
|
374
|
+
inlineStyleLanguage,
|
|
378
375
|
};
|
|
379
376
|
}
|
|
380
377
|
//# sourceMappingURL=builder.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"builder.js","sourceRoot":"","sources":["builder.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAsKH,0BAgLC;AApVD,yDAImC;AACnC,8DAAiC;AACjC,+CAAgD;AAChD,0DAA6B;AAC7B,qFAAsF;AACtF,6CAAkD;AAClD,uDAAwD;AACxD,gDAA0D;AAK1D,oDAAoD;AACpD,uCAA6C;AAE7C,qEAAwE;AAExE,qDAA6C;AAI7C,KAAK,UAAU,cAAc,CAAC,UAAkB;IAC9C,qCAAqC;IACrC,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC;QACxC,MAAM,IAAI,KAAK,CACb,wBAAwB,UAAU,uEAAuE,CAC1G,CAAC;IACJ,CAAC;IAED,IAAI,YAAY,CAAC;IACjB,IAAI,CAAC;QACH,YAAY,GAAG,yBAAa,aAAa,UAAU,QAAQ,uCAAC,CAAC;IAC/D,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,IAAA,qBAAa,EAAC,CAAC,CAAC,CAAC;QACjB,IAAI,CAAC,CAAC,IAAI,KAAK,sBAAsB,EAAE,CAAC;YACtC,MAAM,IAAI,KAAK,CAAC,wBAAwB,UAAU,IAAI,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"builder.js","sourceRoot":"","sources":["builder.ts"],"names":[],"mappings":"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"}
|
|
@@ -95,7 +95,7 @@ async function normalizeOptions(context, projectName, options) {
|
|
|
95
95
|
buildProgress: progress,
|
|
96
96
|
reporters: normalizeReporterOption(options.reporters),
|
|
97
97
|
outputFile: options.outputFile,
|
|
98
|
-
browsers,
|
|
98
|
+
browsers: browsers?.length ? browsers : undefined,
|
|
99
99
|
browserViewport: width && height ? { width, height } : undefined,
|
|
100
100
|
watch,
|
|
101
101
|
debug: options.debug ?? false,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"options.js","sourceRoot":"","sources":["options.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"options.js","sourceRoot":"","sources":["options.ts"],"names":[],"mappings":"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"}
|
|
@@ -94,23 +94,14 @@ async function setupBrowserConfiguration(browsers, headless, debug, projectSourc
|
|
|
94
94
|
// Validate that the imported module has the expected structure
|
|
95
95
|
const providerFactory = providerModule[providerName];
|
|
96
96
|
if (typeof providerFactory === 'function') {
|
|
97
|
-
if (providerName === 'playwright'
|
|
98
|
-
process.env['CHROME_BIN']
|
|
99
|
-
// Use the Chrome binary from the 'rules_browsers' toolchain (via CHROME_BIN)
|
|
100
|
-
// for Playwright when available to ensure hermetic testing, preventing reliance
|
|
101
|
-
// on locally installed or NPM-managed browser versions.
|
|
102
|
-
provider = providerFactory({
|
|
103
|
-
launchOptions: {
|
|
104
|
-
executablePath: process.env.CHROME_BIN,
|
|
105
|
-
},
|
|
106
|
-
contextOptions: {
|
|
107
|
-
// Enables `prefer-color-scheme` for Vitest browser instead of `light`
|
|
108
|
-
colorScheme: null,
|
|
109
|
-
},
|
|
110
|
-
});
|
|
111
|
-
}
|
|
112
|
-
else if (providerName === 'playwright') {
|
|
97
|
+
if (providerName === 'playwright') {
|
|
98
|
+
const executablePath = process.env['CHROME_BIN'];
|
|
113
99
|
provider = providerFactory({
|
|
100
|
+
launchOptions: executablePath
|
|
101
|
+
? {
|
|
102
|
+
executablePath,
|
|
103
|
+
}
|
|
104
|
+
: undefined,
|
|
114
105
|
contextOptions: {
|
|
115
106
|
// Enables `prefer-color-scheme` for Vitest browser instead of `light`
|
|
116
107
|
colorScheme: null,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"browser-provider.js","sourceRoot":"","sources":["browser-provider.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA8CH,
|
|
1
|
+
{"version":3,"file":"browser-provider.js","sourceRoot":"","sources":["browser-provider.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,13 +11,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
11
11
|
};
|
|
12
12
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
13
13
|
exports.getVitestBuildOptions = getVitestBuildOptions;
|
|
14
|
+
const node_module_1 = require("node:module");
|
|
14
15
|
const node_path_1 = __importDefault(require("node:path"));
|
|
15
16
|
const path_1 = require("../../../../utils/path");
|
|
16
17
|
const schema_1 = require("../../../application/schema");
|
|
17
|
-
const options_1 = require("../../options");
|
|
18
18
|
const test_discovery_1 = require("../../test-discovery");
|
|
19
|
-
function createTestBedInitVirtualFile(providersFile, projectSourceRoot, teardown,
|
|
20
|
-
const usesZoneJS = polyfills.includes('zone.js');
|
|
19
|
+
function createTestBedInitVirtualFile(providersFile, projectSourceRoot, teardown, zoneTestingStrategy) {
|
|
21
20
|
let providersImport = 'const providers = [];';
|
|
22
21
|
if (providersFile) {
|
|
23
22
|
const relativePath = node_path_1.default.relative(projectSourceRoot, providersFile);
|
|
@@ -27,12 +26,23 @@ function createTestBedInitVirtualFile(providersFile, projectSourceRoot, teardown
|
|
|
27
26
|
}
|
|
28
27
|
return `
|
|
29
28
|
// Initialize the Angular testing environment
|
|
30
|
-
import { NgModule
|
|
29
|
+
import { NgModule, provideZoneChangeDetection } from '@angular/core';
|
|
31
30
|
import { getTestBed, ɵgetCleanupHook as getCleanupHook } from '@angular/core/testing';
|
|
32
31
|
import { BrowserTestingModule, platformBrowserTesting } from '@angular/platform-browser/testing';
|
|
33
32
|
import { afterEach, beforeEach } from 'vitest';
|
|
34
33
|
${providersImport}
|
|
35
34
|
|
|
35
|
+
${zoneTestingStrategy === 'static'
|
|
36
|
+
? `import 'zone.js/testing';`
|
|
37
|
+
: zoneTestingStrategy === 'dynamic'
|
|
38
|
+
? `
|
|
39
|
+
if (typeof Zone !== 'undefined') {
|
|
40
|
+
// 'zone.js/testing' is used to initialize the ZoneJS testing environment.
|
|
41
|
+
// It must be imported dynamically to avoid a static dependency on 'zone.js'.
|
|
42
|
+
await import('zone.js/testing');
|
|
43
|
+
}`
|
|
44
|
+
: ''}
|
|
45
|
+
|
|
36
46
|
// The beforeEach and afterEach hooks are registered outside the globalThis guard.
|
|
37
47
|
// This ensures that the hooks are always applied, even in non-isolated browser environments.
|
|
38
48
|
// Same as https://github.com/angular/angular/blob/05a03d3f975771bb59c7eefd37c01fa127ee2229/packages/core/testing/srcs/test_hooks.ts#L21-L29
|
|
@@ -48,7 +58,10 @@ function createTestBedInitVirtualFile(providersFile, projectSourceRoot, teardown
|
|
|
48
58
|
// The guard condition above ensures that the setup is only performed once.
|
|
49
59
|
|
|
50
60
|
@NgModule({
|
|
51
|
-
providers: [
|
|
61
|
+
providers: [
|
|
62
|
+
...(typeof Zone !== 'undefined' ? [provideZoneChangeDetection()] : []),
|
|
63
|
+
...providers,
|
|
64
|
+
],
|
|
52
65
|
})
|
|
53
66
|
class TestModule {}
|
|
54
67
|
|
|
@@ -126,17 +139,53 @@ async function getVitestBuildOptions(options, baseBuildOptions) {
|
|
|
126
139
|
externalPackages: true,
|
|
127
140
|
externalDependencies,
|
|
128
141
|
};
|
|
129
|
-
|
|
130
|
-
|
|
142
|
+
// Inject the zone.js testing polyfill if Zone.js is installed.
|
|
143
|
+
let zoneTestingStrategy;
|
|
144
|
+
if (buildOptions.polyfills?.includes('zone.js/testing')) {
|
|
145
|
+
zoneTestingStrategy = 'none';
|
|
146
|
+
}
|
|
147
|
+
else if (buildOptions.polyfills?.includes('zone.js')) {
|
|
148
|
+
zoneTestingStrategy = 'static';
|
|
149
|
+
}
|
|
150
|
+
else {
|
|
151
|
+
try {
|
|
152
|
+
const projectRequire = (0, node_module_1.createRequire)(node_path_1.default.join(projectSourceRoot, 'package.json'));
|
|
153
|
+
projectRequire.resolve('zone.js');
|
|
154
|
+
zoneTestingStrategy = 'dynamic';
|
|
155
|
+
}
|
|
156
|
+
catch {
|
|
157
|
+
zoneTestingStrategy = 'none';
|
|
158
|
+
}
|
|
159
|
+
}
|
|
160
|
+
const testBedInitContents = createTestBedInitVirtualFile(providersFile, projectSourceRoot, !options.debug, zoneTestingStrategy);
|
|
131
161
|
const mockPatchContents = `
|
|
132
162
|
import { vi } from 'vitest';
|
|
163
|
+
|
|
133
164
|
const error = new Error(
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
165
|
+
'The "vi.mock" and related methods are not supported for relative imports with the Angular unit-test system. ' +
|
|
166
|
+
'Please use Angular TestBed for mocking dependencies.'
|
|
167
|
+
);
|
|
168
|
+
|
|
169
|
+
// Store original implementations
|
|
170
|
+
const { mock, doMock, importMock, unmock, doUnmock } = vi;
|
|
171
|
+
|
|
172
|
+
function patch(original) {
|
|
173
|
+
return (path, ...args) => {
|
|
174
|
+
// Check if the path is a string and starts with a character that indicates a relative path.
|
|
175
|
+
if (typeof path === 'string' && /^[./]/.test(path)) {
|
|
176
|
+
throw error;
|
|
177
|
+
}
|
|
178
|
+
|
|
179
|
+
// Call the original function for non-relative paths.
|
|
180
|
+
return original(path, ...args);
|
|
181
|
+
};
|
|
182
|
+
}
|
|
183
|
+
|
|
184
|
+
vi.mock = patch(mock);
|
|
185
|
+
vi.doMock = patch(doMock);
|
|
186
|
+
vi.importMock = patch(importMock);
|
|
187
|
+
vi.unmock = patch(unmock);
|
|
188
|
+
vi.doUnmock = patch(doUnmock);
|
|
140
189
|
`;
|
|
141
190
|
return {
|
|
142
191
|
buildOptions,
|
|
@@ -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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"}
|
|
@@ -17,9 +17,11 @@ export declare class VitestExecutor implements TestExecutor {
|
|
|
17
17
|
private readonly logger;
|
|
18
18
|
private readonly buildResultFiles;
|
|
19
19
|
private readonly externalMetadata;
|
|
20
|
+
private readonly debugLevel;
|
|
20
21
|
private readonly testFileToEntryPoint;
|
|
21
22
|
private readonly entryPointToTestFile;
|
|
22
23
|
constructor(projectName: string, options: NormalizedUnitTestBuilderOptions, testEntryPointMappings: Map<string, string> | undefined, logger: BuilderContext['logger']);
|
|
24
|
+
private debugLog;
|
|
23
25
|
execute(buildResult: FullResult | IncrementalResult): AsyncIterable<BuilderOutput>;
|
|
24
26
|
[Symbol.asyncDispose](): Promise<void>;
|
|
25
27
|
private prepareSetupFiles;
|