@nx/react-native 0.0.0-pr-28834-93bb8ce → 0.0.0-pr-28808-0f14212

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/react-native",
-  "version": "0.0.0-pr-28834-93bb8ce",
+  "version": "0.0.0-pr-28808-0f14212",
   "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-28834-93bb8ce",
-    "@nx/jest": "0.0.0-pr-28834-93bb8ce",
-    "@nx/js": "0.0.0-pr-28834-93bb8ce",
-    "@nx/eslint": "0.0.0-pr-28834-93bb8ce",
-    "@nx/react": "0.0.0-pr-28834-93bb8ce",
-    "@nx/workspace": "0.0.0-pr-28834-93bb8ce"
+    "@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"
   },
   "executors": "./executors.json",
   "ng-update": {

package/src/generators/application/application.js

@@ -5,7 +5,6 @@ exports.reactNativeApplicationGeneratorInternal = reactNativeApplicationGenerato
 const devkit_1 = require("@nx/devkit");
 const js_1 = require("@nx/js");
 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 add_linting_1 = require("../../utils/add-linting");
 const add_jest_1 = require("../../utils/add-jest");
 const chmod_android_gradle_files_1 = require("../../utils/chmod-android-gradle-files");
@@ -18,6 +17,7 @@ const create_application_files_1 = require("./lib/create-application-files");
 const add_e2e_1 = require("./lib/add-e2e");
 const ensure_dependencies_1 = require("../../utils/ensure-dependencies");
 const sync_deps_impl_1 = require("../../executors/sync-deps/sync-deps.impl");
+const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 async function reactNativeApplicationGenerator(host, schema) {
     return await reactNativeApplicationGeneratorInternal(host, {
         addPlugin: false,
@@ -25,14 +25,15 @@ async function reactNativeApplicationGenerator(host, schema) {
     });
 }
 async function reactNativeApplicationGeneratorInternal(host, schema) {
-    (0, ts_solution_setup_1.assertNotUsingTsSolutionSetup)(host, 'react-native', 'application');
-    const options = await (0, normalize_options_1.normalizeOptions)(host, schema);
     const tasks = [];
     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',
     });
     tasks.push(jsInitTask);
+    const options = await (0, normalize_options_1.normalizeOptions)(host, schema);
     const initTask = await (0, init_1.default)(host, { ...options, skipFormat: true });
     tasks.push(initTask);
     if (!options.skipPackageJson) {
@@ -76,6 +77,12 @@ async function reactNativeApplicationGeneratorInternal(host, schema) {
             ],
         });
     }
+    (0, ts_solution_setup_1.updateTsconfigFiles)(host, options.appProjectRoot, 'tsconfig.app.json', {
+        jsx: 'react-jsx',
+        module: 'esnext',
+        moduleResolution: 'bundler',
+        noUnusedLocals: false,
+    });
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(host);
     }

package/src/generators/application/lib/add-project.js

@@ -2,6 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addProject = addProject;
 const devkit_1 = require("@nx/devkit");
+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");
 function addProject(host, options) {
     const nxJson = (0, devkit_1.readNxJson)(host);
     const hasPlugin = nxJson.plugins?.some((p) => typeof p === 'string'
@@ -14,9 +16,21 @@ function addProject(host, options) {
         targets: hasPlugin ? {} : getTargets(options),
         tags: options.parsedTags,
     };
-    (0, devkit_1.addProjectConfiguration)(host, options.projectName, {
-        ...project,
-    });
+    if ((0, ts_solution_setup_1.isUsingTsSolutionSetup)(host)) {
+        (0, devkit_1.writeJson)(host, (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'package.json'), {
+            name: (0, get_import_path_1.getImportPath)(host, options.name),
+            version: '0.0.1',
+            private: true,
+            nx: {
+                name: options.name,
+            },
+        });
+    }
+    else {
+        (0, devkit_1.addProjectConfiguration)(host, options.projectName, {
+            ...project,
+        });
+    }
 }
 function getTargets(options) {
     const architect = {};

package/src/generators/init/init.js

@@ -5,7 +5,6 @@ exports.reactNativeInitGeneratorInternal = reactNativeInitGeneratorInternal;
 exports.updateDependencies = updateDependencies;
 const devkit_1 = require("@nx/devkit");
 const add_plugin_1 = require("@nx/devkit/src/utils/add-plugin");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 const plugin_1 = require("../../../plugins/plugin");
 const versions_1 = require("../../utils/versions");
 const add_git_ignore_entry_1 = require("./lib/add-git-ignore-entry");
@@ -16,7 +15,6 @@ function reactNativeInitGenerator(host, schema) {
     });
 }
 async function reactNativeInitGeneratorInternal(host, schema) {
-    (0, ts_solution_setup_1.assertNotUsingTsSolutionSetup)(host, 'react-native', 'init');
     (0, add_git_ignore_entry_1.addGitIgnoreEntry)(host);
     const nxJson = (0, devkit_1.readNxJson)(host);
     const addPluginDefault = process.env.NX_ADD_PLUGINS !== 'false' &&