@ngtools/webpack 11.2.0-rc.0 → 11.2.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ngtools/webpack",
-  "version": "11.2.0-rc.0",
+  "version": "11.2.2",
   "description": "Webpack plugin that AoT compiles your Angular components and modules.",
   "main": "./src/index.js",
   "typings": "src/index.d.ts",
@@ -25,7 +25,7 @@
   },
   "homepage": "https://github.com/angular/angular-cli",
   "dependencies": {
-    "@angular-devkit/core": "11.2.0-rc.0",
+    "@angular-devkit/core": "11.2.2",
     "enhanced-resolve": "5.7.0",
     "webpack-sources": "2.2.0"
   },
@@ -36,7 +36,7 @@
   },
   "engines": {
     "node": ">= 10.13.0",
-    "npm": "^6.11.0",
+    "npm": "^6.11.0 || ^7.5.6",
     "yarn": ">= 1.13.0"
   }
 }

package/src/ivy/plugin.d.ts

@@ -27,11 +27,14 @@ export declare class AngularWebpackPlugin {
     private buildTimestamp;
     private readonly lazyRouteMap;
     private readonly requiredFilesToEmit;
+    private readonly requiredFilesToEmitCache;
+    private readonly fileEmitHistory;
     constructor(options?: Partial<AngularPluginOptions>);
     get options(): AngularPluginOptions;
     apply(compiler: Compiler & {
         watchMode?: boolean;
     }): void;
+    private rebuildRequiredFiles;
     private loadConfiguration;
     private updateAotProgram;
     private updateJitProgram;

package/src/ivy/plugin.js

@@ -10,6 +10,7 @@ exports.AngularWebpackPlugin = void 0;
  */
 const compiler_cli_1 = require("@angular/compiler-cli");
 const program_1 = require("@angular/compiler-cli/src/ngtsc/program");
+const crypto_1 = require("crypto");
 const path = require("path");
 const ts = require("typescript");
 const webpack_1 = require("webpack");
@@ -34,11 +35,16 @@ function initializeNgccProcessor(compiler, tsconfig) {
     const processor = new ngcc_processor_1.NgccProcessor(mainFields, warnings, errors, compiler.context, tsconfig, inputFileSystem, (_b = webpackOptions.resolve) === null || _b === void 0 ? void 0 : _b.symlinks);
     return { processor, errors, warnings };
 }
+function hashContent(content) {
+    return crypto_1.createHash('md5').update(content).digest();
+}
 const PLUGIN_NAME = 'angular-compiler';
 class AngularWebpackPlugin {
     constructor(options = {}) {
         this.lazyRouteMap = {};
         this.requiredFilesToEmit = new Set();
+        this.requiredFilesToEmitCache = new Map();
+        this.fileEmitHistory = new Map();
         this.pluginOptions = {
             emitClassMetadata: false,
             emitNgModuleScope: false,
@@ -152,19 +158,7 @@ class AngularWebpackPlugin {
             }
             compilation.hooks.finishModules.tapPromise(PLUGIN_NAME, async (modules) => {
                 // Rebuild any remaining AOT required modules
-                const rebuild = (filename) => new Promise((resolve) => {
-                    const module = modules.find(({ resource }) => resource && paths_1.normalizePath(resource) === filename);
-                    if (!module) {
-                        resolve();
-                    }
-                    else {
-                        compilation.rebuildModule(module, resolve);
-                    }
-                });
-                for (const requiredFile of this.requiredFilesToEmit) {
-                    await rebuild(requiredFile);
-                }
-                this.requiredFilesToEmit.clear();
+                await this.rebuildRequiredFiles(modules, compilation, fileEmitter);
                 // Analyze program for unused files
                 if (compilation.errors.length > 0) {
                     return;
@@ -192,6 +186,41 @@ class AngularWebpackPlugin {
             compilation[symbol_1.AngularPluginSymbol] = fileEmitter;
         });
     }
+    async rebuildRequiredFiles(modules, compilation, fileEmitter) {
+        if (this.requiredFilesToEmit.size === 0) {
+            return;
+        }
+        const rebuild = (webpackModule) => new Promise((resolve) => compilation.rebuildModule(webpackModule, resolve));
+        const filesToRebuild = new Set();
+        for (const requiredFile of this.requiredFilesToEmit) {
+            const history = this.fileEmitHistory.get(requiredFile);
+            if (history) {
+                const emitResult = await fileEmitter(requiredFile);
+                if ((emitResult === null || emitResult === void 0 ? void 0 : emitResult.content) === undefined ||
+                    history.length !== emitResult.content.length ||
+                    emitResult.hash === undefined ||
+                    Buffer.compare(history.hash, emitResult.hash) !== 0) {
+                    // New emit result is different so rebuild using new emit result
+                    this.requiredFilesToEmitCache.set(requiredFile, emitResult);
+                    filesToRebuild.add(requiredFile);
+                }
+            }
+            else {
+                // No emit history so rebuild
+                filesToRebuild.add(requiredFile);
+            }
+        }
+        if (filesToRebuild.size > 0) {
+            for (const webpackModule of [...modules]) {
+                const resource = webpackModule.resource;
+                if (resource && filesToRebuild.has(paths_1.normalizePath(resource))) {
+                    await rebuild(webpackModule);
+                }
+            }
+        }
+        this.requiredFilesToEmit.clear();
+        this.requiredFilesToEmitCache.clear();
+    }
     loadConfiguration(compilation) {
         const { options: compilerOptions, rootNames, errors } = compiler_cli_1.readConfiguration(this.pluginOptions.tsconfig, this.pluginOptions.compilerOptions);
         compilerOptions.enableIvy = true;
@@ -290,7 +319,7 @@ class AngularWebpackPlugin {
                 if (!sourceFile.isDeclarationFile &&
                     !ignoreForEmit.has(sourceFile) &&
                     !angularCompiler.incrementalDriver.safeToSkipEmit(sourceFile)) {
-                    this.requiredFilesToEmit.add(sourceFile.fileName);
+                    this.requiredFilesToEmit.add(paths_1.normalizePath(sourceFile.fileName));
                 }
             }
             // NOTE: This can be removed once support for the deprecated lazy route string format is removed
@@ -299,7 +328,7 @@ class AngularWebpackPlugin {
                 this.lazyRouteMap[routeKey] = lazyRoute.referencedModule.filePath;
             }
             return this.createFileEmitter(builder, transformation_1.mergeTransformers(angularCompiler.prepareEmit().transformers, transformers), getDependencies, (sourceFile) => {
-                this.requiredFilesToEmit.delete(sourceFile.fileName);
+                this.requiredFilesToEmit.delete(paths_1.normalizePath(sourceFile.fileName));
                 angularCompiler.incrementalDriver.recordSuccessfulEmit(sourceFile);
             });
         });
@@ -355,12 +384,16 @@ class AngularWebpackPlugin {
     }
     createFileEmitter(program, transformers = {}, getExtraDependencies, onAfterEmit) {
         return async (file) => {
-            const sourceFile = program.getSourceFile(file);
+            const filePath = paths_1.normalizePath(file);
+            if (this.requiredFilesToEmitCache.has(filePath)) {
+                return this.requiredFilesToEmitCache.get(filePath);
+            }
+            const sourceFile = program.getSourceFile(filePath);
             if (!sourceFile) {
                 return undefined;
             }
-            let content = undefined;
-            let map = undefined;
+            let content;
+            let map;
             program.emit(sourceFile, (filename, data) => {
                 if (filename.endsWith('.map')) {
                     map = data;
@@ -370,11 +403,17 @@ class AngularWebpackPlugin {
                 }
             }, undefined, undefined, transformers);
             onAfterEmit === null || onAfterEmit === void 0 ? void 0 : onAfterEmit(sourceFile);
+            let hash;
+            if (content !== undefined && this.watchMode) {
+                // Capture emit history info for Angular rebuild analysis
+                hash = hashContent(content);
+                this.fileEmitHistory.set(filePath, { length: content.length, hash });
+            }
             const dependencies = [
                 ...program.getAllDependencies(sourceFile),
                 ...getExtraDependencies(sourceFile),
             ].map(paths_1.externalizePath);
-            return { content, map, dependencies };
+            return { content, map, dependencies, hash };
         };
     }
 }

package/src/ivy/symbol.d.ts

@@ -10,5 +10,6 @@ export interface EmitFileResult {
     content?: string;
     map?: string;
     dependencies: readonly string[];
+    hash?: Uint8Array;
 }
 export declare type FileEmitter = (file: string) => Promise<EmitFileResult | undefined>;