@ngtools/webpack 12.0.3 → 12.0.4

package/package.json

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

package/src/ivy/plugin.d.ts

@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 import { CompilerOptions } from '@angular/compiler-cli';
-import { Compiler } from 'webpack';
+import type { Compiler } from 'webpack';
 export interface AngularWebpackPluginOptions {
     tsconfig: string;
     compilerOptions?: CompilerOptions;

package/src/ivy/plugin.js

@@ -12,7 +12,6 @@ const compiler_cli_1 = require("@angular/compiler-cli");
 const program_1 = require("@angular/compiler-cli/src/ngtsc/program");
 const crypto_1 = require("crypto");
 const ts = require("typescript");
-const webpack_1 = require("webpack");
 const ngcc_processor_1 = require("../ngcc_processor");
 const paths_plugin_1 = require("../paths-plugin");
 const resource_loader_1 = require("../resource_loader");
@@ -64,9 +63,10 @@ class AngularWebpackPlugin {
         return this.pluginOptions;
     }
     apply(compiler) {
+        const { NormalModuleReplacementPlugin, util } = compiler.webpack;
         // Setup file replacements with webpack
         for (const [key, value] of Object.entries(this.pluginOptions.fileReplacements)) {
-            new webpack_1.NormalModuleReplacementPlugin(new RegExp('^' + key.replace(/[.*+\-?^${}()|[\]\\]/g, '\\$&') + '$'), value).apply(compiler);
+            new NormalModuleReplacementPlugin(new RegExp('^' + key.replace(/[.*+\-?^${}()|[\]\\]/g, '\\$&') + '$'), value).apply(compiler);
         }
         // Set resolver options
         const pathsPlugin = new paths_plugin_1.TypeScriptPathsPlugin();
@@ -84,7 +84,7 @@ class AngularWebpackPlugin {
                 (_b = resolveOptions.plugins) !== null && _b !== void 0 ? _b : (resolveOptions.plugins = []);
                 resolveOptions.plugins.push(pathsPlugin);
                 // https://github.com/webpack/webpack/issues/11635#issuecomment-707016779
-                return webpack_1.util.cleverMerge(resolveOptions, { mainFields: [...ivyMainFields, '...'] });
+                return util.cleverMerge(resolveOptions, { mainFields: [...ivyMainFields, '...'] });
             });
         });
         let ngccProcessor;

package/src/resource_loader.d.ts

@@ -5,7 +5,7 @@
  * 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 { Compilation } from 'webpack';
+import type { Compilation } from 'webpack';
 export declare class WebpackResourceLoader {
     private _parentCompilation?;
     private _fileDependencies;

package/src/resource_loader.js

@@ -11,7 +11,6 @@ exports.WebpackResourceLoader = void 0;
 const crypto_1 = require("crypto");
 const path = require("path");
 const vm = require("vm");
-const webpack_1 = require("webpack");
 const paths_1 = require("./ivy/paths");
 class WebpackResourceLoader {
     constructor(shouldCache) {
@@ -93,12 +92,13 @@ class WebpackResourceLoader {
                 name: 'resource',
             },
         };
-        const context = this._parentCompilation.compiler.context;
+        const { context, webpack } = this._parentCompilation.compiler;
+        const { EntryPlugin, NormalModule, library, node, sources } = webpack;
         const childCompiler = this._parentCompilation.createChildCompiler('angular-compiler:resource', outputOptions, [
-            new webpack_1.node.NodeTemplatePlugin(outputOptions),
-            new webpack_1.node.NodeTargetPlugin(),
-            new webpack_1.EntryPlugin(context, entry, { name: 'resource' }),
-            new webpack_1.library.EnableLibraryPlugin('var'),
+            new node.NodeTemplatePlugin(outputOptions),
+            new node.NodeTargetPlugin(),
+            new EntryPlugin(context, entry, { name: 'resource' }),
+            new library.EnableLibraryPlugin('var'),
         ]);
         childCompiler.hooks.thisCompilation.tap('angular-compiler', (compilation, { normalModuleFactory }) => {
             // If no data is provided, the resource will be read from the filesystem
@@ -115,7 +115,7 @@ class WebpackResourceLoader {
                     }
                     return true;
                 });
-                webpack_1.NormalModule.getCompilationHooks(compilation)
+                NormalModule.getCompilationHooks(compilation)
                     .readResourceForScheme.for('angular-resource')
                     .tap('angular-compiler', () => data);
             }
@@ -127,7 +127,7 @@ class WebpackResourceLoader {
                 try {
                     const output = this._evaluate(outputFilePath, asset.source().toString());
                     if (typeof output === 'string') {
-                        compilation.assets[outputFilePath] = new webpack_1.sources.RawSource(output);
+                        compilation.assets[outputFilePath] = new sources.RawSource(output);
                     }
                 }
                 catch (error) {
@@ -139,7 +139,7 @@ class WebpackResourceLoader {
         let finalContent;
         let finalMap;
         childCompiler.hooks.compilation.tap('angular-compiler', (childCompilation) => {
-            childCompilation.hooks.processAssets.tap({ name: 'angular-compiler', stage: webpack_1.Compilation.PROCESS_ASSETS_STAGE_REPORT }, () => {
+            childCompilation.hooks.processAssets.tap({ name: 'angular-compiler', stage: webpack.Compilation.PROCESS_ASSETS_STAGE_REPORT }, () => {
                 var _a, _b;
                 finalContent = (_a = childCompilation.assets[outputFilePath]) === null || _a === void 0 ? void 0 : _a.source().toString();
                 finalMap = (_b = childCompilation.assets[outputFilePath + '.map']) === null || _b === void 0 ? void 0 : _b.source().toString();

package/src/webpack-diagnostics.d.ts

@@ -5,6 +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 { Compilation } from 'webpack';
+import type { Compilation } from 'webpack';
 export declare function addWarning(compilation: Compilation, message: string): void;
 export declare function addError(compilation: Compilation, message: string): void;

package/src/webpack-diagnostics.js

@@ -8,12 +8,11 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addError = exports.addWarning = void 0;
-const webpack_1 = require("webpack");
 function addWarning(compilation, message) {
-    compilation.warnings.push(new webpack_1.WebpackError(message));
+    compilation.warnings.push(new compilation.compiler.webpack.WebpackError(message));
 }
 exports.addWarning = addWarning;
 function addError(compilation, message) {
-    compilation.errors.push(new webpack_1.WebpackError(message));
+    compilation.errors.push(new compilation.compiler.webpack.WebpackError(message));
 }
 exports.addError = addError;