@angular-devkit/build-angular 17.0.0-rc.3 → 17.0.0-rc.4

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/src/index.d.ts CHANGED
@@ -14,4 +14,5 @@ export { execute as executeExtractI18nBuilder, ExtractI18nBuilderOptions, } from
14
14
  export { execute as executeKarmaBuilder, KarmaBuilderOptions, KarmaConfigOptions, } from './builders/karma';
15
15
  export { execute as executeProtractorBuilder, ProtractorBuilderOptions, } from './builders/protractor';
16
16
  export { execute as executeServerBuilder, ServerBuilderOptions, ServerBuilderOutput, } from './builders/server';
17
+ export { execute as executeSSRDevServerBuilder, SSRDevServerBuilderOptions, SSRDevServerBuilderOutput, } from './builders/ssr-dev-server';
17
18
  export { execute as executeNgPackagrBuilder, NgPackagrBuilderOptions } from './builders/ng-packagr';
package/src/index.js CHANGED
@@ -21,7 +21,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
21
21
  for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
22
22
  };
23
23
  Object.defineProperty(exports, "__esModule", { value: true });
24
- exports.executeNgPackagrBuilder = exports.executeServerBuilder = exports.executeProtractorBuilder = exports.executeKarmaBuilder = exports.executeExtractI18nBuilder = exports.executeDevServerBuilder = exports.buildApplication = exports.executeBrowserBuilder = exports.Type = exports.OutputHashing = exports.CrossOrigin = void 0;
24
+ exports.executeNgPackagrBuilder = exports.executeSSRDevServerBuilder = exports.executeServerBuilder = exports.executeProtractorBuilder = exports.executeKarmaBuilder = exports.executeExtractI18nBuilder = exports.executeDevServerBuilder = exports.buildApplication = exports.executeBrowserBuilder = exports.Type = exports.OutputHashing = exports.CrossOrigin = void 0;
25
25
  __exportStar(require("./transforms"), exports);
26
26
  var schema_1 = require("./builders/browser/schema");
27
27
  Object.defineProperty(exports, "CrossOrigin", { enumerable: true, get: function () { return schema_1.CrossOrigin; } });
@@ -41,5 +41,7 @@ var protractor_1 = require("./builders/protractor");
41
41
  Object.defineProperty(exports, "executeProtractorBuilder", { enumerable: true, get: function () { return protractor_1.execute; } });
42
42
  var server_1 = require("./builders/server");
43
43
  Object.defineProperty(exports, "executeServerBuilder", { enumerable: true, get: function () { return server_1.execute; } });
44
+ var ssr_dev_server_1 = require("./builders/ssr-dev-server");
45
+ Object.defineProperty(exports, "executeSSRDevServerBuilder", { enumerable: true, get: function () { return ssr_dev_server_1.execute; } });
44
46
  var ng_packagr_1 = require("./builders/ng-packagr");
45
47
  Object.defineProperty(exports, "executeNgPackagrBuilder", { enumerable: true, get: function () { return ng_packagr_1.execute; } });
