@ngtools/webpack 12.2.0-next.0 → 12.2.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ngtools/webpack",
-  "version": "12.2.0-next.0",
+  "version": "12.2.0",
   "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/diagnostics.d.ts

@@ -6,6 +6,8 @@
  * found in the LICENSE file at https://angular.io/license
  */
 import { Diagnostics } from '@angular/compiler-cli';
-import { Compilation } from 'webpack';
+import type { Compilation } from 'webpack';
 export declare type DiagnosticsReporter = (diagnostics: Diagnostics) => void;
 export declare function createDiagnosticsReporter(compilation: Compilation): DiagnosticsReporter;
+export declare function addWarning(compilation: Compilation, message: string): void;
+export declare function addError(compilation: Compilation, message: string): void;

package/src/ivy/diagnostics.js

@@ -7,21 +7,28 @@
  * found in the LICENSE file at https://angular.io/license
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createDiagnosticsReporter = void 0;
+exports.addError = exports.addWarning = exports.createDiagnosticsReporter = void 0;
 const compiler_cli_1 = require("@angular/compiler-cli");
 const typescript_1 = require("typescript");
-const webpack_diagnostics_1 = require("../webpack-diagnostics");
 function createDiagnosticsReporter(compilation) {
     return (diagnostics) => {
         for (const diagnostic of diagnostics) {
             const text = compiler_cli_1.formatDiagnostics([diagnostic]);
             if (diagnostic.category === typescript_1.DiagnosticCategory.Error) {
-                webpack_diagnostics_1.addError(compilation, text);
+                addError(compilation, text);
             }
             else {
-                webpack_diagnostics_1.addWarning(compilation, text);
+                addWarning(compilation, text);
             }
         }
     };
 }
 exports.createDiagnosticsReporter = createDiagnosticsReporter;
+function addWarning(compilation, message) {
+    compilation.warnings.push(new compilation.compiler.webpack.WebpackError(message));
+}
+exports.addWarning = addWarning;
+function addError(compilation, message) {
+    compilation.errors.push(new compilation.compiler.webpack.WebpackError(message));
+}
+exports.addError = addError;

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/ivy/plugin.js

@@ -34,7 +34,6 @@ const ts = __importStar(require("typescript"));
 const ngcc_processor_1 = require("../ngcc_processor");
 const paths_plugin_1 = require("../paths-plugin");
 const resource_loader_1 = require("../resource_loader");
-const webpack_diagnostics_1 = require("../webpack-diagnostics");
 const cache_1 = require("./cache");
 const diagnostics_1 = require("./diagnostics");
 const host_1 = require("./host");
