@ngtools/webpack 12.2.0-next.2 → 12.2.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ngtools/webpack",
-  "version": "12.2.0-next.2",
+  "version": "12.2.1",
   "description": "Webpack plugin that AoT compiles your Angular components and modules.",
   "main": "./src/index.js",
   "typings": "src/index.d.ts",
@@ -24,11 +24,9 @@
     "url": "https://github.com/angular/angular-cli/issues"
   },
   "homepage": "https://github.com/angular/angular-cli",
-  "dependencies": {
-    "enhanced-resolve": "5.8.2"
-  },
+  "dependencies": {},
   "peerDependencies": {
-    "@angular/compiler-cli": "^12.0.0 || ^12.1.0-next",
+    "@angular/compiler-cli": "^12.0.0 || ^12.2.0-next",
     "typescript": "~4.2.3 || ~4.3.2",
     "webpack": "^5.30.0"
   },

package/src/ivy/loader.d.ts

@@ -5,8 +5,6 @@
  * 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 { AngularPluginSymbol, FileEmitterCollection } from './symbol';
-export declare function angularWebpackLoader(this: import('webpack').LoaderContext<unknown> & {
-    [AngularPluginSymbol]?: FileEmitterCollection;
-}, content: string, map: string): void;
+import type { LoaderContext } from 'webpack';
+export declare function angularWebpackLoader(this: LoaderContext<unknown>, content: string, map: string): void;
 export { angularWebpackLoader as default };

package/src/ngcc_processor.d.ts

@@ -5,9 +5,10 @@
  * 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 { Resolver } from 'enhanced-resolve';
 import * as ts from 'typescript';
+import type { Compiler } from 'webpack';
 import { InputFileSystem } from './ivy/system';
+declare type ResolverWithOptions = ReturnType<Compiler['resolverFactory']['get']>;
 export declare class NgccProcessor {
     private readonly propertiesToConsider;
     private readonly compilationWarnings;
@@ -19,7 +20,7 @@ export declare class NgccProcessor {
     private _processedModules;
     private _logger;
     private _nodeModulesDirectory;
-    constructor(propertiesToConsider: string[], compilationWarnings: (Error | string)[], compilationErrors: (Error | string)[], basePath: string, tsConfigPath: string, inputFileSystem: InputFileSystem, resolver: Resolver);
+    constructor(propertiesToConsider: string[], compilationWarnings: (Error | string)[], compilationErrors: (Error | string)[], basePath: string, tsConfigPath: string, inputFileSystem: InputFileSystem, resolver: ResolverWithOptions);
     /** Process the entire node modules tree. */
     process(): void;
     /** Process a module and it's depedencies. */
@@ -31,3 +32,4 @@ export declare class NgccProcessor {
     private tryResolvePackage;
     private findNodeModulesDirectory;
 }
+export {};

package/src/paths-plugin.d.ts

@@ -6,11 +6,14 @@
  * found in the LICENSE file at https://angular.io/license
  */
 import { CompilerOptions } from 'typescript';
+import type { Configuration } from 'webpack';
 export interface TypeScriptPathsPluginOptions extends Pick<CompilerOptions, 'paths' | 'baseUrl'> {
 }
+declare type Resolver = Exclude<Exclude<Configuration['resolve'], undefined>['resolver'], undefined>;
 export declare class TypeScriptPathsPlugin {
     private options?;
     constructor(options?: TypeScriptPathsPluginOptions | undefined);
     update(options: TypeScriptPathsPluginOptions): void;
-    apply(resolver: import('enhanced-resolve').Resolver): void;
+    apply(resolver: Resolver): void;
 }
+export {};

package/src/paths-plugin.js

@@ -28,7 +28,6 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TypeScriptPathsPlugin = void 0;
 const path = __importStar(require("path"));
-const getInnerRequest = require('enhanced-resolve/lib/getInnerRequest');
 class TypeScriptPathsPlugin {
     constructor(options) {
         this.options = options;
@@ -36,7 +35,6 @@ class TypeScriptPathsPlugin {
     update(options) {
         this.options = options;
     }
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     apply(resolver) {
         const target = resolver.ensureHook('resolve');
         resolver.getHook('described-resolve').tapAsync('TypeScriptPathsPlugin', 
@@ -50,7 +48,7 @@ class TypeScriptPathsPlugin {
                 callback();
                 return;
             }
-            const originalRequest = getInnerRequest(resolver, request);
+            const originalRequest = request.request || request.path;
             if (!originalRequest) {
                 callback();
                 return;