feat(core): update apps preset to also set up integrated style; do ad…

…d ts plugin by default from react generators
nrwl · Nov 13, 2024 · 4f67272 · 4f67272
1 parent e812720
commit 4f67272
Show file tree

Hide file tree

Showing 14 changed files with 27 additions and 23 deletions.
diff --git a/packages/detox/src/generators/application/application.ts b/packages/detox/src/generators/application/application.ts
@@ -23,9 +23,6 @@ export async function detoxApplicationGeneratorInternal(
 ) {
   const jsInitTask = await jsInitGenerator(host, {
     skipFormat: true,
-    addTsPlugin:
-      process.env.NX_ADD_PLUGINS !== 'false' &&
-      process.env.NX_ADD_TS_PLUGIN !== 'false',
   });
 
   const options = await normalizeOptions(host, schema);

diff --git a/packages/expo/src/generators/application/application.ts b/packages/expo/src/generators/application/application.ts
@@ -40,9 +40,7 @@ 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',
+    addTsPlugin: schema.useTsSolution,
   });
 
   const options = await normalizeOptions(host, schema);

diff --git a/packages/expo/src/generators/application/schema.d.ts b/packages/expo/src/generators/application/schema.d.ts
@@ -15,6 +15,8 @@ export interface Schema {
   e2eTestRunner: 'cypress' | 'playwright' | 'detox' | 'none'; // default is none
   standaloneConfig?: boolean;
   skipPackageJson?: boolean; // default is false
+  // Internal options
   addPlugin?: boolean;
   nxCloudToken?: string;
+  useTsSolution?: boolean;
 }
diff --git a/packages/next/src/generators/application/application.ts b/packages/next/src/generators/application/application.ts
@@ -49,9 +49,7 @@ 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',
+    addTsPlugin: schema.useTsSolution,
   });
   tasks.push(jsInitTask);
 

diff --git a/packages/next/src/generators/application/schema.d.ts b/packages/next/src/generators/application/schema.d.ts
@@ -17,6 +17,8 @@ export interface Schema {
   skipPackageJson?: boolean;
   appDir?: boolean;
   src?: boolean;
+  // Internal options
   rootProject?: boolean;
   addPlugin?: boolean;
+  useTsSolution?: boolean;
 }
diff --git a/packages/react-native/src/generators/application/application.ts b/packages/react-native/src/generators/application/application.ts
@@ -45,9 +45,7 @@ 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',
+    addTsPlugin: schema.useTsSolution,
   });
   tasks.push(jsInitTask);
 

diff --git a/packages/react-native/src/generators/application/schema.d.ts b/packages/react-native/src/generators/application/schema.d.ts
@@ -16,6 +16,8 @@ export interface Schema {
   bundler: 'webpack' | 'vite'; // default is webpack
   install: boolean; // default is true
   skipPackageJson?: boolean; //default is false
+  // Internal options
   addPlugin?: boolean;
   nxCloudToken?: string;
+  useTsSolution?: boolean;
 }
diff --git a/packages/react/src/generators/application/application.ts b/packages/react/src/generators/application/application.ts
@@ -116,9 +116,7 @@ export async function applicationGeneratorInternal(
     ...schema,
     tsConfigName: schema.rootProject ? 'tsconfig.json' : 'tsconfig.base.json',
     skipFormat: true,
-    addTsPlugin:
-      process.env.NX_ADD_PLUGINS !== 'false' &&
-      process.env.NX_ADD_TS_PLUGIN !== 'false',
+    addTsPlugin: schema.useTsSolution,
   });
   tasks.push(jsInitTask);
 