@@ -128,8 +127,8 @@ class AngularWebpackPlugin {
             if (!ngccProcessor) {
                 const { processor, errors, warnings } = initializeNgccProcessor(compiler, this.pluginOptions.tsconfig);
                 processor.process();
-                warnings.forEach((warning) => webpack_diagnostics_1.addWarning(compilation, warning));
-                errors.forEach((error) => webpack_diagnostics_1.addError(compilation, error));
+                warnings.forEach((warning) => diagnostics_1.addWarning(compilation, warning));
+                errors.forEach((error) => diagnostics_1.addError(compilation, error));
                 ngccProcessor = processor;
             }
             // Setup and read TypeScript and Angular compiler configuration
@@ -220,7 +219,7 @@ class AngularWebpackPlugin {
                     if (previousUnused && previousUnused.has(unused)) {
                         continue;
                     }
-                    webpack_diagnostics_1.addWarning(compilation, `${unused} is part of the TypeScript compilation but it's unused.\n` +
+                    diagnostics_1.addWarning(compilation, `${unused} is part of the TypeScript compilation but it's unused.\n` +
                         `Add only entry points to the 'files' or 'include' properties in your tsconfig.`);
                 }
                 previousUnused = currentUnused;
@@ -362,17 +361,17 @@ class AngularWebpackPlugin {
                 affectedFiles.add(result.affected);
             }
         }
-        // Collect non-semantic diagnostics
+        // Collect program level diagnostics
         const diagnostics = [
             ...angularCompiler.getOptionDiagnostics(),
             ...builder.getOptionsDiagnostics(),
             ...builder.getGlobalDiagnostics(),
-            ...builder.getSyntacticDiagnostics(),
         ];
         diagnosticsReporter(diagnostics);
-        // Collect semantic diagnostics
+        // Collect source file specific diagnostics
         for (const sourceFile of builder.getSourceFiles()) {
             if (!ignoreForDiagnostics.has(sourceFile)) {
+                diagnosticsReporter(builder.getSyntacticDiagnostics(sourceFile));
                 diagnosticsReporter(builder.getSemanticDiagnostics(sourceFile));
             }
         }

package/src/loaders/direct-resource.d.ts

@@ -0,0 +1,9 @@
+/**
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * 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
+ */
+export declare const DirectAngularResourceLoaderPath: string;
+export default function (content: string): string;

package/src/loaders/direct-resource.js

@@ -0,0 +1,15 @@
+"use strict";
+/**
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * 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
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DirectAngularResourceLoaderPath = void 0;
+exports.DirectAngularResourceLoaderPath = __filename;
+function default_1(content) {
+    return `export default ${JSON.stringify(content)};`;
+}
+exports.default = default_1;

package/src/{inline-data-loader.d.ts → loaders/inline-resource.d.ts}

@@ -6,6 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 import type { Compilation, LoaderContext } from 'webpack';
+export declare const InlineAngularResourceLoaderPath: string;
 export declare const InlineAngularResourceSymbol: unique symbol;
 export interface CompilationWithInlineAngularResource extends Compilation {
     [InlineAngularResourceSymbol]: string;

package/src/{inline-data-loader.js → loaders/inline-resource.js}

@@ -7,7 +7,8 @@
  * found in the LICENSE file at https://angular.io/license
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.InlineAngularResourceSymbol = void 0;
+exports.InlineAngularResourceSymbol = exports.InlineAngularResourceLoaderPath = void 0;
+exports.InlineAngularResourceLoaderPath = __filename;
 exports.InlineAngularResourceSymbol = Symbol('@ngtools/webpack[angular-resource]');
 function default_1() {
     const callback = this.async();

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;

package/src/resource_loader.js

@@ -30,15 +30,15 @@ exports.WebpackResourceLoader = void 0;
 const crypto_1 = require("crypto");
 const path = __importStar(require("path"));
 const vm = __importStar(require("vm"));
-const inline_data_loader_1 = require("./inline-data-loader");
 const paths_1 = require("./ivy/paths");
+const inline_resource_1 = require("./loaders/inline-resource");
 class WebpackResourceLoader {
     constructor(shouldCache) {
         this._fileDependencies = new Map();
         this._reverseDependencies = new Map();
         this.modifiedResources = new Set();
         this.outputPathCounter = 1;
-        this.inlineDataLoaderPath = require.resolve('./inline-data-loader');
+        this.inlineDataLoaderPath = inline_resource_1.InlineAngularResourceLoaderPath;
         if (shouldCache) {
             this.fileCache = new Map();
             this.assetCache = new Map();
@@ -141,7 +141,7 @@ class WebpackResourceLoader {
                 NormalModule.getCompilationHooks(compilation)
                     .readResourceForScheme.for('angular-resource')
                     .tap('angular-compiler', () => data);
-                compilation[inline_data_loader_1.InlineAngularResourceSymbol] = data;
+                compilation[inline_resource_1.InlineAngularResourceSymbol] = data;
             }
             compilation.hooks.additionalAssets.tap('angular-compiler', () => {
                 const asset = compilation.assets[outputFilePath];
@@ -161,12 +161,10 @@ class WebpackResourceLoader {
             });
         });
         let finalContent;
-        let finalMap;
         childCompiler.hooks.compilation.tap('angular-compiler', (childCompilation) => {
             childCompilation.hooks.processAssets.tap({ name: 'angular-compiler', stage: webpack.Compilation.PROCESS_ASSETS_STAGE_REPORT }, () => {
-                var _a, _b;
+                var _a;
                 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();
                 delete childCompilation.assets[outputFilePath];
                 delete childCompilation.assets[outputFilePath + '.map'];
             });
@@ -188,13 +186,38 @@ class WebpackResourceLoader {
                 const parent = childCompiler.parentCompilation;
                 if (parent) {
                     parent.children = parent.children.filter((child) => child !== childCompilation);
-                    for (const fileDependency of childCompilation.fileDependencies) {
-                        if (data && containingFile && fileDependency.endsWith(entry)) {
+                    let fileDependencies;
+                    for (const dependency of childCompilation.fileDependencies) {
+                        // Skip paths that do not appear to be files (have no extension).
+                        // `fileDependencies` can contain directories and not just files which can
+                        // cause incorrect cache invalidation on rebuilds.
+                        if (!path.extname(dependency)) {
+                            continue;
+                        }
+                        if (data && containingFile && dependency.endsWith(entry)) {
                             // use containing file if the resource was inline
                             parent.fileDependencies.add(containingFile);
                         }
                         else {
-                            parent.fileDependencies.add(fileDependency);
+                            parent.fileDependencies.add(dependency);
+                        }
+                        // Save the dependencies for this resource.
+                        if (filePath) {
+                            const resolvedFile = paths_1.normalizePath(dependency);
+                            const entry = this._reverseDependencies.get(resolvedFile);
+                            if (entry) {
+                                entry.add(filePath);
+                            }
+                            else {
+                                this._reverseDependencies.set(resolvedFile, new Set([filePath]));
+                            }
+                            if (fileDependencies) {
+                                fileDependencies.add(dependency);
+                            }
+                            else {
+                                fileDependencies = new Set([dependency]);
+                                this._fileDependencies.set(filePath, fileDependencies);
+                            }
                         }
                     }
                     parent.contextDependencies.addAll(childCompilation.contextDependencies);
@@ -202,30 +225,12 @@ class WebpackResourceLoader {
                     parent.buildDependencies.addAll(childCompilation.buildDependencies);
                     parent.warnings.push(...childCompilation.warnings);
                     parent.errors.push(...childCompilation.errors);
-                    for (const { info, name, source } of childCompilation.getAssets()) {
-                        if (info.sourceFilename === undefined) {
-                            throw new Error(`'${name}' asset info 'sourceFilename' is 'undefined'.`);
-                        }
-                        (_a = this.assetCache) === null || _a === void 0 ? void 0 : _a.set(info.sourceFilename, { info, name, source });
-                    }
-                }
-                // Save the dependencies for this resource.
-                if (filePath) {
-                    this._fileDependencies.set(filePath, new Set(childCompilation.fileDependencies));
-                    for (const file of childCompilation.fileDependencies) {
-                        const resolvedFile = paths_1.normalizePath(file);
-                        // Skip paths that do not appear to be files (have no extension).
-                        // `fileDependencies` can contain directories and not just files which can
-                        // cause incorrect cache invalidation on rebuilds.
-                        if (!path.extname(resolvedFile)) {
-                            continue;
-                        }
-                        const entry = this._reverseDependencies.get(resolvedFile);
-                        if (entry) {
-                            entry.add(filePath);
-                        }
-                        else {
-                            this._reverseDependencies.set(resolvedFile, new Set([filePath]));
+                    if (this.assetCache) {
+                        for (const { info, name, source } of childCompilation.getAssets()) {
+                            // Use the originating file as the cache key if present
+                            // Otherwise, generate a cache key based on the generated name
+                            const cacheKey = (_a = info.sourceFilename) !== null && _a !== void 0 ? _a : `!![GENERATED]:${name}`;
+                            this.assetCache.set(cacheKey, { info, name, source });
                         }
                     }
                 }

package/src/transformers/replace_resources.js

@@ -28,7 +28,8 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getResourceUrl = exports.replaceResources = void 0;
 const ts = __importStar(require("typescript"));
-const inlineDataLoaderPath = require.resolve('../inline-data-loader');
+const direct_resource_1 = require("../loaders/direct-resource");
+const inline_resource_1 = require("../loaders/inline-resource");
 function replaceResources(shouldTransform, getTypeChecker, directTemplateLoading = false, inlineStyleMimeType, inlineStyleFileExtension) {
     if (inlineStyleMimeType && !/^text\/[-.\w]+$/.test(inlineStyleMimeType)) {
         throw new Error('Invalid inline style MIME type.');
@@ -99,7 +100,7 @@ function visitComponentMetadata(nodeFactory, node, styleReplacements, directTemp
         case 'moduleId':
             return undefined;
         case 'templateUrl':
-            const url = getResourceUrl(node.initializer, directTemplateLoading ? '!raw-loader!' : '');
+            const url = getResourceUrl(node.initializer, directTemplateLoading ? `!${direct_resource_1.DirectAngularResourceLoaderPath}!` : '');
             if (!url) {
                 return node;
             }
@@ -127,7 +128,7 @@ function visitComponentMetadata(nodeFactory, node, styleReplacements, directTemp
                     else if (inlineStyleFileExtension) {
                         const data = Buffer.from(node.text).toString('base64');
                         const containingFile = node.getSourceFile().fileName;
-                        url = `${containingFile}.${inlineStyleFileExtension}!=!${inlineDataLoaderPath}?data=${data}!${containingFile}`;
+                        url = `${containingFile}.${inlineStyleFileExtension}!=!${inline_resource_1.InlineAngularResourceLoaderPath}?data=${encodeURIComponent(data)}!${containingFile}`;
                     }
                     else {
                         return nodeFactory.createStringLiteral(node.text);

package/src/webpack-diagnostics.d.ts

@@ -1,10 +0,0 @@
-/**
- * @license
- * Copyright Google LLC All Rights Reserved.
- *
- * 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 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

@@ -1,18 +0,0 @@
-"use strict";
-/**
- * @license
- * Copyright Google LLC All Rights Reserved.
- *
- * 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
- */
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.addError = exports.addWarning = void 0;
-function addWarning(compilation, message) {
-    compilation.warnings.push(new compilation.compiler.webpack.WebpackError(message));
-}
-exports.addWarning = addWarning;
-function addError(compilation, message) {
-    compilation.errors.push(new compilation.compiler.webpack.WebpackError(message));
-}
-exports.addError = addError;