@ngtools/webpack 14.0.3 → 14.0.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ngtools/webpack",
-  "version": "14.0.3",
+  "version": "14.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

@@ -36,6 +36,7 @@ export declare class AngularWebpackPlugin {
     private get compilerCli();
     get options(): AngularWebpackPluginOptions;
     apply(compiler: Compiler): void;
+    private setupCompilation;
     private registerWithCompilation;
     private markResourceUsed;
     private rebuildRequiredFiles;

package/src/ivy/plugin.js

@@ -97,9 +97,8 @@ class AngularWebpackPlugin {
     get options() {
         return this.pluginOptions;
     }
-    // eslint-disable-next-line max-lines-per-function
     apply(compiler) {
-        const { NormalModuleReplacementPlugin, util } = compiler.webpack;
+        const { NormalModuleReplacementPlugin, WebpackError, util } = compiler.webpack;
         this.webpackCreateHash = util.createHash;
         // Setup file replacements with webpack
         for (const [key, value] of Object.entries(this.pluginOptions.fileReplacements)) {
@@ -126,124 +125,132 @@ class AngularWebpackPlugin {
         });
         // Load the compiler-cli if not already available
         compiler.hooks.beforeCompile.tapPromise(PLUGIN_NAME, () => this.initializeCompilerCli());
-        let ngccProcessor;
-        let resourceLoader;
-        let previousUnused;
+        const compilationState = { pathsPlugin };
         compiler.hooks.thisCompilation.tap(PLUGIN_NAME, (compilation) => {
-            // Register plugin to ensure deterministic emit order in multi-plugin usage
-            const emitRegistration = this.registerWithCompilation(compilation);
-            this.watchMode = compiler.watchMode;
-            // Initialize webpack cache
-            if (!this.webpackCache && compilation.options.cache) {
-                this.webpackCache = compilation.getCache(PLUGIN_NAME);
+            try {
+                this.setupCompilation(compilation, compilationState);
             }
-            // Initialize the resource loader if not already setup
-            if (!resourceLoader) {
-                resourceLoader = new resource_loader_1.WebpackResourceLoader(this.watchMode);
+            catch (error) {
+                compilation.errors.push(new WebpackError(`Failed to initialize Angular compilation - ${error instanceof Error ? error.message : error}`));
             }
-            // Initialize and process eager ngcc if not already setup
-            if (!ngccProcessor) {
-                const { processor, errors, warnings } = initializeNgccProcessor(compiler, this.pluginOptions.tsconfig, this.compilerNgccModule);
-                processor.process();
-                warnings.forEach((warning) => (0, diagnostics_1.addWarning)(compilation, warning));
-                errors.forEach((error) => (0, diagnostics_1.addError)(compilation, error));
-                ngccProcessor = processor;
+        });
+    }
+    setupCompilation(compilation, state) {
+        const compiler = compilation.compiler;
+        // Register plugin to ensure deterministic emit order in multi-plugin usage
+        const emitRegistration = this.registerWithCompilation(compilation);
+        this.watchMode = compiler.watchMode;
+        // Initialize webpack cache
+        if (!this.webpackCache && compilation.options.cache) {
+            this.webpackCache = compilation.getCache(PLUGIN_NAME);
+        }
+        // Initialize the resource loader if not already setup
+        if (!state.resourceLoader) {
+            state.resourceLoader = new resource_loader_1.WebpackResourceLoader(this.watchMode);
+        }
+        // Initialize and process eager ngcc if not already setup
+        if (!state.ngccProcessor) {
+            const { processor, errors, warnings } = initializeNgccProcessor(compiler, this.pluginOptions.tsconfig, this.compilerNgccModule);
+            processor.process();
+            warnings.forEach((warning) => (0, diagnostics_1.addWarning)(compilation, warning));
+            errors.forEach((error) => (0, diagnostics_1.addError)(compilation, error));
+            state.ngccProcessor = processor;
+        }
+        // Setup and read TypeScript and Angular compiler configuration
+        const { compilerOptions, rootNames, errors } = this.loadConfiguration();
+        // Create diagnostics reporter and report configuration file errors
+        const diagnosticsReporter = (0, diagnostics_1.createDiagnosticsReporter)(compilation, (diagnostic) => this.compilerCli.formatDiagnostics([diagnostic]));
+        diagnosticsReporter(errors);
+        // Update TypeScript path mapping plugin with new configuration
+        state.pathsPlugin.update(compilerOptions);
+        // Create a Webpack-based TypeScript compiler host
+        const system = (0, system_1.createWebpackSystem)(
+        // Webpack lacks an InputFileSytem type definition with sync functions
+        compiler.inputFileSystem, (0, paths_1.normalizePath)(compiler.context));
+        const host = ts.createIncrementalCompilerHost(compilerOptions, system);
+        // Setup source file caching and reuse cache from previous compilation if present
+        let cache = this.sourceFileCache;
+        let changedFiles;
+        if (cache) {
+            changedFiles = new Set();
+            for (const changedFile of [...compiler.modifiedFiles, ...compiler.removedFiles]) {
+                const normalizedChangedFile = (0, paths_1.normalizePath)(changedFile);
+                // Invalidate file dependencies
+                this.fileDependencies.delete(normalizedChangedFile);
+                // Invalidate existing cache
+                cache.invalidate(normalizedChangedFile);
+                changedFiles.add(normalizedChangedFile);
             }
-            // Setup and read TypeScript and Angular compiler configuration
-            const { compilerOptions, rootNames, errors } = this.loadConfiguration();
-            // Create diagnostics reporter and report configuration file errors
-            const diagnosticsReporter = (0, diagnostics_1.createDiagnosticsReporter)(compilation, (diagnostic) => this.compilerCli.formatDiagnostics([diagnostic]));
-            diagnosticsReporter(errors);
-            // Update TypeScript path mapping plugin with new configuration
-            pathsPlugin.update(compilerOptions);
-            // Create a Webpack-based TypeScript compiler host
-            const system = (0, system_1.createWebpackSystem)(
-            // Webpack lacks an InputFileSytem type definition with sync functions
-            compiler.inputFileSystem, (0, paths_1.normalizePath)(compiler.context));
-            const host = ts.createIncrementalCompilerHost(compilerOptions, system);
-            // Setup source file caching and reuse cache from previous compilation if present
-            let cache = this.sourceFileCache;
-            let changedFiles;
-            if (cache) {
-                changedFiles = new Set();
-                for (const changedFile of [...compiler.modifiedFiles, ...compiler.removedFiles]) {
-                    const normalizedChangedFile = (0, paths_1.normalizePath)(changedFile);
-                    // Invalidate file dependencies
-                    this.fileDependencies.delete(normalizedChangedFile);
-                    // Invalidate existing cache
-                    cache.invalidate(normalizedChangedFile);
-                    changedFiles.add(normalizedChangedFile);
-                }
+        }
+        else {
+            // Initialize a new cache
+            cache = new cache_1.SourceFileCache();
+            // Only store cache if in watch mode
+            if (this.watchMode) {
+                this.sourceFileCache = cache;
             }
-            else {
-                // Initialize a new cache
-                cache = new cache_1.SourceFileCache();
-                // Only store cache if in watch mode
-                if (this.watchMode) {
-                    this.sourceFileCache = cache;
+        }
+        (0, host_1.augmentHostWithCaching)(host, cache);
+        const moduleResolutionCache = ts.createModuleResolutionCache(host.getCurrentDirectory(), host.getCanonicalFileName.bind(host), compilerOptions);
+        // Setup source file dependency collection
+        (0, host_1.augmentHostWithDependencyCollection)(host, this.fileDependencies, moduleResolutionCache);
+        // Setup on demand ngcc
+        (0, host_1.augmentHostWithNgcc)(host, state.ngccProcessor, moduleResolutionCache);
+        // Setup resource loading
+        state.resourceLoader.update(compilation, changedFiles);
+        (0, host_1.augmentHostWithResources)(host, state.resourceLoader, {
+            directTemplateLoading: this.pluginOptions.directTemplateLoading,
+            inlineStyleFileExtension: this.pluginOptions.inlineStyleFileExtension,
+        });
+        // Setup source file adjustment options
+        (0, host_1.augmentHostWithReplacements)(host, this.pluginOptions.fileReplacements, moduleResolutionCache);
+        (0, host_1.augmentHostWithSubstitutions)(host, this.pluginOptions.substitutions);
+        // Create the file emitter used by the webpack loader
+        const { fileEmitter, builder, internalFiles } = this.pluginOptions.jitMode
+            ? this.updateJitProgram(compilerOptions, rootNames, host, diagnosticsReporter)
+            : this.updateAotProgram(compilerOptions, rootNames, host, diagnosticsReporter, state.resourceLoader);
+        // Set of files used during the unused TypeScript file analysis
+        const currentUnused = new Set();
+        for (const sourceFile of builder.getSourceFiles()) {
+            if (internalFiles === null || internalFiles === void 0 ? void 0 : internalFiles.has(sourceFile)) {
+                continue;
+            }
+            // Ensure all program files are considered part of the compilation and will be watched.
+            // Webpack does not normalize paths. Therefore, we need to normalize the path with FS seperators.
+            compilation.fileDependencies.add((0, paths_1.externalizePath)(sourceFile.fileName));
+            // Add all non-declaration files to the initial set of unused files. The set will be
+            // analyzed and pruned after all Webpack modules are finished building.
+            if (!sourceFile.isDeclarationFile) {
+                currentUnused.add((0, paths_1.normalizePath)(sourceFile.fileName));
+            }
+        }
+        compilation.hooks.finishModules.tapPromise(PLUGIN_NAME, async (modules) => {
+            var _a, _b;
+            // Rebuild any remaining AOT required modules
+            await this.rebuildRequiredFiles(modules, compilation, fileEmitter);
+            // Clear out the Webpack compilation to avoid an extra retaining reference
+            (_a = state.resourceLoader) === null || _a === void 0 ? void 0 : _a.clearParentCompilation();
+            // Analyze program for unused files
+            if (compilation.errors.length > 0) {
+                return;
+            }
+            for (const webpackModule of modules) {
+                const resource = webpackModule.resource;
+                if (resource) {
+                    this.markResourceUsed((0, paths_1.normalizePath)(resource), currentUnused);
                 }
             }
-            (0, host_1.augmentHostWithCaching)(host, cache);
-            const moduleResolutionCache = ts.createModuleResolutionCache(host.getCurrentDirectory(), host.getCanonicalFileName.bind(host), compilerOptions);
-            // Setup source file dependency collection
-            (0, host_1.augmentHostWithDependencyCollection)(host, this.fileDependencies, moduleResolutionCache);
-            // Setup on demand ngcc
-            (0, host_1.augmentHostWithNgcc)(host, ngccProcessor, moduleResolutionCache);
-            // Setup resource loading
-            resourceLoader.update(compilation, changedFiles);
-            (0, host_1.augmentHostWithResources)(host, resourceLoader, {
-                directTemplateLoading: this.pluginOptions.directTemplateLoading,
-                inlineStyleFileExtension: this.pluginOptions.inlineStyleFileExtension,
-            });
-            // Setup source file adjustment options
-            (0, host_1.augmentHostWithReplacements)(host, this.pluginOptions.fileReplacements, moduleResolutionCache);
-            (0, host_1.augmentHostWithSubstitutions)(host, this.pluginOptions.substitutions);
-            // Create the file emitter used by the webpack loader
-            const { fileEmitter, builder, internalFiles } = this.pluginOptions.jitMode
-                ? this.updateJitProgram(compilerOptions, rootNames, host, diagnosticsReporter)
-                : this.updateAotProgram(compilerOptions, rootNames, host, diagnosticsReporter, resourceLoader);
-            // Set of files used during the unused TypeScript file analysis
-            const currentUnused = new Set();
-            for (const sourceFile of builder.getSourceFiles()) {
-                if (internalFiles === null || internalFiles === void 0 ? void 0 : internalFiles.has(sourceFile)) {
+            for (const unused of currentUnused) {
+                if ((_b = state.previousUnused) === null || _b === void 0 ? void 0 : _b.has(unused)) {
                     continue;
                 }
-                // Ensure all program files are considered part of the compilation and will be watched.
-                // Webpack does not normalize paths. Therefore, we need to normalize the path with FS seperators.
-                compilation.fileDependencies.add((0, paths_1.externalizePath)(sourceFile.fileName));
-                // Add all non-declaration files to the initial set of unused files. The set will be
-                // analyzed and pruned after all Webpack modules are finished building.
-                if (!sourceFile.isDeclarationFile) {
-                    currentUnused.add((0, paths_1.normalizePath)(sourceFile.fileName));
-                }
+                (0, 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.`);
             }
-            compilation.hooks.finishModules.tapPromise(PLUGIN_NAME, async (modules) => {
-                // Rebuild any remaining AOT required modules
-                await this.rebuildRequiredFiles(modules, compilation, fileEmitter);
-                // Clear out the Webpack compilation to avoid an extra retaining reference
-                resourceLoader === null || resourceLoader === void 0 ? void 0 : resourceLoader.clearParentCompilation();
-                // Analyze program for unused files
-                if (compilation.errors.length > 0) {
-                    return;
-                }
-                for (const webpackModule of modules) {
-                    const resource = webpackModule.resource;
-                    if (resource) {
-                        this.markResourceUsed((0, paths_1.normalizePath)(resource), currentUnused);
-                    }
-                }
-                for (const unused of currentUnused) {
-                    if (previousUnused && previousUnused.has(unused)) {
-                        continue;
-                    }
-                    (0, 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;
-            });
-            // Store file emitter for loader usage
-            emitRegistration.update(fileEmitter);
+            state.previousUnused = currentUnused;
         });
+        // Store file emitter for loader usage
+        emitRegistration.update(fileEmitter);
     }
     registerWithCompilation(compilation) {
         let fileEmitters = compilationFileEmitters.get(compilation);

package/src/ngcc_processor.js

@@ -115,24 +115,30 @@ class NgccProcessor {
         // that we cannot setup multiple cluster masters with different options.
         // - We will not be able to have concurrent builds otherwise Ex: App-Shell,
         // as NGCC will create a lock file for both builds and it will cause builds to fails.
-        const { status, error } = (0, child_process_1.spawnSync)(process.execPath, [
-            this.compilerNgcc.ngccMainFilePath,
-            '--source' /** basePath */,
-            this._nodeModulesDirectory,
-            '--properties' /** propertiesToConsider */,
-            ...this.propertiesToConsider,
-            '--first-only' /** compileAllFormats */,
-            '--create-ivy-entry-points' /** createNewEntryPointFormats */,
-            '--async',
-            '--tsconfig' /** tsConfigPath */,
-            this.tsConfigPath,
-            '--use-program-dependencies',
-        ], {
-            stdio: ['inherit', process.stderr, process.stderr],
-        });
-        if (status !== 0) {
-            const errorMessage = (error === null || error === void 0 ? void 0 : error.message) || '';
-            throw new Error(errorMessage + `NGCC failed${errorMessage ? ', see above' : ''}.`);
+        const originalProcessTitle = process.title;
+        try {
+            const { status, error } = (0, child_process_1.spawnSync)(process.execPath, [
+                this.compilerNgcc.ngccMainFilePath,
+                '--source' /** basePath */,
+                this._nodeModulesDirectory,
+                '--properties' /** propertiesToConsider */,
+                ...this.propertiesToConsider,
+                '--first-only' /** compileAllFormats */,
+                '--create-ivy-entry-points' /** createNewEntryPointFormats */,
+                '--async',
+                '--tsconfig' /** tsConfigPath */,
+                this.tsConfigPath,
+                '--use-program-dependencies',
+            ], {
+                stdio: ['inherit', process.stderr, process.stderr],
+            });
+            if (status !== 0) {
+                const errorMessage = (error === null || error === void 0 ? void 0 : error.message) || '';
+                throw new Error(errorMessage + `NGCC failed${errorMessage ? ', see above' : ''}.`);
+            }
+        }
+        finally {
+            process.title = originalProcessTitle;
         }
         (0, benchmark_1.timeEnd)(timeLabel);
         // ngcc was successful so if a run hash was generated, write it for next time