Skip to content

fix(@angular-devkit/build-angular): emit root files when localize is enabled when using the esbuild based builders #26392

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

Merged
merged 1 commit into from
Nov 17, 2023
Merged

fix(@angular-devkit/build-angular): emit root files when localize is enabled when using the esbuild based builders #26392

Show file tree
Hide file tree
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
11 changes: 8 additions & 3 deletions packages/angular_devkit/build_angular/src/builders/application/i18n.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

import { BuilderContext } from '@angular-devkit/architect';
import { join, posix } from 'node:path';
import { InitialFileRecord } from '../../tools/esbuild/bundler-context';
import { BuildOutputFileType, InitialFileRecord } from '../../tools/esbuild/bundler-context';
import { ExecutionResult } from '../../tools/esbuild/bundler-execution-result';
import { I18nInliner } from '../../tools/esbuild/i18n-inliner';
import { maxWorkers } from '../../utils/environment-options';
Expand Down Expand Up @@ -108,8 +108,13 @@ export async function inlineI18n(
await inliner.close();
}

// Update the result with all localized files
executionResult.outputFiles = updatedOutputFiles;
// Update the result with all localized files.
executionResult.outputFiles = [
// Root files are not modified.
...executionResult.outputFiles.filter(({ type }) => type === BuildOutputFileType.Root),
// Updated files for each locale.
...updatedOutputFiles,
];

// Assets are only changed if not using the flat output option
if (options.i18nOptions.flatOutput !== true) {
Expand Down
19 changes: 16 additions & 3 deletions ...ular_devkit/build_angular/src/builders/application/tests/options/extract-licenses_spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ describeBuilder(buildApplication, APPLICATION_BUILDER_INFO, (harness) => {
});

const { result } = await harness.executeOnce();
expect(result?.success).toBe(true);
expect(result?.success).toBeTrue();
harness.expectFile('dist/3rdpartylicenses.txt').content.toContain('MIT');
});

Expand All @@ -29,7 +29,7 @@ describeBuilder(buildApplication, APPLICATION_BUILDER_INFO, (harness) => {
});

const { result } = await harness.executeOnce();
expect(result?.success).toBe(true);
expect(result?.success).toBeTrue();
harness.expectFile('dist/3rdpartylicenses.txt').toNotExist();
});

Expand All @@ -39,8 +39,21 @@ describeBuilder(buildApplication, APPLICATION_BUILDER_INFO, (harness) => {
});

const { result } = await harness.executeOnce();
expect(result?.success).toBe(true);
expect(result?.success).toBeTrue();
harness.expectFile('dist/3rdpartylicenses.txt').content.toContain('MIT');
});

it(`should generate '3rdpartylicenses.txt' when 'extractLicenses' and 'localize' are true`, async () => {
harness.useTarget('build', {
...BASE_OPTIONS,
localize: true,
extractLicenses: true,
});

const { result } = await harness.executeOnce();
expect(result?.success).toBeTrue();
harness.expectFile('dist/3rdpartylicenses.txt').content.toContain('MIT');
harness.expectFile('dist/browser/en-US/main.js').toExist();
});
});
});