@ngtools/webpack 11.1.0-next.3 → 11.1.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ngtools/webpack",
-  "version": "11.1.0-next.3",
+  "version": "11.1.1",
   "description": "Webpack plugin that AoT compiles your Angular components and modules.",
   "main": "./src/index.js",
   "typings": "src/index.d.ts",
@@ -25,8 +25,8 @@
   },
   "homepage": "https://github.com/angular/angular-cli",
   "dependencies": {
-    "@angular-devkit/core": "11.1.0-next.3",
-    "enhanced-resolve": "5.4.0",
+    "@angular-devkit/core": "11.1.1",
+    "enhanced-resolve": "5.6.0",
     "webpack-sources": "2.2.0"
   },
   "peerDependencies": {

package/src/ivy/plugin.js

@@ -272,7 +272,18 @@ class AngularWebpackPlugin {
             for (const sourceFile of builder.getSourceFiles()) {
                 // Collect Angular template diagnostics
                 if (!ignoreForDiagnostics.has(sourceFile)) {
-                    diagnosticsReporter(angularCompiler.getDiagnostics(sourceFile));
+                    // The below check should be removed once support for compiler 11.0 is dropped.
+                    // Also, the below require should be changed to an ES6 import.
+                    if (angularCompiler.getDiagnosticsForFile) {
+                        // @angular/compiler-cli 11.1+
+                        const { OptimizeFor } = require('@angular/compiler-cli/src/ngtsc/typecheck/api');
+                        diagnosticsReporter(angularCompiler.getDiagnosticsForFile(sourceFile, OptimizeFor.WholeProgram));
+                    }
+                    else {
+                        // @angular/compiler-cli 11.0+
+                        const getDiagnostics = angularCompiler.getDiagnostics;
+                        diagnosticsReporter(getDiagnostics.call(angularCompiler, sourceFile));
+                    }
                 }
                 // Collect sources that are required to be emitted
                 if (!sourceFile.isDeclarationFile &&

package/src/ivy/transformation.js

@@ -23,7 +23,7 @@ function createAotTransformers(builder, options) {
     const removeNgModuleScope = !options.emitNgModuleScope;
     if (removeClassMetadata || removeNgModuleScope) {
         // tslint:disable-next-line: no-non-null-assertion
-        transformers.after.push(remove_ivy_jit_support_calls_1.removeIvyJitSupportCalls(removeClassMetadata, removeNgModuleScope, getTypeChecker));
+        transformers.before.push(remove_ivy_jit_support_calls_1.removeIvyJitSupportCalls(removeClassMetadata, removeNgModuleScope, getTypeChecker));
     }
     return transformers;
 }

package/src/transformers/elide_imports.js

@@ -102,6 +102,10 @@ function elideImports(sourceFile, removedNodes, getTypeChecker, compilerOptions)
         return [];
     }
     const isUnused = (node) => {
+        // Do not remove JSX factory imports
+        if (node.text === compilerOptions.jsxFactory) {
+            return false;
+        }
         const symbol = typeChecker.getSymbolAtLocation(node);
         return symbol && !usedSymbols.has(symbol);
     };

package/src/transformers/spec_helpers.d.ts

@@ -1,6 +1,6 @@
 import * as ts from 'typescript';
 import { WebpackCompilerHost } from '../compiler_host';
-export declare function createTypescriptContext(content: string, additionalFiles?: Record<string, string>, useLibs?: boolean, extraCompilerOptions?: ts.CompilerOptions): {
+export declare function createTypescriptContext(content: string, additionalFiles?: Record<string, string>, useLibs?: boolean, extraCompilerOptions?: ts.CompilerOptions, jsxFile?: boolean): {
     compilerHost: WebpackCompilerHost;
     program: ts.Program;
 };

package/src/transformers/spec_helpers.js

@@ -15,10 +15,11 @@ const ts = require("typescript");
 const compiler_host_1 = require("../compiler_host");
 // Test transform helpers.
 const basePath = '/project/src/';
-const fileName = basePath + 'test-file.ts';
+const basefileName = basePath + 'test-file.ts';
 const typeScriptLibFiles = loadTypeScriptLibFiles();
 const tsLibFiles = loadTsLibFiles();
-function createTypescriptContext(content, additionalFiles, useLibs = false, extraCompilerOptions = {}) {
+function createTypescriptContext(content, additionalFiles, useLibs = false, extraCompilerOptions = {}, jsxFile = false) {
+    const fileName = basefileName + (jsxFile ? 'x' : '');
     // Set compiler options.
     const compilerOptions = {
         noEmitOnError: useLibs,
@@ -81,7 +82,7 @@ function transformTypescript(content, transformers, program, compilerHost) {
         throw new Error(ts.formatDiagnostics(diagnostics, compilerHost));
     }
     // Return the transpiled js.
-    return compilerHost.readFile(fileName.replace(/\.tsx?$/, '.js'));
+    return compilerHost.readFile(basefileName.replace(/\.tsx?$/, '.js'));
 }
 exports.transformTypescript = transformTypescript;
 function loadTypeScriptLibFiles() {