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

refactor(@angular-devkit/build-angular): clean up linker detection code

Browse Source
This commit is contained in:
Alan Agius 2021-03-15 09:12:52 +01:00
parent 9ea34ba202
commit 217a02b879
1 changed files with 6 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,6 +5,7 @@
* Use of this source code is governed by an MIT-style license that can be * Use of this source code is governed by an MIT-style license that can be
* found in the LICENSE file at https://angular.io/license * found in the LICENSE file at https://angular.io/license
*/ */
import { needsLinking } from '@angular/compiler-cli/linker';
import { custom } from 'babel-loader'; import { custom } from 'babel-loader';
import { ScriptTarget } from 'typescript'; import { ScriptTarget } from 'typescript';
import { ApplicationPresetOptions } from './presets/application'; import { ApplicationPresetOptions } from './presets/application';
@ -16,45 +17,17 @@ interface AngularCustomOptions {
i18n: ApplicationPresetOptions['i18n']; i18n: ApplicationPresetOptions['i18n'];
} }
/** function requiresLinking(
* Cached linker check utility function
*
* If undefined, not yet been imported
* If null, attempted import failed and no linker support
* If function, import succeeded and linker supported
*/
let needsLinking: undefined | null | typeof import('@angular/compiler-cli/linker').needsLinking;
async function checkLinking(
path: string, path: string,
source: string, source: string,
): Promise<{ hasLinkerSupport?: boolean; requiresLinking: boolean }> { ): boolean {
// @angular/core and @angular/compiler will cause false positives // @angular/core and @angular/compiler will cause false positives
// Also, TypeScript files do not require linking // Also, TypeScript files do not require linking
if (/[\\\/]@angular[\\\/](?:compiler|core)|\.tsx?$/.test(path)) { if (/[\\\/]@angular[\\\/](?:compiler|core)|\.tsx?$/.test(path)) {
return { requiresLinking: false }; return false;
} }
if (needsLinking !== null) { return needsLinking(path, source);
try {
if (needsLinking === undefined) {
needsLinking = (await import('@angular/compiler-cli/linker')).needsLinking;
}
// If the linker entry point is present then there is linker support
return { hasLinkerSupport: true, requiresLinking: needsLinking(path, source) };
} catch {
needsLinking = null;
}
}
// Fallback for Angular versions less than 11.1.0 with no linker support.
// This information is used to issue errors if a partially compiled library is used when unsupported.
return {
hasLinkerSupport: false,
requiresLinking:
source.includes('ɵɵngDeclareDirective') || source.includes('ɵɵngDeclareComponent'),
};
} }
export default custom<AngularCustomOptions>(() => { export default custom<AngularCustomOptions>(() => {
@ -80,15 +53,7 @@ export default custom<AngularCustomOptions>(() => {
}; };
// Analyze file for linking // Analyze file for linking
const { hasLinkerSupport, requiresLinking } = await checkLinking(this.resourcePath, source); customOptions.shouldLink = await requiresLinking(this.resourcePath, source);
if (requiresLinking && !hasLinkerSupport) {
// Cannot link if there is no linker support
this.emitError(
'File requires the Angular linker. "@angular/compiler-cli" version 11.1.0 or greater is needed.',
);
} else {
customOptions.shouldLink = requiresLinking;
}
shouldProcess ||= customOptions.shouldLink; shouldProcess ||= customOptions.shouldLink;
// Analyze for ES target processing // Analyze for ES target processing