@nx/webpack 19.5.7 → 19.6.0-beta.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/webpack",
-  "version": "19.5.7",
+  "version": "19.6.0-beta.1",
   "private": false,
   "description": "The Nx Plugin for Webpack contains executors and generators that support building applications using Webpack.",
   "repository": {
@@ -69,9 +69,9 @@
     "webpack-dev-server": "^4.9.3",
     "webpack-node-externals": "^3.0.0",
     "webpack-subresource-integrity": "^5.1.0",
-    "@nx/devkit": "19.5.7",
-    "@nx/js": "19.5.7",
-    "@nrwl/webpack": "19.5.7"
+    "@nx/devkit": "19.6.0-beta.1",
+    "@nx/js": "19.6.0-beta.1",
+    "@nrwl/webpack": "19.6.0-beta.1"
   },
   "publishConfig": {
     "access": "public"

package/src/generators/configuration/configuration.js

@@ -5,7 +5,7 @@ exports.configurationGeneratorInternal = configurationGeneratorInternal;
 const devkit_1 = require("@nx/devkit");
 const init_1 = require("../init/init");
 const has_plugin_1 = require("../../utils/has-plugin");
-const add_build_target_defaults_1 = require("@nx/devkit/src/generators/add-build-target-defaults");
+const target_defaults_utils_1 = require("@nx/devkit/src/generators/target-defaults-utils");
 const ensure_dependencies_1 = require("../../utils/ensure-dependencies");
 function configurationGenerator(tree, options) {
     return configurationGeneratorInternal(tree, { addPlugin: false, ...options });
@@ -125,7 +125,7 @@ module.exports = composePlugins(withNx(), (config) => {
     }
 }
 function addBuildTarget(tree, options) {
-    (0, add_build_target_defaults_1.addBuildTargetDefaults)(tree, '@nx/webpack:webpack');
+    (0, target_defaults_utils_1.addBuildTargetDefaults)(tree, '@nx/webpack:webpack');
     const project = (0, devkit_1.readProjectConfiguration)(tree, options.project);
     const buildOptions = {
         target: options.target,

package/src/plugins/plugin.js

@@ -150,6 +150,7 @@ async function createWebpackTargets(configFilePath, projectRoot, options, contex
         },
     };
     targets[options.serveStaticTargetName] = {
+        dependsOn: [options.buildTargetName],
         executor: '@nx/web:file-server',
         options: {
             buildTarget: options.buildTargetName,

package/src/plugins/use-legacy-nx-plugin/use-legacy-nx-plugin.d.ts

@@ -1,6 +1,6 @@
-import { NxWebpackExecutionContext } from '../../utils/config';
-import { NxAppWebpackPluginOptions } from '../nx-webpack-plugin/nx-app-webpack-plugin-options';
-import { Configuration } from 'webpack';
+import type { NxWebpackExecutionContext } from '../../utils/config';
+import type { NxAppWebpackPluginOptions } from '../nx-webpack-plugin/nx-app-webpack-plugin-options';
+import type { Compiler, Configuration } from 'webpack';
 /**
  * This function is used to wrap the legacy plugin function to be used with the `composePlugins` function.
  * Initially the webpack config would be passed to the legacy plugin function and the options would be passed as a second argument.
@@ -26,4 +26,6 @@ module.exports = async () => ({
  * @param executorOptions The options passed usually inside the executor or the config file
  * @returns Webpack configuration
  */
-export declare function useLegacyNxPlugin(fn: (config: Configuration, ctx: NxWebpackExecutionContext) => Promise<Configuration>, executorOptions: NxAppWebpackPluginOptions): Promise<(config: Configuration) => Promise<Configuration>>;
+export declare function useLegacyNxPlugin(fn: (config: Configuration, ctx: NxWebpackExecutionContext) => Promise<Configuration>, executorOptions: NxAppWebpackPluginOptions): Promise<{
+    apply(compiler: Compiler): void;
+}>;

package/src/plugins/use-legacy-nx-plugin/use-legacy-nx-plugin.js

@@ -47,12 +47,24 @@ async function useLegacyNxPlugin(fn, executorOptions) {
         projectName: projectName,
     };
     const configuration = process.env.NX_TASK_TARGET_CONFIGURATION;
-    return async (config) => {
-        const ctx = {
-            context,
-            options: options,
-            configuration,
-        };
-        return await fn(config, ctx);
+    const ctx = {
+        context,
+        options: options,
+        configuration,
+    };
+    return {
+        apply(compiler) {
+            compiler.hooks.beforeCompile.tapPromise('NxLegacyAsyncPlugin', () => {
+                return new Promise((resolve) => {
+                    fn(compiler.options, ctx).then((updated) => {
+                        // Merge options back shallowly since it's a fully functional configuration.
+                        // Most likely, the user modified the config in place, but this guarantees that updates are applied if users did something like:
+                        // `return { ...config, plugins: [...config.plugins, new MyPlugin()] }`
+                        Object.assign(compiler.options, updated);
+                        resolve();
+                    });
+                });
+            });
+        },
     };
 }