@nx/webpack 0.0.0-pr-28229-afe192c → 0.0.0-pr-28453-54fa63c

package/index.js

@@ -13,7 +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(v20): Remove this in favor of deep imports in order to load configs faster (150-200ms faster).
+// 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. */
 exports.NxWebpackPlugin = nx_app_webpack_plugin_1.NxAppWebpackPlugin;
 /** @deprecated Use NxTsconfigPathsWebpackPlugin from `@nx/webpack/tsconfig-paths-plugin` instead. */

package/migrations.json

@@ -1,11 +1,5 @@
 {
   "generators": {
-    "update-16-0-0-add-nx-packages": {
-      "cli": "nx",
-      "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",
@@ -20,24 +14,6 @@
     }
   },
   "packageJsonUpdates": {
-    "16.3.0": {
-      "version": "16.3.0-beta.8",
-      "packages": {
-        "@svgr/webpack": {
-          "version": "^8.0.1",
-          "alwaysAddToPackageJson": false
-        }
-      }
-    },
-    "16.4.1": {
-      "version": "16.4.1-beta.0",
-      "packages": {
-        "webpack": {
-          "version": "^5.80.0",
-          "alwaysAddToPackageJson": false
-        }
-      }
-    },
     "19.6.0": {
       "version": "19.6.0-beta.1",
       "packages": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/webpack",
-  "version": "0.0.0-pr-28229-afe192c",
+  "version": "0.0.0-pr-28453-54fa63c",
   "private": false,
   "description": "The Nx Plugin for Webpack contains executors and generators that support building applications using Webpack.",
   "repository": {
@@ -69,8 +69,8 @@
     "webpack-dev-server": "^5.0.4",
     "webpack-node-externals": "^3.0.0",
     "webpack-subresource-integrity": "^5.1.0",
-    "@nx/devkit": "0.0.0-pr-28229-afe192c",
-    "@nx/js": "0.0.0-pr-28229-afe192c"
+    "@nx/devkit": "0.0.0-pr-28453-54fa63c",
+    "@nx/js": "0.0.0-pr-28453-54fa63c"
   },
   "publishConfig": {
     "access": "public"

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

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

package/src/generators/configuration/configuration.js

@@ -7,10 +7,12 @@ const init_1 = require("../init/init");
 const has_plugin_1 = require("../../utils/has-plugin");
 const target_defaults_utils_1 = require("@nx/devkit/src/generators/target-defaults-utils");
 const ensure_dependencies_1 = require("../../utils/ensure-dependencies");
+const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 function configurationGenerator(tree, options) {
     return configurationGeneratorInternal(tree, { addPlugin: false, ...options });
 }
 async function configurationGeneratorInternal(tree, options) {
+    (0, ts_solution_setup_1.assertNotUsingTsSolutionSetup)(tree, 'webpack', 'configuration');
     const tasks = [];
     const nxJson = (0, devkit_1.readNxJson)(tree);
     const addPluginDefault = process.env.NX_ADD_PLUGINS !== 'false' &&

package/src/generators/init/init.js

@@ -4,12 +4,14 @@ exports.webpackInitGenerator = webpackInitGenerator;
 exports.webpackInitGeneratorInternal = webpackInitGeneratorInternal;
 const devkit_1 = require("@nx/devkit");
 const add_plugin_1 = require("@nx/devkit/src/utils/add-plugin");
+const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 const plugin_1 = require("../../plugins/plugin");
 const versions_1 = require("../../utils/versions");
 function webpackInitGenerator(tree, schema) {
     return webpackInitGeneratorInternal(tree, { addPlugin: false, ...schema });
 }
 async function webpackInitGeneratorInternal(tree, schema) {
+    (0, ts_solution_setup_1.assertNotUsingTsSolutionSetup)(tree, 'webpack', 'init');
     const nxJson = (0, devkit_1.readNxJson)(tree);
     const addPluginDefault = process.env.NX_ADD_PLUGINS !== 'false' &&
         nxJson.useInferencePlugins !== false;

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

@@ -11,7 +11,7 @@ import type { Compiler, Configuration } from 'webpack';
         return config;
       }
   );
-  
+
 Since composePlugins is async, this function is used to wrap the legacy plugin function to be async.
 Using the nxUseLegacyPlugin function, the first argument is the legacy plugin function and the second argument is the options.
 The context options are created and passed to the legacy plugin function.

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

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.useLegacyNxPlugin = useLegacyNxPlugin;
 const devkit_1 = require("@nx/devkit");
 const normalize_options_1 = require("../nx-webpack-plugin/lib/normalize-options");
+const configuration_1 = require("nx/src/config/configuration");
 /**
  * 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.
@@ -13,7 +14,7 @@ const normalize_options_1 = require("../nx-webpack-plugin/lib/normalize-options"
         return config;
       }
   );
-  
+
 Since composePlugins is async, this function is used to wrap the legacy plugin function to be async.
 Using the nxUseLegacyPlugin function, the first argument is the legacy plugin function and the second argument is the options.
 The context options are created and passed to the legacy plugin function.
@@ -40,8 +41,10 @@ async function useLegacyNxPlugin(fn, executorOptions) {
     const context = {
         cwd: process.cwd(),
         isVerbose: process.env.NX_VERBOSE_LOGGING === 'true',
-        root: project.data.root,
-        projectGraph: (0, devkit_1.readCachedProjectGraph)(),
+        root: devkit_1.workspaceRoot,
+        projectGraph,
+        projectsConfigurations: (0, devkit_1.readProjectsConfigurationFromProjectGraph)(projectGraph),
+        nxJsonConfiguration: (0, configuration_1.readNxJson)(devkit_1.workspaceRoot),
         target: project.data.targets[targetName],
         targetName: targetName,
         projectName: projectName,

package/src/utils/config.js

@@ -5,6 +5,7 @@ exports.isNxWebpackComposablePlugin = isNxWebpackComposablePlugin;
 exports.composePlugins = composePlugins;
 exports.composePluginsSync = composePluginsSync;
 const devkit_1 = require("@nx/devkit");
+const configuration_1 = require("nx/src/config/configuration");
 exports.nxWebpackComposablePlugin = 'nxWebpackComposablePlugin';
 function isNxWebpackComposablePlugin(a) {
     return a?.[exports.nxWebpackComposablePlugin] === true;
@@ -59,6 +60,8 @@ function ensureNxWebpackExecutionContext(ctx) {
         projectName,
         targetName,
         configurationName,
+        projectsConfigurations: (0, devkit_1.readProjectsConfigurationFromProjectGraph)(projectGraph),
+        nxJsonConfiguration: (0, configuration_1.readNxJson)(devkit_1.workspaceRoot),
         cwd: process.cwd(),
         root: devkit_1.workspaceRoot,
         isVerbose: process.env['NX_VERBOSE_LOGGING'] === 'true',

package/src/utils/module-federation/remotes.js

@@ -13,29 +13,32 @@ const path_1 = require("path");
  */
 function mapRemotes(remotes, remoteEntryExt, determineRemoteUrl, isRemoteGlobal = false) {
     const mappedRemotes = {};
-    for (const remote of remotes) {
-        if (Array.isArray(remote)) {
-            mappedRemotes[remote[0]] = handleArrayRemote(remote, remoteEntryExt, isRemoteGlobal);
+    for (const nxRemoteProjectName of remotes) {
+        if (Array.isArray(nxRemoteProjectName)) {
+            const mfRemoteName = normalizeRemoteName(nxRemoteProjectName[0]);
+            mappedRemotes[mfRemoteName] = handleArrayRemote(nxRemoteProjectName, remoteEntryExt, isRemoteGlobal);
         }
-        else if (typeof remote === 'string') {
-            mappedRemotes[remote] = handleStringRemote(remote, determineRemoteUrl, isRemoteGlobal);
+        else if (typeof nxRemoteProjectName === 'string') {
+            const mfRemoteName = normalizeRemoteName(nxRemoteProjectName);
+            mappedRemotes[mfRemoteName] = handleStringRemote(nxRemoteProjectName, determineRemoteUrl, isRemoteGlobal);
         }
     }
     return mappedRemotes;
 }
 // Helper function to deal with remotes that are arrays
 function handleArrayRemote(remote, remoteEntryExt, isRemoteGlobal) {
-    const [remoteName, remoteLocation] = remote;
+    let [nxRemoteProjectName, remoteLocation] = remote;
+    const mfRemoteName = normalizeRemoteName(nxRemoteProjectName);
     const remoteLocationExt = (0, path_1.extname)(remoteLocation);
     // If remote location already has .js or .mjs extension
-    if (['.js', '.mjs'].includes(remoteLocationExt)) {
+    if (['.js', '.mjs', '.json'].includes(remoteLocationExt)) {
         return remoteLocation;
     }
     const baseRemote = remoteLocation.endsWith('/')
         ? remoteLocation.slice(0, -1)
         : remoteLocation;
     const globalPrefix = isRemoteGlobal
-        ? `${remoteName.replace(/-/g, '_')}@`
+        ? `${normalizeRemoteName(nxRemoteProjectName)}@`
         : '';
     // if the remote is defined with anything other than http then we assume it's a promise based remote
     // In that case we should use what the user provides as the remote location
@@ -47,9 +50,11 @@ function handleArrayRemote(remote, remoteEntryExt, isRemoteGlobal) {
     }
 }
 // Helper function to deal with remotes that are strings
-function handleStringRemote(remote, determineRemoteUrl, isRemoteGlobal) {
-    const globalPrefix = isRemoteGlobal ? `${remote.replace(/-/g, '_')}@` : '';
-    return `${globalPrefix}${determineRemoteUrl(remote)}`;
+function handleStringRemote(nxRemoteProjectName, determineRemoteUrl, isRemoteGlobal) {
+    const globalPrefix = isRemoteGlobal
+        ? `${normalizeRemoteName(nxRemoteProjectName)}@`
+        : '';
+    return `${globalPrefix}${determineRemoteUrl(nxRemoteProjectName)}`;
 }
 /**
  * Map remote names to a format that can be understood and used by Module
@@ -63,17 +68,22 @@ function mapRemotesForSSR(remotes, remoteEntryExt, determineRemoteUrl) {
     const mappedRemotes = {};
     for (const remote of remotes) {
         if (Array.isArray(remote)) {
-            const [remoteName, remoteLocation] = remote;
+            let [nxRemoteProjectName, remoteLocation] = remote;
+            const mfRemoteName = normalizeRemoteName(nxRemoteProjectName);
             const remoteLocationExt = (0, path_1.extname)(remoteLocation);
-            mappedRemotes[remoteName] = `${remoteName}@${['.js', '.mjs'].includes(remoteLocationExt)
+            mappedRemotes[mfRemoteName] = `${mfRemoteName}@${['.js', '.mjs', '.json'].includes(remoteLocationExt)
                 ? remoteLocation
                 : `${remoteLocation.endsWith('/')
                     ? remoteLocation.slice(0, -1)
                     : remoteLocation}/remoteEntry.${remoteEntryExt}`}`;
         }
         else if (typeof remote === 'string') {
-            mappedRemotes[remote] = `${remote}@${determineRemoteUrl(remote)}`;
+            const mfRemoteName = normalizeRemoteName(remote);
+            mappedRemotes[mfRemoteName] = `${mfRemoteName}@${determineRemoteUrl(remote)}`;
         }
     }
     return mappedRemotes;
 }
+function normalizeRemoteName(remote) {
+    return remote.replace(/-/g, '_');
+}

package/src/utils/webpack/read-webpack-options.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.readWebpackOptions = readWebpackOptions;
 const devkit_1 = require("@nx/devkit");
 const config_1 = require("../config");
+const devkit_internals_1 = require("nx/src/devkit-internals");
 /**
  * Reads the webpack options from a give webpack configuration. The configuration can be:
  * 1. A standard config object
@@ -25,7 +26,14 @@ async function readWebpackOptions(webpackConfig) {
                 outputPath: undefined,
                 assets: undefined,
             },
-            context: { root: devkit_1.workspaceRoot, cwd: undefined, isVerbose: false },
+            context: {
+                root: devkit_1.workspaceRoot,
+                cwd: undefined,
+                isVerbose: false,
+                projectsConfigurations: null,
+                projectGraph: null,
+                nxJsonConfiguration: (0, devkit_internals_1.readNxJsonFromDisk)(devkit_1.workspaceRoot),
+            },
         });
     }
     else if (typeof webpackConfig === 'function') {

package/src/migrations/update-16-0-0-add-nx-packages/update-16-0-0-add-nx-packages.d.ts

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

package/src/migrations/update-16-0-0-add-nx-packages/update-16-0-0-add-nx-packages.js

@@ -1,9 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = replacePackage;
-const devkit_1 = require("@nx/devkit");
-const replace_package_1 = require("@nx/devkit/src/utils/replace-package");
-async function replacePackage(tree) {
-    await (0, replace_package_1.replaceNrwlPackageWithNxPackage)(tree, '@nrwl/webpack', '@nx/webpack');
-    await (0, devkit_1.formatFiles)(tree);
-}