@angular-devkit/build-angular 14.0.5 → 14.0.6

package/package.json

@@ -1,15 +1,15 @@
 {
   "name": "@angular-devkit/build-angular",
-  "version": "14.0.5",
+  "version": "14.0.6",
   "description": "Angular Webpack Build Facade",
   "main": "src/index.js",
   "typings": "src/index.d.ts",
   "builders": "builders.json",
   "dependencies": {
     "@ampproject/remapping": "2.2.0",
-    "@angular-devkit/architect": "0.1400.5",
-    "@angular-devkit/build-webpack": "0.1400.5",
-    "@angular-devkit/core": "14.0.5",
+    "@angular-devkit/architect": "0.1400.6",
+    "@angular-devkit/build-webpack": "0.1400.6",
+    "@angular-devkit/core": "14.0.6",
     "@babel/core": "7.17.10",
     "@babel/generator": "7.17.10",
     "@babel/helper-annotate-as-pure": "7.16.7",
@@ -20,7 +20,7 @@
     "@babel/runtime": "7.17.9",
     "@babel/template": "7.16.7",
     "@discoveryjs/json-ext": "0.5.7",
-    "@ngtools/webpack": "14.0.5",
+    "@ngtools/webpack": "14.0.6",
     "ansi-colors": "4.1.1",
     "babel-loader": "8.2.5",
     "babel-plugin-istanbul": "6.1.1",

package/src/webpack/plugins/scripts-webpack-plugin.js

@@ -35,6 +35,10 @@ const loader_utils_1 = require("loader-utils");
 const path = __importStar(require("path"));
 const webpack_1 = require("webpack");
 const Entrypoint = require('webpack/lib/Entrypoint');
+/**
+ * The name of the plugin provided to Webpack when tapping Webpack compiler hooks.
+ */
+const PLUGIN_NAME = 'scripts-webpack-plugin';
 function addDependencies(compilation, scripts) {
     for (const script of scripts) {
         compilation.fileDependencies.add(script);
@@ -88,8 +92,8 @@ class ScriptsWebpackPlugin {
         const scripts = this.options.scripts
             .filter((script) => !!script)
             .map((script) => path.resolve(this.options.basePath || '', script));
-        compiler.hooks.thisCompilation.tap('scripts-webpack-plugin', (compilation) => {
-            compilation.hooks.additionalAssets.tapPromise('scripts-webpack-plugin', async () => {
+        compiler.hooks.thisCompilation.tap(PLUGIN_NAME, (compilation) => {
+            compilation.hooks.additionalAssets.tapPromise(PLUGIN_NAME, async () => {
                 if (await this.shouldSkip(compilation, scripts)) {
                     if (this._cachedOutput) {
                         this._insertOutput(compilation, this._cachedOutput, true);
@@ -129,14 +133,24 @@ class ScriptsWebpackPlugin {
                     concatSource.add('\n;');
                 });
                 const combinedSource = new webpack_1.sources.CachedSource(concatSource);
-                const filename = (0, loader_utils_1.interpolateName)({ resourcePath: 'scripts.js' }, this.options.filename, {
-                    content: combinedSource.source(),
-                });
-                const output = { filename, source: combinedSource };
+                const output = { filename: this.options.filename, source: combinedSource };
                 this._insertOutput(compilation, output);
                 this._cachedOutput = output;
                 addDependencies(compilation, scripts);
             });
+            compilation.hooks.processAssets.tapPromise({
+                name: PLUGIN_NAME,
+                stage: compiler.webpack.Compilation.PROCESS_ASSETS_STAGE_DEV_TOOLING,
+            }, async () => {
+                const assetName = this.options.filename;
+                const asset = compilation.getAsset(assetName);
+                if (asset) {
+                    const interpolatedFilename = (0, loader_utils_1.interpolateName)({ resourcePath: 'scripts.js' }, assetName, { content: asset.source.source() });
+                    if (assetName !== interpolatedFilename) {
+                        compilation.renameAsset(assetName, interpolatedFilename);
+                    }
+                }
+            });
         });
     }
 }