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

fix(@ngtools/webpack): support locating PNPM lock file during NGCC processing

Browse Source 
Previously, we only handled Yarn and NPM lock files even though PNPM is supported as package manager.

The lock file is used to perform checks to determine if an initial execution of NGCC was already performed.

Closes #22632
This commit is contained in:
Alan Agius 2022-02-02 14:21:50 +01:00 committed by Filipe Silva
parent 7c92becb19
commit 966dd01eab
1 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
packages/ngtools/webpack/src/ngcc_processor.ts
View File

@ -73,15 +73,6 @@ export class NgccProcessor {
const runHashBasePath = path.join(this._nodeModulesDirectory, '.cli-ngcc');
const projectBasePath = path.join(this._nodeModulesDirectory, '..');
try {
let lockData;
let lockFile = 'yarn.lock';
try {
lockData = readFileSync(path.join(projectBasePath, lockFile));
} catch {
lockFile = 'package-lock.json';
lockData = readFileSync(path.join(projectBasePath, lockFile));
}
let ngccConfigData;
try {
ngccConfigData = readFileSync(path.join(projectBasePath, 'ngcc.config.js'));
@ -91,11 +82,12 @@ export class NgccProcessor {
const relativeTsconfigPath = path.relative(projectBasePath, this.tsConfigPath);
const tsconfigData = readFileSync(this.tsConfigPath);
const { lockFileData, lockFilePath } = this.findPackageManagerLockFile(projectBasePath);
// Generate a hash that represents the state of the package lock file and used tsconfig
const runHash = createHash('sha256')
.update(lockData)
.update(lockFile)
.update(lockFileData)
.update(lockFilePath)
.update(ngccConfigData)
.update(tsconfigData)
.update(relativeTsconfigPath)
@ -248,6 +240,24 @@ export class NgccProcessor {
throw new Error(`Cannot locate the 'node_modules' directory.`);
}
private findPackageManagerLockFile(projectBasePath: string): {
lockFilePath: string;
lockFileData: Buffer;
} {
for (const lockFile of ['yarn.lock', 'pnpm-lock.yaml', 'package-lock.json']) {
const lockFilePath = path.join(projectBasePath, lockFile);
try {
return {
lockFilePath,
lockFileData: readFileSync(lockFilePath),
};
} catch {}
}
throw new Error('Cannot locate a package manager lock file.');
}
}
class NgccLogger implements Logger {