Graham/angular-cli
1
0
Fork 0
mirror of https://github.com/angular/angular-cli.git synced 2025-05-19 20:52:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor(@angular-devkit/build-angular): use direct explicit external configuration for metadata

Browse Source 
The metadata used by the development server to determine the prebundling and externalization behavior
is now created using the external configurations of each bundling operation context directly instead
of the higher level `externalDependencies` build option. This better captures the explicitly defined
external values as each bundling operation configuration could contain additional values based on
the needs and/or customization of each. This will have no current noticeable behavior change as the
default behavior currently does not differ from the higher level option.
This commit is contained in:
Charles Lyding 2023-12-18 15:38:46 -05:00 committed by Charles
parent a1f3ae5799
commit d263cb2783
2 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
packages/angular_devkit/build_angular/src/builders/application/execute-build.ts
View File

@ -177,10 +177,14 @@ export async function executeBuild(
}
// Analyze external imports if external options are enabled
if (options.externalPackages || options.externalDependencies?.length) {
if (options.externalPackages || bundlingResult.externalConfiguration) {
const { browser = new Set(), server = new Set() } = bundlingResult.externalImports;
// TODO: Filter externalImports to generate second argument to support wildcard externalDependency values
executionResult.setExternalMetadata([...browser], [...server], options.externalDependencies);
// TODO: Filter externalImports to generate third argument to support wildcard externalConfiguration values
executionResult.setExternalMetadata(
[...browser],
[...server],
bundlingResult.externalConfiguration,
);
}
const { metafile, initialFiles, outputFiles } = bundlingResult;

11
packages/angular_devkit/build_angular/src/tools/esbuild/bundler-context.ts
View File

@ -34,6 +34,7 @@ export type BundleContextResult =
server?: Set<string>;
browser?: Set<string>;
};
externalConfiguration?: string[];
};
export interface InitialFileRecord {
@ -124,6 +125,7 @@ export class BundlerContext {
const externalImportsServer = new Set<string>();
const outputFiles = [];
let externalConfiguration;
for (const result of individualResults) {
warnings.push(...result.warnings);
if (result.errors) {
@ -142,6 +144,13 @@ export class BundlerContext {
outputFiles.push(...result.outputFiles);
result.externalImports.browser?.forEach((value) => externalImportsBrowser.add(value));
result.externalImports.server?.forEach((value) => externalImportsServer.add(value));
if (result.externalConfiguration) {
externalConfiguration ??= new Set<string>();
for (const value of result.externalConfiguration) {
externalConfiguration.add(value);
}
}
}
if (errors !== undefined) {
@ -158,6 +167,7 @@ export class BundlerContext {
browser: externalImportsBrowser,
server: externalImportsServer,
},
externalConfiguration: externalConfiguration ? [...externalConfiguration] : undefined,
};
}
@ -349,6 +359,7 @@ export class BundlerContext {
externalImports: {
[platformIsServer ? 'server' : 'browser']: externalImports,
},
externalConfiguration: this.#esbuildOptions.external,
errors: undefined,
};
}