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

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.js

@@ -4,9 +4,9 @@ exports.normalizeOptions = normalizeOptions;
 const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
 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);
+    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,
@@ -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":"AACA,OAAO,EAIL,iBAAiB,EAOjB,IAAI,EAGL,MAAM,YAAY,CAAC;AA8BpB,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"}
+{"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

@@ -7,9 +7,7 @@ const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
 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");
@@ -33,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,
@@ -84,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);
@@ -202,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);
@@ -224,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);
     }

package/src/generators/redux/redux.js

@@ -5,8 +5,7 @@ const tslib_1 = require("tslib");
 const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
 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;
@@ -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/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":"AACA,OAAO,EAIL,iBAAiB,EAOjB,IAAI,EAGL,MAAM,YAAY,CAAC;AAsBpB,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

@@ -7,7 +7,7 @@ const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
 const path_1 = require("path");
 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');
@@ -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/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":"AAOA,OAAO,EACL,KAAK,aAAa,EAQnB,MAAM,YAAY,CAAC;AAUpB,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"}
+{"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

@@ -8,8 +8,7 @@ const fs_1 = require("fs");
 const cache_directory_1 = require("nx/src/utils/cache-directory");
 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 internal_2 = require("@nx/js/internal");
 const pmCommand = (0, devkit_1.getPackageManagerCommand)();
 const reactRouterConfigBlob = '**/react-router.config.{ts,js,cjs,cts,mjs,mts}';
 exports.createNodesV2 = [
@@ -19,7 +18,7 @@ exports.createNodesV2 = [
         const normalizedOptions = normalizeOptions(options);
         const cachePath = (0, path_1.join)(cache_directory_1.workspaceDataDirectory, `react-router-${optionsHash}.hash`);
         const targetsCache = new internal_1.PluginCache(cachePath);
-        const isUsingTsSolutionSetup = (0, ts_solution_setup_1.isUsingTsSolutionSetup)();
+        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)) {
@@ -77,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);
 }

package/src/utils/ast-utils.js

