@nx/react-native 20.5.0-rc.4 → 20.6.0-beta.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/react-native",
-  "version": "20.5.0-rc.4",
+  "version": "20.6.0-beta.0",
   "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": [
@@ -35,12 +35,12 @@
     "picocolors": "^1.1.0",
     "tsconfig-paths": "^4.1.2",
     "tslib": "^2.3.0",
-    "@nx/devkit": "20.5.0-rc.4",
-    "@nx/jest": "20.5.0-rc.4",
-    "@nx/js": "20.5.0-rc.4",
-    "@nx/eslint": "20.5.0-rc.4",
-    "@nx/react": "20.5.0-rc.4",
-    "@nx/workspace": "20.5.0-rc.4"
+    "@nx/devkit": "20.6.0-beta.0",
+    "@nx/jest": "20.6.0-beta.0",
+    "@nx/js": "20.6.0-beta.0",
+    "@nx/eslint": "20.6.0-beta.0",
+    "@nx/react": "20.6.0-beta.0",
+    "@nx/workspace": "20.6.0-beta.0"
   },
   "executors": "./executors.json",
   "ng-update": {

package/src/generators/application/application.js

@@ -22,6 +22,7 @@ const sort_fields_1 = require("@nx/js/src/utils/package-json/sort-fields");
 async function reactNativeApplicationGenerator(host, schema) {
     return await reactNativeApplicationGeneratorInternal(host, {
         addPlugin: false,
+        useProjectJson: true,
         ...schema,
     });
 }
@@ -46,7 +47,7 @@ async function reactNativeApplicationGeneratorInternal(host, schema) {
     // If we are using the new TS solution
     // We need to update the workspace file (package.json or pnpm-workspaces.yaml) to include the new project
     if (options.isTsSolutionSetup) {
-        (0, ts_solution_setup_1.addProjectToTsSolutionWorkspace)(host, options.appProjectRoot);
+        await (0, ts_solution_setup_1.addProjectToTsSolutionWorkspace)(host, options.appProjectRoot);
     }
     const lintTask = await (0, add_linting_1.addLinting)(host, {
         ...options,

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

@@ -2,7 +2,6 @@
 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");
 function addProject(host, options) {
     const nxJson = (0, devkit_1.readNxJson)(host);
     const hasPlugin = nxJson.plugins?.some((p) => typeof p === 'string'
@@ -15,12 +14,12 @@ function addProject(host, options) {
         targets: hasPlugin ? {} : getTargets(options),
         tags: options.parsedTags,
     };
-    if ((0, ts_solution_setup_1.isUsingTsSolutionSetup)(host)) {
-        const packageJson = {
-            name: options.importPath,
-            version: '0.0.1',
-            private: true,
-        };
+    const packageJson = {
+        name: options.importPath,
+        version: '0.0.1',
+        private: true,
+    };
+    if (!options.useProjectJson) {
         if (options.projectName !== options.importPath) {
             packageJson.nx = { name: options.projectName };
         }
@@ -32,13 +31,15 @@ function addProject(host, options) {
             packageJson.nx ??= {};
             packageJson.nx.tags = options.parsedTags;
         }
-        (0, devkit_1.writeJson)(host, (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'package.json'), packageJson);
     }
     else {
         (0, devkit_1.addProjectConfiguration)(host, options.projectName, {
             ...project,
         });
     }
+    if (!options.useProjectJson || options.isTsSolutionSetup) {
+        (0, devkit_1.writeJson)(host, (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'package.json'), packageJson);
+    }
 }
 function getTargets(options) {
     const architect = {};

package/src/generators/application/lib/normalize-options.js

@@ -45,5 +45,6 @@ async function normalizeOptions(host, options) {
         e2eProjectName,
         e2eProjectRoot,
         isTsSolutionSetup,
+        useProjectJson: options.useProjectJson ?? !isTsSolutionSetup,
     };
 }

package/src/generators/application/schema.d.ts

@@ -21,4 +21,5 @@ export interface Schema {
   nxCloudToken?: string;
   useTsSolution?: boolean;
   formatter?: 'prettier' | 'none';
+  useProjectJson?: boolean;
 }

package/src/generators/application/schema.json

@@ -95,6 +95,10 @@
       "x-prompt": "Which bundler do you want to use to build the application?",
       "default": "vite",
       "x-priority": "important"
+    },
+    "useProjectJson": {
+      "type": "boolean",
+      "description": "Use a `project.json` configuration file instead of inlining the Nx configuration in the `package.json` file."
     }
   },
   "required": ["directory"]

package/src/generators/library/lib/normalize-options.js

@@ -29,6 +29,7 @@ async function normalizeOptions(host, options) {
         parsedTags,
         importPath,
         isUsingTsSolutionConfig,
+        useProjectJson: options.useProjectJson ?? !isUsingTsSolutionConfig,
     };
     return normalized;
 }

package/src/generators/library/library.js

@@ -20,6 +20,7 @@ const versions_1 = require("../../utils/versions");
 async function reactNativeLibraryGenerator(host, schema) {
     return await reactNativeLibraryGeneratorInternal(host, {
         addPlugin: false,
+        useProjectJson: true,
         ...schema,
     });
 }
@@ -45,7 +46,7 @@ async function reactNativeLibraryGeneratorInternal(host, schema) {
         tasks.push(addProjectTask);
     }
     if (options.isUsingTsSolutionConfig) {
-        (0, ts_solution_setup_1.addProjectToTsSolutionWorkspace)(host, options.projectRoot);
+        await (0, ts_solution_setup_1.addProjectToTsSolutionWorkspace)(host, options.projectRoot);
     }
     const lintTask = await (0, add_linting_1.addLinting)(host, {
         ...options,
@@ -100,10 +101,13 @@ async function addProject(host, options) {
         tags: options.parsedTags,
         targets: {},
     };
-    if (options.isUsingTsSolutionConfig) {
-        const packageJson = {
-            name: options.importPath,
-            version: '0.0.1',
+    let packageJson = {
+        name: options.importPath,
+        version: '0.0.1',
+    };
+    if (!options.useProjectJson) {
+        packageJson = {
+            ...packageJson,
             ...determineEntryFields(options),
             files: options.publishable ? ['dist', '!**/*.tsbuildinfo'] : undefined,
             peerDependencies: {
@@ -118,11 +122,16 @@ async function addProject(host, options) {
             packageJson.nx ??= {};
             packageJson.nx.tags = options.parsedTags;
         }
-        (0, devkit_1.writeJson)(host, (0, devkit_1.joinPathFragments)(options.projectRoot, 'package.json'), packageJson);
     }
     else {
         (0, devkit_1.addProjectConfiguration)(host, options.name, project);
     }
+    if (!options.useProjectJson ||
+        options.isUsingTsSolutionConfig ||
+        options.publishable ||
+        options.buildable) {
+        (0, devkit_1.writeJson)(host, (0, devkit_1.joinPathFragments)(options.projectRoot, 'package.json'), packageJson);
+    }
     if (options.publishable || options.buildable) {
         const external = new Set([
             'react/jsx-runtime',

package/src/generators/library/schema.d.ts

@@ -19,4 +19,5 @@ export interface Schema {
   setParserOptionsProject?: boolean;
   skipPackageJson?: boolean; //default is false
   addPlugin?: boolean;
+  useProjectJson?: boolean;
 }

package/src/generators/library/schema.json

@@ -93,6 +93,10 @@
       "type": "boolean",
       "default": false,
       "x-priority": "internal"
+    },
+    "useProjectJson": {
+      "type": "boolean",
+      "description": "Use a `project.json` configuration file instead of inlining the Nx configuration in the `package.json` file."
     }
   },
   "required": ["directory"]