cargdev/angular
1
0
Fork 0
Code Issues 5 Pull Requests Actions Packages Projects Releases Wiki Activity

fix(ngcc): sniff main property for ESM5 format (#36396)

Browse Source 
Previously, `main` was only checked for `umd` or `commonjs`
formats. Now if there are `import` or `export` statements in the
source file it will be deemed to be in `esm5` format.

Fixes #35788

PR Close #36396
This commit is contained in:
Pete Bacon Darwin
2020-04-02 11:03:11 +01:00
committed by Kara Erickson
parent e2b221b8fa
commit 93cbef26c7
2 changed files with 31 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
packages/compiler-cli/ngcc/src/packages/entry_point.ts
View File

@ -199,7 +199,7 @@ export function getEntryPointFormat(
return undefined;
}
const pathToMain = join(entryPoint.path, mainFile);
return isUmdModule(fs, pathToMain) ? 'umd' : 'commonjs';
return sniffModuleFormat(fs, pathToMain);
case 'module':
return 'esm5';
default:
@ -226,15 +226,25 @@ function loadEntryPointPackage(
}
}
function isUmdModule(fs: FileSystem, sourceFilePath: AbsoluteFsPath): boolean {
function sniffModuleFormat(fs: FileSystem, sourceFilePath: AbsoluteFsPath): EntryPointFormat|
undefined {
const resolvedPath = resolveFileWithPostfixes(fs, sourceFilePath, ['', '.js', '/index.js']);
if (resolvedPath === null) {
return false;
return undefined;
}
const sourceFile =
ts.createSourceFile(sourceFilePath, fs.readFile(resolvedPath), ts.ScriptTarget.ES5);
return sourceFile.statements.length > 0 &&
parseStatementForUmdModule(sourceFile.statements[0]) !== null;
if (sourceFile.statements.length === 0) {
return undefined;
}
if (ts.isExternalModule(sourceFile)) {
return 'esm5';
} else if (parseStatementForUmdModule(sourceFile.statements[0]) !== null) {
return 'umd';
} else {
return 'commonjs';
}
}
function mergeConfigAndPackageJson(