@ngtools/webpack 13.2.2 → 13.2.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ngtools/webpack",
-  "version": "13.2.2",
+  "version": "13.2.5",
   "description": "Webpack plugin that AoT compiles your Angular components and modules.",
   "main": "./src/index.js",
   "typings": "src/index.d.ts",

package/src/ngcc_processor.d.ts

@@ -32,5 +32,6 @@ export declare class NgccProcessor {
      */
     private tryResolvePackage;
     private findNodeModulesDirectory;
+    private findPackageManagerLockFile;
 }
 export {};

package/src/ngcc_processor.js

@@ -72,15 +72,6 @@ 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 = (0, fs_1.readFileSync)(path.join(projectBasePath, lockFile));
-            }
-            catch {
-                lockFile = 'package-lock.json';
-                lockData = (0, fs_1.readFileSync)(path.join(projectBasePath, lockFile));
-            }
             let ngccConfigData;
             try {
                 ngccConfigData = (0, fs_1.readFileSync)(path.join(projectBasePath, 'ngcc.config.js'));
@@ -90,10 +81,11 @@ class NgccProcessor {
             }
             const relativeTsconfigPath = path.relative(projectBasePath, this.tsConfigPath);
             const tsconfigData = (0, fs_1.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 = (0, crypto_1.createHash)('sha256')
-                .update(lockData)
-                .update(lockFile)
+                .update(lockFileData)
+                .update(lockFilePath)
                 .update(ngccConfigData)
                 .update(tsconfigData)
                 .update(relativeTsconfigPath)
@@ -216,6 +208,19 @@ class NgccProcessor {
         }
         throw new Error(`Cannot locate the 'node_modules' directory.`);
     }
+    findPackageManagerLockFile(projectBasePath) {
+        for (const lockFile of ['yarn.lock', 'pnpm-lock.yaml', 'package-lock.json']) {
+            const lockFilePath = path.join(projectBasePath, lockFile);
+            try {
+                return {
+                    lockFilePath,
+                    lockFileData: (0, fs_1.readFileSync)(lockFilePath),
+                };
+            }
+            catch { }
+        }
+        throw new Error('Cannot locate a package manager lock file.');
+    }
 }
 exports.NgccProcessor = NgccProcessor;
 class NgccLogger {