diff --git a/packages/react/src/generators/application/schema.d.ts b/packages/react/src/generators/application/schema.d.ts
@@ -25,8 +25,10 @@ export interface Schema {
   rootProject?: boolean;
   bundler?: 'webpack' | 'vite' | 'rspack';
   minimal?: boolean;
+  // Internal options
   addPlugin?: boolean;
   nxCloudToken?: string;
+  useTsSolution?: boolean;
 }
 
 export interface NormalizedSchema<T extends Schema = Schema> extends T {

diff --git a/packages/react/src/generators/application/schema.json b/packages/react/src/generators/application/schema.json
@@ -123,7 +123,7 @@
       "enum": ["playwright", "cypress", "none"],
       "description": "Test runner to use for end to end (E2E) tests.",
       "x-prompt": "Which E2E test runner would you like to use?",
-      "default": "playwright"
+      "default": "none"
     },
     "tags": {
       "type": "string",

diff --git a/packages/react/src/generators/library/library.ts b/packages/react/src/generators/library/library.ts
@@ -43,9 +43,6 @@ export async function libraryGeneratorInternal(host: Tree, schema: Schema) {
   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/remix/src/generators/application/application.impl.ts b/packages/remix/src/generators/application/application.impl.ts
@@ -70,9 +70,7 @@ export async function remixApplicationGeneratorInternal(
     }),
     await jsInitGenerator(tree, {
       skipFormat: true,
-      addTsPlugin:
-        process.env.NX_ADD_PLUGINS !== 'false' &&
-        process.env.NX_ADD_TS_PLUGIN !== 'false',
+      addTsPlugin: _options.useTsSolution,
     }),
   ];
 

diff --git a/packages/remix/src/generators/application/schema.d.ts b/packages/remix/src/generators/application/schema.d.ts
@@ -8,7 +8,9 @@ export interface NxRemixGeneratorSchema {
   unitTestRunner?: 'vitest' | 'jest' | 'none';
   e2eTestRunner?: 'cypress' | 'playwright' | 'none';
   skipFormat?: boolean;
+  // Internal options
   rootProject?: boolean;
   addPlugin?: boolean;
   nxCloudToken?: string;
+  useTsSolution?: boolean;
 }
diff --git a/packages/workspace/src/generators/preset/preset.ts b/packages/workspace/src/generators/preset/preset.ts
@@ -20,7 +20,12 @@ async function createPreset(tree: Tree, options: Schema) {
     nxJson.useInferencePlugins !== false;
 
   if (options.preset === Preset.Apps) {
-    return;
+    const { initGenerator } = require('@nx' + '/js');
+    return initGenerator(tree, {
+      formatter: options.formatter,
+      addTsPlugin: false,
+      addTsConfigBase: true,
+    });
   } else if (options.preset === Preset.AngularMonorepo) {
     const {
       applicationGenerator: angularApplicationGenerator,
@@ -71,6 +76,7 @@ async function createPreset(tree: Tree, options: Schema) {
       e2eTestRunner: options.e2eTestRunner ?? 'playwright',
       addPlugin,
       nxCloudToken: options.nxCloudToken,
+      useTsSolution: true,
     });
   } else if (options.preset === Preset.ReactStandalone) {
     const { applicationGenerator: reactApplicationGenerator } = require('@nx' +
@@ -100,6 +106,7 @@ async function createPreset(tree: Tree, options: Schema) {
       unitTestRunner: 'vitest',
       addPlugin,
       nxCloudToken: options.nxCloudToken,
+      useTsSolution: true,
     });
   } else if (options.preset === Preset.RemixStandalone) {
     const { applicationGenerator: remixApplicationGenerator } = require('@nx' +
@@ -184,6 +191,7 @@ async function createPreset(tree: Tree, options: Schema) {
       src: options.nextSrcDir,
       e2eTestRunner: options.e2eTestRunner ?? 'playwright',
       addPlugin,
+      useTsSolution: true,
     });
   } else if (options.preset === Preset.NextJsStandalone) {
     const { applicationGenerator: nextApplicationGenerator } = require('@nx' +
@@ -246,6 +254,7 @@ async function createPreset(tree: Tree, options: Schema) {
       addPlugin,
       nxCloudToken: options.nxCloudToken,
       bundler: options.bundler ?? 'webpack',
+      useTsSolution: true,
     });
   } else if (options.preset === Preset.Expo) {
     const { expoApplicationGenerator } = require('@nx' + '/expo');
@@ -256,6 +265,7 @@ async function createPreset(tree: Tree, options: Schema) {
       e2eTestRunner: options.e2eTestRunner ?? 'detox',
       addPlugin,
       nxCloudToken: options.nxCloudToken,
+      useTsSolution: true,
     });
   } else if (options.preset === Preset.TS) {
     const { initGenerator } = require('@nx' + '/js');