feat(react): update app generators for remix, next, expo, rn

nrwl · Nov 12, 2024 · a2e9734 · a2e9734
1 parent ca4a294
commit a2e9734
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 20 deletions.
diff --git a/packages/expo/src/generators/application/application.ts b/packages/expo/src/generators/application/application.ts
@@ -44,6 +44,9 @@ export async function expoApplicationGeneratorInternal(
   const jsInitTask = await jsInitGenerator(host, {
     ...schema,
     skipFormat: true,
+    addTsPlugin:
+      process.env.NX_ADD_PLUGINS !== 'false' &&
+      process.env.NX_ADD_TS_PLUGIN !== 'false',
   });
 
   tasks.push(jsInitTask);

diff --git a/packages/expo/src/generators/init/init.ts b/packages/expo/src/generators/init/init.ts
@@ -9,7 +9,6 @@ import {
   Tree,
 } from '@nx/devkit';
 import { addPluginV1 } from '@nx/devkit/src/utils/add-plugin';
-import { assertNotUsingTsSolutionSetup } from '@nx/js/src/utils/typescript/ts-solution-setup';
 import { createNodes } from '../../../plugins/plugin';
 import {
   expoCliVersion,
@@ -28,8 +27,6 @@ export function expoInitGenerator(tree: Tree, schema: Schema) {
 }
 
 export async function expoInitGeneratorInternal(host: Tree, schema: Schema) {
-  assertNotUsingTsSolutionSetup(host, 'expo', 'init');
-
   const nxJson = readNxJson(host);
   const addPluginDefault =
     process.env.NX_ADD_PLUGINS !== 'false' &&

diff --git a/packages/next/src/generators/application/application.ts b/packages/next/src/generators/application/application.ts
@@ -51,6 +51,9 @@ export async function applicationGeneratorInternal(host: Tree, schema: Schema) {
     js: options.js,
     skipPackageJson: options.skipPackageJson,
     skipFormat: true,
+    addTsPlugin:
+      process.env.NX_ADD_PLUGINS !== 'false' &&
+      process.env.NX_ADD_TS_PLUGIN !== 'false',
   });
   tasks.push(jsInitTask);
 

diff --git a/packages/next/src/generators/init/init.ts b/packages/next/src/generators/init/init.ts
@@ -8,7 +8,6 @@ import {
   createProjectGraphAsync,
 } from '@nx/devkit';
 import { addPlugin } from '@nx/devkit/src/utils/add-plugin';
-import { assertNotUsingTsSolutionSetup } from '@nx/js/src/utils/typescript/ts-solution-setup';
 import { reactDomVersion, reactVersion } from '@nx/react/src/utils/versions';
 import { addGitIgnoreEntry } from '../../utils/add-gitignore-entry';
 import { nextVersion, nxVersion } from '../../utils/versions';
@@ -46,8 +45,6 @@ export async function nextInitGeneratorInternal(
   host: Tree,
   schema: InitSchema
 ) {
-  assertNotUsingTsSolutionSetup(host, 'next', 'init');
-
   const nxJson = readNxJson(host);
   const addPluginDefault =
     process.env.NX_ADD_PLUGINS !== 'false' &&

diff --git a/packages/react-native/src/generators/application/application.ts b/packages/react-native/src/generators/application/application.ts
@@ -49,6 +49,9 @@ export async function reactNativeApplicationGeneratorInternal(
   const jsInitTask = await jsInitGenerator(host, {
     ...schema,
     skipFormat: true,
+    addTsPlugin:
+      process.env.NX_ADD_PLUGINS !== 'false' &&
+      process.env.NX_ADD_TS_PLUGIN !== 'false',
   });
   tasks.push(jsInitTask);
   const initTask = await initGenerator(host, { ...options, skipFormat: true });

diff --git a/packages/react-native/src/generators/init/init.ts b/packages/react-native/src/generators/init/init.ts
@@ -9,7 +9,6 @@ import {
   Tree,
 } from '@nx/devkit';
 import { addPluginV1 } from '@nx/devkit/src/utils/add-plugin';
-import { assertNotUsingTsSolutionSetup } from '@nx/js/src/utils/typescript/ts-solution-setup';
 import { createNodes } from '../../../plugins/plugin';
 import {
   nxVersion,
@@ -31,8 +30,6 @@ export async function reactNativeInitGeneratorInternal(
   host: Tree,
   schema: Schema
 ) {
-  assertNotUsingTsSolutionSetup(host, 'react-native', 'init');
-
   addGitIgnoreEntry(host);
 
   const nxJson = readNxJson(host);

diff --git a/packages/remix/src/generators/application/application.impl.ts b/packages/remix/src/generators/application/application.impl.ts
@@ -74,7 +74,12 @@ export async function remixApplicationGeneratorInternal(
       skipFormat: true,
       addPlugin: true,
     }),
-    await jsInitGenerator(tree, { skipFormat: true }),
+    await jsInitGenerator(tree, {
+      skipFormat: true,
+      addTsPlugin:
+        process.env.NX_ADD_PLUGINS !== 'false' &&
+        process.env.NX_ADD_TS_PLUGIN !== 'false',
+    }),
   ];
 
   addProjectConfiguration(tree, options.projectName, {

diff --git a/packages/remix/src/generators/init/init.ts b/packages/remix/src/generators/init/init.ts
@@ -1,17 +1,13 @@
 import {
-  type Tree,
+  addDependenciesToPackageJson,
+  createProjectGraphAsync,
   formatFiles,
   GeneratorCallback,
   readNxJson,
-  addDependenciesToPackageJson,
   runTasksInSerial,
-  createProjectGraphAsync,
+  type Tree,
 } from '@nx/devkit';
-import {
-  addPlugin,
-  generateCombinations,
-} from '@nx/devkit/src/utils/add-plugin';
-import { assertNotUsingTsSolutionSetup } from '@nx/js/src/utils/typescript/ts-solution-setup';
+import { addPlugin } from '@nx/devkit/src/utils/add-plugin';
 import { createNodesV2 } from '../../plugins/plugin';
 import { nxVersion, remixVersion } from '../../utils/versions';
 import { type Schema } from './schema';
@@ -21,8 +17,6 @@ export function remixInitGenerator(tree: Tree, options: Schema) {
 }
 
 export async function remixInitGeneratorInternal(tree: Tree, options: Schema) {
-  assertNotUsingTsSolutionSetup(tree, 'remix', 'init');
-
   const tasks: GeneratorCallback[] = [];
 
   if (!options.skipPackageJson) {