@nx/webpack 17.2.0 → 17.2.2

package/migrations.json

@@ -29,6 +29,12 @@
       "version": "16.0.0-beta.1",
       "description": "Replace @nrwl/webpack with @nx/webpack",
       "implementation": "./src/migrations/update-16-0-0-add-nx-packages/update-16-0-0-add-nx-packages"
+    },
+    "update-17-2-1-webpack-config-setup": {
+      "cli": "nx",
+      "version": "17.2.1-beta.0",
+      "description": "Add webpack.config.js file when webpackConfig is not defined",
+      "implementation": "./src/migrations/update-17-2-1/webpack-config-setup"
     }
   },
   "packageJsonUpdates": {

package/package.json

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

package/src/executors/dev-server/dev-server.impl.js

@@ -36,7 +36,9 @@ async function* devServerExecutor(serveOptions, context) {
         }
         // Only add the dev server option if user is composable plugin.
         // Otherwise, user should define `devServer` option directly in their webpack config.
-        if ((0, config_1.isNxWebpackComposablePlugin)(userDefinedWebpackConfig)) {
+        if (typeof userDefinedWebpackConfig === 'function' &&
+            (0, config_1.isNxWebpackComposablePlugin)(userDefinedWebpackConfig) &&
+            !buildOptions.standardWebpackConfigFunction) {
             config = await userDefinedWebpackConfig({ devServer }, {
                 options: buildOptions,
                 context,

package/src/executors/webpack/schema.d.ts

@@ -50,6 +50,7 @@ export interface WebpackExecutorOptions {
   // TODO(v18): Remove this option
   /** @deprecated set webpackConfig and provide an explicit webpack.config.js file (See: https://nx.dev/recipes/webpack/webpack-config-setup) */
   isolatedConfig?: boolean;
+  standardWebpackConfigFunction?: boolean;
   main?: string;
   memoryLimit?: number;
   namedChunks?: boolean;

package/src/executors/webpack/schema.json

@@ -237,6 +237,11 @@
       "default": true,
       "x-deprecated": "Automatic configuration of Webpack is deprecated in favor of an explicit 'webpack.config.js' file. This option will be removed in Nx 18. See https://nx.dev/recipes/webpack/webpack-config-setup."
     },
+    "standardWebpackConfigFunction": {
+      "type": "boolean",
+      "description": "Set to true if the webpack config exports a standard webpack function, not an Nx-specific one. See: https://webpack.js.org/configuration/configuration-types/#exporting-a-function",
+      "default": false
+    },
     "extractLicenses": {
       "type": "boolean",
       "description": "Extract all licenses in a separate file, in the case of production builds only."

package/src/executors/webpack/webpack.impl.js

@@ -28,8 +28,12 @@ async function getWebpackConfigs(options, context) {
     }
     const config = options.isolatedConfig
         ? {}
-        : (0, config_1.composePlugins)((0, with_nx_1.withNx)(options), (0, with_web_1.withWeb)(options));
-    if ((0, config_1.isNxWebpackComposablePlugin)(userDefinedWebpackConfig)) {
+        : (options.target === 'web'
+            ? (0, config_1.composePluginsSync)((0, with_nx_1.withNx)(options), (0, with_web_1.withWeb)(options))
+            : (0, with_nx_1.withNx)(options))({}, { options, context });
+    if (typeof userDefinedWebpackConfig === 'function' &&
+        (0, config_1.isNxWebpackComposablePlugin)(userDefinedWebpackConfig) &&
+        !options.standardWebpackConfigFunction) {
         // Old behavior, call the Nx-specific webpack config function that user exports
         return await userDefinedWebpackConfig(config, {
             options,

package/src/migrations/update-17-2-1/webpack-config-setup.d.ts

@@ -0,0 +1,2 @@
+import { Tree } from '@nx/devkit';
+export default function (tree: Tree): Promise<void>;

package/src/migrations/update-17-2-1/webpack-config-setup.js

@@ -0,0 +1,31 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const devkit_1 = require("@nx/devkit");
+const executor_options_utils_1 = require("@nx/devkit/src/generators/executor-options-utils");
+async function default_1(tree) {
+    const update = (options, projectName, targetName, configurationName) => {
+        // Only handle webpack config for default configuration
+        if (configurationName)
+            return;
+        const projectConfiguration = (0, devkit_1.readProjectConfiguration)(tree, projectName);
+        if (!options.webpackConfig && options.isolatedConfig !== false) {
+            options.webpackConfig = `${projectConfiguration.root}/webpack.config.js`;
+            tree.write(options.webpackConfig, `
+        const { composePlugins, withNx } = require('@nx/webpack');
+
+        // Nx plugins for webpack.
+        module.exports = composePlugins(withNx(), (config) => {
+          // Note: This was added by an Nx migration. Webpack builds are required to have a corresponding Webpack config file.
+          // See: https://nx.dev/recipes/webpack/webpack-config-setup
+          return config;
+        });
+        `);
+            projectConfiguration.targets[targetName].options = options;
+            (0, devkit_1.updateProjectConfiguration)(tree, projectName, projectConfiguration);
+        }
+    };
+    (0, executor_options_utils_1.forEachExecutorOptions)(tree, '@nx/webpack:webpack', update);
+    (0, executor_options_utils_1.forEachExecutorOptions)(tree, '@nrwl/webpack:webpack', update);
+    await (0, devkit_1.formatFiles)(tree);
+}
+exports.default = default_1;