@angular/build 22.0.0 → 22.1.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 +20 -20
- package/src/builders/application/index.js +47 -29
- package/src/builders/application/index.js.map +1 -1
- package/src/builders/unit-test/options.d.ts +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/plugins.d.ts +1 -1
- package/src/builders/unit-test/runners/vitest/plugins.js +2 -2
- package/src/builders/unit-test/runners/vitest/plugins.js.map +1 -1
- package/src/tools/esbuild/bundler-context.js +20 -2
- package/src/tools/esbuild/bundler-context.js.map +1 -1
- package/src/tools/esbuild/cache.d.ts +5 -0
- package/src/tools/esbuild/cache.js +82 -6
- package/src/tools/esbuild/cache.js.map +1 -1
- package/src/tools/vite/utils.js +2 -2
- package/src/tools/vite/utils.js.map +1 -1
- package/src/utils/normalize-cache.js +1 -1
- package/src/utils/path.js +3 -2
- package/src/utils/path.js.map +1 -1
- package/src/utils/supported-browsers.js +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": "22.0.0",
|
|
3
|
+
"version": "22.1.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.
|
|
27
|
-
"@babel/core": "7.29.
|
|
28
|
-
"@babel/helper-annotate-as-pure": "7.
|
|
26
|
+
"@angular-devkit/architect": "0.2201.0-next.0",
|
|
27
|
+
"@babel/core": "7.29.7",
|
|
28
|
+
"@babel/helper-annotate-as-pure": "7.29.7",
|
|
29
29
|
"@babel/helper-split-export-declaration": "7.24.7",
|
|
30
|
-
"@inquirer/confirm": "6.
|
|
30
|
+
"@inquirer/confirm": "6.1.1",
|
|
31
31
|
"@vitejs/plugin-basic-ssl": "2.3.0",
|
|
32
32
|
"beasties": "0.4.2",
|
|
33
33
|
"browserslist": "^4.26.0",
|
|
@@ -40,30 +40,30 @@
|
|
|
40
40
|
"parse5-html-rewriting-stream": "8.0.1",
|
|
41
41
|
"picomatch": "4.0.4",
|
|
42
42
|
"piscina": "5.1.4",
|
|
43
|
-
"rollup": "4.
|
|
44
|
-
"sass": "1.
|
|
45
|
-
"semver": "7.
|
|
43
|
+
"rollup": "4.61.0",
|
|
44
|
+
"sass": "1.100.0",
|
|
45
|
+
"semver": "7.8.1",
|
|
46
46
|
"source-map-support": "0.5.21",
|
|
47
|
-
"tinyglobby": "0.2.
|
|
48
|
-
"vite": "7.3.
|
|
47
|
+
"tinyglobby": "0.2.17",
|
|
48
|
+
"vite": "7.3.5",
|
|
49
49
|
"watchpack": "2.5.1"
|
|
50
50
|
},
|
|
51
51
|
"optionalDependencies": {
|
|
52
|
-
"lmdb": "3.5.
|
|
52
|
+
"lmdb": "3.5.5"
|
|
53
53
|
},
|
|
54
54
|
"peerDependencies": {
|
|
55
|
-
"@angular/compiler": "^22.0.0",
|
|
56
|
-
"@angular/compiler-cli": "^22.0.0",
|
|
57
|
-
"@angular/core": "^22.0.0",
|
|
58
|
-
"@angular/localize": "^22.0.0",
|
|
59
|
-
"@angular/platform-browser": "^22.0.0",
|
|
60
|
-
"@angular/platform-server": "^22.0.0",
|
|
61
|
-
"@angular/service-worker": "^22.0.0",
|
|
62
|
-
"@angular/ssr": "^22.0.0",
|
|
55
|
+
"@angular/compiler": "^22.0.0 || ^22.1.0-next.0",
|
|
56
|
+
"@angular/compiler-cli": "^22.0.0 || ^22.1.0-next.0",
|
|
57
|
+
"@angular/core": "^22.0.0 || ^22.1.0-next.0",
|
|
58
|
+
"@angular/localize": "^22.0.0 || ^22.1.0-next.0",
|
|
59
|
+
"@angular/platform-browser": "^22.0.0 || ^22.1.0-next.0",
|
|
60
|
+
"@angular/platform-server": "^22.0.0 || ^22.1.0-next.0",
|
|
61
|
+
"@angular/service-worker": "^22.0.0 || ^22.1.0-next.0",
|
|
62
|
+
"@angular/ssr": "^22.1.0-next.0",
|
|
63
63
|
"istanbul-lib-instrument": "^6.0.0",
|
|
64
64
|
"karma": "^6.4.0",
|
|
65
65
|
"less": "^4.2.0",
|
|
66
|
-
"ng-packagr": "^22.0.0",
|
|
66
|
+
"ng-packagr": "^22.0.0 || ^22.1.0-next.0",
|
|
67
67
|
"postcss": "^8.4.0",
|
|
68
68
|
"tailwindcss": "^2.0.0 || ^3.0.0 || ^4.0.0",
|
|
69
69
|
"tslib": "^2.3.0",
|
|
@@ -54,6 +54,7 @@ const utils_1 = require("../../tools/esbuild/utils");
|
|
|
54
54
|
const color_1 = require("../../utils/color");
|
|
55
55
|
const delete_output_dir_1 = require("../../utils/delete-output-dir");
|
|
56
56
|
const environment_options_1 = require("../../utils/environment-options");
|
|
57
|
+
const path_1 = require("../../utils/path");
|
|
57
58
|
const purge_cache_1 = require("../../utils/purge-cache");
|
|
58
59
|
const version_1 = require("../../utils/version");
|
|
59
60
|
const build_action_1 = require("./build-action");
|
|
@@ -183,37 +184,51 @@ async function* buildApplication(options, context, extensions) {
|
|
|
183
184
|
}
|
|
184
185
|
// Writes the output files to disk and ensures the containing directories are present
|
|
185
186
|
const directoryExists = new Set();
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
(
|
|
189
|
-
file.type === bundler_files_1.BuildOutputFileType.
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
187
|
+
try {
|
|
188
|
+
await (0, utils_1.emitFilesToDisk)(Object.entries(result.files), async ([filePath, file]) => {
|
|
189
|
+
if (outputOptions.ignoreServer &&
|
|
190
|
+
(file.type === bundler_files_1.BuildOutputFileType.ServerApplication ||
|
|
191
|
+
file.type === bundler_files_1.BuildOutputFileType.ServerRoot)) {
|
|
192
|
+
return;
|
|
193
|
+
}
|
|
194
|
+
const fullFilePath = generateFullPath(filePath, file.type, outputOptions);
|
|
195
|
+
// Ensure output subdirectories exist
|
|
196
|
+
const fileBasePath = node_path_1.default.dirname(fullFilePath);
|
|
197
|
+
if (fileBasePath && !directoryExists.has(fileBasePath)) {
|
|
198
|
+
await promises_1.default.mkdir(fileBasePath, { recursive: true });
|
|
199
|
+
directoryExists.add(fileBasePath);
|
|
200
|
+
}
|
|
201
|
+
if (file.origin === 'memory') {
|
|
202
|
+
// Write file contents
|
|
203
|
+
await promises_1.default.writeFile(fullFilePath, file.contents);
|
|
204
|
+
}
|
|
205
|
+
else {
|
|
206
|
+
// Copy file contents
|
|
207
|
+
await promises_1.default.cp(file.inputPath, fullFilePath, {
|
|
208
|
+
mode: promises_1.default.constants.COPYFILE_FICLONE,
|
|
209
|
+
preserveTimestamps: true,
|
|
210
|
+
});
|
|
211
|
+
}
|
|
212
|
+
});
|
|
213
|
+
}
|
|
214
|
+
catch (error) {
|
|
215
|
+
context.logger.error(error instanceof Error ? error.message : String(error));
|
|
216
|
+
yield { success: false };
|
|
217
|
+
continue;
|
|
218
|
+
}
|
|
211
219
|
// Delete any removed files if incremental
|
|
212
220
|
if (result.kind === results_1.ResultKind.Incremental && result.removed?.length) {
|
|
213
|
-
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
|
|
221
|
+
try {
|
|
222
|
+
await Promise.all(result.removed.map((file) => {
|
|
223
|
+
const fullFilePath = generateFullPath(file.path, file.type, outputOptions);
|
|
224
|
+
return promises_1.default.rm(fullFilePath, { force: true, maxRetries: 3 });
|
|
225
|
+
}));
|
|
226
|
+
}
|
|
227
|
+
catch (error) {
|
|
228
|
+
context.logger.error(error instanceof Error ? error.message : String(error));
|
|
229
|
+
yield { success: false };
|
|
230
|
+
continue;
|
|
231
|
+
}
|
|
217
232
|
}
|
|
218
233
|
yield { success: true };
|
|
219
234
|
}
|
|
@@ -237,6 +252,9 @@ function generateFullPath(filePath, type, outputOptions) {
|
|
|
237
252
|
}
|
|
238
253
|
// NOTE: 'base' is a fully resolved path at this point
|
|
239
254
|
const fullFilePath = node_path_1.default.join(outputOptions.base, typeDirectory, filePath);
|
|
255
|
+
if (!(0, path_1.isSubDirectory)(outputOptions.base, fullFilePath)) {
|
|
256
|
+
throw new Error(`The output file path "${fullFilePath}" is outside of the configured output path "${outputOptions.base}".`);
|
|
257
|
+
}
|
|
240
258
|
return fullFilePath;
|
|
241
259
|
}
|
|
242
260
|
const builder = (0, architect_1.createBuilder)(buildApplication);
|
|
@@ -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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"}
|
|
@@ -44,7 +44,7 @@ export declare function normalizeOptions(context: BuilderContext, projectName: s
|
|
|
44
44
|
watch: boolean;
|
|
45
45
|
debug: boolean;
|
|
46
46
|
ui: boolean | undefined;
|
|
47
|
-
isolate: boolean;
|
|
47
|
+
isolate: boolean | undefined;
|
|
48
48
|
quiet: boolean;
|
|
49
49
|
providersFile: string | undefined;
|
|
50
50
|
setupFiles: string[];
|
|
@@ -103,7 +103,7 @@ async function normalizeOptions(context, projectName, options) {
|
|
|
103
103
|
watch,
|
|
104
104
|
debug: options.debug ?? false,
|
|
105
105
|
ui: process.env['CI'] ? false : ui,
|
|
106
|
-
isolate
|
|
106
|
+
isolate,
|
|
107
107
|
quiet: options.quiet ?? (process.env['CI'] ? false : true),
|
|
108
108
|
providersFile: options.providersFile && node_path_1.default.join(workspaceRoot, options.providersFile),
|
|
109
109
|
setupFiles: options.setupFiles
|
|
@@ -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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"}
|
|
@@ -27,7 +27,7 @@ interface VitestConfigPluginOptions {
|
|
|
27
27
|
include: string[];
|
|
28
28
|
optimizeDepsInclude: string[];
|
|
29
29
|
watch: boolean;
|
|
30
|
-
isolate: boolean;
|
|
30
|
+
isolate: boolean | undefined;
|
|
31
31
|
}
|
|
32
32
|
export declare function createVitestConfigPlugin(options: VitestConfigPluginOptions): Promise<VitestPlugins[0]>;
|
|
33
33
|
export declare function createVitestPlugins(pluginOptions: PluginOptions): VitestPlugins;
|
|
@@ -198,8 +198,8 @@ async function createVitestConfigPlugin(options) {
|
|
|
198
198
|
include,
|
|
199
199
|
// CLI provider browser options override, if present
|
|
200
200
|
...(browser ? { browser } : {}),
|
|
201
|
-
// Only override if the user explicitly
|
|
202
|
-
...(options.isolate ? { isolate:
|
|
201
|
+
// Only override if the user explicitly set it via CLI
|
|
202
|
+
...(options.isolate !== undefined ? { isolate: options.isolate } : {}),
|
|
203
203
|
// If the user has not specified an environment, use a smart default.
|
|
204
204
|
...(!testConfig?.environment
|
|
205
205
|
? { environment: await findTestEnvironment(projectResolver) }
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plugins.js","sourceRoot":"","sources":["plugins.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"plugins.js","sourceRoot":"","sources":["plugins.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA6IH,4DAyJC;AAWD,kDAiIC;AAhbD,8DAAiC;AACjC,+CAA4C;AAC5C,6CAA4C;AAC5C,qCAAmC;AACnC,0DAA6B;AAS7B,4FAAmG;AACnG,iDAAqD;AAGrD,yDAA0D;AAkC1D,KAAK,UAAU,mBAAmB,CAChC,eAAsC;IAEtC,IAAI,CAAC;QACH,eAAe,CAAC,WAAW,CAAC,CAAC;QAE7B,OAAO,WAAW,CAAC;IACrB,CAAC;IAAC,MAAM,CAAC;QACP,gDAAgD;QAChD,OAAO,OAAO,CAAC;IACjB,CAAC;AACH,CAAC;AAED,SAAS,yBAAyB,CAChC,OAAyC,EACzC,UAAoC,EACpC,sBAA2C,EAC3C,iBAAyB;IAEzB,IAAI,kBAAkB,GAAG,UAAU,EAAE,QAAQ,EAAE,QAAQ,CAAC;IACxD,IAAI,CAAC,kBAAkB,IAAI,CAAC,sBAAsB,IAAI,UAAU,EAAE,QAAQ,EAAE,OAAO,CAAC,EAAE,CAAC;QACrF,MAAM,eAAe,GAAG,kBAAkB,CAAC,OAAO,EAAE,UAAU,EAAE,OAAO,CAAC,CAAC;QAEzE,MAAM,cAAc,GAAG,eAAe,CAAC,IAAI,CACzC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,EAAE,UAAU,EAAE,MAAM,CAAC,CAAC,QAAQ,CAAC,IAAA,uCAAoB,EAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CACjF,CAAC;QAEF,IAAI,cAAc,EAAE,CAAC;YACnB,kBAAkB,GAAG,UAAU,CAAC;QAClC,CAAC;aAAM,CAAC;YACN,MAAM,cAAc,GAAG,IAAA,2BAAa,EAAC,iBAAiB,GAAG,GAAG,CAAC,CAAC;YAC9D,MAAM,cAAc,GAAG,CAAC,GAAW,EAAE,EAAE;gBACrC,IAAI,CAAC;oBACH,cAAc,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;oBAE5B,OAAO,IAAI,CAAC;gBACd,CAAC;gBAAC,MAAM,CAAC;oBACP,OAAO,KAAK,CAAC;gBACf,CAAC;YACH,CAAC,CAAC;YACF,MAAM,WAAW,GAAG,cAAc,CAAC,2BAA2B,CAAC,CAAC;YAChE,MAAM,KAAK,GAAG,cAAc,CAAC,qBAAqB,CAAC,CAAC;YAEpD,IAAI,WAAW,IAAI,CAAC,KAAK,EAAE,CAAC;gBAC1B,kBAAkB,GAAG,UAAU,CAAC;YAClC,CAAC;iBAAM,CAAC;gBACN,kBAAkB,GAAG,IAAI,CAAC;YAC5B,CAAC;QACH,CAAC;IACH,CAAC;IAED,OAAO,kBAAkB,CAAC;AAC5B,CAAC;AAED,SAAS,kBAAkB,CACzB,OAAyC,EACzC,iBAAmD;IAEnD,MAAM,eAAe,GAAa,EAAE,CAAC;IAErC,MAAM,UAAU,GAAG,OAAiD,CAAC;IACrE,MAAM,WAAW,GAAG,iBAA2D,CAAC;IAEhF,+DAA+D;IAC/D,IAAI,UAAU,EAAE,CAAC;QACf,IAAI,UAAU,CAAC,SAAS,EAAE,CAAC;YACzB,eAAe,CAAC,IAAI,CAAC,GAAG,UAAU,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC;QACtE,CAAC;QACD,IAAI,UAAU,CAAC,IAAI,EAAE,CAAC;YACpB,eAAe,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;QACxC,CAAC;QAED,OAAO,eAAe,CAAC;IACzB,CAAC;IAED,2EAA2E;IAC3E,IAAI,WAAW,IAAI,WAAW,CAAC,OAAO,KAAK,KAAK,EAAE,CAAC;QACjD,IAAI,WAAW,CAAC,SAAS,EAAE,CAAC;YAC1B,eAAe,CAAC,IAAI,CAAC,GAAG,WAAW,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC;QACvE,CAAC;QACD,IAAI,WAAW,CAAC,IAAI,EAAE,CAAC;YACrB,eAAe,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;QACzC,CAAC;IACH,CAAC;IAED,OAAO,eAAe,CAAC;AACzB,CAAC;AAEM,KAAK,UAAU,wBAAwB,CAC5C,OAAkC;IAElC,MAAM,EACJ,OAAO,EACP,OAAO,EACP,WAAW,EACX,SAAS,EACT,UAAU,EACV,cAAc,EACd,iBAAiB,GAClB,GAAG,OAAO,CAAC;IAEZ,MAAM,EAAE,WAAW,EAAE,GAAG,wDAAa,eAAe,GAAC,CAAC;IAEtD,OAAO;QACL,IAAI,EAAE,8BAA8B;QACpC,KAAK,CAAC,MAAM,CAAC,MAAM;YACjB,MAAM,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC;YAE/B,MAAM,kBAAkB,GAAG,yBAAyB,CAClD,OAAO,EACP,UAAU,EACV,OAAO,CAAC,QAAQ,CAAC,OAAO,EACxB,iBAAiB,CAClB,CAAC;YAEF,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;gBAC5B,OAAO,UAAU,EAAE,SAAS,CAAC;YAC/B,CAAC;YAED,IACE,OAAO,CAAC,QAAQ,CAAC,SAAS,KAAK,SAAS;gBACxC,UAAU,EAAE,QAAQ;gBACpB,UAAU,IAAI,UAAU,CAAC,QAAQ,EACjC,CAAC;gBACD,OAAO,UAAU,CAAC,QAAQ,CAAC,QAAQ,CAAC;YACtC,CAAC;YAED,IAAI,UAAU,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC;gBACjC,IAAI,CAAC,IAAI,CACP,gFAAgF;oBAC9E,2EAA2E,CAC9E,CAAC;gBACF,OAAO,UAAU,CAAC,QAAQ,CAAC;YAC7B,CAAC;YAED,IAAI,UAAU,EAAE,OAAO,EAAE,CAAC;gBACxB,IAAI,CAAC,IAAI,CACP,+EAA+E;oBAC7E,8DAA8D,CACjE,CAAC;gBACF,OAAO,UAAU,CAAC,OAAO,CAAC;YAC5B,CAAC;YAED,IAAI,UAAU,EAAE,KAAK,KAAK,SAAS,IAAI,UAAU,CAAC,KAAK,KAAK,OAAO,CAAC,KAAK,EAAE,CAAC;gBAC1E,IAAI,CAAC,IAAI,CACP,0FAA0F;oBACxF,4FAA4F,CAC/F,CAAC;gBACF,OAAO,UAAU,CAAC,KAAK,CAAC;YAC1B,CAAC;YAED,IAAI,UAAU,EAAE,OAAO,EAAE,CAAC;gBACxB,IAAI,CAAC,IAAI,CACP,gFAAgF;oBAC9E,+EAA+E;oBAC/E,2BAA2B,CAC9B,CAAC;YACJ,CAAC;YAED,qFAAqF;YACrF,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;gBACnB,MAAM,WAAW,GAAG,MAAM,CAAC,OAAO,CAAC,MAAM,CACvC,CAAC,MAAM,EAAE,EAAE;gBACT,8FAA8F;gBAC9F,CAAC,MAAM;oBACP,OAAO,MAAM,KAAK,QAAQ;oBAC1B,CAAC,CAAC,MAAM,IAAI,MAAM,CAAC;oBACnB,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,CAC7E,CAAC;gBAEF,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;oBAC3B,cAAc,CAAC,IAAI,CAAC,GAAG,WAAW,CAAC,CAAC;gBACtC,CAAC;gBACD,OAAO,MAAM,CAAC,OAAO,CAAC;YACxB,CAAC;YAED,2DAA2D;YAC3D,IACE,CAAC,OAAO,IAAI,UAAU,EAAE,OAAO,EAAE,OAAO,CAAC;gBACzC,CAAC,OAAO,CAAC,QAAQ,CAAC,OAAO,IAAI,UAAU,EAAE,QAAQ,EAAE,OAAO,CAAC,EAC3D,CAAC;gBACD,uBAAuB,CAAC,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,kBAAkB,CAAC,CAAC;YAC5E,CAAC;YAED,MAAM,eAAe,GAAG,IAAA,2BAAa,EAAC,iBAAiB,GAAG,GAAG,CAAC,CAAC,OAAO,CAAC;YAEvE,MAAM,eAAe,GAAwB;gBAC3C,IAAI,EAAE;oBACJ,UAAU;oBACV,OAAO,EAAE,IAAI;oBACb,iEAAiE;oBACjE,OAAO,EAAE,KAAK;oBACd,QAAQ,EAAE,EAAE,UAAU,EAAE,MAAM,EAAE;iBACjC;gBACD,YAAY,EAAE;oBACZ,WAAW,EAAE,IAAI;oBACjB,OAAO,EAAE,OAAO,CAAC,mBAAmB;iBACrC;gBACD,OAAO,EAAE;oBACP,UAAU,EAAE,CAAC,QAAQ,EAAE,QAAQ,EAAE,MAAM,CAAC;oBACxC,UAAU,EAAE,CAAC,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;iBAC5E;aACF,CAAC;YAEF,MAAM,EAAE,YAAY,EAAE,OAAO,EAAE,GAAG,MAAM,CAAC;YACzC,MAAM,gBAAgB,GAAwB;gBAC5C,IAAI,EAAE;oBACJ,IAAI,EAAE,WAAW;oBACjB,OAAO;oBACP,oDAAoD;oBACpD,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;oBAC/B,sDAAsD;oBACtD,GAAG,CAAC,OAAO,CAAC,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;oBACtE,qEAAqE;oBACrE,GAAG,CAAC,CAAC,UAAU,EAAE,WAAW;wBAC1B,CAAC,CAAC,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC,eAAe,CAAC,EAAE;wBAC7D,CAAC,CAAC,EAAE,CAAC;iBACR;gBACD,OAAO,EAAE,cAAc;gBACvB,YAAY;gBACZ,OAAO;aACR,CAAC;YAEF,MAAM,WAAW,GAAG,WAAW,CAAC,eAAe,EAAE,UAAU,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;YACzF,MAAM,aAAa,GAAG,WAAW,CAAC,WAAW,EAAE,gBAAgB,CAAC,CAAC;YAEjE,OAAO;gBACL,IAAI,EAAE;oBACJ,QAAQ,EAAE,MAAM,sBAAsB,CACpC,OAAO,CAAC,QAAQ,EAChB,UAAU,EAAE,QAAQ,EACpB,WAAW,EACX,kBAAkB,CACnB;oBACD,8DAA8D;oBAC9D,GAAG,CAAC,SAAS,CAAC,CAAC,CAAE,EAAE,SAAS,EAAU,CAAC,CAAC,CAAC,EAAE,CAAC;oBAC5C,QAAQ,EAAE,CAAC,aAAa,CAAC;iBAC1B;aACF,CAAC;QACJ,CAAC;KACF,CAAC;AACJ,CAAC;AAED,MAAM,WAAW,GAAG,IAAI,WAAW,CAAC,OAAO,CAAC,CAAC;AAC7C,KAAK,UAAU,cAAc,CAAC,IAAgB;IAC5C,IAAI,IAAI,CAAC,MAAM,KAAK,QAAQ,EAAE,CAAC;QAC7B,OAAO,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IAC3C,CAAC;IAED,OAAO,IAAA,mBAAQ,EAAC,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;AAC3C,CAAC;AAED,SAAgB,mBAAmB,CAAC,aAA4B;IAC9D,MAAM,EAAE,aAAa,EAAE,gBAAgB,EAAE,oBAAoB,EAAE,GAAG,aAAa,CAAC;IAChF,MAAM,SAAS,GAAG,IAAA,kBAAQ,GAAE,KAAK,OAAO,CAAC;IACzC,IAAI,YAA4B,CAAC;IAEjC,OAAO;QACL;YACE,IAAI,EAAE,iCAAiC;YACvC,OAAO,EAAE,KAAK;YACd,eAAe,CAAC,OAAO;gBACrB,YAAY,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC;YACvC,CAAC;YACD,SAAS,EAAE,CAAC,EAAE,EAAE,QAAQ,EAAE,EAAE;gBAC1B,mCAAmC;gBACnC,IAAI,oBAAoB,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC;oBACjC,OAAO,EAAE,CAAC;gBACZ,CAAC;gBAED,yFAAyF;gBACzF,gGAAgG;gBAChG,yFAAyF;gBACzF,iDAAiD;gBACjD,IAAI,EAAE,CAAC,CAAC,CAAC,KAAK,GAAG,IAAI,SAAS,EAAE,CAAC;oBAC/B,MAAM,QAAQ,GAAG,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;oBAC7B,IAAI,mBAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC;wBAC9B,OAAO,QAAQ,CAAC;oBAClB,CAAC;gBACH,CAAC;gBAED,+CAA+C;gBAC/C,IAAI,OAAe,CAAC;gBACpB,IAAI,QAAQ,EAAE,CAAC;oBACb,iFAAiF;oBACjF,2DAA2D;oBAC3D,OAAO,GAAG,oBAAoB,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,mBAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;gBACxF,CAAC;qBAAM,CAAC;oBACN,2EAA2E;oBAC3E,OAAO,GAAG,aAAa,CAAC;gBAC1B,CAAC;gBAED,sEAAsE;gBACtE,IAAI,QAAgB,CAAC;gBACrB,IAAI,mBAAI,CAAC,UAAU,CAAC,EAAE,CAAC,EAAE,CAAC;oBACxB,MAAM,UAAU,GAAG,mBAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;oBAC9C,QAAQ;wBACN,CAAC,UAAU,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,mBAAI,CAAC,UAAU,CAAC,UAAU,CAAC;4BAC1D,CAAC,CAAC,EAAE;4BACJ,CAAC,CAAC,mBAAI,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;gBAC/B,CAAC;qBAAM,CAAC;oBACN,QAAQ,GAAG,mBAAI,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;gBACpC,CAAC;gBACD,QAAQ,GAAG,IAAA,kBAAW,EAAC,QAAQ,CAAC,CAAC;gBAEjC,IAAI,oBAAoB,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC;oBACvC,OAAO,QAAQ,CAAC;gBAClB,CAAC;gBAED,oEAAoE;gBACpE,MAAM,YAAY,GAAG,mBAAI,CAAC,QAAQ,CAAC,aAAa,EAAE,QAAQ,CAAC,CAAC;gBAC5D,IAAI,gBAAgB,CAAC,GAAG,CAAC,IAAA,kBAAW,EAAC,YAAY,CAAC,CAAC,EAAE,CAAC;oBACpD,OAAO,QAAQ,CAAC;gBAClB,CAAC;gBAED,0FAA0F;gBAC1F,OAAO,SAAS,CAAC;YACnB,CAAC;YACD,KAAK,CAAC,IAAI,CAAC,EAAE;gBACX,IAAA,qBAAM,EAAC,gBAAgB,CAAC,IAAI,GAAG,CAAC,EAAE,sDAAsD,CAAC,CAAC;gBAE1F,yCAAyC;gBACzC,MAAM,UAAU,GAAG,oBAAoB,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;gBAChD,IAAI,UAAU,CAAC;gBACf,IAAI,UAAU,EAAE,CAAC;oBACf,UAAU,GAAG,UAAU,GAAG,KAAK,CAAC;oBAEhC,IAAI,YAAY,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC;wBACpC,qEAAqE;wBACrE,4EAA4E;wBAC5E,2FAA2F;wBAC3F,OAAO;4BACL,IAAI,EAAE,aAAa,UAAU,IAAI;yBAClC,CAAC;oBACJ,CAAC;gBACH,CAAC;qBAAM,CAAC;oBACN,uCAAuC;oBACvC,MAAM,YAAY,GAAG,mBAAI,CAAC,QAAQ,CAAC,aAAa,EAAE,EAAE,CAAC,CAAC;oBACtD,UAAU,GAAG,IAAA,kBAAW,EAAC,YAAY,CAAC,CAAC;gBACzC,CAAC;gBAED,MAAM,UAAU,GAAG,gBAAgB,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;gBACpD,IAAI,UAAU,EAAE,CAAC;oBACf,MAAM,IAAI,GAAG,MAAM,cAAc,CAAC,UAAU,CAAC,CAAC;oBAC9C,MAAM,aAAa,GAAG,UAAU,GAAG,MAAM,CAAC;oBAC1C,MAAM,aAAa,GAAG,gBAAgB,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;oBAC1D,MAAM,aAAa,GAAG,aAAa,CAAC,CAAC,CAAC,MAAM,cAAc,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;oBAEtF,MAAM,GAAG,GAAG,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;oBAClE,IAAI,GAAG,EAAE,CAAC;wBACR,sBAAsB,CAAC,GAAG,EAAE,IAAI,EAAE,aAAa,EAAE,EAAE,CAAC,CAAC;oBACvD,CAAC;oBAED,OAAO;wBACL,IAAI;wBACJ,GAAG;qBACJ,CAAC;gBACJ,CAAC;YACH,CAAC;YACD,eAAe,EAAE,CAAC,MAAM,EAAE,EAAE;gBAC1B,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,IAAA,+CAA2B,EAAC,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,gBAAgB,CAAC,CAAC,CAAC;YAC5F,CAAC;SACF;QACD;YACE,IAAI,EAAE,oBAAoB;YAC1B,kBAAkB,EAAE,GAAG,EAAE;gBACvB,6BAA6B;gBAC7B,IAAI,gBAAgB,CAAC,GAAG,CAAC,YAAY,CAAC,EAAE,CAAC;oBACvC,OAAO;wBACL;4BACE,GAAG,EAAE,MAAM;4BACX,KAAK,EAAE,EAAE,IAAI,EAAE,YAAY,EAAE,GAAG,EAAE,YAAY,EAAE;4BAChD,QAAQ,EAAE,MAAM;yBACjB;qBACF,CAAC;gBACJ,CAAC;gBAED,OAAO,EAAE,CAAC;YACZ,CAAC;SACF;KACF,CAAC;AACJ,CAAC;AAED;;;;;;;GAOG;AACH,SAAS,sBAAsB,CAC7B,GAAyB,EACzB,aAAsB,EACtB,aAAqB,EACrB,EAAU;IAEV,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,MAAM,IAAI,CAAC,GAAG,CAAC,cAAc,EAAE,MAAM,IAAI,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC;QACzE,yFAAyF;QACzF,oFAAoF;QACpF,oFAAoF;QACpF,yCAAyC;QACzC,GAAG,CAAC,OAAO,GAAG,CAAC,iBAAiB,CAAC,CAAC;IACpC,CAAC;SAAM,IAAI,aAAa,IAAI,GAAG,CAAC,OAAO,EAAE,CAAC;QACxC,GAAG,CAAC,OAAO,GAAG,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;YACvC,IAAI,CAAC,MAAM,IAAI,MAAM,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE,CAAC;gBAC7C,OAAO,MAAM,CAAC;YAChB,CAAC;YAED,iGAAiG;YACjG,MAAM,cAAc,GAAG,mBAAI,CAAC,IAAI,CAAC,aAAa,EAAE,MAAM,CAAC,CAAC;YAExD,OAAO,IAAA,kBAAW,EAAC,mBAAI,CAAC,QAAQ,CAAC,mBAAI,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE,cAAc,CAAC,CAAC,CAAC;QACtE,CAAC,CAAC,CAAC;IACL,CAAC;AACH,CAAC;AAQD;;;GAGG;AACH,SAAS,uBAAuB,CAC9B,OAAyC,EACzC,iBAAmD,EACnD,QAAiB;IAEjB,IAAI,QAAQ,KAAK,UAAU,EAAE,CAAC;QAC5B,OAAO;IACT,CAAC;IACD,MAAM,eAAe,GAAG,kBAAkB,CAAC,OAAO,EAAE,iBAAiB,CAAC,CAAC;IAEvE,4CAA4C;IAC5C,MAAM,mBAAmB,GAAG,eAAe;SACxC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,uCAAoB,EAAC,CAAC,CAAC,CAAC,OAAO,CAAC;SAC3C,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,EAAE,UAAU,EAAE,MAAM,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;IAE9D,IAAI,mBAAmB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACnC,MAAM,IAAI,KAAK,CACb,2GAA2G;YACzG,GAAG,mBAAmB,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI;YACrC,2FAA2F;YAC3F,6DAA6D,CAChE,CAAC;IACJ,CAAC;AACH,CAAC;AAED,KAAK,UAAU,sBAAsB,CACnC,eAA6D,EAC7D,cAAgD,EAChD,WAAmB,EACnB,QAAuC;IAEvC,IAAI,eAAe,GAAa,EAAE,CAAC;IACnC,iFAAiF;IACjF,sFAAsF;IACtF,8BAA8B;IAC9B,IAAI,eAAe,CAAC,OAAO,EAAE,CAAC;QAC5B,IAAI,CAAC;YACH,MAAM,YAAY,GAAG,wDAAa,eAAe,GAAC,CAAC;YACnD,eAAe,GAAG,YAAY,CAAC,sBAAsB,CAAC,OAAO,CAAC;QAChE,CAAC;QAAC,MAAM,CAAC,CAAA,CAAC;IACZ,CAAC;IAED,OAAO;QACL,QAAQ;QACR,iBAAiB,EAAE,IAAI;QACvB,gBAAgB,EACd,cAAc,EAAE,gBAAgB,IAAI,IAAA,kBAAW,EAAC,mBAAI,CAAC,IAAI,CAAC,UAAU,EAAE,WAAW,CAAC,CAAC;QACrF,GAAG,CAAC,eAAe,CAAC,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,eAAe,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACtF,+DAA+D;QAC/D,yGAAyG;QACzG,gFAAgF;QAChF,GAAG,CAAC,eAAe,CAAC,OAAO;YACzB,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,WAAW,EAAE,YAAY,EAAE,GAAG,eAAe,CAAC,OAAO,CAAC,EAAE;YACtE,CAAC,CAAC,EAAE,CAAC;QACP,8EAA8E;QAC9E,+DAA+D;QAC/D,UAAU,EAAE,oBAAoB,CAC9B,cAAc,IAAI,YAAY,IAAI,cAAc,CAAC,CAAC,CAAC,cAAc,CAAC,UAAU,CAAC,CAAC,CAAC,SAAS,EACxF,eAAe,CAAC,UAAU,CAC3B;QACD,UAAU,EAAE,oBAAoB,CAC9B,cAAc,IAAI,YAAY,IAAI,cAAc,CAAC,CAAC,CAAC,cAAc,CAAC,UAAU,CAAC,CAAC,CAAC,SAAS,EACxF,eAAe,CAAC,UAAU,CAC3B;QACD,iGAAiG;QACjG,GAAG,CAAC,eAAe,CAAC,OAAO;YACzB,CAAC,CAAC;gBACE,OAAO,EAAE,KAAK,CAAC,IAAI,CACjB,IAAI,GAAG,CAAC;oBACN,0EAA0E;oBAC1E,mCAAmC;oBACnC,GAAG,CAAC,cAAc,EAAE,OAAO,IAAI,EAAE,CAAC;oBAClC,GAAG,eAAe,CAAC,OAAO;oBAC1B,GAAG,eAAe;iBACnB,CAAC,CACH;aACF;YACH,CAAC,CAAC,EAAE,CAAC;QACP,GAAG,CAAC,eAAe,CAAC,SAAS;YAC3B,CAAC,CAAE,EAAE,QAAQ,EAAE,eAAe,CAAC,SAAS,EAAkC;YAC1E,CAAC,CAAC,EAAE,CAAC;KACR,CAAC;AACJ,CAAC;AAED;;;;GAIG;AACH,SAAS,oBAAoB,CAC3B,WAA0B,EAC1B,YAA2B;IAE3B,IAAI,YAAY,KAAK,SAAS,EAAE,CAAC;QAC/B,OAAO,WAAW,CAAC;IACrB,CAAC;IAED,MAAM,MAAM,GAA4B,EAAE,GAAG,CAAC,WAAW,IAAI,EAAE,CAAC,EAAE,CAAC;IACnE,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE,CAAC;QACxD,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;YACxB,MAAM,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;QACtB,CAAC;IACH,CAAC;IAED,OAAO,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAE,MAAY,CAAC,CAAC,CAAC,SAAS,CAAC;AACpE,CAAC"}
|
|
@@ -32,6 +32,8 @@ class BundlerContext {
|
|
|
32
32
|
#esbuildContext;
|
|
33
33
|
#esbuildOptions;
|
|
34
34
|
#esbuildResult;
|
|
35
|
+
#activeBundlePromise;
|
|
36
|
+
#disposed = false;
|
|
35
37
|
#optionsFactory;
|
|
36
38
|
#shouldCacheResult;
|
|
37
39
|
#loadCache;
|
|
@@ -127,7 +129,16 @@ class BundlerContext {
|
|
|
127
129
|
if (!force && this.#esbuildResult) {
|
|
128
130
|
return this.#esbuildResult;
|
|
129
131
|
}
|
|
130
|
-
|
|
132
|
+
if (!force && this.#activeBundlePromise) {
|
|
133
|
+
return this.#activeBundlePromise;
|
|
134
|
+
}
|
|
135
|
+
const bundlePromise = this.#performBundle().finally(() => {
|
|
136
|
+
if (this.#activeBundlePromise === bundlePromise) {
|
|
137
|
+
this.#activeBundlePromise = undefined;
|
|
138
|
+
}
|
|
139
|
+
});
|
|
140
|
+
this.#activeBundlePromise = bundlePromise;
|
|
141
|
+
const result = await bundlePromise;
|
|
131
142
|
if (this.#shouldCacheResult) {
|
|
132
143
|
this.#esbuildResult = result;
|
|
133
144
|
}
|
|
@@ -154,7 +165,12 @@ class BundlerContext {
|
|
|
154
165
|
else {
|
|
155
166
|
// Create a build context and perform the build.
|
|
156
167
|
// Context creation does not perform a build.
|
|
157
|
-
|
|
168
|
+
const esbuildContext = await (0, esbuild_1.context)(this.#esbuildOptions);
|
|
169
|
+
if (this.#disposed) {
|
|
170
|
+
await esbuildContext.dispose();
|
|
171
|
+
throw new Error('BundlerContext was disposed during build.');
|
|
172
|
+
}
|
|
173
|
+
this.#esbuildContext = esbuildContext;
|
|
158
174
|
result = await this.#esbuildContext.rebuild();
|
|
159
175
|
}
|
|
160
176
|
}
|
|
@@ -356,9 +372,11 @@ class BundlerContext {
|
|
|
356
372
|
* @returns A promise that resolves when disposal is complete.
|
|
357
373
|
*/
|
|
358
374
|
async dispose() {
|
|
375
|
+
this.#disposed = true;
|
|
359
376
|
try {
|
|
360
377
|
this.#esbuildOptions = undefined;
|
|
361
378
|
this.#esbuildResult = undefined;
|
|
379
|
+
this.#activeBundlePromise = undefined;
|
|
362
380
|
this.#loadCache = undefined;
|
|
363
381
|
await this.#esbuildContext?.dispose();
|
|
364
382
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bundler-context.js","sourceRoot":"","sources":["bundler-context.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"bundler-context.js","sourceRoot":"","sources":["bundler-context.ts"],"names":[],"mappings":"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"}
|
|
@@ -39,6 +39,7 @@ export interface CacheStore<V> {
|
|
|
39
39
|
* to use a cache.
|
|
40
40
|
*/
|
|
41
41
|
export declare class Cache<V, S extends CacheStore<V> = CacheStore<V>> {
|
|
42
|
+
#private;
|
|
42
43
|
protected readonly store: S;
|
|
43
44
|
readonly namespace?: string | undefined;
|
|
44
45
|
constructor(store: S, namespace?: string | undefined);
|
|
@@ -70,6 +71,10 @@ export declare class Cache<V, S extends CacheStore<V> = CacheStore<V>> {
|
|
|
70
71
|
* @param value A value to put in the cache.
|
|
71
72
|
*/
|
|
72
73
|
put(key: string, value: V): Promise<void>;
|
|
74
|
+
/**
|
|
75
|
+
* Clears the base class internal state (requests, write counts, and pending gets).
|
|
76
|
+
*/
|
|
77
|
+
protected clearInternal(): void;
|
|
73
78
|
}
|
|
74
79
|
/**
|
|
75
80
|
* A lightweight in-memory cache implementation based on a JavaScript Map object.
|
|
@@ -16,10 +16,23 @@ exports.MemoryCache = exports.Cache = void 0;
|
|
|
16
16
|
class Cache {
|
|
17
17
|
store;
|
|
18
18
|
namespace;
|
|
19
|
+
// In-flight creator promises to deduplicate concurrent requests for the same key.
|
|
20
|
+
#requests = new Map();
|
|
21
|
+
// Track how many writes occurred for a key to detect mutations during await gaps.
|
|
22
|
+
#writeCounts = new Map();
|
|
23
|
+
// Count the number of active, pending getOrCreate operations per key to avoid memory leaks.
|
|
24
|
+
#pendingGets = new Map();
|
|
19
25
|
constructor(store, namespace) {
|
|
20
26
|
this.store = store;
|
|
21
27
|
this.namespace = namespace;
|
|
22
28
|
}
|
|
29
|
+
#incrementWrite(key) {
|
|
30
|
+
// Only track write counts if there is a pending getOrCreate operation active for the key.
|
|
31
|
+
// This ensures that write counts are not leaked when no concurrent gets are running.
|
|
32
|
+
if (this.#pendingGets.has(key)) {
|
|
33
|
+
this.#writeCounts.set(key, (this.#writeCounts.get(key) || 0) + 1);
|
|
34
|
+
}
|
|
35
|
+
}
|
|
23
36
|
/**
|
|
24
37
|
* Prefixes a key with the cache namespace if present.
|
|
25
38
|
* @param key A key string to prefix.
|
|
@@ -41,12 +54,63 @@ class Cache {
|
|
|
41
54
|
*/
|
|
42
55
|
async getOrCreate(key, creator) {
|
|
43
56
|
const namespacedKey = this.withNamespace(key);
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
57
|
+
// 1. If another call is already running the creator for this key, share its promise.
|
|
58
|
+
let activeRequest = this.#requests.get(namespacedKey);
|
|
59
|
+
if (activeRequest !== undefined) {
|
|
60
|
+
return activeRequest;
|
|
61
|
+
}
|
|
62
|
+
// Increment pending gets count to enable write-tracking for this key.
|
|
63
|
+
const currentPending = this.#pendingGets.get(namespacedKey) || 0;
|
|
64
|
+
this.#pendingGets.set(namespacedKey, currentPending + 1);
|
|
65
|
+
try {
|
|
66
|
+
const startWriteCount = this.#writeCounts.get(namespacedKey) || 0;
|
|
67
|
+
// 2. Query the backing store. Since store.get can be async, we yield to the event loop.
|
|
68
|
+
const value = await this.store.get(namespacedKey);
|
|
69
|
+
// If a write (e.g. put) occurred during the store.get await gap, we must abort
|
|
70
|
+
// the current execution and restart to ensure we return the newly written value.
|
|
71
|
+
if ((this.#writeCounts.get(namespacedKey) || 0) !== startWriteCount) {
|
|
72
|
+
return this.getOrCreate(key, creator);
|
|
73
|
+
}
|
|
74
|
+
if (value !== undefined) {
|
|
75
|
+
return value;
|
|
76
|
+
}
|
|
77
|
+
// 3. Recheck active request after the await gap in case another concurrent call
|
|
78
|
+
// initiated a creator during the store.get wait.
|
|
79
|
+
activeRequest = this.#requests.get(namespacedKey);
|
|
80
|
+
if (activeRequest !== undefined) {
|
|
81
|
+
return activeRequest;
|
|
82
|
+
}
|
|
83
|
+
// 4. Run the creator to produce the new value, and store its promise in #requests.
|
|
84
|
+
activeRequest = Promise.resolve(creator()).then(async (newValue) => {
|
|
85
|
+
// Ensure this request is still the active one before writing back to the store
|
|
86
|
+
// (prevents overwriting newer data if put() was called before resolution).
|
|
87
|
+
if (this.#requests.get(namespacedKey) === activeRequest) {
|
|
88
|
+
this.#incrementWrite(namespacedKey);
|
|
89
|
+
await this.store.set(namespacedKey, newValue);
|
|
90
|
+
this.#requests.delete(namespacedKey);
|
|
91
|
+
}
|
|
92
|
+
return newValue;
|
|
93
|
+
}, (error) => {
|
|
94
|
+
// Clean up the active request if the creator fails.
|
|
95
|
+
if (this.#requests.get(namespacedKey) === activeRequest) {
|
|
96
|
+
this.#requests.delete(namespacedKey);
|
|
97
|
+
}
|
|
98
|
+
throw error;
|
|
99
|
+
});
|
|
100
|
+
this.#requests.set(namespacedKey, activeRequest);
|
|
101
|
+
return activeRequest;
|
|
102
|
+
}
|
|
103
|
+
finally {
|
|
104
|
+
// Clean up write counts and pending gets once all concurrent gets for this key finish.
|
|
105
|
+
const current = this.#pendingGets.get(namespacedKey) || 0;
|
|
106
|
+
if (current <= 1) {
|
|
107
|
+
this.#pendingGets.delete(namespacedKey);
|
|
108
|
+
this.#writeCounts.delete(namespacedKey);
|
|
109
|
+
}
|
|
110
|
+
else {
|
|
111
|
+
this.#pendingGets.set(namespacedKey, current - 1);
|
|
112
|
+
}
|
|
48
113
|
}
|
|
49
|
-
return value;
|
|
50
114
|
}
|
|
51
115
|
/**
|
|
52
116
|
* Gets the value associated with a provided key if available.
|
|
@@ -64,7 +128,18 @@ class Cache {
|
|
|
64
128
|
* @param value A value to put in the cache.
|
|
65
129
|
*/
|
|
66
130
|
async put(key, value) {
|
|
67
|
-
|
|
131
|
+
const namespacedKey = this.withNamespace(key);
|
|
132
|
+
this.#requests.delete(namespacedKey);
|
|
133
|
+
this.#incrementWrite(namespacedKey);
|
|
134
|
+
await this.store.set(namespacedKey, value);
|
|
135
|
+
}
|
|
136
|
+
/**
|
|
137
|
+
* Clears the base class internal state (requests, write counts, and pending gets).
|
|
138
|
+
*/
|
|
139
|
+
clearInternal() {
|
|
140
|
+
this.#requests.clear();
|
|
141
|
+
this.#writeCounts.clear();
|
|
142
|
+
this.#pendingGets.clear();
|
|
68
143
|
}
|
|
69
144
|
}
|
|
70
145
|
exports.Cache = Cache;
|
|
@@ -79,6 +154,7 @@ class MemoryCache extends Cache {
|
|
|
79
154
|
* Removes all entries from the cache instance.
|
|
80
155
|
*/
|
|
81
156
|
clear() {
|
|
157
|
+
this.clearInternal();
|
|
82
158
|
this.store.clear();
|
|
83
159
|
}
|
|
84
160
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cache.js","sourceRoot":"","sources":["cache.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;AAkCH;;;;GAIG;AACH,MAAa,KAAK;
|
|
1
|
+
{"version":3,"file":"cache.js","sourceRoot":"","sources":["cache.ts"],"names":[],"mappings":"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"}
|
package/src/tools/vite/utils.js
CHANGED
|
@@ -81,8 +81,8 @@ function updateExternalMetadata(result, externalMetadata, externalDependencies,
|
|
|
81
81
|
return;
|
|
82
82
|
}
|
|
83
83
|
const { implicitBrowser, implicitServer, explicit } = result.detail['externalMetadata'];
|
|
84
|
-
const implicitServerFiltered = implicitServer.filter((m) => !(0, node_module_1.isBuiltin)(m) && !isAbsoluteUrl(m));
|
|
85
|
-
const implicitBrowserFiltered = implicitBrowser.filter((m) => !isAbsoluteUrl(m));
|
|
84
|
+
const implicitServerFiltered = implicitServer.filter((m) => !(0, node_module_1.isBuiltin)(m) && !isAbsoluteUrl(m) && !m.endsWith('.json'));
|
|
85
|
+
const implicitBrowserFiltered = implicitBrowser.filter((m) => !isAbsoluteUrl(m) && !m.endsWith('.json'));
|
|
86
86
|
const explicitBrowserFiltered = explicitPackagesOnly
|
|
87
87
|
? explicit.filter((m) => !isAbsoluteUrl(m))
|
|
88
88
|
: explicit;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["utils.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;AAiBH,0DAQC;AAED,8DAQC;AAWD,4DA4DC;AASD,sCAQC;AAED,
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,7 +10,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
10
10
|
exports.normalizeCacheOptions = normalizeCacheOptions;
|
|
11
11
|
const node_path_1 = require("node:path");
|
|
12
12
|
/** Version placeholder is replaced during the build process with actual package version */
|
|
13
|
-
const VERSION = '22.0.0';
|
|
13
|
+
const VERSION = '22.1.0-next.0';
|
|
14
14
|
function hasCacheMetadata(value) {
|
|
15
15
|
return (!!value &&
|
|
16
16
|
typeof value === 'object' &&
|
package/src/utils/path.js
CHANGED
|
@@ -44,8 +44,9 @@ function toPosixPath(path) {
|
|
|
44
44
|
* @returns `true` if the child path is within the parent directory, `false` otherwise.
|
|
45
45
|
*/
|
|
46
46
|
function isSubDirectory(parent, child) {
|
|
47
|
-
const
|
|
47
|
+
const resolvedParent = (0, node_path_1.resolve)(parent);
|
|
48
48
|
const resolvedChild = (0, node_path_1.resolve)(parent, child);
|
|
49
|
-
|
|
49
|
+
const relativePath = toPosixPath((0, node_path_1.relative)(resolvedParent, resolvedChild));
|
|
50
|
+
return relativePath !== '..' && !relativePath.startsWith('../') && !(0, node_path_1.isAbsolute)(relativePath);
|
|
50
51
|
}
|
|
51
52
|
//# sourceMappingURL=path.js.map
|
package/src/utils/path.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"path.js","sourceRoot":"","sources":["path.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;AA4BH,kCAEC;AASD,
|
|
1
|
+
{"version":3,"file":"path.js","sourceRoot":"","sources":["path.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;AA4BH,kCAEC;AASD,wCAMC;AA3CD,yCAAiE;AACjE,+CAAwC;AAExC,MAAM,6BAA6B,GAAG,KAAK,CAAC;AAE5C;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,SAAgB,WAAW,CAAC,IAAY;IACtC,OAAO,uBAAQ,KAAK,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,6BAA6B,EAAE,iBAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;AAC9F,CAAC;AAED;;;;;;GAMG;AACH,SAAgB,cAAc,CAAC,MAAc,EAAE,KAAa;IAC1D,MAAM,cAAc,GAAG,IAAA,mBAAO,EAAC,MAAM,CAAC,CAAC;IACvC,MAAM,aAAa,GAAG,IAAA,mBAAO,EAAC,MAAM,EAAE,KAAK,CAAC,CAAC;IAC7C,MAAM,YAAY,GAAG,WAAW,CAAC,IAAA,oBAAQ,EAAC,cAAc,EAAE,aAAa,CAAC,CAAC,CAAC;IAE1E,OAAO,YAAY,KAAK,IAAI,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,KAAK,CAAC,IAAI,CAAC,IAAA,sBAAU,EAAC,YAAY,CAAC,CAAC;AAC/F,CAAC"}
|
|
@@ -13,7 +13,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
13
13
|
exports.getSupportedBrowsers = getSupportedBrowsers;
|
|
14
14
|
const browserslist_1 = __importDefault(require("browserslist"));
|
|
15
15
|
// The below is replaced by bazel `npm_package`.
|
|
16
|
-
const BASELINE_DATE = '
|
|
16
|
+
const BASELINE_DATE = '2026-05-07';
|
|
17
17
|
function getSupportedBrowsers(projectRoot, logger) {
|
|
18
18
|
// Read the browserslist configuration containing Angular's browser support policy.
|
|
19
19
|
const angularBrowserslist = (0, browserslist_1.default)(`baseline widely available on ${getBaselineDate()}`);
|
package/src/utils/version.js
CHANGED
|
@@ -30,7 +30,7 @@ function assertCompatibleAngularVersion(projectRoot) {
|
|
|
30
30
|
}
|
|
31
31
|
const angularCoreSemVer = new semver_1.SemVer(angularPkgJson['version']);
|
|
32
32
|
const { version, build, raw } = angularCoreSemVer;
|
|
33
|
-
const supportedAngularSemver = '^22.0.0';
|
|
33
|
+
const supportedAngularSemver = '^22.0.0 || ^22.1.0-next.0';
|
|
34
34
|
if (version.startsWith('0.0.0') || supportedAngularSemver.startsWith('0.0.0')) {
|
|
35
35
|
// Internal CLI and FW testing version.
|
|
36
36
|
return;
|