@nx/react-native 0.0.0-pr-28808-0f14212 → 0.0.0-pr-28808-6acf6c6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/react-native",
-  "version": "0.0.0-pr-28808-0f14212",
+  "version": "0.0.0-pr-28808-6acf6c6",
   "private": false,
   "description": "The Nx Plugin for React Native contains generators for managing React Native applications and libraries within an Nx workspace. It provides: \n\n-Integration with libraries such as Jest, Detox, and Storybook.\n-Scaffolding for creating buildable libraries that can be published to npm.\n-Utilities for automatic workspace refactoring.",
   "keywords": [
@@ -36,12 +36,12 @@
     "node-fetch": "^2.6.7",
     "tsconfig-paths": "^4.1.2",
     "tslib": "^2.3.0",
-    "@nx/devkit": "0.0.0-pr-28808-0f14212",
-    "@nx/jest": "0.0.0-pr-28808-0f14212",
-    "@nx/js": "0.0.0-pr-28808-0f14212",
-    "@nx/eslint": "0.0.0-pr-28808-0f14212",
-    "@nx/react": "0.0.0-pr-28808-0f14212",
-    "@nx/workspace": "0.0.0-pr-28808-0f14212"
+    "@nx/devkit": "0.0.0-pr-28808-6acf6c6",
+    "@nx/jest": "0.0.0-pr-28808-6acf6c6",
+    "@nx/js": "0.0.0-pr-28808-6acf6c6",
+    "@nx/eslint": "0.0.0-pr-28808-6acf6c6",
+    "@nx/react": "0.0.0-pr-28808-6acf6c6",
+    "@nx/workspace": "0.0.0-pr-28808-6acf6c6"
   },
   "executors": "./executors.json",
   "ng-update": {

package/src/generators/application/application.js

@@ -29,8 +29,7 @@ async function reactNativeApplicationGeneratorInternal(host, schema) {
     const jsInitTask = await (0, js_1.initGenerator)(host, {
         ...schema,
         skipFormat: true,
-        addTsPlugin: process.env.NX_ADD_PLUGINS !== 'false' &&
-            process.env.NX_ADD_TS_PLUGIN !== 'false',
+        addTsPlugin: schema.useTsSolution,
     });
     tasks.push(jsInitTask);
     const options = await (0, normalize_options_1.normalizeOptions)(host, schema);
@@ -82,7 +81,10 @@ async function reactNativeApplicationGeneratorInternal(host, schema) {
         module: 'esnext',
         moduleResolution: 'bundler',
         noUnusedLocals: false,
-    });
+        lib: ['dom'],
+    }, options.linter === 'eslint'
+        ? ['eslint.config.js', 'eslint.config.cjs', 'eslint.config.mjs']
+        : undefined);
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(host);
     }

package/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;
 }

package/src/generators/application/schema.json

@@ -44,13 +44,15 @@
       "description": "The tool to use for running lint checks.",
       "type": "string",
       "enum": ["eslint", "none"],
-      "default": "eslint"
+      "default": "none",
+      "x-priority": "important"
     },
     "unitTestRunner": {
       "type": "string",
       "enum": ["jest", "none"],
       "description": "Test runner to use for unit tests",
-      "default": "jest"
+      "default": "none",
+      "x-priority": "important"
     },
     "tags": {
       "type": "string",
@@ -71,7 +73,8 @@
       "description": "Adds the specified e2e test runner.",
       "type": "string",
       "enum": ["playwright", "cypress", "detox", "none"],
-      "default": "playwright"
+      "default": "none",
+      "x-priority": "important"
     },
     "install": {
       "type": "boolean",

package/src/generators/library/library.js

@@ -12,6 +12,7 @@ const normalize_options_1 = require("./lib/normalize-options");
 const ensure_dependencies_1 = require("../../utils/ensure-dependencies");
 const log_show_project_command_1 = require("@nx/devkit/src/utils/log-show-project-command");
 const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+const get_import_path_1 = require("@nx/js/src/utils/get-import-path");
 async function reactNativeLibraryGenerator(host, schema) {
     return await reactNativeLibraryGeneratorInternal(host, {
         addPlugin: false,
@@ -19,17 +20,16 @@ async function reactNativeLibraryGenerator(host, schema) {
     });
 }
 async function reactNativeLibraryGeneratorInternal(host, schema) {
-    (0, ts_solution_setup_1.assertNotUsingTsSolutionSetup)(host, 'react-native', 'library');
-    const options = await (0, normalize_options_1.normalizeOptions)(host, schema);
-    if (options.publishable === true && !schema.importPath) {
-        throw new Error(`For publishable libs you have to provide a proper "--importPath" which needs to be a valid npm package name (e.g. my-awesome-lib or @myorg/my-lib)`);
-    }
     const tasks = [];
     const jsInitTask = await (0, js_1.initGenerator)(host, {
         ...schema,
         skipFormat: true,
     });
     tasks.push(jsInitTask);
+    const options = await (0, normalize_options_1.normalizeOptions)(host, schema);
+    if (options.publishable === true && !schema.importPath) {
+        throw new Error(`For publishable libs you have to provide a proper "--importPath" which needs to be a valid npm package name (e.g. my-awesome-lib or @myorg/my-lib)`);
+    }
     const initTask = await (0, init_1.default)(host, { ...options, skipFormat: true });
     tasks.push(initTask);
     if (!options.skipPackageJson) {
@@ -58,6 +58,13 @@ async function reactNativeLibraryGeneratorInternal(host, schema) {
             (0, devkit_1.joinPathFragments)(options.projectRoot, './src', 'index.' + (options.js ? 'js' : 'ts')),
         ]);
     }
+    (0, ts_solution_setup_1.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);
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(host);
     }
@@ -74,7 +81,18 @@ async function addProject(host, options) {
         tags: options.parsedTags,
         targets: {},
     };
-    (0, devkit_1.addProjectConfiguration)(host, options.name, project);
+    if ((0, ts_solution_setup_1.isUsingTsSolutionSetup)(host)) {
+        (0, devkit_1.writeJson)(host, (0, devkit_1.joinPathFragments)(options.projectRoot, 'package.json'), {
+            name: (0, get_import_path_1.getImportPath)(host, options.name),
+            version: '0.0.1',
+            nx: {
+                name: options.name,
+            },
+        });
+    }
+    else {
+        (0, devkit_1.addProjectConfiguration)(host, options.name, project);
+    }
     if (!options.publishable && !options.buildable) {
         return () => { };
     }

package/src/generators/library/schema.json

@@ -32,13 +32,16 @@
       "description": "The tool to use for running lint checks.",
       "type": "string",
       "enum": ["eslint", "none"],
-      "default": "eslint"
+      "default": "none",
+      "x-prompt": "Which linter would you like to use?",
+      "x-priority": "important"
     },
     "unitTestRunner": {
       "type": "string",
       "enum": ["jest", "none"],
       "description": "Test runner to use for unit tests.",
-      "default": "jest"
+      "default": "none",
+      "x-priority": "important"
     },
     "tags": {
       "type": "string",

package/src/generators/web-configuration/web-configuration.js

@@ -40,6 +40,11 @@ async function webConfigurationGenerator(tree, options) {
                 : null,
         });
     }
+    if (!options.skipPackageJson) {
+        tasks.push((0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
+            '@types/react-dom': versions_1.typesReactVersion,
+        }));
+    }
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(tree);
     }