Graham/angular-cli
1
0
Fork 0
mirror of https://github.com/angular/angular-cli.git synced 2025-05-22 23:15:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
This is a follow-up to fb210e5b747ce0351dd9ee7d482770b9cfa71133 which
added support for the ESM-variant of the `@angular/localize` package,
and also prepared for the `tools/` secondary entry-point we will expose
as of v13.

Unfortunately this change currently does not pass-through the ESM-loaded
plugin creators as the option (which is passed to the Babel plugin) is
incorrect. This was hidden due to a type cast. This commit fixes the
issue and also ensures TS would complain in the future if the option
names differ.
This commit is contained in:
Paul Gschwendtner 2021-09-30 12:01:27 +02:00 committed by Charles
parent 1a8d0d0af5
commit f383f3201b
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/angular_devkit/build_angular/src/babel/webpack-loader.ts
View File

@ -138,9 +138,9 @@ export default custom<AngularCustomOptions>(() => {
} }
customOptions.i18n = { customOptions.i18n = {
...(i18n as ApplicationPresetOptions['i18n']), ...(i18n as NonNullable<ApplicationPresetOptions['i18n']>),
i18nPluginCreators, pluginCreators: i18nPluginCreators,
} as ApplicationPresetOptions['i18n']; };
shouldProcess = true; shouldProcess = true;
} }

8
packages/angular_devkit/build_angular/src/utils/process-bundle.ts
View File

@ -24,8 +24,6 @@ import { allowMinify, shouldBeautify } from './environment-options';
import { I18nOptions } from './i18n-options'; import { I18nOptions } from './i18n-options';
import { loadEsmModule } from './load-esm'; 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 // Extract Sourcemap input type from the remapping function since it is not currently exported
type SourceMapInput = Exclude<Parameters<typeof remapping>[0], unknown[]>; type SourceMapInput = Exclude<Parameters<typeof remapping>[0], unknown[]>;
@ -386,7 +384,7 @@ function inlineCopyOnly(options: InlineOptions) {
function findLocalizePositions( function findLocalizePositions(
ast: ParseResult, ast: ParseResult,
options: InlineOptions, options: InlineOptions,
utils: LocalizeUtilities, utils: LocalizeUtilityModule,
): LocalizePosition[] { ): LocalizePosition[] {
const positions: LocalizePosition[] = []; const positions: LocalizePosition[] = [];
@ -438,7 +436,7 @@ function findLocalizePositions(
function unwrapTemplateLiteral( function unwrapTemplateLiteral(
path: NodePath<types.TaggedTemplateExpression>, path: NodePath<types.TaggedTemplateExpression>,
utils: LocalizeUtilities, utils: LocalizeUtilityModule,
): [TemplateStringsArray, types.Expression[]] { ): [TemplateStringsArray, types.Expression[]] {
const [messageParts] = utils.unwrapMessagePartsFromTemplateLiteral( const [messageParts] = utils.unwrapMessagePartsFromTemplateLiteral(
path.get('quasi').get('quasis'), path.get('quasi').get('quasis'),
@ -450,7 +448,7 @@ function unwrapTemplateLiteral(
function unwrapLocalizeCall( function unwrapLocalizeCall(
path: NodePath<types.CallExpression>, path: NodePath<types.CallExpression>,
utils: LocalizeUtilities, utils: LocalizeUtilityModule,
): [TemplateStringsArray, types.Expression[]] { ): [TemplateStringsArray, types.Expression[]] {
const [messageParts] = utils.unwrapMessagePartsFromLocalizeCall(path); const [messageParts] = utils.unwrapMessagePartsFromLocalizeCall(path);
const [expressions] = utils.unwrapSubstitutionsFromLocalizeCall(path); const [expressions] = utils.unwrapSubstitutionsFromLocalizeCall(path);