@@ -78,6 +78,8 @@ function createCompilerPlugin(pluginOptions, styleOptions) {
78
78
  const compilation = pluginOptions.noopTypeScriptCompilation
79
79
  ? new compilation_1.NoopCompilation()
80
80
  : await (0, compilation_1.createAngularCompilation)(!!pluginOptions.jit);
81
+ // Compilation is initially assumed to have errors until emitted
82
+ let hasCompilationErrors = true;
81
83
  // Determines if TypeScript should process JavaScript files based on tsconfig `allowJs` option
82
84
  let shouldTsIgnoreJs = true;
83
85
  // Track incremental component stylesheet builds
@@ -178,72 +180,58 @@ function createCompilerPlugin(pluginOptions, styleOptions) {
178
180
  };
179
181
  // Initialize the Angular compilation for the current build.
180
182
  // In watch mode, previous build state will be reused.
181
- const { compilerOptions: { allowJs }, referencedFiles, } = await compilation.initialize(tsconfigPath, hostOptions, (compilerOptions) => {
182
- // target of 9 is ES2022 (using the number avoids an expensive import of typescript just for an enum)
183
- if (compilerOptions.target === undefined || compilerOptions.target < 9) {
184
- // If 'useDefineForClassFields' is already defined in the users project leave the value as is.
185
- // Otherwise fallback to false due to https://github.com/microsoft/TypeScript/issues/45995
186
- // which breaks the deprecated `@Effects` NGRX decorator and potentially other existing code as well.
187
- compilerOptions.target = 9;
188
- compilerOptions.useDefineForClassFields ??= false;
189
- // Only add the warning on the initial build
190
- setupWarnings?.push({
191
- text: 'TypeScript compiler options "target" and "useDefineForClassFields" are set to "ES2022" and ' +
192
- '"false" respectively by the Angular CLI.',
193
- location: { file: pluginOptions.tsconfig },
194
- notes: [
195
- {
196
- text: 'To control ECMA version and features use the Browerslist configuration. ' +
197
- 'For more information, see https://angular.io/guide/build#configuring-browser-compatibility',
198
- },
199
- ],
200
- });
201
- }
202
- if (compilerOptions.compilationMode === 'partial') {
203
- setupWarnings?.push({
204
- text: 'Angular partial compilation mode is not supported when building applications.',
205
- location: null,
206
- notes: [{ text: 'Full compilation mode will be used instead.' }],
207
- });
208
- compilerOptions.compilationMode = 'full';
209
- }
210
- // Enable incremental compilation by default if caching is enabled
211
- if (pluginOptions.sourceFileCache?.persistentCachePath) {
212
- compilerOptions.incremental ??= true;
213
- // Set the build info file location to the configured cache directory
214
- compilerOptions.tsBuildInfoFile = path.join(pluginOptions.sourceFileCache?.persistentCachePath, '.tsbuildinfo');
215
- }
216
- else {
217
- compilerOptions.incremental = false;
218
- }
219
- return {
220
- ...compilerOptions,
221
- noEmitOnError: false,
222
- inlineSources: pluginOptions.sourcemap,
223
- inlineSourceMap: pluginOptions.sourcemap,
224
- mapRoot: undefined,
225
- sourceRoot: undefined,
226
- preserveSymlinks,
227
- };
228
- });
229
- shouldTsIgnoreJs = !allowJs;
183
+ let referencedFiles;
184
+ try {
185
+ const initializationResult = await compilation.initialize(tsconfigPath, hostOptions, createCompilerOptionsTransformer(setupWarnings, pluginOptions, preserveSymlinks));
186
+ shouldTsIgnoreJs = !initializationResult.compilerOptions.allowJs;
187
+ referencedFiles = initializationResult.referencedFiles;
188
+ }
189
+ catch (error) {
190
+ (result.errors ??= []).push({
191
+ text: 'Angular compilation initialization failed.',
192
+ location: null,
193
+ notes: [
194
+ {
195
+ text: error instanceof Error ? error.stack ?? error.message : `${error}`,
196
+ location: null,
197
+ },
198
+ ],
199
+ });
200
+ // Initialization failure prevents further compilation steps
201
+ hasCompilationErrors = true;
202
+ return result;
203
+ }
230
204
  if (compilation instanceof compilation_1.NoopCompilation) {
231
205
  await sharedTSCompilationState.waitUntilReady;
232
206
  return result;
233
207
  }
234
208
  const diagnostics = await compilation.diagnoseFiles();
235
- if (diagnostics.errors) {
209
+ if (diagnostics.errors?.length) {
236
210
  (result.errors ??= []).push(...diagnostics.errors);
237
211
  }
238
- if (diagnostics.warnings) {
212
+ if (diagnostics.warnings?.length) {
239
213
  (result.warnings ??= []).push(...diagnostics.warnings);
240
214
  }
241
215
  // Update TypeScript file output cache for all affected files
242
- await (0, profiling_1.profileAsync)('NG_EMIT_TS', async () => {
243
- for (const { filename, contents } of await compilation.emitAffectedFiles()) {
244
- typeScriptFileCache.set((0, node_url_1.pathToFileURL)(filename).href, contents);
245
- }
246
- });
216
+ try {
217
+ await (0, profiling_1.profileAsync)('NG_EMIT_TS', async () => {
218
+ for (const { filename, contents } of await compilation.emitAffectedFiles()) {
219
+ typeScriptFileCache.set((0, node_url_1.pathToFileURL)(filename).href, contents);
220
+ }
221
+ });
222
+ }
223
+ catch (error) {
224
+ (result.errors ??= []).push({
225
+ text: 'Angular compilation emit failed.',
226
+ location: null,
227
+ notes: [
228
+ {
229
+ text: error instanceof Error ? error.stack ?? error.message : `${error}`,
230
+ location: null,
231
+ },
232
+ ],
233
+ });
234
+ }
247
235
  // Add errors from failed additional results.
248
236
  // This must be done after emit to capture latest web worker results.
249
237
  for (const { errors } of additionalResults.values()) {
@@ -258,6 +246,7 @@ function createCompilerPlugin(pluginOptions, styleOptions) {
258
246
  ...referencedFileTracker.referencedFiles,
259
247
  ];
260
248
  }
249
+ hasCompilationErrors = !!result.errors?.length;
261
250
  // Reset the setup warnings so that they are only shown during the first build.
262
251
  setupWarnings = undefined;
263
252
  sharedTSCompilationState.markAsReady();
@@ -275,6 +264,11 @@ function createCompilerPlugin(pluginOptions, styleOptions) {
275
264
  // would need to be added to the key as well as a check for any change of content.
276
265
  let contents = typeScriptFileCache.get((0, node_url_1.pathToFileURL)(request).href);
277
266
  if (contents === undefined) {
267
+ // If the Angular compilation had errors the file may not have been emitted.
268
+ // To avoid additional errors about missing files, return empty contents.
269
+ if (hasCompilationErrors) {
270
+ return { contents: '', loader: 'js' };
271
+ }
278
272
  // No TS result indicates the file is not part of the TypeScript program.
279
273
  // If allowJs is enabled and the file is JS then defer to the next load hook.
280
274
  if (!shouldTsIgnoreJs && /\.[cm]?js$/.test(request)) {
@@ -318,6 +312,8 @@ function createCompilerPlugin(pluginOptions, styleOptions) {
318
312
  (0, jit_plugin_callbacks_1.setupJitPluginCallbacks)(build, stylesheetBundler, additionalResults, styleOptions.inlineStyleLanguage);
319
313
  }
320
314
  build.onEnd((result) => {
315
+ // Ensure other compilations are unblocked if the main compilation throws during start
316
+ sharedTSCompilationState?.markAsReady();
321
317
  for (const { outputFiles, metafile } of additionalResults.values()) {
322
318
  // Add any additional output files to the main output files
323
319
  if (outputFiles?.length) {
@@ -340,6 +336,56 @@ function createCompilerPlugin(pluginOptions, styleOptions) {
340
336
  };
341
337
  }
342
338
  exports.createCompilerPlugin = createCompilerPlugin;
339
+ function createCompilerOptionsTransformer(setupWarnings, pluginOptions, preserveSymlinks) {
340
+ return (compilerOptions) => {
341
+ // target of 9 is ES2022 (using the number avoids an expensive import of typescript just for an enum)
342
+ if (compilerOptions.target === undefined || compilerOptions.target < 9) {
343
+ // If 'useDefineForClassFields' is already defined in the users project leave the value as is.
344
+ // Otherwise fallback to false due to https://github.com/microsoft/TypeScript/issues/45995
345
+ // which breaks the deprecated `@Effects` NGRX decorator and potentially other existing code as well.
346
+ compilerOptions.target = 9;
347
+ compilerOptions.useDefineForClassFields ??= false;
348
+ // Only add the warning on the initial build
349
+ setupWarnings?.push({
350
+ text: 'TypeScript compiler options "target" and "useDefineForClassFields" are set to "ES2022" and ' +
351
+ '"false" respectively by the Angular CLI.',
352
+ location: { file: pluginOptions.tsconfig },
353
+ notes: [
354
+ {
355
+ text: 'To control ECMA version and features use the Browerslist configuration. ' +
356
+ 'For more information, see https://angular.io/guide/build#configuring-browser-compatibility',
357
+ },
358
+ ],
359
+ });
360
+ }
361
+ if (compilerOptions.compilationMode === 'partial') {
362
+ setupWarnings?.push({
363
+ text: 'Angular partial compilation mode is not supported when building applications.',
364
+ location: null,
365
+ notes: [{ text: 'Full compilation mode will be used instead.' }],
366
+ });
367
+ compilerOptions.compilationMode = 'full';
368
+ }
369
+ // Enable incremental compilation by default if caching is enabled
370
+ if (pluginOptions.sourceFileCache?.persistentCachePath) {
371
+ compilerOptions.incremental ??= true;
372
+ // Set the build info file location to the configured cache directory
373
+ compilerOptions.tsBuildInfoFile = path.join(pluginOptions.sourceFileCache?.persistentCachePath, '.tsbuildinfo');
374
+ }
375
+ else {
376
+ compilerOptions.incremental = false;
377
+ }
378
+ return {
379
+ ...compilerOptions,
380
+ noEmitOnError: false,
381
+ inlineSources: pluginOptions.sourcemap,
382
+ inlineSourceMap: pluginOptions.sourcemap,
383
+ mapRoot: undefined,
384
+ sourceRoot: undefined,
385
+ preserveSymlinks,
386
+ };
387
+ };
388
+ }
343
389
  function bundleWebWorker(build, pluginOptions, workerFile) {
344
390
  try {
345
391
  return build.esbuild.buildSync({
@@ -177,12 +177,9 @@ function createServerCodeBundleOptions(options, target, sourceFileCache) {
177
177
  exports.createServerCodeBundleOptions = createServerCodeBundleOptions;
178
178
  function createServerPolyfillBundleOptions(options, target, sourceFileCache) {
179
179
  const polyfills = [];
180
- const zoneFlagsNamespace = 'angular:zone-flags/placeholder';
181
180
  const polyfillsFromConfig = new Set(options.polyfills);
182
- let hasZoneJs = false;
183
181
  if (polyfillsFromConfig.has('zone.js')) {
184
- hasZoneJs = true;
185
- polyfills.push(zoneFlagsNamespace, 'zone.js/node');
182
+ polyfills.push('zone.js/node');
186
183
  }
187
184
  if (polyfillsFromConfig.has('@angular/localize') ||
188
185
  polyfillsFromConfig.has('@angular/localize/init')) {
@@ -222,18 +219,6 @@ function createServerPolyfillBundleOptions(options, target, sourceFileCache) {
222
219
  },
223
220
  };
224
221
  buildOptions.plugins ??= [];
225
- // Disable Zone.js uncaught promise rejections to provide cleaner stacktraces.
226
- if (hasZoneJs) {
227
- buildOptions.plugins.unshift((0, virtual_module_plugin_1.createVirtualModulePlugin)({
228
- namespace: zoneFlagsNamespace,
229
- entryPointOnly: false,
230
- loadContent: () => ({
231
- contents: `globalThis.__zone_symbol__DISABLE_WRAPPING_UNCAUGHT_PROMISE_REJECTION = true;`,
232
- loader: 'js',
233
- resolveDir: workspaceRoot,
234
- }),
235
- }));
236
- }
237
222
  buildOptions.plugins.push((0, rxjs_esm_resolution_plugin_1.createRxjsEsmResolutionPlugin)());
238
223
  return () => buildOptions;
239
224
  }
@@ -16,7 +16,10 @@ export type BundleContextResult = {
16
16
  metafile: Metafile;
17
17
  outputFiles: BuildOutputFile[];
18
18
  initialFiles: Map<string, InitialFileRecord>;
19
- externalImports: Set<string>;
19
+ externalImports: {
20
+ server?: Set<string>;
21
+ browser?: Set<string>;
22
+ };
20
23
  };
21
24
  export interface InitialFileRecord {
22
25
  entrypoint: boolean;
@@ -68,7 +68,8 @@ class BundlerContext {
68
68
  const warnings = [];
69
69
  const metafile = { inputs: {}, outputs: {} };
70
70
  const initialFiles = new Map();
71
- const externalImports = new Set();
71
+ const externalImportsBrowser = new Set();
72
+ const externalImportsServer = new Set();
72
73
  const outputFiles = [];
73
74
  for (const result of individualResults) {
74
75
  warnings.push(...result.warnings);
@@ -84,7 +85,8 @@ class BundlerContext {
84
85
  }
85
86
  result.initialFiles.forEach((value, key) => initialFiles.set(key, value));
86
87
  outputFiles.push(...result.outputFiles);
87
- result.externalImports.forEach((value) => externalImports.add(value));
88
+ result.externalImports.browser?.forEach((value) => externalImportsBrowser.add(value));
89
+ result.externalImports.server?.forEach((value) => externalImportsServer.add(value));
88
90
  }
89
91
  if (errors !== undefined) {
90
92
  return { errors, warnings };
@@ -95,7 +97,10 @@ class BundlerContext {
95
97
  metafile,
96
98
  initialFiles,
97
99
  outputFiles,
98
- externalImports,
100
+ externalImports: {
101
+ browser: externalImportsBrowser,
102
+ server: externalImportsServer,
103
+ },
99
104
  };
100
105
  }
101
106
  /**
@@ -241,16 +246,14 @@ class BundlerContext {
241
246
  externalImports.add(importData.path);
242
247
  }
243
248
  }
249
+ const platformIsServer = this.#esbuildOptions?.platform === 'node';
244
250
  const outputFiles = result.outputFiles.map((file) => {
245
251
  let fileType;
246
252
  if ((0, node_path_1.dirname)(file.path) === 'media') {
247
253
  fileType = BuildOutputFileType.Media;
248
254
  }
249
255
  else {
250
- fileType =
251
- this.#esbuildOptions?.platform === 'node'
252
- ? BuildOutputFileType.Server
253
- : BuildOutputFileType.Browser;
256
+ fileType = platformIsServer ? BuildOutputFileType.Server : BuildOutputFileType.Browser;
254
257
  }
255
258
  return (0, utils_1.convertOutputFile)(file, fileType);
256
259
  });
@@ -259,7 +262,9 @@ class BundlerContext {
259
262
  ...result,
260
263
  outputFiles,
261
264
  initialFiles,
262
- externalImports,
265
+ externalImports: {
266
+ [platformIsServer ? 'server' : 'browser']: externalImports,
267
+ },
263
268
  errors: undefined,
264
269
  };
265
270
  }
@@ -5,7 +5,7 @@
5
5
  * Use of this source code is governed by an MIT-style license that can be
6
6
  * found in the LICENSE file at https://angular.io/license
7
7
  */
8
- import type { Message } from 'esbuild';
8
+ import type { Message, PartialMessage } from 'esbuild';
9
9
  import type { ChangedFiles } from '../../tools/esbuild/watcher';
10
10
  import type { SourceFileCache } from './angular/source-file-cache';
11
11
  import type { BuildOutputFile, BuildOutputFileType, BundlerContext } from './bundler-context';
@@ -19,6 +19,11 @@ export interface RebuildState {
19
19
  fileChanges: ChangedFiles;
20
20
  previousOutputHashes: Map<string, string>;
21
21
  }
22
+ export interface ExternalResultMetadata {
23
+ implicitBrowser: string[];
24
+ implicitServer: string[];
25
+ explicit: string[];
26
+ }
22
27
  /**
23
28
  * Represents the result of a single builder execute call.
24
29
  */
@@ -27,22 +32,20 @@ export declare class ExecutionResult {
27
32
  private codeBundleCache?;
28
33
  outputFiles: BuildOutputFile[];
29
34
  assetFiles: BuildOutputAsset[];
30
- errors: Message[];
31
- externalMetadata?: {
32
- implicit: string[];
33
- explicit?: string[];
34
- };
35
+ errors: (Message | PartialMessage)[];
36
+ externalMetadata?: ExternalResultMetadata;
35
37
  constructor(rebuildContexts: BundlerContext[], codeBundleCache?: SourceFileCache | undefined);
36
38
  addOutputFile(path: string, content: string, type: BuildOutputFileType): void;
37
39
  addAssets(assets: BuildOutputAsset[]): void;
38
- addErrors(errors: Message[]): void;
40
+ addErrors(errors: (Message | PartialMessage)[]): void;
39
41
  /**
40
42
  * Add external JavaScript import metadata to the result. This is currently used
41
43
  * by the development server to optimize the prebundling process.
42
- * @param implicit External dependencies due to the external packages option.
44
+ * @param implicitBrowser External dependencies for the browser bundles due to the external packages option.
45
+ * @param implicitServer External dependencies for the server bundles due to the external packages option.
43
46
  * @param explicit External dependencies due to explicit project configuration.
44
47
  */
45
- setExternalMetadata(implicit: string[], explicit: string[] | undefined): void;
48
+ setExternalMetadata(implicitBrowser: string[], implicitServer: string[], explicit: string[] | undefined): void;
46
49
  get output(): {
47
50
  success: boolean;
48
51
  };
@@ -50,11 +53,8 @@ export declare class ExecutionResult {
50
53
  success: boolean;
51
54
  outputFiles: BuildOutputFile[];
52
55
  assetFiles: BuildOutputAsset[];
53
- errors: Message[];
54
- externalMetadata: {
55
- implicit: string[];
56
- explicit?: string[] | undefined;
57
- } | undefined;
56
+ errors: (PartialMessage | Message)[];
57
+ externalMetadata: ExternalResultMetadata | undefined;
58
58
  };
59
59
  get watchFiles(): string[];
60
60
  createRebuildState(fileChanges: ChangedFiles): RebuildState;
@@ -35,11 +35,12 @@ class ExecutionResult {
35
35
  /**
36
36
  * Add external JavaScript import metadata to the result. This is currently used
37
37
  * by the development server to optimize the prebundling process.
38
- * @param implicit External dependencies due to the external packages option.
38
+ * @param implicitBrowser External dependencies for the browser bundles due to the external packages option.
39
+ * @param implicitServer External dependencies for the server bundles due to the external packages option.
39
40
  * @param explicit External dependencies due to explicit project configuration.
40
41
  */
41
- setExternalMetadata(implicit, explicit) {
42
- this.externalMetadata = { implicit, explicit };
42
+ setExternalMetadata(implicitBrowser, implicitServer, explicit) {
43
+ this.externalMetadata = { implicitBrowser, implicitServer, explicit: explicit ?? [] };
43
44
  }
44
45
  get output() {
45
46
  return {
@@ -38,6 +38,10 @@ function checkCommonJSModules(metafile, allowedCommonJsDependencies) {
38
38
  // Used by '@angular/platform-server' and is in a seperate chunk that is unused when
39
39
  // using `provideHttpClient(withFetch())`.
40
40
  allowedRequests.add('xhr2');
41
+ // Packages used by @angular/ssr.
42
+ // While critters is ESM it has a number of direct and transtive CJS deps.
43
+ allowedRequests.add('express');
44
+ allowedRequests.add('critters');
41
45
  // Find all entry points that contain code (JS/TS)
42
46
  const files = [];
43
47
  for (const { entryPoint } of Object.values(metafile.outputs)) {
@@ -62,6 +66,10 @@ function checkCommonJSModules(metafile, allowedCommonJsDependencies) {
62
66
  continue;
63
67
  }
64
68
  seenFiles.add(imported.path);
69
+ // If the dependency is allowed ignore all other checks
70
+ if (allowedRequests.has(imported.original)) {
71
+ continue;
72
+ }
65
73
  // Only check actual code files
66
74
  if (!isPathCode(imported.path)) {
67
75
  continue;
@@ -117,10 +125,7 @@ function isPathCode(name) {
117
125
  * @returns True, if specifier is potentially relative; false, otherwise.
118
126
  */
119
127
  function isPotentialRelative(specifier) {
120
- if (specifier[0] === '.') {
121
- return true;
122
- }
123
- return false;
128
+ return specifier[0] === '.';
124
129
  }
125
130
  /**
126
131
  * Creates an esbuild diagnostic message for a given non-ESM module request.
@@ -13,4 +13,4 @@ import { BundlerOptionsFactory } from './bundler-context';
13
13
  * @param options The builder's user-provider normalized options.
14
14
  * @returns An esbuild BuildOptions object.
15
15
  */
16
- export declare function createGlobalScriptsBundleOptions(options: NormalizedApplicationBuildOptions, initial: boolean): BundlerOptionsFactory | undefined;
16
+ export declare function createGlobalScriptsBundleOptions(options: NormalizedApplicationBuildOptions, target: string[], initial: boolean): BundlerOptionsFactory | undefined;
@@ -48,7 +48,7 @@ const virtual_module_plugin_1 = require("./virtual-module-plugin");
48
48
  * @param options The builder's user-provider normalized options.
49
49
  * @returns An esbuild BuildOptions object.
50
50
  */
51
- function createGlobalScriptsBundleOptions(options, initial) {
51
+ function createGlobalScriptsBundleOptions(options, target, initial) {
52
52
  const { globalScripts, optimizationOptions, outputNames, preserveSymlinks, sourcemapOptions, workspaceRoot, } = options;
53
53
  const namespace = 'angular:script/global';
54
54
  const entryPoints = {};
@@ -81,6 +81,7 @@ function createGlobalScriptsBundleOptions(options, initial) {
81
81
  sourcemap: sourcemapOptions.scripts && (sourcemapOptions.hidden ? 'external' : true),
82
82
  write: false,
83
83
  platform: 'neutral',
84
+ target,
84
85
  preserveSymlinks,
85
86
  plugins: [
86
87
  (0, sourcemap_ignorelist_plugin_1.createSourcemapIgnorelistPlugin)(),
@@ -24,7 +24,7 @@ export interface JavaScriptTransformerOptions {
24
24
  export declare class JavaScriptTransformer {
25
25
  #private;
26
26
  readonly maxThreads: number;
27
- constructor(options: JavaScriptTransformerOptions, maxThreads: number);
27
+ constructor(options: JavaScriptTransformerOptions, maxThreads: number, reuseResults?: boolean);
28
28
  /**
29
29
  * Performs JavaScript transformations on a file from the filesystem.
30
30
  * If no transformations are required, the data for the original file will be returned.
@@ -23,7 +23,8 @@ class JavaScriptTransformer {
23
23
  maxThreads;
24
24
  #workerPool;
25
25
  #commonOptions;
26
- constructor(options, maxThreads) {
26
+ #pendingfileResults;
27
+ constructor(options, maxThreads, reuseResults) {
27
28
  this.maxThreads = maxThreads;
28
29
  // Extract options to ensure only the named options are serialized and sent to the worker
29
30
  const { sourcemap, thirdPartySourcemaps = false, advancedOptimizations = false, jit = false, } = options;
@@ -33,6 +34,10 @@ class JavaScriptTransformer {
33
34
  advancedOptimizations,
34
35
  jit,
35
36
  };
37
+ // Currently only tracks pending file transform results
38
+ if (reuseResults) {
39
+ this.#pendingfileResults = new Map();
40
+ }
36
41
  }
37
42
  #ensureWorkerPool() {
38
43
  this.#workerPool ??= new piscina_1.default({
@@ -52,13 +57,19 @@ class JavaScriptTransformer {
52
57
  * @returns A promise that resolves to a UTF-8 encoded Uint8Array containing the result.
53
58
  */
54
59
  transformFile(filename, skipLinker) {
55
- // Always send the request to a worker. Files are almost always from node modules which means
56
- // they may need linking. The data is also not yet available to perform most transformation checks.
57
- return this.#ensureWorkerPool().run({
58
- filename,
59
- skipLinker,
60
- ...this.#commonOptions,
61
- });
60
+ const pendingKey = `${!!skipLinker}--${filename}`;
61
+ let pending = this.#pendingfileResults?.get(pendingKey);
62
+ if (pending === undefined) {
63
+ // Always send the request to a worker. Files are almost always from node modules which means
64
+ // they may need linking. The data is also not yet available to perform most transformation checks.
65
+ pending = this.#ensureWorkerPool().run({
66
+ filename,
67
+ skipLinker,
68
+ ...this.#commonOptions,
69
+ });
70
+ this.#pendingfileResults?.set(pendingKey, pending);
71
+ }
72
+ return pending;
62
73
  }
63
74
  /**
64
75
  * Performs JavaScript transformations on the provided data of a file. The file does not need
@@ -88,6 +99,7 @@ class JavaScriptTransformer {
88
99
  * @returns A void promise that resolves when closing is complete.
89
100
  */
90
101
  async close() {
102
+ this.#pendingfileResults?.clear();
91
103
  if (this.#workerPool) {
92
104
  // Workaround piscina bug where a worker thread will be recreated after destroy to meet the minimum.
93
105
  this.#workerPool.options.minThreads = 0;
@@ -228,7 +228,7 @@ class AnyComponentStyleCalculator extends Calculator {
228
228
  * Calculate the bytes given a string value.
229
229
  */
230
230
  function calculateBytes(input, baseline, factor = 1) {
231
- const matches = input.match(/^\s*(\d+(?:\.\d+)?)\s*(%|(?:[mM]|[kK]|[gG])?[bB])?\s*$/);
231
+ const matches = input.trim().match(/^(\d+(?:\.\d+)?)[ \t]*(%|[kmg]?b)?$/i);
232
232
  if (!matches) {
233
233
  return NaN;
234
234
  }
@@ -68,8 +68,11 @@ exports.allowMinify = debugOptimize.minify;
68
68
  */
69
69
  const maxWorkersVariable = process.env['NG_BUILD_MAX_WORKERS'];
70
70
  exports.maxWorkers = isPresent(maxWorkersVariable) ? +maxWorkersVariable : 4;
71
+ // Default to enabled unless inside a Web Container which currently fails when transferring MessagePort objects
71
72
  const parallelTsVariable = process.env['NG_BUILD_PARALLEL_TS'];
72
- exports.useParallelTs = !isPresent(parallelTsVariable) || !isDisabled(parallelTsVariable);
73
+ exports.useParallelTs = isPresent(parallelTsVariable)
74
+ ? !isDisabled(parallelTsVariable)
75
+ : !process.versions.webcontainer;
73
76
  const legacySassVariable = process.env['NG_BUILD_LEGACY_SASS'];
74
77
  exports.useLegacySass = (() => {
75
78
  if (!isPresent(legacySassVariable)) {
@@ -8,6 +8,10 @@
8
8
  */
9
9
  Object.defineProperty(exports, "__esModule", { value: true });
10
10
  exports.loadEsmModule = void 0;
11
+ /**
12
+ * Lazily compiled dynamic import loader function.
13
+ */
14
+ let load;
11
15
  /**
12
16
  * This uses a dynamic import to load a module which may be ESM.
13
17
  * CommonJS code can load ESM code via a dynamic import. Unfortunately, TypeScript
@@ -21,6 +25,7 @@ exports.loadEsmModule = void 0;
21
25
  * @returns A Promise that resolves to the dynamically imported module.
22
26
  */
23
27
  function loadEsmModule(modulePath) {
24
- return new Function('modulePath', `return import(modulePath);`)(modulePath);
28
+ load ??= new Function('modulePath', `return import(modulePath);`);
29
+ return load(modulePath);
25
30
  }
26
31
  exports.loadEsmModule = loadEsmModule;
@@ -5,10 +5,6 @@
5
5
  * Use of this source code is governed by an MIT-style license that can be
6
6
  * found in the LICENSE file at https://angular.io/license
7
7
  */
8
- /**
9
- * Node.js ESM loader to redirect imports to in memory files.
10
- * @see: https://nodejs.org/api/esm.html#loaders for more information about loaders.
11
- */
12
8
  export interface ESMInMemoryFileLoaderWorkerData {
13
9
  outputFiles: Record<string, string>;
14
10
  workspaceRoot: string;