@angular/build 22.1.0-next.4 → 22.1.0-rc.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 +8 -7
- package/src/builders/application/chunk-optimizer.js +2 -2
- package/src/builders/application/chunk-optimizer.js.map +1 -1
- package/src/builders/application/execute-build.js +1 -3
- package/src/builders/application/execute-build.js.map +1 -1
- package/src/builders/application/inject-debug-ids.js +4 -2
- package/src/builders/application/inject-debug-ids.js.map +1 -1
- package/src/builders/application/options.js +2 -7
- package/src/builders/application/options.js.map +1 -1
- package/src/builders/application/schema.d.ts +1 -1
- package/src/builders/unit-test/builder.js +0 -3
- package/src/builders/unit-test/builder.js.map +1 -1
- package/src/builders/unit-test/options.d.ts +2 -2
- package/src/builders/unit-test/options.js +15 -5
- package/src/builders/unit-test/options.js.map +1 -1
- package/src/builders/unit-test/runners/vitest/executor.js +28 -4
- package/src/builders/unit-test/runners/vitest/executor.js.map +1 -1
- package/src/builders/unit-test/runners/vitest/plugins.js +3 -1
- package/src/builders/unit-test/runners/vitest/plugins.js.map +1 -1
- package/src/builders/unit-test/schema.d.ts +7 -7
- package/src/tools/angular/compilation/aot-compilation.js +11 -1
- package/src/tools/angular/compilation/aot-compilation.js.map +1 -1
- package/src/tools/babel/plugins/oxc-transform.d.ts +28 -0
- package/src/tools/babel/plugins/oxc-transform.js +655 -0
- package/src/tools/babel/plugins/oxc-transform.js.map +1 -0
- package/src/tools/esbuild/bundler-context.d.ts +10 -0
- package/src/tools/esbuild/bundler-context.js +72 -0
- package/src/tools/esbuild/bundler-context.js.map +1 -1
- package/src/tools/esbuild/global-scripts.js +2 -35
- package/src/tools/esbuild/global-scripts.js.map +1 -1
- package/src/tools/esbuild/i18n-inliner-worker.js +66 -70
- package/src/tools/esbuild/i18n-inliner-worker.js.map +1 -1
- package/src/tools/esbuild/javascript-transformer-worker.js +38 -26
- package/src/tools/esbuild/javascript-transformer-worker.js.map +1 -1
- package/src/tools/sass/rebasing-importer.js +2 -5
- package/src/tools/sass/rebasing-importer.js.map +1 -1
- package/src/utils/debug-id.d.ts +5 -0
- package/src/utils/debug-id.js +11 -3
- package/src/utils/debug-id.js.map +1 -1
- package/src/utils/index-file/augment-index-html.js +8 -1
- package/src/utils/index-file/augment-index-html.js.map +1 -1
- package/src/utils/normalize-cache.js +1 -1
- package/src/utils/path.d.ts +9 -0
- package/src/utils/path.js +17 -0
- package/src/utils/path.js.map +1 -1
- package/src/utils/source-map.d.ts +7 -0
- package/src/utils/source-map.js +84 -0
- package/src/utils/source-map.js.map +1 -1
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@angular/build",
|
|
3
|
-
"version": "22.1.0-
|
|
3
|
+
"version": "22.1.0-rc.0",
|
|
4
4
|
"description": "Official build system for Angular",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"Angular CLI",
|
|
@@ -23,29 +23,30 @@
|
|
|
23
23
|
"builders": "builders.json",
|
|
24
24
|
"dependencies": {
|
|
25
25
|
"@ampproject/remapping": "2.3.0",
|
|
26
|
-
"@angular-devkit/architect": "0.2201.0-
|
|
26
|
+
"@angular-devkit/architect": "0.2201.0-rc.0",
|
|
27
27
|
"@babel/core": "8.0.1",
|
|
28
28
|
"@babel/helper-annotate-as-pure": "8.0.0",
|
|
29
29
|
"@babel/helper-split-export-declaration": "7.24.7",
|
|
30
30
|
"@inquirer/confirm": "6.1.1",
|
|
31
31
|
"@vitejs/plugin-basic-ssl": "2.3.0",
|
|
32
|
-
"beasties": "0.4.
|
|
32
|
+
"beasties": "0.4.3",
|
|
33
33
|
"browserslist": "^4.26.0",
|
|
34
34
|
"esbuild": "0.28.1",
|
|
35
35
|
"https-proxy-agent": "9.1.0",
|
|
36
36
|
"jsonc-parser": "3.3.1",
|
|
37
37
|
"listr2": "10.2.2",
|
|
38
|
-
"magic-string": "0.
|
|
38
|
+
"magic-string": "1.0.0",
|
|
39
39
|
"mrmime": "2.0.1",
|
|
40
|
+
"oxc-parser": "0.140.0",
|
|
40
41
|
"parse5-html-rewriting-stream": "8.0.1",
|
|
41
42
|
"picomatch": "4.0.5",
|
|
42
43
|
"piscina": "5.2.0",
|
|
43
|
-
"rolldown": "1.
|
|
44
|
+
"rolldown": "1.2.0",
|
|
44
45
|
"sass": "1.101.0",
|
|
45
46
|
"semver": "7.8.5",
|
|
46
47
|
"source-map-support": "0.5.21",
|
|
47
48
|
"tinyglobby": "0.2.17",
|
|
48
|
-
"vite": "8.1.
|
|
49
|
+
"vite": "8.1.5",
|
|
49
50
|
"watchpack": "2.5.2"
|
|
50
51
|
},
|
|
51
52
|
"optionalDependencies": {
|
|
@@ -59,7 +60,7 @@
|
|
|
59
60
|
"@angular/platform-browser": "^22.0.0 || ^22.1.0-next.0",
|
|
60
61
|
"@angular/platform-server": "^22.0.0 || ^22.1.0-next.0",
|
|
61
62
|
"@angular/service-worker": "^22.0.0 || ^22.1.0-next.0",
|
|
62
|
-
"@angular/ssr": "^22.1.0-
|
|
63
|
+
"@angular/ssr": "^22.1.0-rc.0",
|
|
63
64
|
"istanbul-lib-instrument": "^6.0.0",
|
|
64
65
|
"karma": "^6.4.0",
|
|
65
66
|
"less": "^4.2.0",
|
|
@@ -245,7 +245,7 @@ async function optimizeChunks(original, sourcemap) {
|
|
|
245
245
|
const result = await bundle.generate({
|
|
246
246
|
minify: { mangle: false, compress: false },
|
|
247
247
|
sourcemap,
|
|
248
|
-
chunkFileNames: (chunkInfo) => `${chunkInfo.name.replace(/-[a-zA-Z0-
|
|
248
|
+
chunkFileNames: (chunkInfo) => `${chunkInfo.name.replace(/-[a-zA-Z0-9_-]{8}$/, '')}-[hash].js`,
|
|
249
249
|
});
|
|
250
250
|
optimizedOutput = result.output;
|
|
251
251
|
}
|
|
@@ -265,7 +265,7 @@ async function optimizeChunks(original, sourcemap) {
|
|
|
265
265
|
const result = await bundle.generate({
|
|
266
266
|
compact: true,
|
|
267
267
|
sourcemap,
|
|
268
|
-
chunkFileNames: (chunkInfo) => `${chunkInfo.name.replace(/-[a-zA-Z0-
|
|
268
|
+
chunkFileNames: (chunkInfo) => `${chunkInfo.name.replace(/-[a-zA-Z0-9_-]{8}$/, '')}-[hash].js`,
|
|
269
269
|
});
|
|
270
270
|
optimizedOutput = result.output;
|
|
271
271
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"chunk-optimizer.js","sourceRoot":"","sources":["chunk-optimizer.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"chunk-optimizer.js","sourceRoot":"","sources":["chunk-optimizer.ts"],"names":[],"mappings":"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"}
|
|
@@ -149,9 +149,7 @@ async function executeBuild(options, context, rebuildState) {
|
|
|
149
149
|
const lazyChunksCount = Object.keys(metafile.outputs).filter((path) => path.endsWith('.js') && !initialFiles.has(path)).length;
|
|
150
150
|
// Only run if the number of lazy chunks meets the configured threshold.
|
|
151
151
|
// This avoids overhead for small projects with few chunks.
|
|
152
|
-
|
|
153
|
-
// causes the file to be renamed and thus causes incorrect preloading.
|
|
154
|
-
if (!options.serverEntryPoint && lazyChunksCount >= environment_options_1.optimizeChunksThreshold) {
|
|
152
|
+
if (lazyChunksCount >= environment_options_1.optimizeChunksThreshold) {
|
|
155
153
|
const { optimizeChunks } = await Promise.resolve().then(() => __importStar(require('./chunk-optimizer')));
|
|
156
154
|
const optimizationResult = await (0, profiling_1.profileAsync)('OPTIMIZE_CHUNKS', () => optimizeChunks(bundlingResult, options.sourcemapOptions.scripts ? !options.sourcemapOptions.hidden || 'hidden' : false));
|
|
157
155
|
if (optimizationResult.errors) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"execute-build.js","sourceRoot":"","sources":["execute-build.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAiCH,
|
|
1
|
+
{"version":3,"file":"execute-build.js","sourceRoot":"","sources":["execute-build.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAiCH,oCA2UC;AAzWD,iEAA2E;AAC3E,qFAA0F;AAC1F,qFAAgF;AAChF,mEAAuE;AACvE,yEAA0F;AAC1F,2FAA6F;AAC7F,qEAAwE;AACxE,2EAA4E;AAC5E,+EAAiF;AACjF,6EAAwE;AACxE,6DAA6D;AAC7D,qDAImC;AACnC,qEAAqF;AACrF,yEAA0E;AAC1E,+DAA2D;AAC3D,oEAG+C;AAC/C,uEAAsE;AACtE,+DAA+D;AAC/D,iCAA4D;AAE5D,qDAAqF;AAErF,kDAAkD;AAC3C,KAAK,UAAU,YAAY,CAChC,OAA0C,EAC1C,OAAuB,EACvB,YAA2B;IAE3B,MAAM,EACJ,WAAW,EACX,aAAa,EACb,WAAW,EACX,mBAAmB,EACnB,MAAM,EACN,YAAY,EACZ,gBAAgB,EAChB,QAAQ,EACR,UAAU,EACV,OAAO,EACP,MAAM,EACN,QAAQ,EACR,QAAQ,GACT,GAAG,OAAO,CAAC;IAEZ,4FAA4F;IAC5F,MAAM,QAAQ,GAAG,IAAA,yCAAoB,EAAC,WAAW,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;IAEnE,uCAAuC;IACvC,qEAAqE;IACrE,IAAI,WAAW,CAAC,YAAY,EAAE,CAAC;QAC7B,MAAM,IAAA,6BAAsB,EAAC,OAAO,EAAE,WAAW,CAAC,CAAC;IACrD,CAAC;IAED,oFAAoF;IACpF,IAAI,eAAe,CAAC;IACpB,IAAI,qBAAqB,CAAC;IAC1B,IAAI,eAAe,CAAC;IACpB,IAAI,cAAmC,CAAC;IACxC,IAAI,eAAgD,CAAC;IACrD,IAAI,yBAAgE,CAAC;IACrE,IAAI,CAAC;QACH,IAAI,YAAY,EAAE,CAAC;YACjB,eAAe,GAAG,YAAY,CAAC,eAAe,CAAC;YAC/C,qBAAqB,GAAG,YAAY,CAAC,qBAAqB,CAAC;YAC3D,eAAe,GAAG,YAAY,CAAC,eAAe,CAAC;YAC/C,eAAe,GAAG,YAAY,CAAC,eAAe,CAAC;YAC/C,yCAAyC;YACzC,eAAe,EAAE,KAAK,EAAE,CAAC;YAEzB,MAAM,cAAc,GAAG,YAAY,CAAC,WAAW,CAAC,GAAG,CAAC;YAEpD,0EAA0E;YAC1E,0EAA0E;YAC1E,cAAc,GAAG,MAAM,gCAAc,CAAC,SAAS,CAC7C,eAAe,CAAC,aAAa,EAC7B,cAAc,CACf,CAAC;YAEF,wFAAwF;YACxF,mCAAmC;YACnC,MAAM,sBAAsB,GAAG,eAAe,EAAE,UAAU,CAAC,cAAc,CAAC,CAAC;YAC3E,MAAM,iBAAiB,GAA0B,EAAE,CAAC;YACpD,KAAK,MAAM,iBAAiB,IAAI,eAAe,CAAC,kBAAkB,EAAE,CAAC;gBACnE,iBAAiB,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC;gBAC7C,MAAM,MAAM,GAAG,MAAM,iBAAiB,CAAC,MAAM,CAAC,sBAAsB,CAAC,CAAC;gBACtE,iBAAiB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YACjC,CAAC;YACD,cAAc,GAAG,gCAAc,CAAC,YAAY,CAAC,CAAC,cAAc,EAAE,GAAG,iBAAiB,CAAC,CAAC,CAAC;QACvF,CAAC;aAAM,CAAC;YACN,MAAM,MAAM,GAAG,IAAA,2CAAmC,EAAC,QAAQ,CAAC,CAAC;YAC7D,eAAe,GAAG,IAAI,mCAAe,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;YAC5F,qBAAqB,GAAG,IAAA,4CAA2B,EAAC,OAAO,EAAE,MAAM,CAAC,CAAC;YACrE,IAAI,OAAO,CAAC,eAAe,EAAE,CAAC;gBAC5B,eAAe,GAAG,IAAI,GAAG,EAAkB,CAAC;YAC9C,CAAC;YACD,MAAM,kBAAkB,GAAG,MAAM,IAAA,sCAAwB,EACvD,CAAC,CAAC,OAAO,CAAC,GAAG,EACb,CAAC,OAAO,CAAC,gBAAgB,CAC1B,CAAC;YACF,yBAAyB,GAAG,IAAI,6CAAyB,CAAC,kBAAkB,CAAC,CAAC;YAC9E,eAAe,GAAG,IAAA,qCAAoB,EACpC,OAAO,EACP,MAAM,EACN,eAAe,EACf,qBAAqB,EACrB,yBAAyB,EACzB,eAAe,CAChB,CAAC;YAEF,qCAAqC;YACrC,cAAc,GAAG,MAAM,gCAAc,CAAC,SAAS,CAAC;gBAC9C,GAAG,eAAe,CAAC,kBAAkB;gBACrC,GAAG,eAAe,CAAC,aAAa;aACjC,CAAC,CAAC;QACL,CAAC;QAED,kEAAkE;QAClE,oGAAoG;QACpG,IAAI,YAAY,IAAI,OAAO,CAAC,qBAAqB,EAAE,CAAC;YAClD,qBAAqB,CAAC,UAAU,CAAC,YAAY,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;YAE/D,MAAM,gBAAgB,GAAG,MAAM,qBAAqB,CAAC,cAAc,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;YAChF,cAAc,GAAG,gCAAc,CAAC,YAAY,CAAC,CAAC,cAAc,EAAE,GAAG,gBAAgB,CAAC,CAAC,CAAC;QACtF,CAAC;IACH,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,yBAAyB,EAAE,OAAO,EAAE,CAAC;QAC3C,MAAM,KAAK,CAAC;IACd,CAAC;IAED,MAAM,eAAe,GAAG,IAAI,0CAAe,CACzC,eAAe,EACf,qBAAqB,EACrB,eAAe,EACf,eAAe,CAChB,CAAC;IACF,eAAe,CAAC,WAAW,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC;IAErD,mEAAmE;IACnE,IAAI,OAAO,CAAC,qBAAqB,EAAE,CAAC;QAClC,eAAe,CAAC,eAAe,CAAC,IAAI,CAAC,GAAG,qBAAqB,CAAC,sBAAsB,EAAE,CAAC,CAAC;IAC1F,CAAC;IAED,oCAAoC;IACpC,IAAI,cAAc,CAAC,MAAM,EAAE,CAAC;QAC1B,eAAe,CAAC,SAAS,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;QAEjD,OAAO,eAAe,CAAC;IACzB,CAAC;IAED,mDAAmD;IACnD,kFAAkF;IAClF,IAAI,OAAO,CAAC,mBAAmB,CAAC,OAAO,EAAE,CAAC;QACxC,yDAAyD;QACzD,sFAAsF;QACtF,MAAM,EAAE,QAAQ,EAAE,YAAY,EAAE,GAAG,cAAc,CAAC;QAClD,MAAM,eAAe,GAAG,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,MAAM,CAC1D,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,CAC1D,CAAC,MAAM,CAAC;QAET,wEAAwE;QACxE,2DAA2D;QAC3D,IAAI,eAAe,IAAI,6CAAuB,EAAE,CAAC;YAC/C,MAAM,EAAE,cAAc,EAAE,GAAG,wDAAa,mBAAmB,GAAC,CAAC;YAC7D,MAAM,kBAAkB,GAAG,MAAM,IAAA,wBAAY,EAAC,iBAAiB,EAAE,GAAG,EAAE,CACpE,cAAc,CACZ,cAAc,EACd,OAAO,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,gBAAgB,CAAC,MAAM,IAAI,QAAQ,CAAC,CAAC,CAAC,KAAK,CACxF,CACF,CAAC;YAEF,IAAI,kBAAkB,CAAC,MAAM,EAAE,CAAC;gBAC9B,eAAe,CAAC,SAAS,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC;gBAErD,OAAO,eAAe,CAAC;YACzB,CAAC;YAED,cAAc,GAAG,kBAAkB,CAAC;QACtC,CAAC;IACH,CAAC;IAED,2DAA2D;IAC3D,IAAI,OAAO,CAAC,gBAAgB,IAAI,cAAc,CAAC,qBAAqB,EAAE,CAAC;QACrE,MAAM,EACJ,qBAAqB,GAAG,EAAE,EAC1B,eAAe,EAAE,EAAE,OAAO,GAAG,EAAE,EAAE,MAAM,GAAG,EAAE,EAAE,GAC/C,GAAG,cAAc,CAAC;QACnB,uFAAuF;QACvF,gDAAgD;QAChD,gFAAgF;QAChF,MAAM,kBAAkB,GAAG,qBAAqB,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,GAAG,GAAG,CAAC,CAAC;QACrF,MAAM,UAAU,GAAG,IAAI,GAAG,CAAC,qBAAqB,CAAC,CAAC;QAClD,MAAM,gBAAgB,GAAG,IAAI,GAAG,EAAU,CAAC;QAE3C,MAAM,kBAAkB,GAAG,CAAC,GAAW,EAAW,EAAE;YAClD,2GAA2G;YAC3G,gEAAgE;YAChE,IAAI,GAAG,CAAC,UAAU,CAAC,GAAG,4CAAuB,GAAG,CAAC,EAAE,CAAC;gBAClD,OAAO,KAAK,CAAC;YACf,CAAC;YAED,IAAI,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;gBACxB,OAAO,IAAI,CAAC;YACd,CAAC;YAED,KAAK,MAAM,MAAM,IAAI,kBAAkB,EAAE,CAAC;gBACxC,IAAI,GAAG,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC;oBAC3B,OAAO,IAAI,CAAC;gBACd,CAAC;YACH,CAAC;YAED,OAAO,KAAK,CAAC;QACf,CAAC,CAAC;QAEF,MAAM,eAAe,GAAa,EAAE,CAAC;QACrC,KAAK,MAAM,GAAG,IAAI,OAAO,EAAE,CAAC;YAC1B,IAAI,kBAAkB,CAAC,GAAG,CAAC,EAAE,CAAC;gBAC5B,gBAAgB,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;YAC5B,CAAC;iBAAM,CAAC;gBACN,eAAe,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YAC5B,CAAC;QACH,CAAC;QAED,MAAM,cAAc,GAAa,EAAE,CAAC;QACpC,KAAK,MAAM,GAAG,IAAI,MAAM,EAAE,CAAC;YACzB,IAAI,kBAAkB,CAAC,GAAG,CAAC,EAAE,CAAC;gBAC5B,gBAAgB,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;YAC5B,CAAC;iBAAM,CAAC;gBACN,cAAc,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YAC3B,CAAC;QACH,CAAC;QAED,eAAe,CAAC,mBAAmB,CAAC,eAAe,EAAE,cAAc,EAAE,CAAC,GAAG,gBAAgB,CAAC,CAAC,CAAC;IAC9F,CAAC;IAED,MAAM,EAAE,QAAQ,EAAE,YAAY,EAAE,WAAW,EAAE,GAAG,cAAc,CAAC;IAE/D,eAAe,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,WAAW,CAAC,CAAC;IAEjD,sDAAsD;IACtD,IAAI,cAAoD,CAAC;IACzD,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;QACpB,MAAM,WAAW,GAAG,IAAA,kCAAmB,EAAC,QAAQ,EAAE,WAAW,EAAE,YAAY,CAAC,CAAC;QAC7E,cAAc,GAAG,CAAC,GAAG,IAAA,gCAAY,EAAC,OAAO,CAAC,OAAO,EAAE,WAAW,EAAE,IAAI,CAAC,CAAC,CAAC;QACvE,KAAK,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,cAAc,EAAE,CAAC;YACnD,IAAI,QAAQ,KAAK,OAAO,EAAE,CAAC;gBACzB,eAAe,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;YACpC,CAAC;iBAAM,CAAC;gBACN,eAAe,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;YACtC,CAAC;QACH,CAAC;IACH,CAAC;IAED,6DAA6D;IAC7D,IAAI,sBAAsB,CAAC;IAC3B,IAAI,mBAAmB,CAAC,OAAO,IAAI,mBAAmB,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;QACrE,sBAAsB,GAAG,MAAM,IAAA,uCAA+B,EAAC,eAAe,CAAC,WAAW,CAAC,CAAC;IAC9F,CAAC;IAED,iEAAiE;IACjE,IAAI,mBAAmB,CAAC,OAAO,EAAE,CAAC;QAChC,MAAM,QAAQ,GAAG,IAAA,uCAAoB,EAAC,QAAQ,EAAE,OAAO,CAAC,2BAA2B,CAAC,CAAC;QACrF,eAAe,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;IACxC,CAAC;IAED,cAAc;IACd,IAAI,MAAM,EAAE,CAAC;QACX,eAAe,CAAC,SAAS,CAAC,MAAM,IAAA,8BAAa,EAAC,MAAM,EAAE,aAAa,CAAC,CAAC,CAAC;IACxE,CAAC;IAED,+CAA+C;IAC/C,IAAI,OAAO,CAAC,eAAe,EAAE,CAAC;QAC5B,eAAe,CAAC,aAAa,CAC3B,sBAAsB,EACtB,MAAM,IAAA,mCAAe,EAAC,QAAQ,EAAE,aAAa,CAAC,EAC9C,mCAAmB,CAAC,IAAI,CACzB,CAAC;IACJ,CAAC;IAED,4CAA4C;IAC5C,IAAI,OAAO,CAAC,gBAAgB,EAAE,CAAC;QAC7B,eAAe,CAAC,eAAe,CAAC,IAAI,CAAC,OAAO,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC;QACrE,eAAe,CAAC,aAAa,GAAG,OAAO,CAAC,gBAAgB,CAAC,MAAM,CAAC;QAChE,eAAe,CAAC,YAAY,GAAG,OAAO,CAAC,QAAQ,CAAC;IAClD,CAAC;IAED,oCAAoC;IACpC,IAAI,gBAAgB,EAAE,CAAC;QACrB,eAAe,CAAC,aAAa,CAC3B,8CAAmC,EACnC,IAAA,iDAAsC,EAAC,WAAW,EAAE,QAAQ,CAAC,YAAY,EAAE,QAAQ,CAAC,EACpF,mCAAmB,CAAC,UAAU,CAC/B,CAAC;IACJ,CAAC;IAED,+CAA+C;IAC/C,IAAI,WAAW,CAAC,YAAY,EAAE,CAAC;QAC7B,MAAM,MAAM,GAAG,MAAM,IAAA,iBAAU,EAAC,QAAQ,EAAE,OAAO,EAAE,eAAe,EAAE,YAAY,CAAC,CAAC;QAClF,eAAe,CAAC,SAAS,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QACzC,eAAe,CAAC,WAAW,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;QAC7C,eAAe,CAAC,oBAAoB,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC;IACjE,CAAC;SAAM,CAAC;QACN,MAAM,MAAM,GAAG,MAAM,IAAA,4CAAsB,EACzC,QAAQ,EACR,OAAO,EACP,eAAe,CAAC,WAAW,EAC3B,eAAe,CAAC,UAAU,EAC1B,YAAY;QACZ,6DAA6D;QAC7D,WAAW,CAAC,sBAAsB,CAAC,CAAC,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC,CAAC,SAAS,CAC1E,CAAC;QAEF,0CAA0C;QAC1C,eAAe,CAAC,SAAS,CAAC,CAAC,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;QACvD,eAAe,CAAC,WAAW,CAAC,CAAC,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;QAE3D,eAAe,CAAC,oBAAoB,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC;QAC/D,eAAe,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,qBAAqB,CAAC,CAAC;QAClE,eAAe,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,gBAAgB,CAAC,CAAC;IAC9D,CAAC;IAED,eAAe,CAAC,aAAa,CAC3B,yBAAyB,EACzB,IAAI,CAAC,SAAS,CAAC,EAAE,MAAM,EAAE,eAAe,CAAC,iBAAiB,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,EACtE,mCAAmB,CAAC,IAAI,CACzB,CAAC;IAEF,4CAA4C;IAC5C,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC;QAClB,eAAe,CAAC,aAAa,CAC3B,YAAY,EACZ,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,EACjC,mCAAmB,CAAC,IAAI,CACzB,CAAC;IACJ,CAAC;IAED,IAAI,CAAC,QAAQ,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;QAChC,MAAM,YAAY,GAChB,YAAY,IAAI,eAAe,CAAC,gBAAgB,CAAC,YAAY,CAAC,kBAAkB,CAAC,CAAC;QACpF,eAAe,CAAC,MAAM,CACpB,IAAA,qBAAa,EACX,QAAQ,EACR,WAAW,EACX,YAAY,EACZ,cAAc,EACd,MAAM,EACN,YAAY,EACZ,sBAAsB,EACtB,CAAC,CAAC,UAAU,EACZ,OAAO,CACR,CACF,CAAC;IACJ,CAAC;IAED,OAAO,eAAe,CAAC;AACzB,CAAC"}
|
|
@@ -35,9 +35,11 @@ function injectDebugIds(outputFiles) {
|
|
|
35
35
|
if (!map) {
|
|
36
36
|
continue;
|
|
37
37
|
}
|
|
38
|
-
const
|
|
38
|
+
const mapText = map.text;
|
|
39
|
+
const mapTextForHash = (0, debug_id_1.stripDebugIdFromSourceMap)(mapText);
|
|
40
|
+
const id = (0, debug_id_1.generateDebugId)(mapTextForHash);
|
|
39
41
|
file.contents = encoder.encode((0, debug_id_1.injectDebugIdIntoJs)(file.text, id));
|
|
40
|
-
map.contents = encoder.encode((0, debug_id_1.injectDebugIdIntoSourceMap)(
|
|
42
|
+
map.contents = encoder.encode((0, debug_id_1.injectDebugIdIntoSourceMap)(mapText, id));
|
|
41
43
|
}
|
|
42
44
|
}
|
|
43
45
|
//# sourceMappingURL=inject-debug-ids.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"inject-debug-ids.js","sourceRoot":"","sources":["inject-debug-ids.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;
|
|
1
|
+
{"version":3,"file":"inject-debug-ids.js","sourceRoot":"","sources":["inject-debug-ids.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;AAqBH,wCAwBC;AA3CD,qEAAyF;AACzF,mDAK8B;AAE9B;;;;;;;;;;GAUG;AACH,SAAgB,cAAc,CAAC,WAA8B;IAC3D,MAAM,WAAW,GAAG,IAAI,GAAG,EAA2B,CAAC;IACvD,KAAK,MAAM,IAAI,IAAI,WAAW,EAAE,CAAC;QAC/B,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IACnC,CAAC;IAED,MAAM,OAAO,GAAG,IAAI,WAAW,EAAE,CAAC;IAElC,KAAK,MAAM,IAAI,IAAI,WAAW,EAAE,CAAC;QAC/B,IAAI,IAAI,CAAC,IAAI,KAAK,mCAAmB,CAAC,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;YAC5E,SAAS;QACX,CAAC;QAED,MAAM,GAAG,GAAG,WAAW,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,IAAI,MAAM,CAAC,CAAC;QAChD,IAAI,CAAC,GAAG,EAAE,CAAC;YACT,SAAS;QACX,CAAC;QAED,MAAM,OAAO,GAAG,GAAG,CAAC,IAAI,CAAC;QACzB,MAAM,cAAc,GAAG,IAAA,oCAAyB,EAAC,OAAO,CAAC,CAAC;QAC1D,MAAM,EAAE,GAAG,IAAA,0BAAe,EAAC,cAAc,CAAC,CAAC;QAC3C,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC,MAAM,CAAC,IAAA,8BAAmB,EAAC,IAAI,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC;QACnE,GAAG,CAAC,QAAQ,GAAG,OAAO,CAAC,MAAM,CAAC,IAAA,qCAA0B,EAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC;IACzE,CAAC;AACH,CAAC"}
|
|
@@ -13,7 +13,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
13
13
|
exports.INDEX_HTML_SERVER = exports.INDEX_HTML_CSR = void 0;
|
|
14
14
|
exports.normalizeOptions = normalizeOptions;
|
|
15
15
|
exports.getLocaleBaseHref = getLocaleBaseHref;
|
|
16
|
-
const node_fs_1 = require("node:fs");
|
|
17
16
|
const promises_1 = require("node:fs/promises");
|
|
18
17
|
const node_module_1 = require("node:module");
|
|
19
18
|
const node_path_1 = __importDefault(require("node:path"));
|
|
@@ -22,6 +21,7 @@ const color_1 = require("../../utils/color");
|
|
|
22
21
|
const environment_options_1 = require("../../utils/environment-options");
|
|
23
22
|
const i18n_options_1 = require("../../utils/i18n-options");
|
|
24
23
|
const normalize_cache_1 = require("../../utils/normalize-cache");
|
|
24
|
+
const path_1 = require("../../utils/path");
|
|
25
25
|
const postcss_configuration_1 = require("../../utils/postcss-configuration");
|
|
26
26
|
const project_metadata_1 = require("../../utils/project-metadata");
|
|
27
27
|
const resolve_project_1 = require("../../utils/resolve-project");
|
|
@@ -53,12 +53,7 @@ async function normalizeOptions(context, projectName, options, extensions) {
|
|
|
53
53
|
// If not explicitly set, default to the Node.js process argument
|
|
54
54
|
const preserveSymlinks = options.preserveSymlinks ?? process.execArgv.includes('--preserve-symlinks');
|
|
55
55
|
// Setup base paths based on workspace root and project information
|
|
56
|
-
const workspaceRoot = preserveSymlinks
|
|
57
|
-
? context.workspaceRoot
|
|
58
|
-
: // NOTE: promises.realpath should not be used here since it uses realpath.native which
|
|
59
|
-
// can cause case conversion and other undesirable behavior on Windows systems.
|
|
60
|
-
// ref: https://github.com/nodejs/node/issues/7726
|
|
61
|
-
(0, node_fs_1.realpathSync)(context.workspaceRoot);
|
|
56
|
+
const workspaceRoot = (0, path_1.canonicalizePath)(context.workspaceRoot, preserveSymlinks);
|
|
62
57
|
const projectMetadata = await context.getProjectMetadata(projectName);
|
|
63
58
|
const { projectRoot, projectSourceRoot } = (0, project_metadata_1.getProjectRootPaths)(workspaceRoot, projectMetadata);
|
|
64
59
|
// Gather persistent caching option and provide a project specific cache location
|
|
@@ -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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"}
|
|
@@ -356,7 +356,7 @@ export declare enum InlineStyleLanguage {
|
|
|
356
356
|
/**
|
|
357
357
|
* Translate the bundles in one or more locales.
|
|
358
358
|
*/
|
|
359
|
-
export type Localize = string[] | boolean;
|
|
359
|
+
export type Localize = [string, ...string[]] | boolean;
|
|
360
360
|
/**
|
|
361
361
|
* Enables optimization of the build output. Including minification of scripts and styles,
|
|
362
362
|
* tree-shaking, dead-code elimination, inlining of critical CSS and fonts inlining. For
|
|
@@ -293,9 +293,6 @@ async function* execute(options, context, extensions) {
|
|
|
293
293
|
yield { success: false };
|
|
294
294
|
return;
|
|
295
295
|
}
|
|
296
|
-
// Resolve final preserveSymlinks option
|
|
297
|
-
normalizedOptions.preserveSymlinks =
|
|
298
|
-
buildTargetOptions.preserveSymlinks ?? process.execArgv.includes('--preserve-symlinks');
|
|
299
296
|
// Get runner-specific build options
|
|
300
297
|
let runnerBuildOptions;
|
|
301
298
|
let virtualFiles;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"builder.js","sourceRoot":"","sources":["builder.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAsKH,
|
|
1
|
+
{"version":3,"file":"builder.js","sourceRoot":"","sources":["builder.ts"],"names":[],"mappings":"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"}
|
|
@@ -36,7 +36,7 @@ export declare function normalizeOptions(context: BuilderContext, projectName: s
|
|
|
36
36
|
buildProgress: boolean | undefined;
|
|
37
37
|
reporters: [string, Record<string, unknown>][] | undefined;
|
|
38
38
|
outputFile: string | undefined;
|
|
39
|
-
browsers: string[] | undefined;
|
|
39
|
+
browsers: [string, ...string[]] | undefined;
|
|
40
40
|
browserViewport: {
|
|
41
41
|
width: number;
|
|
42
42
|
height: number;
|
|
@@ -50,7 +50,7 @@ export declare function normalizeOptions(context: BuilderContext, projectName: s
|
|
|
50
50
|
setupFiles: string[];
|
|
51
51
|
dumpVirtualFiles: boolean | undefined;
|
|
52
52
|
listTests: boolean | undefined;
|
|
53
|
-
preserveSymlinks: boolean
|
|
53
|
+
preserveSymlinks: boolean;
|
|
54
54
|
runnerConfig: string | boolean | undefined;
|
|
55
55
|
}>;
|
|
56
56
|
export declare function injectTestingPolyfills(polyfills?: string[]): string[];
|
|
@@ -16,6 +16,7 @@ const architect_1 = require("@angular-devkit/architect");
|
|
|
16
16
|
const node_fs_1 = require("node:fs");
|
|
17
17
|
const node_path_1 = __importDefault(require("node:path"));
|
|
18
18
|
const normalize_cache_1 = require("../../utils/normalize-cache");
|
|
19
|
+
const path_1 = require("../../utils/path");
|
|
19
20
|
const project_metadata_1 = require("../../utils/project-metadata");
|
|
20
21
|
const tty_1 = require("../../utils/tty");
|
|
21
22
|
const schema_1 = require("./schema");
|
|
@@ -34,16 +35,25 @@ function normalizeReporterOption(reporters) {
|
|
|
34
35
|
: entry);
|
|
35
36
|
}
|
|
36
37
|
async function normalizeOptions(context, projectName, options) {
|
|
38
|
+
// Target specifier defaults to the current project's build target using a development configuration
|
|
39
|
+
const buildTargetSpecifier = options.buildTarget ?? `::development`;
|
|
40
|
+
const buildTarget = (0, architect_1.targetFromTargetString)(buildTargetSpecifier, projectName, 'build');
|
|
41
|
+
// Load target options to determine preserveSymlinks setting
|
|
42
|
+
let buildTargetOptions;
|
|
43
|
+
try {
|
|
44
|
+
buildTargetOptions = await context.getTargetOptions(buildTarget);
|
|
45
|
+
}
|
|
46
|
+
catch { }
|
|
47
|
+
const preserveSymlinks = typeof buildTargetOptions?.preserveSymlinks === 'boolean'
|
|
48
|
+
? buildTargetOptions.preserveSymlinks
|
|
49
|
+
: process.execArgv.includes('--preserve-symlinks');
|
|
37
50
|
// Setup base paths based on workspace root and project information
|
|
38
|
-
const workspaceRoot = context.workspaceRoot;
|
|
51
|
+
const workspaceRoot = (0, path_1.canonicalizePath)(context.workspaceRoot, preserveSymlinks);
|
|
39
52
|
const projectMetadata = await context.getProjectMetadata(projectName);
|
|
40
53
|
const { projectRoot, projectSourceRoot } = (0, project_metadata_1.getProjectRootPaths)(workspaceRoot, projectMetadata);
|
|
41
54
|
// Gather persistent caching option and provide a project specific cache location
|
|
42
55
|
const cacheOptions = (0, normalize_cache_1.normalizeCacheOptions)(projectMetadata, workspaceRoot);
|
|
43
56
|
cacheOptions.path = node_path_1.default.join(cacheOptions.path, projectName);
|
|
44
|
-
// Target specifier defaults to the current project's build target using a development configuration
|
|
45
|
-
const buildTargetSpecifier = options.buildTarget ?? `::development`;
|
|
46
|
-
const buildTarget = (0, architect_1.targetFromTargetString)(buildTargetSpecifier, projectName, 'build');
|
|
47
57
|
const { runner, browsers, progress, filter, browserViewport, ui, runnerConfig, isolate } = options;
|
|
48
58
|
if (ui && runner !== schema_1.Runner.Vitest) {
|
|
49
59
|
throw new Error('The "ui" option is only available for the "vitest" runner.');
|
|
@@ -111,7 +121,7 @@ async function normalizeOptions(context, projectName, options) {
|
|
|
111
121
|
: [],
|
|
112
122
|
dumpVirtualFiles: options.dumpVirtualFiles,
|
|
113
123
|
listTests: options.listTests,
|
|
114
|
-
preserveSymlinks
|
|
124
|
+
preserveSymlinks,
|
|
115
125
|
runnerConfig: typeof runnerConfig === 'string'
|
|
116
126
|
? runnerConfig.length === 0
|
|
117
127
|
? true
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"options.js","sourceRoot":"","sources":["options.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;;;
|
|
1
|
+
{"version":3,"file":"options.js","sourceRoot":"","sources":["options.ts"],"names":[],"mappings":"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"}
|
|
@@ -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 promises_1 = require("node:timers/promises");
|
|
49
50
|
const utils_1 = require("../../../../tools/vite/utils");
|
|
50
51
|
const error_1 = require("../../../../utils/error");
|
|
51
52
|
const results_1 = require("../../../application/results");
|
|
@@ -185,8 +186,31 @@ class VitestExecutor {
|
|
|
185
186
|
yield { success };
|
|
186
187
|
}
|
|
187
188
|
async [Symbol.asyncDispose]() {
|
|
189
|
+
if (!this.vitest) {
|
|
190
|
+
return;
|
|
191
|
+
}
|
|
188
192
|
this.debugLog(DebugLogLevel.Info, 'Disposing VitestExecutor: Closing Vitest instance.');
|
|
189
|
-
|
|
193
|
+
const controller = new AbortController();
|
|
194
|
+
const timeoutMs = 10_000;
|
|
195
|
+
try {
|
|
196
|
+
await Promise.race([
|
|
197
|
+
this.vitest.close(),
|
|
198
|
+
(0, promises_1.setTimeout)(timeoutMs, undefined, { signal: controller.signal, ref: false })
|
|
199
|
+
.then(() => {
|
|
200
|
+
this.logger.warn(`Vitest instance failed to close cleanly within ${timeoutMs}ms. Continuing teardown...`);
|
|
201
|
+
})
|
|
202
|
+
.catch(() => {
|
|
203
|
+
// Suppress AbortError triggered by controller.abort() when close() resolves first
|
|
204
|
+
}),
|
|
205
|
+
]);
|
|
206
|
+
}
|
|
207
|
+
catch (error) {
|
|
208
|
+
(0, error_1.assertIsError)(error);
|
|
209
|
+
this.logger.error(`An error occurred while closing Vitest instance: ${error.message}`);
|
|
210
|
+
}
|
|
211
|
+
finally {
|
|
212
|
+
controller.abort();
|
|
213
|
+
}
|
|
190
214
|
this.debugLog(DebugLogLevel.Info, 'Vitest instance closed.');
|
|
191
215
|
}
|
|
192
216
|
prepareSetupFiles() {
|
|
@@ -279,10 +303,10 @@ class VitestExecutor {
|
|
|
279
303
|
config: externalConfigPath,
|
|
280
304
|
root: workspaceRoot,
|
|
281
305
|
project,
|
|
282
|
-
outputFile,
|
|
283
|
-
cache: cacheOptions.enabled ? undefined : false,
|
|
284
|
-
testNamePattern: this.options.filter,
|
|
285
306
|
watch,
|
|
307
|
+
...(outputFile !== undefined ? { outputFile } : {}),
|
|
308
|
+
...(cacheOptions.enabled ? {} : { cache: false }),
|
|
309
|
+
...(this.options.filter !== undefined ? { testNamePattern: this.options.filter } : {}),
|
|
286
310
|
...(typeof ui === 'boolean' ? { ui } : {}),
|
|
287
311
|
...debugOptions,
|
|
288
312
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"executor.js","sourceRoot":"","sources":["executor.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"executor.js","sourceRoot":"","sources":["executor.ts"],"names":[],"mappings":"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"}
|
|
@@ -84,7 +84,9 @@ function determineCoverageProvider(browser, testConfig, optionsCoverageEnabled,
|
|
|
84
84
|
};
|
|
85
85
|
const hasIstanbul = checkInstalled('@vitest/coverage-istanbul');
|
|
86
86
|
const hasV8 = checkInstalled('@vitest/coverage-v8');
|
|
87
|
-
|
|
87
|
+
// Favor istanbul when browser testing is enabled (to avoid slow CDP V8 HTTP sourcemap remapping)
|
|
88
|
+
// or when only istanbul is installed.
|
|
89
|
+
if (hasIstanbul && (browsersToCheck.length > 0 || !hasV8)) {
|
|
88
90
|
determinedProvider = 'istanbul';
|
|
89
91
|
}
|
|
90
92
|
else {
|