@@ -21,11 +21,11 @@ exports.getComponentNode = getComponentNode;
 exports.parseComponentPropsInfo = parseComponentPropsInfo;
 const js_1 = require("@nx/js");
 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;
 function addImport(source, statement) {
     if (!tsModule) {
-        tsModule = (0, ensure_typescript_1.ensureTypescript)();
+        tsModule = (0, internal_1.ensureTypescript)();
     }
     const allImports = (0, js_1.findNodes)(source, tsModule.SyntaxKind.ImportDeclaration);
     if (allImports.length > 0) {
@@ -50,7 +50,7 @@ function addImport(source, statement) {
 }
 function findMainRenderStatement(source) {
     if (!tsModule) {
-        tsModule = (0, ensure_typescript_1.ensureTypescript)();
+        tsModule = (0, internal_1.ensureTypescript)();
     }
     // 1. Try to find ReactDOM.render.
     const calls = (0, js_1.findNodes)(source, tsModule.SyntaxKind.CallExpression);
@@ -88,7 +88,7 @@ function findDefaultExport(source) {
 }
 function findDefaultExportDeclaration(source) {
     if (!tsModule) {
-        tsModule = (0, ensure_typescript_1.ensureTypescript)();
+        tsModule = (0, internal_1.ensureTypescript)();
     }
     const identifier = findDefaultExportIdentifier(source);
     if (identifier) {
@@ -107,7 +107,7 @@ function findDefaultExportDeclaration(source) {
 }
 function findExportDeclarationsForJsx(source) {
     if (!tsModule) {
-        tsModule = (0, ensure_typescript_1.ensureTypescript)();
+        tsModule = (0, internal_1.ensureTypescript)();
     }
     const variables = (0, js_1.findNodes)(source, tsModule.SyntaxKind.VariableDeclaration);
     const variableStatements = (0, js_1.findNodes)(source, tsModule.SyntaxKind.VariableStatement);
@@ -157,7 +157,7 @@ function findExportDeclarationsForJsx(source) {
 }
 function findDefaultExportIdentifier(source) {
     if (!tsModule) {
-        tsModule = (0, ensure_typescript_1.ensureTypescript)();
+        tsModule = (0, internal_1.ensureTypescript)();
     }
     const exports = (0, js_1.findNodes)(source, tsModule.SyntaxKind.ExportAssignment);
     const identifier = exports
@@ -167,7 +167,7 @@ function findDefaultExportIdentifier(source) {
 }
 function findDefaultClassOrFunction(source) {
     if (!tsModule) {
-        tsModule = (0, ensure_typescript_1.ensureTypescript)();
+        tsModule = (0, internal_1.ensureTypescript)();
     }
     const fns = (0, js_1.findNodes)(source, tsModule.SyntaxKind.FunctionDeclaration);
     const cls = (0, js_1.findNodes)(source, tsModule.SyntaxKind.ClassDeclaration);
@@ -177,7 +177,7 @@ function findDefaultClassOrFunction(source) {
 }
 function hasDefaultExportModifier(x) {
     if (!tsModule) {
-        tsModule = (0, ensure_typescript_1.ensureTypescript)();
+        tsModule = (0, internal_1.ensureTypescript)();
     }
     return (x.modifiers &&
         x.modifiers.some((m) => m.kind === tsModule.SyntaxKind.ExportKeyword) &&
@@ -185,7 +185,7 @@ function hasDefaultExportModifier(x) {
 }
 function findComponentImportPath(componentName, source) {
     if (!tsModule) {
-        tsModule = (0, ensure_typescript_1.ensureTypescript)();
+        tsModule = (0, internal_1.ensureTypescript)();
     }
     const allImports = (0, js_1.findNodes)(source, tsModule.SyntaxKind.ImportDeclaration);
     const matching = allImports.filter((i) => {
@@ -201,7 +201,7 @@ function findComponentImportPath(componentName, source) {
 }
 function findElements(source, tagName) {
     if (!tsModule) {
-        tsModule = (0, ensure_typescript_1.ensureTypescript)();
+        tsModule = (0, internal_1.ensureTypescript)();
     }
     const nodes = (0, js_1.findNodes)(source, [
         tsModule.SyntaxKind.JsxSelfClosingElement,
@@ -222,7 +222,7 @@ function findClosestOpening(tagName, node) {
 }
 function isTag(tagName, node) {
     if (!tsModule) {
-        tsModule = (0, ensure_typescript_1.ensureTypescript)();
+        tsModule = (0, internal_1.ensureTypescript)();
     }
     if (tsModule.isJsxOpeningLikeElement(node)) {
         return (node.tagName.kind === tsModule.SyntaxKind.Identifier &&
@@ -236,7 +236,7 @@ function isTag(tagName, node) {
 }
 function addInitialRoutes(sourcePath, source, addBrowserRouter) {
     if (!tsModule) {
-        tsModule = (0, ensure_typescript_1.ensureTypescript)();
+        tsModule = (0, internal_1.ensureTypescript)();
     }
     const jsxClosingElements = (0, js_1.findNodes)(source, [
         tsModule.SyntaxKind.JsxClosingElement,
@@ -405,7 +405,7 @@ const store = configureStore({
 }
 function updateReduxStore(sourcePath, source, feature) {
     if (!tsModule) {
-        tsModule = (0, ensure_typescript_1.ensureTypescript)();
+        tsModule = (0, internal_1.ensureTypescript)();
     }
     const calls = (0, js_1.findNodes)(source, tsModule.SyntaxKind.CallExpression);
     let reducerDescriptor;
@@ -459,7 +459,7 @@ function updateReduxStore(sourcePath, source, feature) {
 }
 function getComponentNode(sourceFile) {
     if (!tsModule) {
-        tsModule = (0, ensure_typescript_1.ensureTypescript)();
+        tsModule = (0, internal_1.ensureTypescript)();
     }
     const defaultExport = findDefaultExport(sourceFile);
     if (!(defaultExport &&
@@ -472,7 +472,7 @@ function getComponentNode(sourceFile) {
 }
 function parseComponentPropsInfo(sourceFile, cmpDeclaration) {
     if (!tsModule) {
-        tsModule = (0, ensure_typescript_1.ensureTypescript)();
+        tsModule = (0, internal_1.ensureTypescript)();
     }
     let propsTypeName = null;
     let inlineTypeString = null;