@ngtools/webpack 13.2.1 → 14.0.0-next.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ngtools/webpack",
-  "version": "13.2.1",
+  "version": "14.0.0-next.1",
   "description": "Webpack plugin that AoT compiles your Angular components and modules.",
   "main": "./src/index.js",
   "typings": "src/index.d.ts",
@@ -26,7 +26,7 @@
   "homepage": "https://github.com/angular/angular-cli",
   "dependencies": {},
   "peerDependencies": {
-    "@angular/compiler-cli": "^13.0.0",
+    "@angular/compiler-cli": "^14.0.0 || ^14.0.0-next",
     "typescript": ">=4.4.3 <4.6",
     "webpack": "^5.30.0"
   },

package/src/index.d.ts

@@ -5,14 +5,4 @@
  * 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
  */
-import * as ivyInternal from './ivy';
 export { AngularWebpackLoaderPath, AngularWebpackPlugin, AngularWebpackPluginOptions, default, } from './ivy';
-/** @deprecated Deprecated as of v12, please use the direct exports
- * (`AngularWebpackPlugin` instead of `ivy.AngularWebpackPlugin`)
- */
-export declare namespace ivy {
-    const AngularWebpackLoaderPath: string;
-    const AngularWebpackPlugin: typeof ivyInternal.AngularWebpackPlugin;
-    type AngularWebpackPlugin = ivyInternal.AngularWebpackPlugin;
-    type AngularPluginOptions = ivyInternal.AngularWebpackPluginOptions;
-}

package/src/index.js

@@ -6,41 +6,12 @@
  * 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
  */
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ivy = exports.default = exports.AngularWebpackPlugin = exports.AngularWebpackLoaderPath = void 0;
-const ivyInternal = __importStar(require("./ivy"));
+exports.default = exports.AngularWebpackPlugin = exports.AngularWebpackLoaderPath = void 0;
 var ivy_1 = require("./ivy");
 Object.defineProperty(exports, "AngularWebpackLoaderPath", { enumerable: true, get: function () { return ivy_1.AngularWebpackLoaderPath; } });
 Object.defineProperty(exports, "AngularWebpackPlugin", { enumerable: true, get: function () { return ivy_1.AngularWebpackPlugin; } });
 Object.defineProperty(exports, "default", { enumerable: true, get: function () { return __importDefault(ivy_1).default; } });
-/** @deprecated Deprecated as of v12, please use the direct exports
- * (`AngularWebpackPlugin` instead of `ivy.AngularWebpackPlugin`)
- */
-// eslint-disable-next-line @typescript-eslint/no-namespace
-var ivy;
-(function (ivy) {
-    ivy.AngularWebpackLoaderPath = ivyInternal.AngularWebpackLoaderPath;
-    ivy.AngularWebpackPlugin = ivyInternal.AngularWebpackPlugin;
-})(ivy = exports.ivy || (exports.ivy = {}));

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 {