8000 refactor(@angular-devkit/build-angular): move internal bundle output … · angular/angular-cli@444475f · GitHub
[go: up one dir, main page]
Skip to content

Commit 444475f

Browse files
clydindgp1130
clydin
authored and
dgp1130
committed
refactor(@angular-devkit/build-angular): move internal bundle output processing into esbuild bundle helper
The path adjustments and initial file logic for index file generation are now centralized in the esbuild build helper function. This allows usage of the functionality in multiple areas of the build system. (cherry picked from commit 4e42261)
1 parent ff03827 commit 444475f

File tree

3 files changed

+38
-32
lines changed

3 files changed

+38
-32
lines changed

‎packages/angular_devkit/build_angular/src/builders/browser-esbuild/esbuild.ts

Lines changed: 30 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ import {
1717
build,
1818
formatMessages,
1919
} from 'esbuild';
20+
import { basename, extname, relative } from 'node:path';
21+
import { FileInfo } from '../../utils/index-file/augment-index-html';
2022

2123
/**
2224
* Determines if an unknown value is an esbuild BuildFailure error object thrown by esbuild.
@@ -39,16 +41,20 @@ export function isEsBuildFailure(value: unknown): value is BuildFailure {
3941
* warnings and errors for the attempted build.
4042
*/
4143
export async function bundle(
44+
workspaceRoot: string,
4245
optionsOrInvalidate: BuildOptions | BuildInvalidate,
4346
): Promise<
44-
(BuildResult & { outputFiles: OutputFile[] }) | (BuildFailure & { outputFiles?: never })
47+
| (BuildResult & { outputFiles: OutputFile[]; initialFiles: FileInfo[] })
48+
| (BuildFailure & { outputFiles?: never })
4549
> {
50+
let result;
4651
try {
4752
if (typeof optionsOrInvalidate === 'function') {
48-
return (await optionsOrInvalidate()) as BuildResult & { outputFiles: OutputFile[] };
53+
result = (await optionsOrInvalidate()) as BuildResult & { outputFiles: OutputFile[] };
4954
} else {
50-
return await build({
55+
result = await build({
5156
...optionsOrInvalidate,
57+
metafile: true,
5258
write: false,
5359
});
5460
}
@@ -60,6 +66,27 @@ export async function bundle(
6066
throw failure;
6167
}
6268
}
69+
70+
const initialFiles: FileInfo[] = [];
71+
for (const outputFile of result.outputFiles) {
72+
// Entries in the metafile are relative to the `absWorkingDir` option which is set to the workspaceRoot
73+
const relativeFilePath = relative(workspaceRoot, outputFile.path);
74+
const entryPoint = result.metafile?.outputs[relativeFilePath]?.entryPoint;
75+
76+
outputFile.path = relativeFilePath;
77+
78+
if (entryPoint) {
79+
// An entryPoint value indicates an initial file
80+
initialFiles.push({
81+
file: outputFile.path,
82+
// The first part of the filename is the name of file (e.g., "polyfills" for "polyfills.7S5G3MDY.js")
83+
name: basename(outputFile.path).split('.')[0],
84+
extension: extname(outputFile.path),
85+
});
86+
}
87+
}
88+
89+
return { ...result, initialFiles };
6390
}
6491

6592
export async function logMessages(

‎packages/angular_devkit/build_angular/src/builders/browser-esbuild/index.ts

Lines changed: 7 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,10 @@ async function execute(
9292

9393
const [codeResults, styleResults] = await Promise.all([
9494
// Execute esbuild to bundle the application code
95-
bundle(rebuildState?.codeRebuild ?? createCodeBundleOptions(options, target, codeBundleCache)),
95+
bundle(
96+
workspaceRoot,
97+
rebuildState?.codeRebuild ?? createCodeBundleOptions(options, target, codeBundleCache),
98+
),
9699
// Execute esbuild to bundle the global stylesheets
97100
bundleGlobalStylesheets(options, target),
98101
]);
@@ -108,31 +111,9 @@ async function execute(
108111
return new ExecutionResult(false, rebuildState?.codeRebuild, codeBundleCache);
109112
}
110113

111-
// Structure the code bundling output files
112-
const initialFiles: FileInfo[] = [];
113-
const outputFiles: OutputFile[] = [];
114-
for (const outputFile of codeResults.outputFiles) {
115-
// Entries in the metafile are relative to the `absWorkingDir` option which is set to the workspaceRoot
116-
const relativeFilePath = path.relative(workspaceRoot, outputFile.path);
117-
const entryPoint = codeResults.metafile?.outputs[relativeFilePath]?.entryPoint;
118-
119-
outputFile.path = relativeFilePath;
120-
121-
if (entryPoint) {
122-
// An entryPoint value indicates an initial file
123-
initialFiles.push({
124-
file: outputFile.path,
125-
// The first part of the filename is the name of file (e.g., "polyfills" for "polyfills.7S5G3MDY.js")
126-
name: path.basename(outputFile.path).split('.')[0],
127-
extension: path.extname(outputFile.path),
128-
});
129-
}
130-
outputFiles.push(outputFile);
131-
}
132-
133-
// Add global stylesheets output files
134-
outputFiles.push(...styleResults.outputFiles);
135-
initialFiles.push(...styleResults.initialFiles);
114+
// Combine the bundling output files
115+
const initialFiles: FileInfo[] = [...codeResults.initialFiles, ...styleResults.initialFiles];
116+
const outputFiles: OutputFile[] = [...codeResults.outputFiles, ...styleResults.outputFiles];
136117

137118
// Return if the global stylesheet bundling has errors
138119
if (styleResults.errors.length) {
@@ -268,7 +249,6 @@ function createCodeBundleOptions(
268249
conditions: ['es2020', 'es2015', 'module'],
269250
resolveExtensions: ['.ts', '.tsx', '.mjs', '.js'],
270251
logLevel: options.verbose ? 'debug' : 'silent',
271-
metafile: true,
272252
minify: optimizationOptions.scripts,
273253
pure: ['forwardRef'],
274254
outdir: workspaceRoot,

‎packages/angular_devkit/build_angular/src/builders/browser-esbuild/stylesheets.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ async function bundleStylesheet(
2828
options: BundleStylesheetOptions,
2929
) {
3030
// Execute esbuild
31-
const result = await bundle({
31+
const result = await bundle(options.workspaceRoot, {
3232
...entry,
3333
absWorkingDir: options.workspaceRoot,
3434
bundle: true,
@@ -58,7 +58,6 @@ async function bundleStylesheet(
5858
const resourceFiles: OutputFile[] = [];
5959
if (result.outputFiles) {
6060
for (const 5157 outputFile of result.outputFiles) {
61-
outputFile.path = path.relative(options.workspaceRoot, outputFile.path);
6261
const filename = path.basename(outputFile.path);
6362
if (filename.endsWith('.css')) {
6463
outputPath = outputFile.path;

0 commit comments

Comments
 (0)
0