Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(@angular-devkit/build-angular): limit concurrent output file writes with application builder #26016

Merged
merged 1 commit into from
Oct 12, 2023
Merged

fix(@angular-devkit/build-angular): limit concurrent output file writes with application builder #26016

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
71 changes: 49 additions & 22 deletions packages/angular_devkit/build_angular/src/tools/esbuild/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,40 +175,67 @@ export function getFeatureSupport(target: string[]): BuildOptions['supported'] {
return supported;
}

const MAX_CONCURRENT_WRITES = 64;

export async function writeResultFiles(
outputFiles: BuildOutputFile[],
assetFiles: { source: string; destination: string }[] | undefined,
outputPath: string,
) {
const directoryExists = new Set<string>();
await Promise.all(
outputFiles.map(async (file) => {
const fullOutputPath = file.fullOutputPath;

// Writes the output file to disk and ensures the containing directories are present
const writeOutputFile = async (file: BuildOutputFile) => {
const fullOutputPath = file.fullOutputPath;
// Ensure output subdirectories exist
const basePath = path.dirname(fullOutputPath);
if (basePath && !directoryExists.has(basePath)) {
await fs.mkdir(path.join(outputPath, basePath), { recursive: true });
directoryExists.add(basePath);
}
// Write file contents
await fs.writeFile(path.join(outputPath, fullOutputPath), file.contents);
};

// Write files in groups of MAX_CONCURRENT_WRITES to avoid too many open files
for (let fileIndex = 0; fileIndex < outputFiles.length; ) {
const groupMax = Math.min(fileIndex + MAX_CONCURRENT_WRITES, outputFiles.length);

const actions = [];
while (fileIndex < groupMax) {
actions.push(writeOutputFile(outputFiles[fileIndex++]));
}

await Promise.all(actions);
}

if (assetFiles?.length) {
clydin marked this conversation as resolved.
Show resolved Hide resolved
const copyAssetFile = async (asset: { source: string; destination: string }) => {
// Ensure output subdirectories exist
const basePath = path.dirname(fullOutputPath);
const destPath = join('browser', asset.destination);
const basePath = path.dirname(destPath);
if (basePath && !directoryExists.has(basePath)) {
await fs.mkdir(path.join(outputPath, basePath), { recursive: true });
directoryExists.add(basePath);
}
// Write file contents
await fs.writeFile(path.join(outputPath, fullOutputPath), file.contents);
}),
);
// Copy file contents
await fs.copyFile(
asset.source,
path.join(outputPath, destPath),
fsConstants.COPYFILE_FICLONE,
);
};

for (let fileIndex = 0; fileIndex < assetFiles.length; ) {
const groupMax = Math.min(fileIndex + MAX_CONCURRENT_WRITES, assetFiles.length);

const actions = [];
while (fileIndex < groupMax) {
actions.push(copyAssetFile(assetFiles[fileIndex++]));
}

if (assetFiles?.length) {
await Promise.all(
assetFiles.map(async ({ source, destination }) => {
// Ensure output subdirectories exist
const destPath = join('browser', destination);
const basePath = path.dirname(destPath);
if (basePath && !directoryExists.has(basePath)) {
await fs.mkdir(path.join(outputPath, basePath), { recursive: true });
directoryExists.add(basePath);
}
// Copy file contents
await fs.copyFile(source, path.join(outputPath, destPath), fsConstants.COPYFILE_FICLONE);
}),
);
await Promise.all(actions);
}
}
}

Expand Down
Loading