@ngtools/webpack 12.1.0 → 12.1.4

package/package.json

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

@@ -362,17 +362,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/resource_loader.js

@@ -188,13 +188,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 +227,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

@@ -127,7 +127,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}!=!${inlineDataLoaderPath}?data=${encodeURIComponent(data)}!${containingFile}`;
                     }
                     else {
                         return nodeFactory.createStringLiteral(node.text);