@ngtools/webpack 14.0.0-next.9 → 14.0.0-rc.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ngtools/webpack",
-  "version": "14.0.0-next.9",
+  "version": "14.0.0-rc.2",
   "description": "Webpack plugin that AoT compiles your Angular components and modules.",
   "main": "./src/index.js",
   "typings": "src/index.d.ts",
@@ -26,9 +26,9 @@
   "homepage": "https://github.com/angular/angular-cli",
   "dependencies": {},
   "peerDependencies": {
-    "@angular/compiler-cli": "^14.0.0 || ^14.0.0-next",
-    "typescript": "~4.6.2",
-    "webpack": "^5.30.0"
+    "@angular/compiler-cli": "^14.0.0 || ^14.0.0-rc",
+    "typescript": ">=4.6.2 <4.8",
+    "webpack": "^5.54.0"
   },
   "engines": {
     "node": "^14.15.0 || >=16.10.0",

package/src/ivy/host.js

@@ -155,9 +155,10 @@ function augmentHostWithNgcc(host, ngcc, moduleResolutionCache) {
         const baseResolveTypeReferenceDirectives = host.resolveTypeReferenceDirectives;
         host.resolveTypeReferenceDirectives = function (names, ...parameters) {
             return names.map((name) => {
-                const result = baseResolveTypeReferenceDirectives.call(host, [name], ...parameters);
+                const fileName = typeof name === 'string' ? name : name.fileName;
+                const result = baseResolveTypeReferenceDirectives.call(host, [fileName], ...parameters);
                 if (result[0] && ngcc) {
-                    ngcc.processModule(name, result[0]);
+                    ngcc.processModule(fileName, result[0]);
                 }
                 return result[0];
             });
@@ -166,9 +167,10 @@ function augmentHostWithNgcc(host, ngcc, moduleResolutionCache) {
     else {
         host.resolveTypeReferenceDirectives = function (moduleNames, containingFile, redirectedReference, options) {
             return moduleNames.map((name) => {
-                const result = ts.resolveTypeReferenceDirective(name, containingFile, options, host, redirectedReference).resolvedTypeReferenceDirective;
+                const fileName = typeof name === 'string' ? name : name.fileName;
+                const result = ts.resolveTypeReferenceDirective(fileName, containingFile, options, host, redirectedReference).resolvedTypeReferenceDirective;
                 if (result && ngcc) {
-                    ngcc.processModule(name, result);
+                    ngcc.processModule(fileName, result);
                 }
                 return result;
             });

package/src/ivy/plugin.d.ts

@@ -27,6 +27,7 @@ export declare class AngularWebpackPlugin {
     private builder?;
     private sourceFileCache?;
     private webpackCache?;
+    private webpackCreateHash?;
     private readonly fileDependencies;
     private readonly requiredFilesToEmit;
     private readonly requiredFilesToEmitCache;

package/src/ivy/plugin.js

@@ -32,7 +32,6 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AngularWebpackPlugin = void 0;
 const assert_1 = require("assert");
-const crypto_1 = require("crypto");
 const ts = __importStar(require("typescript"));
 const ngcc_processor_1 = require("../ngcc_processor");
 const paths_plugin_1 = require("../paths-plugin");
@@ -101,6 +100,7 @@ class AngularWebpackPlugin {
     // eslint-disable-next-line max-lines-per-function
     apply(compiler) {
         const { NormalModuleReplacementPlugin, util } = compiler.webpack;
+        this.webpackCreateHash = util.createHash;
         // Setup file replacements with webpack
         for (const [key, value] of Object.entries(this.pluginOptions.fileReplacements)) {
             new NormalModuleReplacementPlugin(new RegExp('^' + key.replace(/[.*+\-?^${}()|[\]\\]/g, '\\$&') + '$'), value).apply(compiler);
@@ -533,9 +533,10 @@ class AngularWebpackPlugin {
         this.compilerNgccModule = await new Function(`return import('@angular/compiler-cli/ngcc');`)();
     }
     async addFileEmitHistory(filePath, content) {
+        assert_1.strict.ok(this.webpackCreateHash, 'File emitter is used prior to Webpack compilation');
         const historyData = {
             length: content.length,
-            hash: (0, crypto_1.createHash)('md5').update(content).digest(),
+            hash: this.webpackCreateHash('xxhash64').update(content).digest(),
         };
         if (this.webpackCache) {
             const history = await this.getFileEmitHistory(filePath);

package/src/paths-plugin.js

@@ -105,6 +105,7 @@ class TypeScriptPathsPlugin {
         resolver.getHook('described-resolve').tapAsync('TypeScriptPathsPlugin', 
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
         (request, resolveContext, callback) => {
+            var _a;
             // Preprocessing of the options will ensure that `patterns` is either undefined or has elements to check
             if (!this.patterns) {
                 callback();
@@ -142,33 +143,59 @@ class TypeScriptPathsPlugin {
             // For example, if the first one resolves, any others are not needed and do not need
             // to be created.
             const replacements = findReplacements(originalRequest, this.patterns);
-            const tryResolve = () => {
-                var _a;
+            const basePath = (_a = this.baseUrl) !== null && _a !== void 0 ? _a : '';
+            const attemptResolveRequest = (request) => {
+                return new Promise((resolve, reject) => {
+                    resolver.doResolve(target, request, '', resolveContext, (error, result) => {
+                        if (error) {
+                            reject(error);
+                        }
+                        else if (result) {
+                            resolve(result);
+                        }
+                        else {
+                            resolve(null);
+                        }
+                    });
+                });
+            };
+            const tryNextReplacement = () => {
                 const next = replacements.next();
                 if (next.done) {
                     callback();
                     return;
                 }
-                const potentialRequest = {
+                const targetPath = path.resolve(basePath, next.value);
+                // If there is no extension. i.e. the target does not refer to an explicit
+                // file, then this is a candidate for module/package resolution.
+                const canBeModule = path.extname(targetPath) === '';
+                // Resolution in the target location, preserving the original request.
+                // This will work with the `resolve-in-package` resolution hook, supporting
+                // package exports for e.g. locally-built APF libraries.
+                const potentialRequestAsPackage = {
                     ...request,
-                    request: path.resolve((_a = this.baseUrl) !== null && _a !== void 0 ? _a : '', next.value),
+                    path: targetPath,
                     typescriptPathMapped: true,
                 };
-                resolver.doResolve(target, potentialRequest, '', resolveContext, 
-                // eslint-disable-next-line @typescript-eslint/no-explicit-any
-                (error, result) => {
-                    if (error) {
-                        callback(error);
-                    }
-                    else if (result) {
-                        callback(undefined, result);
-                    }
-                    else {
-                        tryResolve();
-                    }
-                });
+                // Resolution in the original callee location, but with the updated request
+                // to point to the mapped target location.
+                const potentialRequestAsFile = {
+                    ...request,
+                    request: targetPath,
+                    typescriptPathMapped: true,
+                };
+                let resultPromise = attemptResolveRequest(potentialRequestAsFile);
+                // If the request can be a module, we configure the resolution to try package/module
+                // resolution if the file resolution did not have a result.
+                if (canBeModule) {
+                    resultPromise = resultPromise.then((result) => result !== null && result !== void 0 ? result : attemptResolveRequest(potentialRequestAsPackage));
+                }
+                // If we have a result, complete. If not, and no error, try the next replacement.
+                resultPromise
+                    .then((res) => (res === null ? tryNextReplacement() : callback(undefined, res)))
+                    .catch((error) => callback(error));
             };
-            tryResolve();
+            tryNextReplacement();
         });
     }
 }

package/src/resource_loader.js

@@ -31,7 +31,6 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.WebpackResourceLoader = void 0;
-const crypto_1 = require("crypto");
 const path = __importStar(require("path"));
 const vm = __importStar(require("vm"));
 const paths_1 = require("./ivy/paths");
@@ -94,10 +93,13 @@ class WebpackResourceLoader {
     setAffectedResources(file, resources) {
         this._reverseDependencies.set(file, new Set(resources));
     }
+    // eslint-disable-next-line max-lines-per-function
     async _compile(filePath, data, fileExtension, resourceType, containingFile) {
         if (!this._parentCompilation) {
             throw new Error('WebpackResourceLoader cannot be used without parentCompilation');
         }
+        const { context, webpack } = this._parentCompilation.compiler;
+        const { EntryPlugin, NormalModule, library, node, sources, util: { createHash }, } = webpack;
         const getEntry = () => {
             if (filePath) {
                 return `${filePath}?${replace_resources_1.NG_COMPONENT_RESOURCE_QUERY}`;
@@ -110,7 +112,9 @@ class WebpackResourceLoader {
             }
             else if (data) {
                 // Create a special URL for reading the resource from memory
-                return `angular-resource:${resourceType},${(0, crypto_1.createHash)('md5').update(data).digest('hex')}`;
+                return `angular-resource:${resourceType},${createHash('xxhash64')
+                    .update(data)
+                    .digest('hex')}`;
             }
             throw new Error(`"filePath", "resourceType" or "data" must be specified.`);
         };
@@ -128,8 +132,6 @@ class WebpackResourceLoader {
                 name: 'resource',
             },
         };
-        const { context, webpack } = this._parentCompilation.compiler;
-        const { EntryPlugin, NormalModule, library, node, sources } = webpack;
         const childCompiler = this._parentCompilation.createChildCompiler('angular-compiler:resource', outputOptions, [
             new node.NodeTemplatePlugin(outputOptions),
             new node.NodeTargetPlugin(),