Skip to content

fix(@angular-devkit/build-angular): ESM-interop loaded plugin creators of @angular/localize/tools not respected #21842

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
clydin merged 1 commit into from
Sep 30, 2021
Merged

fix(@angular-devkit/build-angular): ESM-interop loaded plugin creators of @angular/localize/tools not respected #21842

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
6 changes: 3 additions & 3 deletions packages/angular_devkit/build_angular/src/babel/webpack-loader.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,9 +138,9 @@ export default custom<AngularCustomOptions>(() => {
}

customOptions.i18n = {
...(i18n as ApplicationPresetOptions['i18n']),
i18nPluginCreators,
} as ApplicationPresetOptions['i18n'];
...(i18n as NonNullable<ApplicationPresetOptions['i18n']>),
pluginCreators: i18nPluginCreators,
};
shouldProcess = true;
}

Expand Down
8 changes: 3 additions & 5 deletions packages/angular_devkit/build_angular/src/utils/process-bundle.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@ import { allowMinify, shouldBeautify } from './environment-options';
import { I18nOptions } from './i18n-options';
import { loadEsmModule } from './load-esm';

type LocalizeUtilities = typeof import('@angular/localize/src/tools/src/source_file_utils');

// Extract Sourcemap input type from the remapping function since it is not currently exported
type SourceMapInput = Exclude<Parameters<typeof remapping>[0], unknown[]>;

Expand Down Expand Up @@ -386,7 +384,7 @@ function inlineCopyOnly(options: InlineOptions) {
function findLocalizePositions(
ast: ParseResult,
options: InlineOptions,
utils: LocalizeUtilities,
utils: LocalizeUtilityModule,
): LocalizePosition[] {
const positions: LocalizePosition[] = [];

Expand Down Expand Up @@ -438,7 +436,7 @@ function findLocalizePositions(

function unwrapTemplateLiteral(
path: NodePath<types.TaggedTemplateExpression>,
utils: LocalizeUtilities,
utils: LocalizeUtilityModule,
): [TemplateStringsArray, types.Expression[]] {
const [messageParts] = utils.unwrapMessagePartsFromTemplateLiteral(
path.get('quasi').get('quasis'),
Expand All @@ -450,7 +448,7 @@ function unwrapTemplateLiteral(

function unwrapLocalizeCall(
path: NodePath<types.CallExpression>,
utils: LocalizeUtilities,
utils: LocalizeUtilityModule,
): [TemplateStringsArray, types.Expression[]] {
const [messageParts] = utils.unwrapMessagePartsFromLocalizeCall(path);
const [expressions] = utils.unwrapSubstitutionsFromLocalizeCall(path);
Expand Down