@nx/react 21.3.0-beta.6 → 21.3.0-canary.20250614-db86a35

package/mf/dynamic-federation.js

@@ -4,7 +4,7 @@ exports.setRemoteUrlResolver = setRemoteUrlResolver;
 exports.setRemoteDefinitions = setRemoteDefinitions;
 exports.setRemoteDefinition = setRemoteDefinition;
 exports.loadRemoteModule = loadRemoteModule;
-const url_helpers_1 = require("@nx/module-federation/url-helpers");
+const node_path_1 = require("node:path");
 let remoteUrlDefinitions = {};
 let resolveRemoteUrl;
 const remoteModuleMap = new Map();
@@ -132,7 +132,15 @@ async function loadRemoteContainer(remoteName) {
     const remoteUrl = remoteUrlDefinitions
         ? remoteUrlDefinitions[remoteName]
         : await resolveRemoteUrl(remoteName);
-    const containerUrl = (0, url_helpers_1.processRuntimeRemoteUrl)(remoteUrl, 'mjs');
+    const url = new URL(remoteUrl);
+    const ext = (0, node_path_1.extname)(url.pathname);
+    const needsRemoteEntry = !['.js', '.mjs', '.json'].includes(ext);
+    if (needsRemoteEntry) {
+        url.pathname = url.pathname.endsWith('/')
+            ? `${url.pathname}remoteEntry.mjs`
+            : `${url.pathname}/remoteEntry.mjs`;
+    }
+    const containerUrl = url.href;
     const container = await fetchRemoteModule(containerUrl, remoteName);
     await container.init(__webpack_share_scopes__.default);
     remoteContainerMap.set(remoteName, container);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/react",
-  "version": "21.3.0-beta.6",
+  "version": "21.3.0-canary.20250614-db86a35",
   "private": false,
   "description": "The React plugin for Nx contains executors and generators for managing React applications and libraries within an Nx workspace. It provides:\n\n\n- Integration with libraries such as Jest, Vitest, Playwright, Cypress, and Storybook.\n\n- Generators for applications, libraries, components, hooks, and more.\n\n- Library build support for publishing packages to npm or other registries.\n\n- Utilities for automatic workspace refactoring.",
   "repository": {
@@ -38,11 +38,11 @@
     "minimatch": "9.0.3",
     "picocolors": "^1.1.0",
     "tslib": "^2.3.0",
-    "@nx/devkit": "21.3.0-beta.6",
-    "@nx/js": "21.3.0-beta.6",
-    "@nx/eslint": "21.3.0-beta.6",
-    "@nx/web": "21.3.0-beta.6",
-    "@nx/module-federation": "21.3.0-beta.6",
+    "@nx/devkit": "21.3.0-canary.20250614-db86a35",
+    "@nx/js": "21.3.0-canary.20250614-db86a35",
+    "@nx/eslint": "21.3.0-canary.20250614-db86a35",
+    "@nx/web": "21.3.0-canary.20250614-db86a35",
+    "@nx/module-federation": "21.3.0-canary.20250614-db86a35",
     "express": "^4.21.2",
     "http-proxy-middleware": "^3.0.3",
     "semver": "^7.6.3"

package/plugins/component-testing/index.js

@@ -2,9 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.nxComponentTestingPreset = nxComponentTestingPreset;
 const cypress_preset_1 = require("@nx/cypress/plugins/cypress-preset");
-const ct_helpers_1 = require("@nx/cypress/src/utils/ct-helpers");
 const devkit_1 = require("@nx/devkit");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+const ct_helpers_1 = require("@nx/cypress/src/utils/ct-helpers");
 const fs_1 = require("fs");
 const path_1 = require("path");
 /**
@@ -161,7 +160,7 @@ function buildTargetWebpack(ctx, buildTarget, componentTestingProjectName) {
     const { composePluginsSync } = require('@nx/webpack/src/utils/config');
     const { withNx } = require('@nx/webpack/src/utils/with-nx');
     const { withWeb } = require('@nx/webpack/src/utils/with-web');
-    const options = normalizeOptions(withSchemaDefaults(parsed, context), devkit_1.workspaceRoot, buildableProjectConfig.root, (0, ts_solution_setup_1.getProjectSourceRoot)(buildableProjectConfig));
+    const options = normalizeOptions(withSchemaDefaults(parsed, context), devkit_1.workspaceRoot, buildableProjectConfig.root, buildableProjectConfig.sourceRoot);
     let customWebpack;
     if (options.webpackConfig) {
         customWebpack = resolveUserDefinedWebpackConfig(options.webpackConfig, options.tsConfig.startsWith(context.root)
@@ -184,7 +183,7 @@ function buildTargetWebpack(ctx, buildTarget, componentTestingProjectName) {
                 extractLicenses: false,
                 root: devkit_1.workspaceRoot,
                 projectRoot: ctProjectConfig.root,
-                sourceRoot: (0, ts_solution_setup_1.getProjectSourceRoot)(ctProjectConfig),
+                sourceRoot: ctProjectConfig.sourceRoot,
             },
             context,
         });

package/plugins/storybook/index.js

@@ -2,13 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.webpack = exports.core = void 0;
 const devkit_1 = require("@nx/devkit");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 const config_1 = require("@nx/webpack/src/utils/config");
-const fs_1 = require("fs");
 const path_1 = require("path");
 const webpack_1 = require("webpack");
-const with_react_1 = require("../with-react");
 const merge_plugins_1 = require("./merge-plugins");
+const with_react_1 = require("../with-react");
+const fs_1 = require("fs");
 // This is shamelessly taken from CRA and modified for NX use
 // https://github.com/facebook/create-react-app/blob/4784997f0682e75eb32a897b4ffe34d735912e6c/packages/react-scripts/config/env.js#L71
 function getClientEnvironment(mode) {
@@ -63,7 +62,7 @@ const getProjectData = async (storybookOptions) => {
         ? {
             workspaceRoot: process.env.NX_WORKSPACE_ROOT,
             projectRoot: projectNode.data.root,
-            sourceRoot: (0, ts_solution_setup_1.getProjectSourceRoot)(projectNode.data),
+            sourceRoot: projectNode.data.sourceRoot,
             projectNode,
         }
         : // Edge-case: missing project node
@@ -129,7 +128,7 @@ const webpack = async (storybookWebpackConfig = {}, options) => {
         ...options,
         root: projectData.workspaceRoot,
         projectRoot: projectData.projectRoot,
-        sourceRoot: (0, ts_solution_setup_1.getProjectSourceRoot)(projectData.projectNode.data),
+        sourceRoot: projectData.sourceRoot,
         fileReplacements: [],
         sourceMap: true,
         styles: options.styles ?? [],

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

@@ -2,12 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = moduleFederationDevServer;
 const devkit_1 = require("@nx/devkit");
-const async_iterable_1 = require("@nx/devkit/src/utils/async-iterable");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
-const utils_1 = require("@nx/module-federation/src/executors/utils");
+const dev_server_impl_1 = require("@nx/webpack/src/executors/dev-server/dev-server.impl");
 const file_server_impl_1 = require("@nx/web/src/executors/file-server/file-server.impl");
+const utils_1 = require("@nx/module-federation/src/executors/utils");
+const async_iterable_1 = require("@nx/devkit/src/utils/async-iterable");
 const wait_for_port_open_1 = require("@nx/web/src/utils/wait-for-port-open");
-const dev_server_impl_1 = require("@nx/webpack/src/executors/dev-server/dev-server.impl");
 const fs_1 = require("fs");
 const path_1 = require("path");
 const lib_1 = require("./lib");
@@ -24,7 +23,8 @@ async function* moduleFederationDevServer(schema, context) {
         }, context)
         : (0, dev_server_impl_1.default)(options, context);
     const p = context.projectsConfigurations.projects[context.projectName];
-    let pathToManifestFile = (0, path_1.join)(context.root, (0, ts_solution_setup_1.getProjectSourceRoot)(p), 'assets/module-federation.manifest.json');
+    const buildOptions = (0, lib_1.getBuildOptions)(options.buildTarget, context);
+    let pathToManifestFile = (0, path_1.join)(context.root, p.sourceRoot, 'assets/module-federation.manifest.json');
     if (options.pathToManifestFile) {
         const userPathToManifestFile = (0, path_1.join)(context.root, options.pathToManifestFile);
         if (!(0, fs_1.existsSync)(userPathToManifestFile)) {

package/src/executors/module-federation-ssr-dev-server/module-federation-ssr-dev-server.impl.js

@@ -2,19 +2,19 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = moduleFederationSsrDevServer;
 const devkit_1 = require("@nx/devkit");
-const async_iterable_1 = require("@nx/devkit/src/utils/async-iterable");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
-const utils_1 = require("@nx/module-federation/src/executors/utils");
-const wait_for_port_open_1 = require("@nx/web/src/utils/wait-for-port-open");
 const ssr_dev_server_impl_1 = require("@nx/webpack/src/executors/ssr-dev-server/ssr-dev-server.impl");
-const fs_1 = require("fs");
 const path_1 = require("path");
+const utils_1 = require("@nx/module-federation/src/executors/utils");
+const async_iterable_1 = require("@nx/devkit/src/utils/async-iterable");
+const fs_1 = require("fs");
+const wait_for_port_open_1 = require("@nx/web/src/utils/wait-for-port-open");
 const lib_1 = require("./lib");
 async function* moduleFederationSsrDevServer(ssrDevServerOptions, context) {
     const options = (0, lib_1.normalizeOptions)(ssrDevServerOptions);
     let iter = (0, ssr_dev_server_impl_1.default)(options, context);
     const projectConfig = context.projectsConfigurations.projects[context.projectName];
-    let pathToManifestFile = (0, path_1.join)(context.root, (0, ts_solution_setup_1.getProjectSourceRoot)(projectConfig), 'assets/module-federation.manifest.json');
+    const buildOptions = (0, lib_1.getBuildOptions)(options.browserTarget, context);
+    let pathToManifestFile = (0, path_1.join)(context.root, projectConfig.sourceRoot, 'assets/module-federation.manifest.json');
     if (options.pathToManifestFile) {
         const userPathToManifestFile = (0, path_1.join)(context.root, options.pathToManifestFile);
         if (!(0, fs_1.existsSync)(userPathToManifestFile)) {

package/src/executors/module-federation-static-server/module-federation-static-server.impl.d.ts

@@ -1,7 +1,7 @@
-import { StaticRemotesConfig } from '@nx/module-federation/src/utils';
-import { ExecutorContext } from 'nx/src/config/misc-interfaces';
-import { ModuleFederationDevServerOptions } from '../module-federation-dev-server/schema';
 import { ModuleFederationStaticServerSchema } from './schema';
+import { ModuleFederationDevServerOptions } from '../module-federation-dev-server/schema';
+import { ExecutorContext } from 'nx/src/config/misc-interfaces';
+import { StaticRemotesConfig } from '@nx/module-federation/src/utils';
 export declare function startProxies(staticRemotesConfig: StaticRemotesConfig, hostServeOptions: ModuleFederationDevServerOptions, mappedLocationOfHost: string, mappedLocationsOfRemotes: Record<string, string>, sslOptions?: {
     pathToCert: string;
     pathToKey: string;

package/src/executors/module-federation-static-server/module-federation-static-server.impl.js

@@ -2,23 +2,22 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.startProxies = startProxies;
 exports.default = moduleFederationStaticServer;
+const path_1 = require("path");
 const devkit_1 = require("@nx/devkit");
-const async_iterable_1 = require("@nx/devkit/src/utils/async-iterable");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
-const utils_1 = require("@nx/module-federation/src/executors/utils");
-const utils_2 = require("@nx/module-federation/src/utils");
-const file_server_impl_1 = require("@nx/web/src/executors/file-server/file-server.impl");
-const wait_for_port_open_1 = require("@nx/web/src/utils/wait-for-port-open");
-const child_process_1 = require("child_process");
 const fs_1 = require("fs");
+const utils_1 = require("@nx/module-federation/src/utils");
+const utils_2 = require("@nx/module-federation/src/executors/utils");
+const child_process_1 = require("child_process");
 const process = require("node:process");
-const path_1 = require("path");
+const file_server_impl_1 = require("@nx/web/src/executors/file-server/file-server.impl");
+const async_iterable_1 = require("@nx/devkit/src/utils/async-iterable");
+const wait_for_port_open_1 = require("@nx/web/src/utils/wait-for-port-open");
 function getBuildAndServeOptionsFromServeTarget(serveTarget, context) {
     const target = (0, devkit_1.parseTargetString)(serveTarget, context);
     const serveOptions = (0, devkit_1.readTargetOptions)(target, context);
     const buildTarget = (0, devkit_1.parseTargetString)(serveOptions.buildTarget, context);
     const buildOptions = (0, devkit_1.readTargetOptions)(buildTarget, context);
-    let pathToManifestFile = (0, path_1.join)(context.root, (0, ts_solution_setup_1.getProjectSourceRoot)(context.projectGraph.nodes[context.projectName].data), 'assets/module-federation.manifest.json');
+    let pathToManifestFile = (0, path_1.join)(context.root, context.projectGraph.nodes[context.projectName].data.sourceRoot, 'assets/module-federation.manifest.json');
     if (serveOptions.pathToManifestFile) {
         const userPathToManifestFile = (0, path_1.join)(context.root, serveOptions.pathToManifestFile);
         if (!(0, fs_1.existsSync)(userPathToManifestFile)) {
@@ -164,15 +163,15 @@ async function* moduleFederationStaticServer(schema, context) {
     // Get the remotes from the module federation config
     const p = context.projectsConfigurations.projects[context.projectName];
     const options = getBuildAndServeOptionsFromServeTarget(schema.serveTarget, context);
-    const moduleFederationConfig = (0, utils_2.getModuleFederationConfig)(options.buildOptions.tsConfig, context.root, p.root, 'react');
-    const remotes = (0, utils_2.getRemotes)([], options.serveOptions.skipRemotes, moduleFederationConfig, {
+    const moduleFederationConfig = (0, utils_1.getModuleFederationConfig)(options.buildOptions.tsConfig, context.root, p.root, 'react');
+    const remotes = (0, utils_1.getRemotes)([], options.serveOptions.skipRemotes, moduleFederationConfig, {
         projectName: context.projectName,
         projectGraph: context.projectGraph,
         root: context.root,
     }, options.pathToManifestFile);
-    const staticRemotesConfig = (0, utils_2.parseStaticRemotesConfig)([...remotes.staticRemotes, ...remotes.dynamicRemotes], context);
+    const staticRemotesConfig = (0, utils_1.parseStaticRemotesConfig)([...remotes.staticRemotes, ...remotes.dynamicRemotes], context);
     options.serveOptions.staticRemotesPort ??= remotes.staticRemotePort;
-    const mappedLocationsOfStaticRemotes = await (0, utils_1.buildStaticRemotes)(staticRemotesConfig, nxBin, context, options.serveOptions);
+    const mappedLocationsOfStaticRemotes = await (0, utils_2.buildStaticRemotes)(staticRemotesConfig, nxBin, context, options.serveOptions);
     // Build the host
     const hostUrlSegment = (0, path_1.basename)(options.buildOptions.outputPath);
     const mappedLocationOfHost = `http${options.serveOptions.ssl ? 's' : ''}://${options.serveOptions.host}:${options.serveOptions.staticRemotesPort}/${hostUrlSegment}`;

package/src/generators/application/lib/add-project.js

@@ -89,7 +89,7 @@ function createRspackBuildTarget(options) {
             styles: options.styledModule || !options.hasStyles
                 ? []
                 : [
-                    (0, devkit_1.joinPathFragments)(options.appProjectRoot, `src/styles.${options.style === 'tailwind' ? 'css' : options.style}`),
+                    (0, devkit_1.joinPathFragments)(options.appProjectRoot, `src/styles.${options.style}`),
                 ],
             scripts: [],
             configurations: {
@@ -151,7 +151,7 @@ function createBuildTarget(options) {
             styles: options.styledModule || !options.hasStyles
                 ? []
                 : [
-                    (0, devkit_1.joinPathFragments)(options.appProjectRoot, `src/styles.${options.style === 'tailwind' ? 'css' : options.style}`),
+                    (0, devkit_1.joinPathFragments)(options.appProjectRoot, `src/styles.${options.style}`),
                 ],
             scripts: [],
             webpackConfig: (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'webpack.config.js'),

package/src/generators/component-story/component-story.js

@@ -4,17 +4,16 @@ exports.createComponentStoriesFile = createComponentStoriesFile;
 exports.findPropsAndGenerateFile = findPropsAndGenerateFile;
 exports.componentStoryGenerator = componentStoryGenerator;
 const devkit_1 = require("@nx/devkit");
-const ensure_typescript_1 = require("@nx/js/src/utils/typescript/ensure-typescript");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 const ast_utils_1 = require("../../utils/ast-utils");
 const component_props_1 = require("../../utils/component-props");
+const ensure_typescript_1 = require("@nx/js/src/utils/typescript/ensure-typescript");
 let tsModule;
 function createComponentStoriesFile(host, { project, componentPath, interactionTests }) {
     if (!tsModule) {
         tsModule = (0, ensure_typescript_1.ensureTypescript)();
     }
     const proj = (0, devkit_1.getProjects)(host).get(project);
-    const componentFilePath = (0, devkit_1.joinPathFragments)((0, ts_solution_setup_1.getProjectSourceRoot)(proj, host), componentPath);
+    const componentFilePath = (0, devkit_1.joinPathFragments)(proj.sourceRoot ?? proj.root, componentPath);
     const componentDirectory = componentFilePath.replace(componentFilePath.slice(componentFilePath.lastIndexOf('/')), '');
     const isPlainJs = componentFilePath.endsWith('.jsx') || componentFilePath.endsWith('.js');
     const componentFileName = componentFilePath

package/src/generators/component-test/component-test.js

@@ -2,12 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.componentTestGenerator = componentTestGenerator;
 const devkit_1 = require("@nx/devkit");
-const ensure_typescript_1 = require("@nx/js/src/utils/typescript/ensure-typescript");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 const path_1 = require("path");
 const ast_utils_1 = require("../../utils/ast-utils");
 const component_props_1 = require("../../utils/component-props");
 const versions_1 = require("../../utils/versions");
+const ensure_typescript_1 = require("@nx/js/src/utils/typescript/ensure-typescript");
 let tsModule;
 async function componentTestGenerator(tree, options) {
     (0, devkit_1.ensurePackage)('@nx/cypress', versions_1.nxVersion);
@@ -16,11 +15,10 @@ async function componentTestGenerator(tree, options) {
     // normalize any windows paths
     options.componentPath = options.componentPath.replace(/\\/g, '/');
     const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, options.project);
-    const sourceRoot = (0, ts_solution_setup_1.getProjectSourceRoot)(projectConfig, tree);
-    const normalizedPath = options.componentPath.startsWith(sourceRoot)
-        ? (0, path_1.relative)(sourceRoot, options.componentPath)
+    const normalizedPath = options.componentPath.startsWith(projectConfig.sourceRoot)
+        ? (0, path_1.relative)(projectConfig.sourceRoot, options.componentPath)
         : options.componentPath;
-    const componentPath = (0, devkit_1.joinPathFragments)(sourceRoot, normalizedPath);
+    const componentPath = (0, devkit_1.joinPathFragments)(projectConfig.sourceRoot, normalizedPath);
     if (tree.exists(componentPath)) {
         generateSpecsForComponents(tree, componentPath);
     }

package/src/generators/cypress-component-configuration/lib/add-files.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addFiles = addFiles;
 const devkit_1 = require("@nx/devkit");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 const versions_1 = require("nx/src/utils/versions");
 const ct_utils_1 = require("../../../utils/ct-utils");
 const component_test_1 = require("../../component-test/component-test");
@@ -33,8 +32,7 @@ async function addFiles(tree, projectConfig, options, found) {
     }
     if (options.generateTests) {
         const filePaths = [];
-        const sourceRoot = (0, ts_solution_setup_1.getProjectSourceRoot)(projectConfig, tree);
-        (0, devkit_1.visitNotIgnoredFiles)(tree, sourceRoot, (filePath) => {
+        (0, devkit_1.visitNotIgnoredFiles)(tree, projectConfig.sourceRoot, (filePath) => {
             if ((0, ct_utils_1.isComponent)(tree, filePath)) {
                 filePaths.push(filePath);
             }

package/src/generators/host/files/rspack-module-federation-ssr-ts/rspack.config.ts__tmpl__

@@ -1,6 +1,6 @@
-import { NxAppRspackPlugin } from '@nx/rspack/app-plugin.js';
-import { NxReactRspackPlugin } from '@nx/rspack/react-plugin.js';
-import { NxModuleFederationPlugin, NxModuleFederationSSRDevServerPlugin } from '@nx/module-federation/rspack.js';
+import { NxAppRspackPlugin } from '@nx/rspack/app-plugin';
+import { NxReactRspackPlugin } from '@nx/rspack/react-plugin';
+import { NxModuleFederationPlugin, NxModuleFederationSSRDevServerPlugin } from '@nx/module-federation/rspack';
 import { join } from 'path';
 
 import browserMfConfig from './module-federation.config';

package/src/generators/host/files/rspack-module-federation-ts/rspack.config.prod.ts__tmpl__

@@ -1,6 +1,6 @@
-import { NxAppRspackPlugin } from '@nx/rspack/app-plugin.js';
-import { NxReactRspackPlugin } from '@nx/rspack/react-plugin.js';
-import { NxModuleFederationPlugin, NxModuleFederationDevServerPlugin } from '@nx/module-federation/rspack.js';
+import { NxAppRspackPlugin } from '@nx/rspack/app-plugin';
+import { NxReactRspackPlugin } from '@nx/rspack/react-plugin';
+import { NxModuleFederationPlugin, NxModuleFederationDevServerPlugin } from '@nx/module-federation/rspack';
 import { ModuleFederationConfig } from '@nx/module-federation';
 import { join } from 'path';
 

package/src/generators/host/files/rspack-module-federation-ts/rspack.config.ts__tmpl__

@@ -1,6 +1,6 @@
-import { NxAppRspackPlugin } from '@nx/rspack/app-plugin.js';
-import { NxReactRspackPlugin } from '@nx/rspack/react-plugin.js';
-import { NxModuleFederationPlugin, NxModuleFederationDevServerPlugin } from '@nx/module-federation/rspack.js';
+import { NxAppRspackPlugin } from '@nx/rspack/app-plugin';
+import { NxReactRspackPlugin } from '@nx/rspack/react-plugin';
+import { NxModuleFederationPlugin, NxModuleFederationDevServerPlugin } from '@nx/module-federation/rspack';
 import { join } from 'path';
 
 import config from './module-federation.config';

package/src/generators/host/files/webpack-module-federation-ssr-ts/webpack.server.config.ts__tmpl__

@@ -1,6 +1,6 @@
 import {composePlugins, withNx} from '@nx/webpack';
 import {withReact} from '@nx/react';
-import {withModuleFederationForSSR} from '@nx/module-federation/webpack.js';
+import {withModuleFederationForSSR} from '@nx/module-federation/webpack';
 
 import baseConfig from './module-federation.config';
 

package/src/generators/host/files/webpack-module-federation-ts/webpack.config.prod.ts__tmpl__

@@ -1,6 +1,6 @@
 import { composePlugins, withNx } from '@nx/webpack';
 import { withReact } from '@nx/react';
-import { withModuleFederation } from '@nx/module-federation/webpack.js';
+import { withModuleFederation } from '@nx/module-federation/webpack';
 import { ModuleFederationConfig } from '@nx/module-federation';
 
 import baseConfig from './module-federation.config';

package/src/generators/host/files/webpack-module-federation-ts/webpack.config.ts__tmpl__

@@ -1,6 +1,6 @@
 import {composePlugins, withNx} from '@nx/webpack';
 import {withReact} from '@nx/react';
-import {withModuleFederation} from '@nx/module-federation/webpack.js';
+import {withModuleFederation} from '@nx/module-federation/webpack';
 import { ModuleFederationConfig } from '@nx/module-federation';
 
 import baseConfig from './module-federation.config';

package/src/generators/host/lib/add-module-federation-files.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addModuleFederationFiles = addModuleFederationFiles;
 const devkit_1 = require("@nx/devkit");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 const maybe_js_1 = require("../../../utils/maybe-js");
 const create_application_files_1 = require("../../application/lib/create-application-files");
 function addModuleFederationFiles(host, options, defaultRemoteManifest) {
@@ -34,7 +33,7 @@ function addModuleFederationFiles(host, options, defaultRemoteManifest) {
             }),
         };
     const projectConfig = (0, devkit_1.readProjectConfiguration)(host, options.projectName);
-    const pathToMFManifest = (0, devkit_1.joinPathFragments)((0, ts_solution_setup_1.getProjectSourceRoot)(projectConfig, host), 'assets/module-federation.manifest.json');
+    const pathToMFManifest = (0, devkit_1.joinPathFragments)(projectConfig.sourceRoot, 'assets/module-federation.manifest.json');
     // Module federation requires bootstrap code to be dynamically imported.
     // Renaming original entry file so we can use `import(./bootstrap)` in
     // new entry file.

package/src/generators/library/lib/normalize-options.js

@@ -56,7 +56,7 @@ async function normalizeOptions(host, options) {
         if (appProjectType !== 'application') {
             throw new Error(`appProject expected type of "application" but got "${appProjectType}"`);
         }
-        const appSourceRoot = (0, ts_solution_setup_1.getProjectSourceRoot)(appProjectConfig, host);
+        const appSourceRoot = (0, ts_solution_setup_1.getProjectSourceRoot)(host, appProjectConfig.sourceRoot, appProjectConfig.root);
         normalized.appMain =
             appProjectConfig.targets.build?.options?.main ??
                 findMainEntry(host, appProjectConfig.root);

package/src/generators/library/library.js

@@ -45,10 +45,6 @@ async function libraryGeneratorInternal(host, schema) {
         !schema.importPath) {
         throw new Error(`For publishable libs you have to provide a proper "--importPath" which needs to be a valid npm package name (e.g. my-awesome-lib or @myorg/my-lib)`);
     }
-    if (schema.simpleName !== undefined && schema.simpleName !== false) {
-        // TODO(v22): Remove simpleName as user should be using name.
-        devkit_1.logger.warn(`The "--simpleName" option is deprecated and will be removed in Nx 22. Please use the "--name" option to provide the exact name you want for the library.`);
-    }
     if (!options.component) {
         options.style = 'none';
     }

package/src/generators/library/schema.json

@@ -189,8 +189,7 @@
     "simpleName": {
       "description": "Don't include the directory in the name of the module of the library.",
       "type": "boolean",
-      "default": false,
-      "x-deprecated": "Use the --name option to provide the exact name instead. This option will be removed in Nx 22."
+      "default": false
     },
     "useProjectJson": {
       "type": "boolean",

package/src/generators/redux/redux.d.ts

@@ -1,4 +1,4 @@
-import { Tree } from '@nx/devkit';
 import { Schema } from './schema';
+import { Tree } from '@nx/devkit';
 export declare function reduxGenerator(host: Tree, schema: Schema): Promise<import("@nx/devkit").GeneratorCallback>;
 export default reduxGenerator;

package/src/generators/redux/redux.js

@@ -1,14 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.reduxGenerator = reduxGenerator;
+const path = require("path");
+const ast_utils_1 = require("../../utils/ast-utils");
+const versions_1 = require("../../utils/versions");
 const devkit_1 = require("@nx/devkit");
-const artifact_name_and_directory_utils_1 = require("@nx/devkit/src/generators/artifact-name-and-directory-utils");
 const js_1 = require("@nx/js");
 const ensure_typescript_1 = require("@nx/js/src/utils/typescript/ensure-typescript");
+const artifact_name_and_directory_utils_1 = require("@nx/devkit/src/generators/artifact-name-and-directory-utils");
 const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
-const path = require("path");
-const ast_utils_1 = require("../../utils/ast-utils");
-const versions_1 = require("../../utils/versions");
 let tsModule;
 async function reduxGenerator(host, schema) {
     const options = await normalizeOptions(host, schema);
@@ -109,7 +109,7 @@ async function normalizeOptions(host, options) {
         if (appConfig.projectType !== 'application') {
             throw new Error(`Expected ${options.appProject} to be an application but got ${appConfig.projectType}`);
         }
-        appProjectSourcePath = (0, ts_solution_setup_1.getProjectSourceRoot)(appConfig, host);
+        appProjectSourcePath = appConfig.sourceRoot;
         appMainFilePath = path.join(appProjectSourcePath, options.js ? 'main.js' : 'main.tsx');
         if (!host.exists(appMainFilePath)) {
             throw new Error(`Could not find ${appMainFilePath} during store configuration`);

package/src/generators/remote/files/rspack-module-federation-ssr-ts/rspack.config.ts__tmpl__

@@ -1,6 +1,6 @@
-import { NxAppRspackPlugin } from '@nx/rspack/app-plugin.js';
-import { NxReactRspackPlugin } from '@nx/rspack/react-plugin.js';
-import { NxModuleFederationPlugin, NxModuleFederationSSRDevServerPlugin } from '@nx/module-federation/rspack.js';
+import { NxAppRspackPlugin } from '@nx/rspack/app-plugin';
+import { NxReactRspackPlugin } from '@nx/rspack/react-plugin';
+import { NxModuleFederationPlugin, NxModuleFederationSSRDevServerPlugin } from '@nx/module-federation/rspack';
 import { join } from 'path';
 
 import browserMfConfig from './module-federation.config';

package/src/generators/remote/files/rspack-module-federation-ts/rspack.config.ts__tmpl__

@@ -1,6 +1,6 @@
-import { NxAppRspackPlugin } from '@nx/rspack/app-plugin.js';
-import { NxReactRspackPlugin } from '@nx/rspack/react-plugin.js';
-import { NxModuleFederationPlugin, NxModuleFederationDevServerPlugin } from '@nx/module-federation/rspack.js';
+import { NxAppRspackPlugin } from '@nx/rspack/app-plugin';
+import { NxReactRspackPlugin } from '@nx/rspack/react-plugin';
+import { NxModuleFederationPlugin, NxModuleFederationDevServerPlugin } from '@nx/module-federation/rspack';
 import { join } from 'path';
 
 import config from './module-federation.config';

package/src/generators/remote/files/webpack-module-federation-ssr-ts/webpack.server.config.ts__tmpl__

@@ -1,6 +1,6 @@
 import {composePlugins, withNx} from '@nx/webpack';
 import {withReact} from '@nx/react';
-import {withModuleFederationForSSR} from '@nx/module-federation/webpack.js';
+import {withModuleFederationForSSR} from '@nx/module-federation/webpack';
 
 import baseConfig from "./module-federation.server.config";
 

package/src/generators/remote/files/webpack-module-federation-ts/webpack.config.ts__tmpl__

@@ -1,6 +1,6 @@
 import {composePlugins, withNx} from '@nx/webpack';
 import {withReact} from '@nx/react';
-import {withModuleFederation} from '@nx/module-federation/webpack.js';
+import {withModuleFederation} from '@nx/module-federation/webpack';
 
 import baseConfig from './module-federation.config';
 

package/src/generators/remote/lib/update-host-with-remote.js

@@ -2,9 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateHostWithRemote = updateHostWithRemote;
 const devkit_1 = require("@nx/devkit");
-const ensure_typescript_1 = require("@nx/js/src/utils/typescript/ensure-typescript");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 const ast_utils_1 = require("../../../module-federation/ast-utils");
+const ensure_typescript_1 = require("@nx/js/src/utils/typescript/ensure-typescript");
 let tsModule;
 function updateHostWithRemote(host, hostName, remoteName) {
     if (!tsModule) {
@@ -15,7 +14,7 @@ function updateHostWithRemote(host, hostName, remoteName) {
     if (!host.exists(moduleFederationConfigPath)) {
         moduleFederationConfigPath = (0, devkit_1.joinPathFragments)(hostConfig.root, 'module-federation.config.ts');
     }
-    const appComponentPath = findAppComponentPath(host, (0, ts_solution_setup_1.getProjectSourceRoot)(hostConfig, host));
+    const appComponentPath = findAppComponentPath(host, hostConfig.sourceRoot);
     if (host.exists(moduleFederationConfigPath)) {
         // find the host project path
         // Update remotes inside ${host_path}/src/remotes.d.ts

package/src/generators/remote/remote.js

@@ -2,23 +2,22 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addModuleFederationFiles = addModuleFederationFiles;
 exports.remoteGenerator = remoteGenerator;
-const devkit_1 = require("@nx/devkit");
 const path_1 = require("path");
-const project_name_and_root_utils_1 = require("@nx/devkit/src/generators/project-name-and-root-utils");
-const js_1 = require("@nx/js");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+const devkit_1 = require("@nx/devkit");
+const normalize_options_1 = require("../application/lib/normalize-options");
+const application_1 = require("../application/application");
+const update_host_with_remote_1 = require("./lib/update-host-with-remote");
 const update_module_federation_project_1 = require("../../rules/update-module-federation-project");
+const setup_ssr_1 = require("../setup-ssr/setup-ssr");
+const setup_ssr_for_remote_1 = require("./lib/setup-ssr-for-remote");
+const setup_tspath_for_remote_1 = require("./lib/setup-tspath-for-remote");
+const add_remote_to_dynamic_host_1 = require("./lib/add-remote-to-dynamic-host");
 const add_mf_env_to_inputs_1 = require("../../utils/add-mf-env-to-inputs");
 const maybe_js_1 = require("../../utils/maybe-js");
+const js_1 = require("@nx/js");
 const versions_1 = require("../../utils/versions");
-const application_1 = require("../application/application");
+const project_name_and_root_utils_1 = require("@nx/devkit/src/generators/project-name-and-root-utils");
 const create_application_files_1 = require("../application/lib/create-application-files");
-const normalize_options_1 = require("../application/lib/normalize-options");
-const setup_ssr_1 = require("../setup-ssr/setup-ssr");
-const add_remote_to_dynamic_host_1 = require("./lib/add-remote-to-dynamic-host");
-const setup_ssr_for_remote_1 = require("./lib/setup-ssr-for-remote");
-const setup_tspath_for_remote_1 = require("./lib/setup-tspath-for-remote");
-const update_host_with_remote_1 = require("./lib/update-host-with-remote");
 function addModuleFederationFiles(host, options) {
     const templateVariables = options.bundler === 'rspack'
         ? {
@@ -136,7 +135,7 @@ async function remoteGenerator(host, schema) {
     }
     if (options.host && options.dynamic) {
         const hostConfig = (0, devkit_1.readProjectConfiguration)(host, schema.host);
-        const pathToMFManifest = (0, devkit_1.joinPathFragments)((0, ts_solution_setup_1.getProjectSourceRoot)(hostConfig, host), 'assets/module-federation.manifest.json');
+        const pathToMFManifest = (0, devkit_1.joinPathFragments)(hostConfig.sourceRoot, 'assets/module-federation.manifest.json');
         (0, add_remote_to_dynamic_host_1.addRemoteToDynamicHost)(host, options.projectName, options.devServerPort, pathToMFManifest);
     }
     (0, add_mf_env_to_inputs_1.addMfEnvToTargetDefaultInputs)(host, options.bundler);

package/src/generators/setup-ssr/setup-ssr.js

@@ -2,11 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.setupSsrGenerator = setupSsrGenerator;
 const devkit_1 = require("@nx/devkit");
+const versions_1 = require("../../utils/versions");
+const ast_utils_1 = require("../../utils/ast-utils");
 const ensure_typescript_1 = require("@nx/js/src/utils/typescript/ensure-typescript");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 const path_1 = require("path");
-const ast_utils_1 = require("../../utils/ast-utils");
-const versions_1 = require("../../utils/versions");
 let tsModule;
 function readEntryFile(host, path) {
     if (!tsModule) {
@@ -44,7 +43,7 @@ async function setupSsrGenerator(tree, options) {
     ].map((importPath) => {
         return {
             importPath,
-            filePath: (0, devkit_1.joinPathFragments)((0, ts_solution_setup_1.getProjectSourceRoot)(projectConfig, tree), `${importPath}.tsx`),
+            filePath: (0, devkit_1.joinPathFragments)(projectConfig.sourceRoot || projectConfig.root, `${importPath}.tsx`),
         };
     });
     const appComponentInfo = appImportCandidates.find((candidate) => tree.exists(candidate.filePath));

package/src/generators/stories/stories.js

@@ -4,13 +4,13 @@ exports.projectRootPath = projectRootPath;
 exports.containsComponentDeclaration = containsComponentDeclaration;
 exports.createAllStories = createAllStories;
 exports.storiesGenerator = storiesGenerator;
+const component_story_1 = require("../component-story/component-story");
+const ast_utils_1 = require("../../utils/ast-utils");
 const devkit_1 = require("@nx/devkit");
+const path_1 = require("path");
+const minimatch_1 = require("minimatch");
 const ensure_typescript_1 = require("@nx/js/src/utils/typescript/ensure-typescript");
 const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
-const minimatch_1 = require("minimatch");
-const path_1 = require("path");
-const ast_utils_1 = require("../../utils/ast-utils");
-const component_story_1 = require("../component-story/component-story");
 let tsModule;
 async function projectRootPath(tree, config) {
     let projectDir;
@@ -32,7 +32,7 @@ async function projectRootPath(tree, config) {
     else {
         projectDir = '.';
     }
-    return (0, devkit_1.joinPathFragments)((0, ts_solution_setup_1.getProjectSourceRoot)(config, tree), projectDir);
+    return (0, devkit_1.joinPathFragments)(config.sourceRoot ?? config.root, projectDir);
 }
 function containsComponentDeclaration(tree, componentPath) {
     if (!tsModule) {

package/src/utils/versions.d.ts

@@ -45,7 +45,7 @@ export declare const isbotVersion = "^3.6.5";
 export declare const corsVersion = "~2.8.5";
 export declare const typesCorsVersion = "~2.8.12";
 export declare const moduleFederationNodeVersion = "^2.6.26";
-export declare const moduleFederationEnhancedVersion = "^0.15.0";
+export declare const moduleFederationEnhancedVersion = "^0.9.0";
 export declare const lessVersion = "3.12.2";
 export declare const sassVersion = "^1.55.0";
 export declare const rollupPluginUrlVersion = "^8.0.2";

package/src/utils/versions.js

@@ -52,7 +52,7 @@ exports.isbotVersion = '^3.6.5';
 exports.corsVersion = '~2.8.5';
 exports.typesCorsVersion = '~2.8.12';
 exports.moduleFederationNodeVersion = '^2.6.26';
-exports.moduleFederationEnhancedVersion = '^0.15.0';
+exports.moduleFederationEnhancedVersion = '^0.9.0';
 // style preprocessors
 exports.lessVersion = '3.12.2';
 exports.sassVersion = '^1.55.0';