@nx/webpack 21.0.0-beta.10 → 21.0.0-beta.12

package/index.d.ts

@@ -6,7 +6,7 @@ import { useLegacyNxPlugin } from './src/plugins/use-legacy-nx-plugin/use-legacy
 export { configurationGenerator, convertConfigToWebpackPluginGenerator, useLegacyNxPlugin, };
 /** @deprecated Use `configurationGenerator` instead. */
 export declare const webpackProjectGenerator: typeof configurationGenerator;
-/** @deprecated Use NxAppWebpackPlugin from `@nx/webpack/app-plugin` instead. */
+/** @deprecated Use NxAppWebpackPlugin from `@nx/webpack/app-plugin` instead, which can improve graph creation by 150-200ms per file. */
 export declare const NxWebpackPlugin: typeof NxAppWebpackPlugin;
 /** @deprecated Use NxTsconfigPathsWebpackPlugin from `@nx/webpack/tsconfig-paths-plugin` instead. */
 export declare const NxTsconfigPathsWebpackPlugin: typeof _NxTsconfigPathsWebpackPlugin;

package/index.js

@@ -13,8 +13,7 @@ Object.defineProperty(exports, "useLegacyNxPlugin", { enumerable: true, get: fun
 // Exported for backwards compatibility in case a plugin is using the old name.
 /** @deprecated Use `configurationGenerator` instead. */
 exports.webpackProjectGenerator = configuration_1.configurationGenerator;
-// TODO(v21): Remove this in favor of deep imports in order to load configs faster (150-200ms faster).
-/** @deprecated Use NxAppWebpackPlugin from `@nx/webpack/app-plugin` instead. */
+/** @deprecated Use NxAppWebpackPlugin from `@nx/webpack/app-plugin` instead, which can improve graph creation by 150-200ms per file. */
 exports.NxWebpackPlugin = nx_app_webpack_plugin_1.NxAppWebpackPlugin;
 /** @deprecated Use NxTsconfigPathsWebpackPlugin from `@nx/webpack/tsconfig-paths-plugin` instead. */
 exports.NxTsconfigPathsWebpackPlugin = nx_tsconfig_paths_webpack_plugin_1.NxTsconfigPathsWebpackPlugin;

package/migrations.json

@@ -5,6 +5,12 @@
       "version": "19.6.3-beta.0",
       "description": "Migrate proxy config files to match new format from webpack-dev-server v5.",
       "implementation": "./src/migrations/update-19-6-3/proxy-config"
+    },
+    "update-21-0-0-remove-isolated-config": {
+      "cli": "nx",
+      "version": "21.0.0-beta.11",
+      "description": "Remove isolatedConfig option for @nx/webpack:webpack",
+      "implementation": "./src/migrations/update-21-0-0/remove-isolated-config"
     }
   },
   "packageJsonUpdates": {

package/package.json

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

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

@@ -47,9 +47,6 @@ export interface WebpackExecutorOptions {
   extractLicenses?: boolean;
   fileReplacements?: FileReplacement[];
   generatePackageJson?: boolean;
-  // TODO(v21): 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;

package/src/executors/webpack/schema.json

@@ -254,12 +254,6 @@
       "type": "boolean",
       "description": "Generates a 'stats.json' file which can be analyzed using tools such as: 'webpack-bundle-analyzer' or `<https://webpack.github.io/analyse>`."
     },
-    "isolatedConfig": {
-      "type": "boolean",
-      "description": "Do not apply Nx webpack plugins automatically. Plugins need to be applied in the project's webpack.config.js file (e.g. withNx, withReact, etc.).",
-      "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 20. 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",

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

@@ -11,13 +11,8 @@ const fs_1 = require("../../utils/fs");
 const resolve_user_defined_webpack_config_1 = require("../../utils/webpack/resolve-user-defined-webpack-config");
 const normalize_options_1 = require("./lib/normalize-options");
 const config_1 = require("../../utils/config");
-const with_nx_1 = require("../../utils/with-nx");
 const js_1 = require("@nx/js");
-const with_web_1 = require("../../utils/with-web");
 async function getWebpackConfigs(options, context) {
-    if (options.isolatedConfig && !options.webpackConfig) {
-        throw new Error(`Using "isolatedConfig" without a "webpackConfig" is not supported.`);
-    }
     let userDefinedWebpackConfig = null;
     if (options.webpackConfig) {
         userDefinedWebpackConfig = (0, resolve_user_defined_webpack_config_1.resolveUserDefinedWebpackConfig)(options.webpackConfig, (0, js_1.getRootTsConfigPath)());
@@ -25,11 +20,7 @@ async function getWebpackConfigs(options, context) {
             userDefinedWebpackConfig = await userDefinedWebpackConfig;
         }
     }
-    const config = options.isolatedConfig
-        ? {}
-        : (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 });
+    const config = {};
     if (typeof userDefinedWebpackConfig === 'function' &&
         ((0, config_1.isNxWebpackComposablePlugin)(userDefinedWebpackConfig) ||
             !options.standardWebpackConfigFunction)) {

package/src/generators/convert-to-inferred/utils/build-post-target-transformer.js

@@ -90,14 +90,6 @@ function extractPluginOptions(options, context, configName) {
             }
             delete options.memoryLimit;
         }
-        else if (key === 'isolatedConfig') {
-            context.logger.addLog({
-                executorName: '@nx/webpack:webpack',
-                log: `The 'isolatedConfig' option is deprecated and not supported by the NxAppWebpackPlugin. It was removed from your project configuration.`,
-                project: context.projectName,
-            });
-            delete options.isolatedConfig;
-        }
         else if (key === 'standardWebpackConfigFunction') {
             delete options.standardWebpackConfigFunction;
         }

package/src/generators/init/init.js

@@ -15,7 +15,7 @@ async function webpackInitGeneratorInternal(tree, schema) {
         nxJson.useInferencePlugins !== false;
     schema.addPlugin ??= addPluginDefault;
     if (schema.addPlugin) {
-        await (0, add_plugin_1.addPluginV1)(tree, await (0, devkit_1.createProjectGraphAsync)(), '@nx/webpack/plugin', plugin_1.createNodes, {
+        await (0, add_plugin_1.addPlugin)(tree, await (0, devkit_1.createProjectGraphAsync)(), '@nx/webpack/plugin', plugin_1.createNodesV2, {
             buildTargetName: [
                 'build',
                 'webpack:build',

package/src/migrations/update-21-0-0/remove-isolated-config.d.ts

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

package/src/migrations/update-21-0-0/remove-isolated-config.js

@@ -0,0 +1,41 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = default_1;
+const devkit_1 = require("@nx/devkit");
+const executor_options_utils_1 = require("@nx/devkit/src/generators/executor-options-utils");
+async function default_1(tree) {
+    (0, executor_options_utils_1.forEachExecutorOptions)(tree, '@nx/webpack:webpack', (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) {
+            delete options['isolatedConfig'];
+            options.webpackConfig = `${projectConfiguration.root}/webpack.config.js`;
+            tree.write(options.webpackConfig, options.target === 'web'
+                ? `
+const { composePlugins, withNx, withWeb } = require('@nx/webpack');
+
+// Nx plugins for webpack.
+module.exports = composePlugins(withNx(), withWeb(), (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;
+});
+`
+                : `
+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);
+        }
+    });
+    await (0, devkit_1.formatFiles)(tree);
+}

package/src/plugins/nx-webpack-plugin/lib/apply-web-config.js

@@ -359,6 +359,7 @@ function applyWebConfig(options, config = {}, { useNormalizedEntry, } = {}) {
                     },
                 },
             },
+            // TODO(v22): Remove this but provide a migration in `@nx/react` to add @svgr/webpack in userland webpack config
             // SVG: same as image but we need to separate it so it can be swapped for SVGR in the React plugin.
             {
                 test: /\.svg$/,