@nx/react 23.0.0-beta.11 → 23.0.0-beta.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/react",
-  "version": "23.0.0-beta.11",
+  "version": "23.0.0-beta.13",
   "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": {
@@ -37,28 +37,28 @@
     "@svgr/webpack": "^8.0.1",
     "minimatch": "10.2.5",
     "tslib": "^2.3.0",
-    "@nx/devkit": "23.0.0-beta.11",
-    "@nx/js": "23.0.0-beta.11",
-    "@nx/eslint": "23.0.0-beta.11",
-    "@nx/web": "23.0.0-beta.11",
-    "@nx/module-federation": "23.0.0-beta.11",
-    "@nx/rollup": "23.0.0-beta.11",
+    "@nx/devkit": "23.0.0-beta.13",
+    "@nx/js": "23.0.0-beta.13",
+    "@nx/eslint": "23.0.0-beta.13",
+    "@nx/web": "23.0.0-beta.13",
+    "@nx/module-federation": "23.0.0-beta.13",
+    "@nx/rollup": "23.0.0-beta.13",
     "express": "^4.21.2",
     "http-proxy-middleware": "^3.0.5",
     "semver": "^7.6.3"
   },
   "devDependencies": {
-    "@nx/cypress": "23.0.0-beta.11",
-    "@nx/playwright": "23.0.0-beta.11",
-    "@nx/rsbuild": "23.0.0-beta.11",
-    "@nx/vite": "23.0.0-beta.11",
-    "@nx/vitest": "23.0.0-beta.11",
-    "@nx/webpack": "23.0.0-beta.11",
-    "@nx/storybook": "23.0.0-beta.11",
-    "nx": "23.0.0-beta.11"
+    "@nx/cypress": "23.0.0-beta.13",
+    "@nx/playwright": "23.0.0-beta.13",
+    "@nx/rsbuild": "23.0.0-beta.13",
+    "@nx/vite": "23.0.0-beta.13",
+    "@nx/vitest": "23.0.0-beta.13",
+    "@nx/webpack": "23.0.0-beta.13",
+    "@nx/storybook": "23.0.0-beta.13",
+    "nx": "23.0.0-beta.13"
   },
   "optionalDependencies": {
-    "@nx/vite": "23.0.0-beta.11"
+    "@nx/vite": "23.0.0-beta.13"
   },
   "publishConfig": {
     "access": "public"

package/plugins/component-testing/index.js

@@ -4,7 +4,7 @@ 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 internal_1 = require("@nx/js/internal");
 const fs_1 = require("fs");
 const path_1 = require("path");
 /**
@@ -167,7 +167,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, (0, internal_1.getProjectSourceRoot)(buildableProjectConfig));
     let customWebpack;
     if (options.webpackConfig) {
         customWebpack = resolveUserDefinedWebpackConfig(options.webpackConfig, options.tsConfig.startsWith(context.root)
@@ -189,7 +189,7 @@ function buildTargetWebpack(ctx, buildTarget, componentTestingProjectName) {
                     extractLicenses: false,
                     root: devkit_1.workspaceRoot,
                     projectRoot: ctProjectConfig.root,
-                    sourceRoot: (0, ts_solution_setup_1.getProjectSourceRoot)(ctProjectConfig),
+                    sourceRoot: (0, internal_1.getProjectSourceRoot)(ctProjectConfig),
                 },
                 context,
                 configuration: parsed.configuration,

package/plugins/component-testing/webpack-fallback.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.buildBaseWebpackConfig = buildBaseWebpackConfig;
 const tsconfig_paths_webpack_plugin_1 = require("tsconfig-paths-webpack-plugin");
 const webpack_1 = require("@nx/webpack");
-const ts_config_1 = require("@nx/js/src/utils/typescript/ts-config");
+const js_1 = require("@nx/js");
 function buildBaseWebpackConfig({ tsConfigPath = 'tsconfig.cy.json', compiler = 'babel', }) {
     const extensions = ['.ts', '.tsx', '.mjs', '.js', '.jsx'];
     const config = {
@@ -13,7 +13,7 @@ function buildBaseWebpackConfig({ tsConfigPath = 'tsconfig.cy.json', compiler =
             plugins: [
                 new tsconfig_paths_webpack_plugin_1.TsconfigPathsPlugin({
                     configFile: tsConfigPath,
-                    baseUrl: (0, ts_config_1.resolvePathsBaseUrl)(tsConfigPath),
+                    baseUrl: (0, js_1.resolvePathsBaseUrl)(tsConfigPath),
                     extensions,
                 }),
             ],

package/plugins/storybook/index.js

@@ -2,7 +2,7 @@
 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 internal_1 = require("@nx/js/internal");
 const config_1 = require("@nx/webpack/src/utils/config");
 const fs_1 = require("fs");
 const path_1 = require("path");
@@ -64,7 +64,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: (0, internal_1.getProjectSourceRoot)(projectNode.data),
             projectNode,
         }
         : // Edge-case: missing project node
@@ -130,7 +130,7 @@ const webpack = async (storybookWebpackConfig = {}, options) => {
         ...options,
         root: projectData.workspaceRoot,
         projectRoot: projectData.projectRoot,
-        sourceRoot: (0, ts_solution_setup_1.getProjectSourceRoot)(projectData.projectNode.data),
+        sourceRoot: (0, internal_1.getProjectSourceRoot)(projectData.projectNode.data),
         fileReplacements: [],
         sourceMap: true,
         styles: options.styles ?? [],

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

@@ -4,7 +4,7 @@ exports.default = moduleFederationDevServer;
 const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const internal_1 = require("@nx/devkit/internal");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+const internal_2 = require("@nx/js/internal");
 const utils_1 = require("@nx/module-federation/src/executors/utils");
 const file_server_impl_1 = tslib_1.__importDefault(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");
@@ -26,7 +26,7 @@ async function* moduleFederationDevServer(schema, context) {
         : // TODO(JamesHenry): remove type assertion once the nx repo is updated to use https://github.com/nrwl/nx/pull/33095
             (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');
+    let pathToManifestFile = (0, path_1.join)(context.root, (0, internal_2.getProjectSourceRoot)(p), '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

@@ -4,7 +4,7 @@ exports.default = moduleFederationSsrDevServer;
 const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const internal_1 = require("@nx/devkit/internal");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+const internal_2 = require("@nx/js/internal");
 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 = tslib_1.__importDefault(require("@nx/webpack/src/executors/ssr-dev-server/ssr-dev-server.impl"));
@@ -16,7 +16,7 @@ async function* moduleFederationSsrDevServer(ssrDevServerOptions, context) {
     // TODO(JamesHenry): remove type assertion once the nx repo is updated to use https://github.com/nrwl/nx/pull/33095
     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');
+    let pathToManifestFile = (0, path_1.join)(context.root, (0, internal_2.getProjectSourceRoot)(projectConfig), '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.js

@@ -5,7 +5,7 @@ exports.default = moduleFederationStaticServer;
 const tslib_1 = require("tslib");
 const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+const internal_2 = require("@nx/js/internal");
 const utils_1 = require("@nx/module-federation/src/executors/utils");
 const utils_2 = require("@nx/module-federation/src/utils");
 const file_server_impl_1 = tslib_1.__importDefault(require("@nx/web/src/executors/file-server/file-server.impl"));
@@ -18,7 +18,7 @@ function getBuildAndServeOptionsFromServeTarget(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, (0, internal_2.getProjectSourceRoot)(context.projectGraph.nodes[context.projectName].data), 'assets/module-federation.manifest.json');
     if (serveOptions.pathToManifestFile) {
         const userPathToManifestFile = (0, path_1.join)(context.root, serveOptions.pathToManifestFile);
         if (!(0, fs_1.existsSync)(userPathToManifestFile)) {

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

@@ -1 +1 @@
-{"version":3,"file":"application.d.ts","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/application/application.ts"],"names":[],"mappings":"AAIA,OAAO,EAEL,iBAAiB,EAIjB,IAAI,EAGL,MAAM,YAAY,CAAC;AA6BpB,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAGlC,wBAAsB,oBAAoB,CACxC,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,iBAAiB,CAAC,CAM5B;AAED,wBAAsB,4BAA4B,CAChD,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,iBAAiB,CAAC,CAsL5B;AAED,eAAe,oBAAoB,CAAC"}
+{"version":3,"file":"application.d.ts","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/application/application.ts"],"names":[],"mappings":"AAIA,OAAO,EAEL,iBAAiB,EAMjB,IAAI,EAGL,MAAM,YAAY,CAAC;AA+BpB,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,wBAAsB,oBAAoB,CACxC,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,iBAAiB,CAAC,CAM5B;AAED,wBAAsB,4BAA4B,CAChD,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,iBAAiB,CAAC,CA2L5B;AAiBD,eAAe,oBAAoB,CAAC"}

package/src/generators/application/application.js

@@ -5,8 +5,9 @@ exports.applicationGeneratorInternal = applicationGeneratorInternal;
 const tslib_1 = require("tslib");
 const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
+const internal_2 = require("@nx/devkit/internal");
 const js_1 = require("@nx/js");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+const internal_3 = require("@nx/js/internal");
 const create_ts_config_1 = require("../../utils/create-ts-config");
 const init_1 = tslib_1.__importDefault(require("../init/init"));
 const create_application_files_1 = require("./lib/create-application-files");
@@ -23,7 +24,6 @@ const add_webpack_1 = require("./lib/bundlers/add-webpack");
 const add_rspack_1 = require("./lib/bundlers/add-rspack");
 const add_rsbuild_1 = require("./lib/bundlers/add-rsbuild");
 const add_vite_1 = require("./lib/bundlers/add-vite");
-const sort_fields_1 = require("@nx/js/src/utils/package-json/sort-fields");
 async function applicationGenerator(tree, schema) {
     return await applicationGeneratorInternal(tree, {
         addPlugin: false,
@@ -33,7 +33,7 @@ async function applicationGenerator(tree, schema) {
 }
 async function applicationGeneratorInternal(tree, schema) {
     const tasks = [];
-    const addTsPlugin = (0, ts_solution_setup_1.shouldConfigureTsSolutionSetup)(tree, schema.addPlugin, schema.useTsSolution);
+    const addTsPlugin = (0, internal_3.shouldConfigureTsSolutionSetup)(tree, schema.addPlugin, schema.useTsSolution);
     const jsInitTask = await (0, js_1.initGenerator)(tree, {
         ...schema,
         tsConfigName: schema.rootProject ? 'tsconfig.json' : 'tsconfig.base.json',
@@ -71,18 +71,23 @@ async function applicationGeneratorInternal(tree, schema) {
     });
     tasks.push(initTask);
     if (!options.addPlugin) {
-        const nxJson = (0, devkit_1.readNxJson)(tree);
-        nxJson.targetDefaults ??= {};
-        if (!Object.keys(nxJson.targetDefaults).includes('build')) {
-            nxJson.targetDefaults.build = {
+        const nxJson = (0, devkit_1.readNxJson)(tree) ?? {};
+        const existing = findBuildDefault(nxJson.targetDefaults);
+        if (!existing) {
+            (0, internal_2.upsertTargetDefault)(tree, nxJson, {
+                target: 'build',
                 cache: true,
                 dependsOn: ['^build'],
-            };
+            });
+            (0, devkit_1.updateNxJson)(tree, nxJson);
         }
-        else if (!nxJson.targetDefaults.build.dependsOn) {
-            nxJson.targetDefaults.build.dependsOn = ['^build'];
+        else if (!existing.dependsOn) {
+            (0, internal_2.upsertTargetDefault)(tree, nxJson, {
+                target: 'build',
+                dependsOn: ['^build'],
+            });
+            (0, devkit_1.updateNxJson)(tree, nxJson);
         }
-        (0, devkit_1.updateNxJson)(tree, nxJson);
     }
     if (options.bundler === 'webpack') {
         await (0, add_webpack_1.initWebpack)(tree, options, tasks);
@@ -101,7 +106,7 @@ async function applicationGeneratorInternal(tree, schema) {
     // If we are using the new TS solution
     // We need to update the workspace file (package.json or pnpm-workspaces.yaml) to include the new project
     if (options.isUsingTsSolutionConfig) {
-        await (0, ts_solution_setup_1.addProjectToTsSolutionWorkspace)(tree, options.appProjectRoot);
+        await (0, internal_3.addProjectToTsSolutionWorkspace)(tree, options.appProjectRoot);
     }
     const lintTask = await (0, add_linting_1.addLinting)(tree, options);
     tasks.push(lintTask);
@@ -150,14 +155,14 @@ async function applicationGeneratorInternal(tree, schema) {
         });
     }
     // Only for the new TS solution
-    (0, ts_solution_setup_1.updateTsconfigFiles)(tree, options.appProjectRoot, 'tsconfig.app.json', {
+    (0, internal_3.updateTsconfigFiles)(tree, options.appProjectRoot, 'tsconfig.app.json', {
         jsx: 'react-jsx',
         module: 'esnext',
         moduleResolution: 'bundler',
     }, options.linter === 'eslint'
         ? ['eslint.config.js', 'eslint.config.cjs', 'eslint.config.mjs']
         : undefined, options.useReactRouter ? 'app' : 'src');
-    (0, sort_fields_1.sortPackageJsonFields)(tree, options.appProjectRoot);
+    (0, internal_3.sortPackageJsonFields)(tree, options.appProjectRoot);
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(tree);
     }
@@ -166,4 +171,14 @@ async function applicationGeneratorInternal(tree, schema) {
     });
     return (0, devkit_1.runTasksInSerial)(...tasks);
 }
+function findBuildDefault(td) {
+    if (!td)
+        return undefined;
+    if (Array.isArray(td)) {
+        return td.find((e) => e.target === 'build' &&
+            e.projects === undefined &&
+            e.plugin === undefined);
+    }
+    return td['build'];
+}
 exports.default = applicationGenerator;

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

@@ -40,7 +40,7 @@ const eslint_1 = require("@nx/eslint");
 const eslint_file_1 = require("@nx/eslint/src/generators/utils/eslint-file");
 const flat_config_1 = require("@nx/eslint/src/utils/flat-config");
 const devkit_2 = 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 lint_1 = require("../../../utils/lint");
 const versions_1 = require("../../../utils/versions");
 async function addLinting(host, options) {
@@ -75,7 +75,7 @@ async function addLinting(host, options) {
         }
         if (!options.skipPackageJson) {
             const installTask = (0, devkit_2.addDependenciesToPackageJson)(host, lint_1.extraEslintDependencies.dependencies, lint_1.extraEslintDependencies.devDependencies);
-            const addSwcTask = (0, add_swc_dependencies_1.addSwcDependencies)(host);
+            const addSwcTask = (0, internal_1.addSwcDependencies)(host);
             tasks.push(installTask, addSwcTask);
         }
         if (options.useReactRouter) {

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

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addRouting = addRouting;
 const devkit_1 = require("@nx/devkit");
-const ensure_typescript_1 = require("@nx/js/src/utils/typescript/ensure-typescript");
+const internal_1 = require("@nx/js/internal");
 const ast_utils_1 = require("../../../utils/ast-utils");
 const versions_1 = require("../../../utils/versions");
 const maybe_js_1 = require("../../../utils/maybe-js");
@@ -12,7 +12,7 @@ function addRouting(host, options) {
         return () => { };
     }
     if (!tsModule) {
-        tsModule = (0, ensure_typescript_1.ensureTypescript)();
+        tsModule = (0, internal_1.ensureTypescript)();
     }
     const appPath = (0, devkit_1.joinPathFragments)(options.appProjectRoot, (0, maybe_js_1.maybeJs)({
         js: options.js,

package/src/generators/application/lib/create-application-files.js

@@ -13,7 +13,7 @@ const has_webpack_plugin_1 = require("../../../utils/has-webpack-plugin");
 const get_app_tests_1 = require("./get-app-tests");
 const onboarding_1 = require("nx/src/nx-cloud/utilities/onboarding");
 const has_rspack_plugin_1 = require("../../../utils/has-rspack-plugin");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+const internal_1 = require("@nx/js/internal");
 const versions_1 = require("../../../utils/versions");
 function getDefaultTemplateVariables(host, options) {
     const hasStyleFile = ['scss', 'css'].includes(options.style);
@@ -35,7 +35,7 @@ function getDefaultTemplateVariables(host, options) {
         inSourceVitestTests: (0, get_in_source_vitest_tests_template_1.getInSourceVitestTestsTemplate)(appTests),
         style: options.style,
         hasStyleFile,
-        isUsingTsSolutionSetup: (0, ts_solution_setup_1.isUsingTsSolutionSetup)(host),
+        isUsingTsSolutionSetup: (0, internal_1.isUsingTsSolutionSetup)(host),
         port: options.port ?? 4200,
     };
 }

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

@@ -5,7 +5,7 @@ const devkit_1 = require("@nx/devkit");
 const internal_1 = require("@nx/devkit/internal");
 const assertion_1 = require("../../../utils/assertion");
 const find_free_port_1 = require("./find-free-port");
-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) {
     await (0, internal_1.ensureRootProjectName)(options, 'application');
     const { projectName, names: projectNames, projectRoot: appProjectRoot, importPath, } = await (0, internal_1.determineProjectNameAndRootOptions)(host, {
@@ -19,7 +19,7 @@ async function normalizeOptions(host, options) {
         nxJson.useInferencePlugins !== false;
     options.addPlugin ??= addPlugin;
     options.rootProject = appProjectRoot === '.';
-    const isUsingTsSolutionConfig = (0, ts_solution_setup_1.isUsingTsSolutionSetup)(host);
+    const isUsingTsSolutionConfig = (0, internal_2.isUsingTsSolutionSetup)(host);
     const appProjectName = !isUsingTsSolutionConfig || options.name ? projectName : importPath;
     const e2eProjectName = options.rootProject ? 'e2e' : `${appProjectName}-e2e`;
     const e2eProjectRoot = options.rootProject ? 'e2e' : `${appProjectRoot}-e2e`;

package/src/generators/component/component.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.componentGenerator = componentGenerator;
 const devkit_1 = require("@nx/devkit");
-const ensure_typescript_1 = require("@nx/js/src/utils/typescript/ensure-typescript");
+const internal_1 = require("@nx/js/internal");
 const path_1 = require("path");
 const ast_utils_1 = require("../../utils/ast-utils");
 const get_in_source_vitest_tests_template_1 = require("../../utils/get-in-source-vitest-tests-template");
@@ -45,7 +45,7 @@ function createComponentFiles(host, options) {
 let tsModule;
 function addExportsToBarrel(host, options) {
     if (!tsModule) {
-        tsModule = (0, ensure_typescript_1.ensureTypescript)();
+        tsModule = (0, internal_1.ensureTypescript)();
     }
     const workspace = (0, devkit_1.getProjects)(host);
     const isApp = workspace.get(options.projectName).projectType === 'application';

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

@@ -4,7 +4,7 @@ exports.normalizeOptions = normalizeOptions;
 const devkit_1 = require("@nx/devkit");
 const internal_1 = require("@nx/devkit/internal");
 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(tree, options) {
     (0, assertion_1.assertValidStyle)(options.style);
     const { artifactName: name, directory, fileName, filePath, fileExtension, fileExtensionType, project: projectName, } = await (0, internal_1.determineArtifactNameAndDirectoryOptions)(tree, {
@@ -17,7 +17,7 @@ async function normalizeOptions(tree, options) {
     const { className } = (0, devkit_1.names)(name);
     const { sourceRoot: projectSourceRoot, root: projectRoot, projectType, } = project;
     if (options.export &&
-        (0, ts_solution_setup_1.getProjectType)(tree, projectRoot, projectType) === 'application') {
+        (0, internal_2.getProjectType)(tree, projectRoot, projectType) === 'application') {
         devkit_1.logger.warn(`The "--export" option should not be used with applications and will do nothing.`);
     }
     options.classComponent = options.classComponent ?? false;

package/src/generators/component-story/component-story.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"component-story.d.ts","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/component-story/component-story.ts"],"names":[],"mappings":"AAAA,OAAO,EAML,IAAI,EACL,MAAM,YAAY,CAAC;AAGpB,OAAO,KAAK,KAAK,EAAE,MAAM,YAAY,CAAC;AAWtC,MAAM,WAAW,gCAAgC;IAC/C,OAAO,EAAE,MAAM,CAAC;IAChB,aAAa,EAAE,MAAM,CAAC;IACtB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB;AAED,wBAAgB,0BAA0B,CACxC,IAAI,EAAE,IAAI,EACV,EACE,OAAO,EACP,aAAa,EACb,gBAAgB,EAChB,WAAW,GACZ,EAAE,gCAAgC,QA2EpC;AAED,wBAAgB,wBAAwB,CACtC,IAAI,EAAE,IAAI,EACV,UAAU,EAAE,EAAE,CAAC,UAAU,EACzB,cAAc,EAAE,EAAE,CAAC,IAAI,EACvB,kBAAkB,EAAE,MAAM,EAC1B,IAAI,EAAE,MAAM,EACZ,gBAAgB,EAAE,OAAO,EACzB,WAAW,EAAE,MAAM,EACnB,SAAS,EAAE,OAAO,EAClB,aAAa,CAAC,EAAE,OAAO,QAwBxB;AAED,wBAAsB,uBAAuB,CAC3C,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,gCAAgC,iBAWzC;AAED,eAAe,uBAAuB,CAAC"}
+{"version":3,"file":"component-story.d.ts","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/component-story/component-story.ts"],"names":[],"mappings":"AAAA,OAAO,EAML,IAAI,EACL,MAAM,YAAY,CAAC;AAEpB,OAAO,KAAK,KAAK,EAAE,MAAM,YAAY,CAAC;AAWtC,MAAM,WAAW,gCAAgC;IAC/C,OAAO,EAAE,MAAM,CAAC;IAChB,aAAa,EAAE,MAAM,CAAC;IACtB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB;AAED,wBAAgB,0BAA0B,CACxC,IAAI,EAAE,IAAI,EACV,EACE,OAAO,EACP,aAAa,EACb,gBAAgB,EAChB,WAAW,GACZ,EAAE,gCAAgC,QA2EpC;AAED,wBAAgB,wBAAwB,CACtC,IAAI,EAAE,IAAI,EACV,UAAU,EAAE,EAAE,CAAC,UAAU,EACzB,cAAc,EAAE,EAAE,CAAC,IAAI,EACvB,kBAAkB,EAAE,MAAM,EAC1B,IAAI,EAAE,MAAM,EACZ,gBAAgB,EAAE,OAAO,EACzB,WAAW,EAAE,MAAM,EACnB,SAAS,EAAE,OAAO,EAClB,aAAa,CAAC,EAAE,OAAO,QAwBxB;AAED,wBAAsB,uBAAuB,CAC3C,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,gCAAgC,iBAWzC;AAED,eAAe,uBAAuB,CAAC"}

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

@@ -4,8 +4,7 @@ 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 internal_1 = require("@nx/js/internal");
 const ast_utils_1 = require("../../utils/ast-utils");
 const component_props_1 = require("../../utils/component-props");
 const framework_1 = require("../../utils/framework");
@@ -13,10 +12,10 @@ const path_1 = require("path");
 let tsModule;
 function createComponentStoriesFile(host, { project, componentPath, interactionTests, uiFramework, }) {
     if (!tsModule) {
-        tsModule = (0, ensure_typescript_1.ensureTypescript)();
+        tsModule = (0, internal_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)((0, internal_1.getProjectSourceRoot)(proj, host), 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.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"component-test.d.ts","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/component-test/component-test.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,IAAI,EACL,MAAM,YAAY,CAAC;AAUpB,OAAO,EAAE,mBAAmB,EAAE,MAAM,UAAU,CAAC;AAI/C,wBAAsB,sBAAsB,CAC1C,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,mBAAmB,iBAkB7B;AAqED,eAAe,sBAAsB,CAAC"}
+{"version":3,"file":"component-test.d.ts","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/component-test/component-test.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,IAAI,EACL,MAAM,YAAY,CAAC;AASpB,OAAO,EAAE,mBAAmB,EAAE,MAAM,UAAU,CAAC;AAI/C,wBAAsB,sBAAsB,CAC1C,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,mBAAmB,iBAkB7B;AAqED,eAAe,sBAAsB,CAAC"}

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

@@ -2,8 +2,7 @@
 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 internal_1 = require("@nx/js/internal");
 const path_1 = require("path");
 const ast_utils_1 = require("../../utils/ast-utils");
 const component_props_1 = require("../../utils/component-props");
@@ -14,7 +13,7 @@ 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 sourceRoot = (0, internal_1.getProjectSourceRoot)(projectConfig, tree);
     const normalizedPath = options.componentPath.startsWith(sourceRoot)
         ? (0, path_1.relative)(sourceRoot, options.componentPath)
         : options.componentPath;
@@ -25,7 +24,7 @@ async function componentTestGenerator(tree, options) {
 }
 function generateSpecsForComponents(tree, filePath) {
     if (!tsModule) {
-        tsModule = (0, ensure_typescript_1.ensureTypescript)();
+        tsModule = (0, internal_1.ensureTypescript)();
     }
     const sourceFile = tsModule.createSourceFile(filePath, tree.read(filePath, 'utf-8'), tsModule.ScriptTarget.Latest, true);
     const cmpNodes = (0, ast_utils_1.findExportDeclarationsForJsx)(sourceFile);

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

@@ -35,7 +35,7 @@ var __importStar = (this && this.__importStar) || (function () {
 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 internal_1 = require("@nx/js/internal");
 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");
@@ -66,7 +66,7 @@ async function addFiles(tree, projectConfig, options, found) {
     }
     if (options.generateTests) {
         const filePaths = [];
-        const sourceRoot = (0, ts_solution_setup_1.getProjectSourceRoot)(projectConfig, tree);
+        const sourceRoot = (0, internal_1.getProjectSourceRoot)(projectConfig, tree);
         (0, devkit_1.visitNotIgnoredFiles)(tree, sourceRoot, (filePath) => {
             if ((0, ct_utils_1.isComponent)(tree, filePath)) {
                 filePaths.push(filePath);

package/src/generators/federate-module/lib/utils.js

@@ -9,10 +9,10 @@ exports.updateExposesPropertyinAST = updateExposesPropertyinAST;
 exports.writeToConfig = writeToConfig;
 exports.updateExposesProperty = updateExposesProperty;
 const devkit_1 = require("@nx/devkit");
-const ensure_typescript_1 = require("@nx/js/src/utils/typescript/ensure-typescript");
+const internal_1 = require("@nx/js/internal");
 let tsModule;
 if (!tsModule) {
-    tsModule = (0, ensure_typescript_1.ensureTypescript)();
+    tsModule = (0, internal_1.ensureTypescript)();
 }
 /**
  * Adds a Module Federation path to the exposes property of the module federation config

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

@@ -1 +1 @@
-{"version":3,"file":"hook.d.ts","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/hook/hook.ts"],"names":[],"mappings":"AAKA,OAAO,EAQL,IAAI,EACL,MAAM,YAAY,CAAC;AAIpB,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAclC,wBAAsB,aAAa,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,iBAO7D;AAmHD,eAAe,aAAa,CAAC"}
+{"version":3,"file":"hook.d.ts","sourceRoot":"","sources":["../../../../../../packages/react/src/generators/hook/hook.ts"],"names":[],"mappings":"AAKA,OAAO,EAQL,IAAI,EACL,MAAM,YAAY,CAAC;AAIpB,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAYlC,wBAAsB,aAAa,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,iBAO7D;AAmHD,eAAe,aAAa,CAAC"}

package/src/generators/hook/hook.js

@@ -4,10 +4,9 @@ exports.hookGenerator = hookGenerator;
 const internal_1 = require("@nx/devkit/internal");
 // TODO(jack): Remove inline renderHook function when RTL releases with its own version
 const devkit_1 = require("@nx/devkit");
-const ensure_typescript_1 = require("@nx/js/src/utils/typescript/ensure-typescript");
+const internal_2 = require("@nx/js/internal");
 const path_1 = require("path");
 const ast_utils_1 = require("../../utils/ast-utils");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 async function hookGenerator(host, schema) {
     const options = await normalizeOptions(host, schema);
     createFiles(host, options);
@@ -29,7 +28,7 @@ function createFiles(host, options) {
 let tsModule;
 function addExportsToBarrel(host, options) {
     if (!tsModule) {
-        tsModule = (0, ensure_typescript_1.ensureTypescript)();
+        tsModule = (0, internal_2.ensureTypescript)();
     }
     const workspace = (0, devkit_1.getProjects)(host);
     const isApp = workspace.get(options.projectName).projectType === 'application';
@@ -64,7 +63,7 @@ async function normalizeOptions(host, options) {
     const project = (0, devkit_1.getProjects)(host).get(projectName);
     const { root, sourceRoot: projectSourceRoot, projectType } = project;
     if (options.export &&
-        (0, ts_solution_setup_1.getProjectType)(host, root, projectType) === 'application') {
+        (0, internal_2.getProjectType)(host, root, projectType) === 'application') {
         devkit_1.logger.warn(`The "--export" option should not be used with applications and will do nothing.`);
     }
     return {

package/src/generators/host/host.js

@@ -15,7 +15,7 @@ const setup_ssr_for_host_1 = require("./lib/setup-ssr-for-host");
 const update_module_federation_e2e_project_1 = require("./lib/update-module-federation-e2e-project");
 const add_mf_env_to_inputs_1 = require("../../utils/add-mf-env-to-inputs");
 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 versions_1 = require("../../utils/versions");
 const update_module_federation_tsconfig_1 = require("./lib/update-module-federation-tsconfig");
 const normalize_host_name_1 = require("./lib/normalize-host-name");
@@ -57,7 +57,7 @@ async function hostGenerator(host, schema) {
     });
     tasks.push(initTask);
     // 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 hostPackageJsonPath = (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'package.json');
         if (host.exists(hostPackageJsonPath)) {
             (0, devkit_1.updateJson)(host, hostPackageJsonPath, (json) => {
@@ -98,7 +98,7 @@ async function hostGenerator(host, schema) {
     (0, update_module_federation_e2e_project_1.updateModuleFederationE2eProject)(host, options);
     (0, update_module_federation_tsconfig_1.updateModuleFederationTsconfig)(host, options);
     // Add remotes as devDependencies in TS solution setup
-    if ((0, ts_solution_setup_1.isUsingTsSolutionSetup)(host) && remotesWithPorts.length > 0) {
+    if ((0, internal_2.isUsingTsSolutionSetup)(host) && remotesWithPorts.length > 0) {
         addRemotesAsHostDependencies(host, options.projectName, remotesWithPorts);
     }
     if (options.ssr) {

package/src/generators/host/lib/add-module-federation-files.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"add-module-federation-files.d.ts","sourceRoot":"","sources":["../../../../../../../packages/react/src/generators/host/lib/add-module-federation-files.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,IAAI,EAML,MAAM,YAAY,CAAC;AAUpB,OAAO,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAG7C,wBAAgB,wBAAwB,CACtC,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,gBAAgB,EACzB,qBAAqB,EAAE;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,EAAE,QAgJxD"}
+{"version":3,"file":"add-module-federation-files.d.ts","sourceRoot":"","sources":["../../../../../../../packages/react/src/generators/host/lib/add-module-federation-files.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,IAAI,EAML,MAAM,YAAY,CAAC;AAOpB,OAAO,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAG7C,wBAAgB,wBAAwB,CACtC,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,gBAAgB,EACzB,qBAAqB,EAAE;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,EAAE,QAgJxD"}

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

@@ -2,7 +2,7 @@
 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 internal_1 = require("@nx/js/internal");
 const maybe_js_1 = require("../../../utils/maybe-js");
 const create_application_files_1 = require("../../application/lib/create-application-files");
 const path_1 = require("path");
@@ -35,7 +35,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)((0, internal_1.getProjectSourceRoot)(projectConfig, host), '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.
@@ -69,7 +69,7 @@ function addModuleFederationFiles(host, options, defaultRemoteManifest) {
             processBundlerConfigFile(options, host, 'webpack.config.prod.js');
         }
         // Delete TypeScript prod config in TS solution setup - not needed in Crystal
-        if ((0, ts_solution_setup_1.isUsingTsSolutionSetup)(host)) {
+        if ((0, internal_1.isUsingTsSolutionSetup)(host)) {
             const prodConfigFileName = options.bundler === 'rspack'
                 ? 'rspack.config.prod.ts'
                 : 'webpack.config.prod.ts';

package/src/generators/host/lib/update-module-federation-tsconfig.js

@@ -2,13 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateModuleFederationTsconfig = updateModuleFederationTsconfig;
 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");
 function updateModuleFederationTsconfig(host, options) {
     const tsconfigPath = (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'tsconfig.json');
     const tsconfigRuntimePath = (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'tsconfig.app.json');
     if (!host.exists(tsconfigPath) || !host.exists(tsconfigRuntimePath))
         return;
-    if ((0, ts_solution_setup_1.isUsingTsSolutionSetup)(host)) {
+    if ((0, internal_1.isUsingTsSolutionSetup)(host)) {
         // Update references to match what `nx sync` does.
         if (options.remotes?.length) {
             (0, devkit_1.updateJson)(host, tsconfigPath, (json) => {