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

package/src/generators/library/lib/add-rollup-build-target.js

@@ -59,6 +59,12 @@ module.exports = withNx(
     }
     else {
         // Legacy behavior, there is a target in project.json using rollup executor.
+        // Mirrors warnRollupExecutorGenerating from @nx/rollup/src/utils/deprecation.
+        // Inlined to avoid a cross-package deep import; @nx/rollup's package
+        // exports field doesn't expose internal `src/...` paths, so the import
+        // works at compile time (via tsconfig project refs) but fails at runtime
+        // in published packages.
+        devkit_1.logger.warn('The `@nx/rollup:rollup` executor is deprecated and will be removed in Nx v24. Run `nx g @nx/rollup:convert-to-inferred` to migrate to the `@nx/rollup/plugin` inferred targets. See https://nx.dev/docs/guides/tasks--caching/convert-to-inferred for details.');
         const { targets } = (0, devkit_1.readProjectConfiguration)(host, options.name);
         targets.build = {
             executor: '@nx/rollup:rollup',

package/src/generators/library/lib/install-common-dependencies.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.installCommonDependencies = installCommonDependencies;
 const devkit_1 = require("@nx/devkit");
-const add_swc_dependencies_1 = require("@nx/js/src/utils/swc/add-swc-dependencies");
+const internal_1 = require("@nx/js/internal");
 const version_utils_1 = require("../../../utils/version-utils");
 const versions_1 = require("../../../utils/versions");
 async function installCommonDependencies(host, options) {
@@ -32,7 +32,7 @@ async function installCommonDependencies(host, options) {
     const baseInstallTask = (0, devkit_1.addDependenciesToPackageJson)(host, dependencies, devDependencies);
     tasks.push(baseInstallTask);
     if (options.compiler === 'swc') {
-        tasks.push((0, add_swc_dependencies_1.addSwcDependencies)(host));
+        tasks.push((0, internal_1.addSwcDependencies)(host));
     }
     else if (options.compiler === 'babel') {
         tasks.push((0, devkit_1.addDependenciesToPackageJson)(host, {}, {

package/src/generators/library/lib/normalize-options.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"normalize-options.d.ts","sourceRoot":"","sources":["../../../../../../../packages/react/src/generators/library/lib/normalize-options.ts"],"names":[],"mappings":"AAAA,OAAO,EAML,IAAI,EACL,MAAM,YAAY,CAAC;AAMpB,OAAO,EAAE,gBAAgB,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAOrD,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,gBAAgB,CAAC,CAmG3B"}
+{"version":3,"file":"normalize-options.d.ts","sourceRoot":"","sources":["../../../../../../../packages/react/src/generators/library/lib/normalize-options.ts"],"names":[],"mappings":"AAIA,OAAO,EAML,IAAI,EACL,MAAM,YAAY,CAAC;AAEpB,OAAO,EAAE,gBAAgB,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAOrD,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,gBAAgB,CAAC,CAmG3B"}

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

@@ -1,14 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeOptions = normalizeOptions;
+const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
-const project_name_and_root_utils_1 = require("@nx/devkit/src/generators/project-name-and-root-utils");
 const assertion_1 = require("../../../utils/assertion");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+const internal_2 = require("@nx/js/internal");
 async function normalizeOptions(host, options) {
-    const isUsingTsSolutionConfig = (0, ts_solution_setup_1.isUsingTsSolutionSetup)(host);
-    await (0, project_name_and_root_utils_1.ensureRootProjectName)(options, 'library');
-    const { projectName, names: projectNames, projectRoot, importPath, } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(host, {
+    const isUsingTsSolutionConfig = (0, internal_2.isUsingTsSolutionSetup)(host);
+    await (0, internal_1.ensureRootProjectName)(options, 'library');
+    const { projectName, names: projectNames, projectRoot, importPath, } = await (0, internal_1.determineProjectNameAndRootOptions)(host, {
         name: options.name,
         projectType: 'library',
         directory: options.directory,
@@ -50,11 +50,11 @@ async function normalizeOptions(host, options) {
     normalized.inSourceTests === normalized.minimal || normalized.inSourceTests;
     if (options.appProject) {
         const appProjectConfig = (0, devkit_1.getProjects)(host).get(options.appProject);
-        const appProjectType = (0, ts_solution_setup_1.getProjectType)(host, appProjectConfig.root, appProjectConfig.projectType);
+        const appProjectType = (0, internal_2.getProjectType)(host, appProjectConfig.root, appProjectConfig.projectType);
         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, internal_2.getProjectSourceRoot)(appProjectConfig, host);
         normalized.appMain =
             appProjectConfig.targets.build?.options?.main ??
                 findMainEntry(host, appProjectConfig.root);

package/src/generators/library/lib/update-app-routes.js

@@ -6,7 +6,7 @@ const ast_utils_1 = require("../../../utils/ast-utils");
 const ast_utils_2 = require("../../../utils/ast-utils");
 const maybe_js_1 = require("../../../utils/maybe-js");
 const versions_1 = require("../../../utils/versions");
-const ensure_typescript_1 = require("@nx/js/src/utils/typescript/ensure-typescript");
+const internal_1 = require("@nx/js/internal");
 let tsModule;
 function updateAppRoutes(host, options) {
     if (!options.appMain || !options.appSourceRoot) {
@@ -53,7 +53,7 @@ function readComponent(host, path) {
         throw new Error(`Cannot find ${path}`);
     }
     if (!tsModule) {
-        tsModule = (0, ensure_typescript_1.ensureTypescript)();
+        tsModule = (0, internal_1.ensureTypescript)();
     }
     const content = host.read(path, 'utf-8');
     const source = tsModule.createSourceFile(path, content, tsModule.ScriptTarget.Latest, true);

package/src/generators/library/library.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"library.d.ts","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/library/library.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,iBAAiB,EAOjB,IAAI,EAGL,MAAM,YAAY,CAAC;AAgCpB,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAElC,wBAAsB,gBAAgB,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,8BAMhE;AAED,wBAAsB,wBAAwB,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,8BA0RxE;AAED,eAAe,gBAAgB,CAAC"}
+{"version":3,"file":"library.d.ts","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/library/library.ts"],"names":[],"mappings":"AACA,OAAO,EAIL,iBAAiB,EAOjB,IAAI,EAGL,MAAM,YAAY,CAAC;AA4BpB,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAElC,wBAAsB,gBAAgB,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,8BAMhE;AAED,wBAAsB,wBAAwB,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,8BAyRxE;AAED,eAAe,gBAAgB,CAAC"}

package/src/generators/library/library.js

@@ -3,14 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.libraryGenerator = libraryGenerator;
 exports.libraryGeneratorInternal = libraryGeneratorInternal;
 const tslib_1 = require("tslib");
+const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
-const artifact_name_and_directory_utils_1 = require("@nx/devkit/src/generators/artifact-name-and-directory-utils");
-const log_show_project_command_1 = require("@nx/devkit/src/utils/log-show-project-command");
 const js_1 = require("@nx/js");
 const path_1 = require("path");
-const add_release_config_1 = require("@nx/js/src/generators/library/utils/add-release-config");
-const sort_fields_1 = require("@nx/js/src/utils/package-json/sort-fields");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+const internal_2 = require("@nx/js/internal");
 const create_ts_config_1 = require("../../utils/create-ts-config");
 const jest_utils_1 = require("../../utils/jest-utils");
 const maybe_js_1 = require("../../utils/maybe-js");
@@ -34,7 +31,7 @@ async function libraryGenerator(host, schema) {
 }
 async function libraryGeneratorInternal(host, schema) {
     const tasks = [];
-    const addTsPlugin = (0, ts_solution_setup_1.shouldConfigureTsSolutionSetup)(host, schema.addPlugin);
+    const addTsPlugin = (0, internal_2.shouldConfigureTsSolutionSetup)(host, schema.addPlugin);
     const jsInitTask = await (0, js_1.initGenerator)(host, {
         ...schema,
         addTsPlugin,
@@ -85,7 +82,7 @@ async function libraryGeneratorInternal(host, schema) {
     }
     (0, create_files_1.createFiles)(host, options);
     if (options.isUsingTsSolutionConfig) {
-        await (0, ts_solution_setup_1.addProjectToTsSolutionWorkspace)(host, options.projectRoot);
+        await (0, internal_2.addProjectToTsSolutionWorkspace)(host, options.projectRoot);
     }
     const lintTask = await (0, add_linting_1.addLinting)(host, options);
     tasks.push(lintTask);
@@ -110,7 +107,7 @@ async function libraryGeneratorInternal(host, schema) {
             includeLib: true,
             includeVitest: options.unitTestRunner === 'vitest',
             inSourceTests: options.inSourceTests,
-            rollupOptionsExternal: [
+            rolldownOptionsExternal: [
                 "'react'",
                 "'react-dom'",
                 "'react/jsx-runtime'",
@@ -169,7 +166,7 @@ async function libraryGeneratorInternal(host, schema) {
             includeLib: true,
             includeVitest: true,
             inSourceTests: options.inSourceTests,
-            rollupOptionsExternal: [
+            rolldownOptionsExternal: [
                 "'react'",
                 "'react-dom'",
                 "'react/jsx-runtime'",
@@ -184,8 +181,8 @@ async function libraryGeneratorInternal(host, schema) {
         }, true);
     }
     if (options.component) {
-        const relativeCwd = (0, artifact_name_and_directory_utils_1.getRelativeCwd)();
-        const path = (0, devkit_1.joinPathFragments)(options.projectRoot, 'src/lib', options.fileName);
+        const relativeCwd = (0, internal_1.getRelativeCwd)();
+        const path = (0, devkit_1.joinPathFragments)(options.projectRoot, 'src/lib', options.js ? `${options.fileName}.js` : options.fileName);
         const componentTask = await (0, component_1.default)(host, {
             path: relativeCwd ? (0, path_1.relative)(relativeCwd, path) : path,
             style: options.style,
@@ -193,7 +190,6 @@ async function libraryGeneratorInternal(host, schema) {
                 (options.unitTestRunner === 'vitest' && options.inSourceTests == true),
             export: true,
             routing: options.routing,
-            js: options.js,
             name: options.name,
             inSourceTests: options.inSourceTests,
             skipFormat: true,
@@ -204,14 +200,14 @@ async function libraryGeneratorInternal(host, schema) {
     if (options.publishable) {
         const projectConfiguration = (0, devkit_1.readProjectConfiguration)(host, options.name);
         if (options.isUsingTsSolutionConfig) {
-            await (0, add_release_config_1.addReleaseConfigForTsSolution)(host, options.name, projectConfiguration);
+            await (0, internal_2.addReleaseConfigForTsSolution)(host, options.name, projectConfiguration);
         }
         else {
             const nxJson = (0, devkit_1.readNxJson)(host);
-            await (0, add_release_config_1.addReleaseConfigForNonTsSolution)(host, options.name, projectConfiguration);
+            await (0, internal_2.addReleaseConfigForNonTsSolution)(host, options.name, projectConfiguration);
         }
         (0, devkit_1.updateProjectConfiguration)(host, options.name, projectConfiguration);
-        tasks.push(await (0, add_release_config_1.releaseTasks)(host));
+        tasks.push(await (0, internal_2.releaseTasks)(host));
     }
     if (!options.skipPackageJson) {
         const installReactTask = await (0, install_common_dependencies_1.installCommonDependencies)(host, options);
@@ -226,14 +222,14 @@ async function libraryGeneratorInternal(host, schema) {
             (0, maybe_js_1.maybeJs)(options, (0, devkit_1.joinPathFragments)(options.projectRoot, './src/index.ts')),
         ]);
     }
-    (0, ts_solution_setup_1.updateTsconfigFiles)(host, options.projectRoot, 'tsconfig.lib.json', {
+    (0, internal_2.updateTsconfigFiles)(host, options.projectRoot, 'tsconfig.lib.json', {
         jsx: 'react-jsx',
         module: 'esnext',
         moduleResolution: 'bundler',
     }, options.linter === 'eslint'
         ? ['eslint.config.js', 'eslint.config.cjs', 'eslint.config.mjs']
         : undefined);
-    (0, sort_fields_1.sortPackageJsonFields)(host, options.projectRoot);
+    (0, internal_2.sortPackageJsonFields)(host, options.projectRoot);
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(host);
     }
@@ -242,7 +238,7 @@ async function libraryGeneratorInternal(host, schema) {
         tasks.push(() => (0, devkit_1.installPackagesTask)(host, true));
     }
     tasks.push(() => {
-        (0, log_show_project_command_1.logShowProjectCommand)(options.name);
+        (0, internal_1.logShowProjectCommand)(options.name);
     });
     return (0, devkit_1.runTasksInSerial)(...tasks);
 }

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

@@ -1 +1 @@
-{"version":3,"file":"redux.d.ts","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/redux/redux.ts"],"names":[],"mappings":"AAAA,OAAO,EASL,IAAI,EACL,MAAM,YAAY,CAAC;AAepB,OAAO,EAAoB,MAAM,EAAE,MAAM,UAAU,CAAC;AAIpD,wBAAsB,cAAc,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,mDAW9D;AA0LD,eAAe,cAAc,CAAC"}
+{"version":3,"file":"redux.d.ts","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/redux/redux.ts"],"names":[],"mappings":"AACA,OAAO,EASL,IAAI,EACL,MAAM,YAAY,CAAC;AAcpB,OAAO,EAAoB,MAAM,EAAE,MAAM,UAAU,CAAC;AAIpD,wBAAsB,cAAc,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,mDAW9D;AA0LD,eAAe,cAAc,CAAC"}

package/src/generators/redux/redux.js

@@ -2,11 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.reduxGenerator = reduxGenerator;
 const tslib_1 = require("tslib");
+const internal_1 = require("@nx/devkit/internal");
 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 ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+const internal_2 = require("@nx/js/internal");
 const path = tslib_1.__importStar(require("path"));
 const ast_utils_1 = require("../../utils/ast-utils");
 const versions_1 = require("../../utils/versions");
@@ -35,7 +34,7 @@ function addReduxPackageDependencies(host) {
 }
 function addExportsToBarrel(host, options) {
     if (!tsModule) {
-        tsModule = (0, ensure_typescript_1.ensureTypescript)();
+        tsModule = (0, internal_2.ensureTypescript)();
     }
     const indexFilePath = (0, devkit_1.joinPathFragments)(options.projectSourcePath, options.fileExtensionType === 'js' ? 'index.js' : 'index.ts');
     if (!host.exists(indexFilePath)) {
@@ -62,7 +61,7 @@ function addStoreConfiguration(host, options) {
 }
 function updateReducerConfiguration(host, options) {
     if (!tsModule) {
-        tsModule = (0, ensure_typescript_1.ensureTypescript)();
+        tsModule = (0, internal_2.ensureTypescript)();
     }
     if (!options.appProjectSourcePath) {
         return;
@@ -77,7 +76,7 @@ function updateReducerConfiguration(host, options) {
     host.write(options.appMainFilePath, changes);
 }
 async function normalizeOptions(host, options) {
-    const { artifactName: name, directory, fileName, fileExtension, fileExtensionType, project: projectName, } = await (0, artifact_name_and_directory_utils_1.determineArtifactNameAndDirectoryOptions)(host, {
+    const { artifactName: name, directory, fileName, fileExtension, fileExtensionType, project: projectName, } = await (0, internal_1.determineArtifactNameAndDirectoryOptions)(host, {
         path: options.path,
         name: options.name,
         suffix: 'slice',
@@ -95,7 +94,7 @@ async function normalizeOptions(host, options) {
     const tsPaths = tsConfigJson.compilerOptions
         ? tsConfigJson.compilerOptions.paths || {}
         : {};
-    const modulePath = (0, ts_solution_setup_1.getProjectType)(host, root, projectType) === 'application'
+    const modulePath = (0, internal_2.getProjectType)(host, root, projectType) === 'application'
         ? options.path
             ? `./app/${options.path}/${extraNames.fileName}.slice`
             : `./app/${extraNames.fileName}.slice`
@@ -110,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 = (0, internal_2.getProjectSourceRoot)(appConfig, host);
         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/redux/schema.d.ts

@@ -1,4 +1,4 @@
-import type { FileExtensionType } from '@nx/devkit/src/generators/artifact-name-and-directory-utils';
+import type { FileExtensionType } from '@nx/devkit/internal';
 
 export interface Schema {
   path: string;

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

@@ -1,4 +1,4 @@
-import {ModuleFederationConfig} from '@nx/module-federation';
+import type {ModuleFederationConfig} from '@nx/module-federation';
 
 const config: ModuleFederationConfig = {
   name: '<%= projectName %>',

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 { 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/module-federation.config.ts__tmpl__

@@ -1,4 +1,4 @@
-import {ModuleFederationConfig} from '@nx/module-federation';
+import type {ModuleFederationConfig} from '@nx/module-federation';
 
 const config: ModuleFederationConfig = {
   name: '<%= projectName %>',

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 { 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/module-federation.server.config.ts__tmpl__

@@ -1,4 +1,4 @@
-import {ModuleFederationConfig} from '@nx/module-federation';
+import type {ModuleFederationConfig} from '@nx/module-federation';
 
 const config: ModuleFederationConfig = {
   name: '<%= projectName %>',

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/module-federation.config.ts__tmpl__

@@ -1,4 +1,4 @@
-import {ModuleFederationConfig} from '@nx/module-federation';
+import type {ModuleFederationConfig} from '@nx/module-federation';
 
 const config: ModuleFederationConfig = {
   name: '<%= projectName %>',

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/setup-package-json-exports-for-remote.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.setupPackageJsonExportsForRemote = setupPackageJsonExportsForRemote;
 const devkit_1 = require("@nx/devkit");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+const internal_1 = require("@nx/js/internal");
 const maybe_js_1 = require("../../../utils/maybe-js");
 function setupPackageJsonExportsForRemote(tree, options) {
     const project = (0, devkit_1.readProjectConfiguration)(tree, options.projectName);
@@ -12,7 +12,7 @@ function setupPackageJsonExportsForRemote(tree, options) {
             `TypeScript solution setup requires package.json for all projects.`);
     }
     const exportPath = (0, maybe_js_1.maybeJs)(options, './src/remote-entry.ts');
-    const customCondition = (0, ts_solution_setup_1.getDefinedCustomConditionName)(tree);
+    const customCondition = (0, internal_1.getDefinedCustomConditionName)(tree);
     (0, devkit_1.updateJson)(tree, packageJsonPath, (json) => {
         json.exports = {
             ...json.exports,

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

@@ -2,20 +2,19 @@
 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 internal_1 = require("@nx/js/internal");
 const ast_utils_1 = require("../../../module-federation/ast-utils");
 let tsModule;
 function updateHostWithRemote(host, hostName, remoteName) {
     if (!tsModule) {
-        tsModule = (0, ensure_typescript_1.ensureTypescript)();
+        tsModule = (0, internal_1.ensureTypescript)();
     }
     const hostConfig = (0, devkit_1.readProjectConfiguration)(host, hostName);
     let moduleFederationConfigPath = (0, devkit_1.joinPathFragments)(hostConfig.root, 'module-federation.config.js');
     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, (0, internal_1.getProjectSourceRoot)(hostConfig, host));
     if (host.exists(moduleFederationConfigPath)) {
         // find the host project path
         // Update remotes inside ${host_path}/src/remotes.d.ts
@@ -36,7 +35,7 @@ function updateHostWithRemote(host, hostName, remoteName) {
         devkit_1.logger.warn(`Could not find app component at ${appComponentPath}. Did you generate this project with "@nx/react:host" or "@nx/react:consumer"?`);
     }
     // Add remote as devDependency in TS solution setup
-    if ((0, ts_solution_setup_1.isUsingTsSolutionSetup)(host)) {
+    if ((0, internal_1.isUsingTsSolutionSetup)(host)) {
         addRemoteAsHostDependency(host, hostName, remoteName);
     }
 }

package/src/generators/remote/remote.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"remote.d.ts","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/remote/remote.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,iBAAiB,EAOjB,IAAI,EAGL,MAAM,YAAY,CAAC;AAuBpB,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAOzD,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAElC,wBAAgB,wBAAwB,CACtC,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,gBAAgB,CAAC,MAAM,CAAC,QAmFlC;AAED,wBAAsB,eAAe,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,8BAqK/D;AAED,eAAe,eAAe,CAAC"}
+{"version":3,"file":"remote.d.ts","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/remote/remote.ts"],"names":[],"mappings":"AACA,OAAO,EAIL,iBAAiB,EAOjB,IAAI,EAGL,MAAM,YAAY,CAAC;AAmBpB,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAOzD,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAElC,wBAAgB,wBAAwB,CACtC,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,gBAAgB,CAAC,MAAM,CAAC,QAmFlC;AAED,wBAAsB,eAAe,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,8BAqK/D;AAED,eAAe,eAAe,CAAC"}

package/src/generators/remote/remote.js

@@ -3,11 +3,11 @@ 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");
@@ -57,7 +57,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');
@@ -93,7 +93,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 +105,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 +124,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 +160,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"}