@nx/react 23.0.0-beta.2 → 23.0.0-beta.21

package/src/generators/remote/remote.js

@@ -3,15 +3,16 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.addModuleFederationFiles = addModuleFederationFiles;
 exports.remoteGenerator = remoteGenerator;
 const tslib_1 = require("tslib");
+const internal_1 = require("@nx/devkit/internal");
 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 internal_2 = require("@nx/js/internal");
 const update_module_federation_project_1 = require("../../rules/update-module-federation-project");
 const add_mf_env_to_inputs_1 = require("../../utils/add-mf-env-to-inputs");
 const normalize_remote_1 = require("../../utils/normalize-remote");
 const maybe_js_1 = require("../../utils/maybe-js");
+const module_federation_deprecation_1 = require("../../utils/module-federation-deprecation");
 const versions_1 = require("../../utils/versions");
 const application_1 = tslib_1.__importDefault(require("../application/application"));
 const create_application_files_1 = require("../application/lib/create-application-files");
@@ -57,7 +58,7 @@ function addModuleFederationFiles(host, options) {
             host.delete(pathToWebpackProdConfig);
         }
         // Delete TypeScript prod config in TS solution setup - not needed in Crystal
-        if ((0, ts_solution_setup_1.isUsingTsSolutionSetup)(host)) {
+        if ((0, internal_2.isUsingTsSolutionSetup)(host)) {
             const pathToTsProdConfig = (0, devkit_1.joinPathFragments)(options.appProjectRoot, options.bundler === 'rspack'
                 ? 'rspack.config.prod.ts'
                 : 'webpack.config.prod.ts');
@@ -68,6 +69,7 @@ function addModuleFederationFiles(host, options) {
     }
 }
 async function remoteGenerator(host, schema) {
+    (0, module_federation_deprecation_1.warnReactRemoteGeneratorDeprecation)();
     const tasks = [];
     const name = await (0, normalize_remote_1.normalizeRemoteName)(host, schema.name, schema);
     const options = {
@@ -93,7 +95,7 @@ async function remoteGenerator(host, schema) {
             throw new Error(`Invalid remote name provided: ${options.projectName}. ${isValidRemote.message}`);
         }
     }
-    await (0, project_name_and_root_utils_1.ensureRootProjectName)(options, 'application');
+    await (0, internal_1.ensureRootProjectName)(options, 'application');
     const isValidRemote = (0, js_1.isValidVariable)(options.projectName);
     if (!isValidRemote.isValid) {
         throw new Error(`Invalid remote name provided: ${options.projectName}. ${isValidRemote.message}`);
@@ -105,7 +107,7 @@ async function remoteGenerator(host, schema) {
     });
     tasks.push(initAppTask);
     // In TS solution setup, update package.json to use simple name instead of scoped name
-    if ((0, ts_solution_setup_1.isUsingTsSolutionSetup)(host)) {
+    if ((0, internal_2.isUsingTsSolutionSetup)(host)) {
         const remotePackageJsonPath = (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'package.json');
         if (host.exists(remotePackageJsonPath)) {
             (0, devkit_1.updateJson)(host, remotePackageJsonPath, (json) => {
@@ -124,7 +126,7 @@ async function remoteGenerator(host, schema) {
     addModuleFederationFiles(host, options);
     (0, update_module_federation_project_1.updateModuleFederationProject)(host, options);
     // Conditionally setup TS path or package.json exports based on TS solution setup
-    if ((0, ts_solution_setup_1.isUsingTsSolutionSetup)(host)) {
+    if ((0, internal_2.isUsingTsSolutionSetup)(host)) {
         (0, setup_package_json_exports_for_remote_1.setupPackageJsonExportsForRemote)(host, options);
     }
     else {
@@ -160,7 +162,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)((0, internal_2.getProjectSourceRoot)(hostConfig, host), '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.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"setup-ssr.d.ts","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/setup-ssr/setup-ssr.ts"],"names":[],"mappings":"AAAA,OAAO,EAUL,IAAI,EAGL,MAAM,YAAY,CAAC;AAcpB,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AA2CvC,wBAAsB,iBAAiB,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,mDAkNlE;AAED,eAAe,iBAAiB,CAAC"}
+{"version":3,"file":"setup-ssr.d.ts","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/setup-ssr/setup-ssr.ts"],"names":[],"mappings":"AAAA,OAAO,EAUL,IAAI,EAGL,MAAM,YAAY,CAAC;AAcpB,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AA2CvC,wBAAsB,iBAAiB,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,mDAgNlE;AAED,eAAe,iBAAiB,CAAC"}

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

@@ -2,15 +2,15 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.setupSsrGenerator = setupSsrGenerator;
 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 internal_1 = require("@nx/devkit/internal");
+const internal_2 = require("@nx/js/internal");
 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) {
-        tsModule = (0, ensure_typescript_1.ensureTypescript)();
+        tsModule = (0, internal_2.ensureTypescript)();
     }
     const content = host.read(path, 'utf-8');
     return {
@@ -44,7 +44,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)((0, internal_2.getProjectSourceRoot)(projectConfig, tree), `${importPath}.tsx`),
         };
     });
     const appComponentInfo = appImportCandidates.find((candidate) => tree.exists(candidate.filePath));
@@ -160,9 +160,6 @@ async function setupSsrGenerator(tree, options) {
             'server',
         ];
     }
-    nxJson.targetDefaults ??= {};
-    nxJson.targetDefaults['server'] ??= {};
-    nxJson.targetDefaults.server.cache = true;
     (0, devkit_1.generateFiles)(tree, (0, path_1.join)(__dirname, 'files'), projectRoot, {
         tmpl: '',
         port: Number(options?.serverPort) || 4200,
@@ -183,6 +180,7 @@ async function setupSsrGenerator(tree, options) {
         const changes = (0, devkit_1.applyChangesToString)(content, (0, ast_utils_1.addStaticRouter)(serverEntry, source));
         tree.write(serverEntry, changes);
     }
+    (0, internal_1.upsertTargetDefault)(tree, nxJson, { target: 'server', cache: true });
     (0, devkit_1.updateNxJson)(tree, nxJson);
     const installTask = (0, devkit_1.addDependenciesToPackageJson)(tree, {
         express: versions_1.expressVersion,

package/src/generators/stories/stories.js

@@ -6,8 +6,7 @@ exports.createAllStories = createAllStories;
 exports.storiesGenerator = storiesGenerator;
 const tslib_1 = require("tslib");
 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 internal_1 = require("@nx/js/internal");
 const minimatch_1 = require("minimatch");
 const path_1 = require("path");
 const ast_utils_1 = require("../../utils/ast-utils");
@@ -16,7 +15,7 @@ const component_story_1 = tslib_1.__importDefault(require("../component-story/co
 let tsModule;
 async function projectRootPath(tree, config) {
     let projectDir;
-    if ((0, ts_solution_setup_1.getProjectType)(tree, config.root, config.projectType) === 'application') {
+    if ((0, internal_1.getProjectType)(tree, config.root, config.projectType) === 'application') {
         const isNextJs = await isNextJsProject(tree, config);
         if (isNextJs) {
             // Next.js apps
@@ -34,11 +33,11 @@ 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)((0, internal_1.getProjectSourceRoot)(config, tree), projectDir);
 }
 function containsComponentDeclaration(tree, componentPath) {
     if (!tsModule) {
-        tsModule = (0, ensure_typescript_1.ensureTypescript)();
+        tsModule = (0, internal_1.ensureTypescript)();
     }
     const contents = tree.read(componentPath, 'utf-8');
     if (contents === null) {
@@ -50,7 +49,7 @@ function containsComponentDeclaration(tree, componentPath) {
 }
 async function createAllStories(tree, schema, projectConfiguration) {
     const { isTheFileAStory } = await Promise.resolve().then(() => tslib_1.__importStar(require('@nx/storybook/src/utils/utilities')));
-    const sourceRoot = (0, ts_solution_setup_1.getProjectSourceRoot)(projectConfiguration, tree);
+    const sourceRoot = (0, internal_1.getProjectSourceRoot)(projectConfiguration, tree);
     let componentPaths = [];
     const projectPath = await projectRootPath(tree, projectConfiguration);
     (0, devkit_1.visitNotIgnoredFiles)(tree, projectPath, (path) => {

package/src/migrations/update-20-2-0/migrate-with-mf-import-to-new-package.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"migrate-with-mf-import-to-new-package.d.ts","sourceRoot":"","sources":["../../../../../../packages/react/src/migrations/update-20-2-0/migrate-with-mf-import-to-new-package.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,IAAI,EAKV,MAAM,YAAY,CAAC;AASpB,wBAA8B,mBAAmB,CAAC,IAAI,EAAE,IAAI,iBAqD3D"}
+{"version":3,"file":"migrate-with-mf-import-to-new-package.d.ts","sourceRoot":"","sources":["../../../../../../packages/react/src/migrations/update-20-2-0/migrate-with-mf-import-to-new-package.ts"],"names":[],"mappings":"AACA,OAAO,EACL,KAAK,IAAI,EAKV,MAAM,YAAY,CAAC;AAQpB,wBAA8B,mBAAmB,CAAC,IAAI,EAAE,IAAI,iBAqD3D"}

package/src/migrations/update-20-2-0/migrate-with-mf-import-to-new-package.js

@@ -1,15 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = migrateWithMfImport;
+const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
-const executor_options_utils_1 = require("@nx/devkit/src/generators/executor-options-utils");
 const tsquery_1 = require("@phenomnomnominal/tsquery");
 const versions_1 = require("../../utils/versions");
 const NX_RSPACK_MODULE_FEDERATION_IMPORT_SELECTOR = 'ImportDeclaration > StringLiteral[value=@nx/react/module-federation], VariableStatement CallExpression:has(Identifier[name=require]) > StringLiteral[value=@nx/react/module-federation]';
 const NEW_IMPORT_PATH = `'@nx/module-federation/webpack'`;
 async function migrateWithMfImport(tree) {
     const projects = new Set();
-    (0, executor_options_utils_1.forEachExecutorOptions)(tree, '@nx/react:module-federation-dev-server', (options, project, target) => {
+    (0, internal_1.forEachExecutorOptions)(tree, '@nx/react:module-federation-dev-server', (options, project, target) => {
         const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, project);
         projects.add(projectConfig.root);
     });

package/src/migrations/update-20-3-0/ensure-nx-module-federation-package.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ensure-nx-module-federation-package.d.ts","sourceRoot":"","sources":["../../../../../../packages/react/src/migrations/update-20-3-0/ensure-nx-module-federation-package.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,IAAI,EAGV,MAAM,YAAY,CAAC;AAIpB,wBAA8B,eAAe,CAAC,IAAI,EAAE,IAAI,iBAqBvD"}
+{"version":3,"file":"ensure-nx-module-federation-package.d.ts","sourceRoot":"","sources":["../../../../../../packages/react/src/migrations/update-20-3-0/ensure-nx-module-federation-package.ts"],"names":[],"mappings":"AACA,OAAO,EACL,KAAK,IAAI,EAGV,MAAM,YAAY,CAAC;AAGpB,wBAA8B,eAAe,CAAC,IAAI,EAAE,IAAI,iBAqBvD"}

package/src/migrations/update-20-3-0/ensure-nx-module-federation-package.js

@@ -1,12 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = ensureMfPackage;
+const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
-const executor_options_utils_1 = require("@nx/devkit/src/generators/executor-options-utils");
 const versions_1 = require("../../utils/versions");
 async function ensureMfPackage(tree) {
     const projects = new Set();
-    (0, executor_options_utils_1.forEachExecutorOptions)(tree, '@nx/react:module-federation-dev-server', (options, project, target) => {
+    (0, internal_1.forEachExecutorOptions)(tree, '@nx/react:module-federation-dev-server', (options, project, target) => {
         const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, project);
         projects.add(projectConfig.root);
     });

package/src/migrations/update-22-0-0/add-svgr-to-webpack-config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"add-svgr-to-webpack-config.d.ts","sourceRoot":"","sources":["../../../../../../packages/react/src/migrations/update-22-0-0/add-svgr-to-webpack-config.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,IAAI,EAKV,MAAM,YAAY,CAAC;AAiHpB,wBAA8B,sBAAsB,CAAC,IAAI,EAAE,IAAI,iBAsZ9D"}
+{"version":3,"file":"add-svgr-to-webpack-config.d.ts","sourceRoot":"","sources":["../../../../../../packages/react/src/migrations/update-22-0-0/add-svgr-to-webpack-config.ts"],"names":[],"mappings":"AACA,OAAO,EACL,KAAK,IAAI,EAKV,MAAM,YAAY,CAAC;AAgHpB,wBAA8B,sBAAsB,CAAC,IAAI,EAAE,IAAI,iBAsZ9D"}

package/src/migrations/update-22-0-0/add-svgr-to-webpack-config.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = addSvgrToWebpackConfig;
 const tslib_1 = require("tslib");
+const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
-const executor_options_utils_1 = require("@nx/devkit/src/generators/executor-options-utils");
 const tsquery_1 = require("@phenomnomnominal/tsquery");
 const ts = tslib_1.__importStar(require("typescript"));
 const withSvgrFunctionForWithReact = `
@@ -115,7 +115,7 @@ function withSvgr(svgrOptions = {}) {
 async function addSvgrToWebpackConfig(tree) {
     const projects = new Map();
     // Find all React webpack projects using either withReact OR NxReactWebpackPlugin
-    (0, executor_options_utils_1.forEachExecutorOptions)(tree, '@nx/webpack:webpack', (options, project, target) => {
+    (0, internal_1.forEachExecutorOptions)(tree, '@nx/webpack:webpack', (options, project, target) => {
         if (!options.webpackConfig)
             return;
         const webpackConfigPath = options.webpackConfig;

package/src/migrations/update-23-0-0/remove-nx-react-webpack-plugin-import.d.ts

@@ -0,0 +1,3 @@
+import { Tree } from '@nx/devkit';
+export default function removeNxReactWebpackPluginImport(tree: Tree): Promise<void>;
+//# sourceMappingURL=remove-nx-react-webpack-plugin-import.d.ts.map

package/src/migrations/update-23-0-0/remove-nx-react-webpack-plugin-import.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"remove-nx-react-webpack-plugin-import.d.ts","sourceRoot":"","sources":["../../../../../../packages/react/src/migrations/update-23-0-0/remove-nx-react-webpack-plugin-import.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,IAAI,EAAwB,MAAM,YAAY,CAAC;AA8BrE,wBAA8B,gCAAgC,CAAC,IAAI,EAAE,IAAI,iBAuHxE"}

package/src/migrations/update-23-0-0/remove-nx-react-webpack-plugin-import.js

@@ -0,0 +1,128 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = removeNxReactWebpackPluginImport;
+const devkit_1 = require("@nx/devkit");
+const tsquery_1 = require("@phenomnomnominal/tsquery");
+const DEPRECATED_SYMBOL = 'NxReactWebpackPlugin';
+const DEPRECATED_PACKAGE = '@nx/react';
+const NEW_PACKAGE = '@nx/react/webpack-plugin';
+// ES module import: import { NxReactWebpackPlugin[, ...] } from '@nx/react'
+const ES_IMPORT_SELECTOR = `ImportDeclaration:has(StringLiteral[value=${DEPRECATED_PACKAGE}]):has(ImportClause ImportSpecifier > Identifier[name=${DEPRECATED_SYMBOL}])`;
+const IMPORT_SPECIFIERS_SELECTOR = `ImportClause ImportSpecifier`;
+const TARGET_IMPORT_SPECIFIER_SELECTOR = `ImportClause ImportSpecifier > Identifier[name=${DEPRECATED_SYMBOL}]`;
+const ES_MODULE_PATH_SELECTOR = `StringLiteral[value=${DEPRECATED_PACKAGE}]`;
+// CJS require: const { NxReactWebpackPlugin[, ...] } = require('@nx/react')
+const CJS_REQUIRE_STMT_SELECTOR = `VariableStatement:has(ObjectBindingPattern > BindingElement > Identifier[name=${DEPRECATED_SYMBOL}]):has(CallExpression:has(Identifier[name=require]) > StringLiteral[value=${DEPRECATED_PACKAGE}])`;
+const CJS_BINDING_ELEMENTS_SELECTOR = `ObjectBindingPattern > BindingElement`;
+const CJS_TARGET_BINDING_SELECTOR = `ObjectBindingPattern > BindingElement > Identifier[name=${DEPRECATED_SYMBOL}]`;
+const CJS_REQUIRE_PATH_SELECTOR = `CallExpression:has(Identifier[name=require]) > StringLiteral[value=${DEPRECATED_PACKAGE}]`;
+// Walk past whitespace from `fromIndex` to find a trailing comma. Returns the
+// position AFTER the comma if found, otherwise the original index. Handles
+// the `Foo , withReact` shape where the user wrote whitespace before the
+// comma — `node.getEnd()` stops at the identifier and the comma sits one
+// character past the whitespace.
+function endAfterTrailingComma(text, fromIndex) {
+    let i = fromIndex;
+    while (i < text.length && /\s/.test(text.charAt(i)))
+        i++;
+    return text.charAt(i) === ',' ? i + 1 : fromIndex;
+}
+async function removeNxReactWebpackPluginImport(tree) {
+    (0, devkit_1.visitNotIgnoredFiles)(tree, '', (filePath) => {
+        if (!filePath.endsWith('.ts') &&
+            !filePath.endsWith('.tsx') &&
+            !filePath.endsWith('.js') &&
+            !filePath.endsWith('.jsx') &&
+            !filePath.endsWith('.cjs') &&
+            !filePath.endsWith('.mjs')) {
+            return;
+        }
+        let contents = tree.read(filePath, 'utf-8');
+        if (!contents)
+            return;
+        // Quick check: must contain the deprecated symbol and the deprecated package path
+        if (!contents.includes(DEPRECATED_SYMBOL) ||
+            (!contents.includes(`'${DEPRECATED_PACKAGE}'`) &&
+                !contents.includes(`"${DEPRECATED_PACKAGE}"`))) {
+            return;
+        }
+        let changed = false;
+        // Re-parse on every iteration so multiple matches in the same file work
+        // correctly. The multi-specifier branch prepends a new declaration which
+        // shifts every offset; collected AST positions go stale after one rewrite,
+        // so process one match at a time.
+        let didRewrite = true;
+        while (didRewrite) {
+            didRewrite = false;
+            const sourceFile = (0, tsquery_1.ast)(contents);
+            const importNode = (0, tsquery_1.query)(sourceFile, ES_IMPORT_SELECTOR)[0];
+            if (importNode) {
+                const specifiers = (0, tsquery_1.query)(importNode, IMPORT_SPECIFIERS_SELECTOR);
+                const targetIdentifier = (0, tsquery_1.query)(importNode, TARGET_IMPORT_SPECIFIER_SELECTOR)[0];
+                if (targetIdentifier) {
+                    // Walk to the ImportSpecifier to cover `Foo` and `Foo as Bar`.
+                    const targetSpec = targetIdentifier.parent;
+                    if (specifiers.length === 1) {
+                        const modulePathNode = (0, tsquery_1.query)(importNode, ES_MODULE_PATH_SELECTOR)[0];
+                        if (modulePathNode) {
+                            contents =
+                                contents.slice(0, modulePathNode.getStart()) +
+                                    `'${NEW_PACKAGE}'` +
+                                    contents.slice(modulePathNode.getEnd());
+                            changed = true;
+                            didRewrite = true;
+                            continue;
+                        }
+                    }
+                    else {
+                        // Extract target spec verbatim (preserves alias)
+                        const end = endAfterTrailingComma(contents, targetSpec.getEnd());
+                        contents =
+                            `import { ${targetSpec.getText()} } from '${NEW_PACKAGE}';\n` +
+                                contents.slice(0, targetSpec.getStart()) +
+                                contents.slice(end);
+                        changed = true;
+                        didRewrite = true;
+                        continue;
+                    }
+                }
+            }
+            const stmtNode = (0, tsquery_1.query)(sourceFile, CJS_REQUIRE_STMT_SELECTOR)[0];
+            if (stmtNode) {
+                const bindingElements = (0, tsquery_1.query)(stmtNode, CJS_BINDING_ELEMENTS_SELECTOR);
+                const targetIdentifier = (0, tsquery_1.query)(stmtNode, CJS_TARGET_BINDING_SELECTOR)[0];
+                if (targetIdentifier) {
+                    // Walk to the BindingElement to cover `Foo` and `Foo: Bar`.
+                    const targetBinding = targetIdentifier.parent;
+                    if (bindingElements.length === 1) {
+                        const requirePathNode = (0, tsquery_1.query)(stmtNode, CJS_REQUIRE_PATH_SELECTOR)[0];
+                        if (requirePathNode) {
+                            contents =
+                                contents.slice(0, requirePathNode.getStart()) +
+                                    `'${NEW_PACKAGE}'` +
+                                    contents.slice(requirePathNode.getEnd());
+                            changed = true;
+                            didRewrite = true;
+                            continue;
+                        }
+                    }
+                    else {
+                        // Extract target binding verbatim (preserves alias)
+                        const end = endAfterTrailingComma(contents, targetBinding.getEnd());
+                        contents =
+                            `const { ${targetBinding.getText()} } = require('${NEW_PACKAGE}');\n` +
+                                contents.slice(0, targetBinding.getStart()) +
+                                contents.slice(end);
+                        changed = true;
+                        didRewrite = true;
+                        continue;
+                    }
+                }
+            }
+        }
+        if (changed) {
+            tree.write(filePath, contents);
+        }
+    });
+    await (0, devkit_1.formatFiles)(tree);
+}

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

@@ -6,11 +6,11 @@ exports.addRemoteRoute = addRemoteRoute;
 const devkit_1 = require("@nx/devkit");
 const js_1 = require("@nx/js");
 const ast_utils_1 = require("../utils/ast-utils");
-const ensure_typescript_1 = require("@nx/js/src/utils/typescript/ensure-typescript");
+const internal_1 = require("@nx/js/internal");
 let tsModule;
 function addRemoteToConfig(source, app) {
     if (!tsModule) {
-        tsModule = (0, ensure_typescript_1.ensureTypescript)();
+        tsModule = (0, internal_1.ensureTypescript)();
     }
     const assignments = (0, js_1.findNodes)(source, tsModule.SyntaxKind.PropertyAssignment);
     const remotesAssignment = assignments.find((s) => s.name.getText() === 'remotes');

package/src/plugins/router-plugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"router-plugin.d.ts","sourceRoot":"","sources":["../../../../../packages/react/src/plugins/router-plugin.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,aAAa,EAUnB,MAAM,YAAY,CAAC;AAgBpB,MAAM,WAAW,wBAAwB;IACvC,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,mBAAmB,CAAC,EAAE,MAAM,CAAC;CAC9B;AAyBD,eAAO,MAAM,aAAa,EAAE,aAAa,CAAC,wBAAwB,CAsFjE,CAAC"}
+{"version":3,"file":"router-plugin.d.ts","sourceRoot":"","sources":["../../../../../packages/react/src/plugins/router-plugin.ts"],"names":[],"mappings":"AAOA,OAAO,EACL,KAAK,aAAa,EAQnB,MAAM,YAAY,CAAC;AAWpB,MAAM,WAAW,wBAAwB;IACvC,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,mBAAmB,CAAC,EAAE,MAAM,CAAC;CAC9B;AAUD,eAAO,MAAM,aAAa,EAAE,aAAa,CAAC,wBAAwB,CA2FjE,CAAC"}

package/src/plugins/router-plugin.js

@@ -1,35 +1,24 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createNodesV2 = void 0;
+const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
 const path_1 = require("path");
 const fs_1 = require("fs");
-const get_named_inputs_1 = require("@nx/devkit/src/utils/get-named-inputs");
 const cache_directory_1 = require("nx/src/utils/cache-directory");
-const calculate_hash_for_create_nodes_1 = require("@nx/devkit/src/utils/calculate-hash-for-create-nodes");
 const js_1 = require("@nx/js");
 const devkit_internals_1 = require("nx/src/devkit-internals");
-const util_1 = require("@nx/js/src/plugins/typescript/util");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
-const config_utils_1 = require("@nx/devkit/src/utils/config-utils");
+const internal_2 = require("@nx/js/internal");
 const pmCommand = (0, devkit_1.getPackageManagerCommand)();
 const reactRouterConfigBlob = '**/react-router.config.{ts,js,cjs,cts,mjs,mts}';
-function readTargetsCache(cachePath) {
-    return process.env.NX_CACHE_PROJECT_GRAPH !== 'false' && (0, fs_1.existsSync)(cachePath)
-        ? (0, devkit_1.readJsonFile)(cachePath)
-        : {};
-}
-function writeTargetsToCache(cachePath, results) {
-    (0, devkit_1.writeJsonFile)(cachePath, results);
-}
 exports.createNodesV2 = [
     reactRouterConfigBlob,
     async (configFiles, options, context) => {
         const optionsHash = (0, devkit_internals_1.hashObject)(options);
         const normalizedOptions = normalizeOptions(options);
         const cachePath = (0, path_1.join)(cache_directory_1.workspaceDataDirectory, `react-router-${optionsHash}.hash`);
-        const targetsCache = readTargetsCache(cachePath);
-        const isUsingTsSolutionSetup = (0, ts_solution_setup_1.isUsingTsSolutionSetup)();
+        const targetsCache = new internal_1.PluginCache(cachePath);
+        const isUsingTsSolutionSetup = (0, internal_2.isUsingTsSolutionSetup)();
         const { roots: projectRoots, configFiles: validConfigFiles } = configFiles.reduce((acc, configFile) => {
             const potentialRoot = (0, path_1.dirname)(configFile);
             if (checkIfConfigFileShouldBeProject(potentialRoot, context)) {
@@ -42,14 +31,16 @@ exports.createNodesV2 = [
             configFiles: [],
         });
         const lockfile = (0, js_1.getLockFileName)((0, devkit_1.detectPackageManager)(context.workspaceRoot));
-        const hashes = await (0, calculate_hash_for_create_nodes_1.calculateHashesForCreateNodes)(projectRoots, { ...normalizedOptions, isUsingTsSolutionSetup }, context, projectRoots.map((_) => [lockfile]));
+        const hashes = await (0, internal_1.calculateHashesForCreateNodes)(projectRoots, { ...normalizedOptions, isUsingTsSolutionSetup }, context, projectRoots.map((_) => [lockfile]));
         try {
             return await (0, devkit_1.createNodesFromFiles)(async (configFile, _, context, idx) => {
                 const projectRoot = (0, path_1.dirname)(configFile);
                 const siblingFiles = (0, fs_1.readdirSync)((0, devkit_1.joinPathFragments)(context.workspaceRoot, projectRoot));
                 const hash = hashes[idx] + configFile;
-                const { projectType, metadata, targets } = (targetsCache[hash] ??=
-                    await buildReactRouterTargets(configFile, projectRoot, normalizedOptions, context, siblingFiles, isUsingTsSolutionSetup));
+                if (!targetsCache.has(hash)) {
+                    targetsCache.set(hash, await buildReactRouterTargets(configFile, projectRoot, normalizedOptions, context, siblingFiles, isUsingTsSolutionSetup));
+                }
+                const { projectType, metadata, targets } = targetsCache.get(hash);
                 const project = {
                     root: projectRoot,
                     targets,
@@ -66,16 +57,16 @@ exports.createNodesV2 = [
             }, validConfigFiles, options, context);
         }
         finally {
-            writeTargetsToCache(cachePath, targetsCache);
+            targetsCache.writeToDisk();
         }
     },
 ];
 async function buildReactRouterTargets(configFilePath, projectRoot, options, context, siblingFiles, isUsingTsSolutionSetup) {
-    const namedInputs = (0, get_named_inputs_1.getNamedInputs)(projectRoot, context);
+    const namedInputs = (0, internal_1.getNamedInputs)(projectRoot, context);
     const configPath = (0, path_1.join)(context.workspaceRoot, configFilePath);
     if (require.cache[configPath])
-        (0, config_utils_1.clearRequireCache)();
-    const reactRouterConfig = await (0, config_utils_1.loadConfigFile)(configPath);
+        (0, internal_1.clearRequireCache)();
+    const reactRouterConfig = await (0, internal_1.loadConfigFile)(configPath);
     const isLibMode = reactRouterConfig?.ssr !== undefined && reactRouterConfig.ssr === false;
     const { buildDirectory, serverBuildPath } = await getBuildPaths(reactRouterConfig, isLibMode);
     const targets = {};
@@ -85,7 +76,7 @@ async function buildReactRouterTargets(configFilePath, projectRoot, options, con
         targets[options.startTargetName] = await startTarget(projectRoot, serverBuildPath, options.buildTargetName, isUsingTsSolutionSetup);
     }
     targets[options.typecheckTargetName] = await typecheckTarget(projectRoot, options.typecheckTargetName, namedInputs, siblingFiles, isUsingTsSolutionSetup);
-    (0, util_1.addBuildAndWatchDepsTargets)(context.workspaceRoot, projectRoot, targets, options, pmCommand);
+    (0, internal_2.addBuildAndWatchDepsTargets)(context.workspaceRoot, projectRoot, targets, options, pmCommand);
     const metadata = {};
     return {
         targets,

package/src/rules/update-module-federation-project.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateModuleFederationProject = updateModuleFederationProject;
 const devkit_1 = require("@nx/devkit");
 const maybe_js_1 = require("../utils/maybe-js");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+const internal_1 = require("@nx/js/internal");
 function updateModuleFederationProject(host, options, isHost = false) {
     const projectConfig = (0, devkit_1.readProjectConfiguration)(host, options.projectName);
     projectConfig.targets ??= {};
@@ -14,7 +14,7 @@ function updateModuleFederationProject(host, options, isHost = false) {
             webpackConfig: `${options.appProjectRoot}/webpack.config.${options.typescriptConfiguration && !options.js ? 'ts' : 'js'}`,
         };
         projectConfig.targets.build.configurations ??= {};
-        if (!(0, ts_solution_setup_1.isUsingTsSolutionSetup)(host)) {
+        if (!(0, internal_1.isUsingTsSolutionSetup)(host)) {
             projectConfig.targets.build.configurations.production = {
                 ...(projectConfig.targets.build.configurations?.production ?? {}),
                 webpackConfig: `${options.appProjectRoot}/webpack.config.prod.${options.typescriptConfiguration && !options.js ? 'ts' : 'js'}`,
@@ -62,7 +62,7 @@ function updateModuleFederationProject(host, options, isHost = false) {
         };
     }
     // Typechecks must be performed first before build and serve to generate remote d.ts files.
-    if ((0, ts_solution_setup_1.isUsingTsSolutionSetup)(host)) {
+    if ((0, internal_1.isUsingTsSolutionSetup)(host)) {
         projectConfig.targets.build ??= {};
         projectConfig.targets.serve ??= {};
         projectConfig.targets.build.dependsOn = ['^build', 'typecheck'];

package/src/utils/add-mf-env-to-inputs.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"add-mf-env-to-inputs.d.ts","sourceRoot":"","sources":["../../../../../packages/react/src/utils/add-mf-env-to-inputs.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,IAAI,EAA4B,MAAM,YAAY,CAAC;AAEjE,wBAAgB,6BAA6B,CAC3C,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,QAAQ,GAAG,SAAS,QAwB9B"}
+{"version":3,"file":"add-mf-env-to-inputs.d.ts","sourceRoot":"","sources":["../../../../../packages/react/src/utils/add-mf-env-to-inputs.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,IAAI,EAA4B,MAAM,YAAY,CAAC;AAMjE,wBAAgB,6BAA6B,CAC3C,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,QAAQ,GAAG,SAAS,QAkC9B"}

package/src/utils/add-mf-env-to-inputs.js

@@ -2,24 +2,31 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addMfEnvToTargetDefaultInputs = addMfEnvToTargetDefaultInputs;
 const devkit_1 = require("@nx/devkit");
+const internal_1 = require("@nx/devkit/internal");
 function addMfEnvToTargetDefaultInputs(tree, bundler) {
-    const nxJson = (0, devkit_1.readNxJson)(tree);
+    const nxJson = (0, devkit_1.readNxJson)(tree) ?? {};
     const executor = bundler === 'rspack' ? '@nx/rspack:rspack' : '@nx/webpack:webpack';
     const mfEnvVar = 'NX_MF_DEV_REMOTES';
-    nxJson.targetDefaults ??= {};
-    nxJson.targetDefaults[executor] ??= {};
-    nxJson.targetDefaults[executor].inputs ??= ['production', '^production'];
-    nxJson.targetDefaults[executor].dependsOn ??= ['^build'];
+    const existing = (0, internal_1.normalizeTargetDefaults)(nxJson.targetDefaults).find((e) => e.executor === executor &&
+        e.target === undefined &&
+        e.projects === undefined &&
+        e.plugin === undefined);
+    const inputs = [...(existing?.inputs ?? ['production', '^production'])];
     let mfEnvVarExists = false;
-    for (const input of nxJson.targetDefaults[executor].inputs) {
+    for (const input of inputs) {
         if (typeof input === 'object' && input['env'] === mfEnvVar) {
             mfEnvVarExists = true;
             break;
         }
     }
     if (!mfEnvVarExists) {
-        nxJson.targetDefaults[executor].inputs.push({ env: mfEnvVar });
+        inputs.push({ env: mfEnvVar });
     }
-    nxJson.targetDefaults[executor].cache = true;
+    (0, internal_1.upsertTargetDefault)(tree, nxJson, {
+        executor,
+        cache: true,
+        inputs,
+        dependsOn: existing?.dependsOn ?? ['^build'],
+    });
     (0, devkit_1.updateNxJson)(tree, nxJson);
 }