fix(core): re-enable CRA migration to Vite

nrwl · Feb 18, 2025 · 4c05e63 · 4c05e63
1 parent 3d63da2
commit 4c05e63
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 9 deletions.
diff --git a/packages/nx/src/command-line/init/implementation/react/index.ts b/packages/nx/src/command-line/init/implementation/react/index.ts
@@ -184,11 +184,6 @@ function createTempWorkspace(options: NormalizedOptions) {
 
   output.log({ title: '🧹 Clearing unused files' });
 
-  cpSync(
-    join('temp-workspace', 'apps', options.reactAppName, 'project.json'),
-    'project.json',
-    { recursive: true }
-  );
   rmSync(join('temp-workspace', 'apps', options.reactAppName), {
     recursive: true,
     force: true,
@@ -255,7 +250,6 @@ function moveFilesToTempWorkspace(options: NormalizedOptions) {
 
   copyPackageJsonDepsFromTempWorkspace();
   const requiredCraFiles = [
-    'project.json',
     'package.json',
     'src',
     'public',

diff --git a/packages/nx/src/command-line/init/implementation/utils.ts b/packages/nx/src/command-line/init/implementation/utils.ts
@@ -3,6 +3,7 @@ import { join } from 'path';
 
 import { NxJsonConfiguration } from '../../../config/nx-json';
 import {
+  directoryExists,
   fileExists,
   readJsonFile,
   writeJsonFile,
@@ -336,3 +337,18 @@ export function isMonorepo(packageJson: PackageJson) {
 
   return false;
 }
+
+export function isCRA(packageJson: PackageJson) {
+  const combinedDependencies = {
+    ...packageJson.dependencies,
+    ...packageJson.devDependencies,
+  };
+  return (
+    // Required dependencies for CRA projects
+    combinedDependencies['react'] &&
+    combinedDependencies['react-dom'] &&
+    combinedDependencies['react-scripts'] &&
+    directoryExists('src') &&
+    directoryExists('public')
+  );
+}
diff --git a/packages/nx/src/command-line/init/init-v2.ts b/packages/nx/src/command-line/init/init-v2.ts
@@ -8,7 +8,10 @@ import { readJsonFile } from '../../utils/fileutils';
 import { getPackageNameFromImportPath } from '../../utils/get-package-name-from-import-path';
 import { output } from '../../utils/output';
 import { PackageJson } from '../../utils/package-json';
-import { getPackageManagerCommand } from '../../utils/package-manager';
+import {
+  detectPackageManager,
+  getPackageManagerCommand,
+} from '../../utils/package-manager';
 import { nxVersion } from '../../utils/versions';
 import { globWithWorkspaceContextSync } from '../../utils/workspace-context';
 import { connectExistingRepoToNxCloudPrompt } from '../connect/connect-to-nx-cloud';
@@ -24,10 +27,12 @@ import { generateDotNxSetup } from './implementation/dot-nx/add-nx-scripts';
 import {
   createNxJsonFile,
   initCloud,
+  isCRA,
   isMonorepo,
   printFinalMessage,
   updateGitIgnore,
 } from './implementation/utils';
+import { addNxToCraRepo } from './implementation/react';
 
 export interface InitArgs {
   interactive: boolean;
@@ -85,6 +90,7 @@ export async function initHandler(options: InitArgs): Promise<void> {
   const packageJson: PackageJson = readJsonFile('package.json');
   const _isTurborepo = existsSync('turbo.json');
   const _isMonorepo = isMonorepo(packageJson);
+  const _isCRA = isCRA(packageJson);
 
   const learnMoreLink = _isTurborepo
     ? 'https://nx.dev/recipes/adopting-nx/from-turborepo'
@@ -108,7 +114,18 @@ export async function initHandler(options: InitArgs): Promise<void> {
     return;
   }
 
-  if (_isMonorepo) {
+  const pmc = getPackageManagerCommand();
+
+  if (_isCRA) {
+    await addNxToCraRepo({
+      addE2e: false,
+      force: false,
+      vite: true,
+      integrated: false,
+      interactive: options.interactive,
+      nxCloud: false,
+    });
+  } else if (_isMonorepo) {
     await addNxToMonorepo({
       interactive: options.interactive,
       nxCloud: false,
@@ -125,7 +142,6 @@ export async function initHandler(options: InitArgs): Promise<void> {
     (options.interactive ? await connectExistingRepoToNxCloudPrompt() : false);
 
   const repoRoot = process.cwd();
-  const pmc = getPackageManagerCommand();
 
   createNxJsonFile(repoRoot, [], [], {});
   updateGitIgnore(repoRoot);