@nx/react-native 0.0.0-pr-28808-eac89e6 → 0.0.0-pr-29122-4727ac1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/react-native",
-  "version": "0.0.0-pr-28808-eac89e6",
+  "version": "0.0.0-pr-29122-4727ac1",
   "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-eac89e6",
-    "@nx/jest": "0.0.0-pr-28808-eac89e6",
-    "@nx/js": "0.0.0-pr-28808-eac89e6",
-    "@nx/eslint": "0.0.0-pr-28808-eac89e6",
-    "@nx/react": "0.0.0-pr-28808-eac89e6",
-    "@nx/workspace": "0.0.0-pr-28808-eac89e6"
+    "@nx/devkit": "0.0.0-pr-29122-4727ac1",
+    "@nx/jest": "0.0.0-pr-29122-4727ac1",
+    "@nx/js": "0.0.0-pr-29122-4727ac1",
+    "@nx/eslint": "0.0.0-pr-29122-4727ac1",
+    "@nx/react": "0.0.0-pr-29122-4727ac1",
+    "@nx/workspace": "0.0.0-pr-29122-4727ac1"
   },
   "executors": "./executors.json",
   "ng-update": {

package/src/generators/application/schema.json

@@ -44,14 +44,14 @@
       "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": {

package/src/generators/component/schema.json

@@ -7,28 +7,31 @@
   "type": "object",
   "examples": [
     {
-      "command": "nx g @nx/react-native:component mylib/src/lib/my-component/my-component ",
-      "description": "Generate a component in the `mylib` library"
+      "description": "Generate a component with the exported symbol matching the file name. It results in the component `Foo` at `mylib/src/lib/foo.tsx`",
+      "command": "nx g @nx/react-native:component mylib/src/lib/foo"
     },
     {
-      "command": "nx g @nx/react-native:component mylib/src/lib/my-component/my-component --classComponent",
-      "description": "Generate a class component in the `mylib` library"
+      "description": "Generate a component with the exported symbol different from the file name. It results in the component `Custom` at `mylib/src/lib/foo.tsx`",
+      "command": "nx g @nx/react-native:component mylib/src/lib/foo --name=custom"
+    },
+    {
+      "description": "Generate a class component at `mylib/src/lib/foo.tsx`",
+      "command": "nx g @nx/react-native:component mylib/src/lib/foo --classComponent"
     }
   ],
   "properties": {
     "path": {
       "type": "string",
-      "description": "The path at which to create the component file.",
+      "description": "The file path to the component without the file extension. Relative to the current working directory.",
       "$default": {
         "$source": "argv",
         "index": 0
       },
-      "x-prompt": "What path would you like to use for the component?"
+      "x-prompt": "What is the component file path?"
     },
     "name": {
       "type": "string",
-      "description": "The name of the component.",
-      "x-prompt": "What name would you like to use for the component?"
+      "description": "The component symbol name. Defaults to the last segment of the file path."
     },
     "js": {
       "type": "boolean",

package/src/generators/library/lib/normalize-options.d.ts

@@ -8,5 +8,6 @@ export interface NormalizedSchema extends Schema {
     parsedTags: string[];
     appMain?: string;
     appSourceRoot?: string;
+    isUsingTsSolutionConfig: boolean;
 }
 export declare function normalizeOptions(host: Tree, options: Schema): Promise<NormalizedSchema>;

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

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeOptions = normalizeOptions;
 const devkit_1 = require("@nx/devkit");
 const project_name_and_root_utils_1 = require("@nx/devkit/src/generators/project-name-and-root-utils");
+const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 async function normalizeOptions(host, options) {
     await (0, project_name_and_root_utils_1.ensureProjectName)(host, options, 'library');
     const { projectName, names: projectNames, projectRoot, importPath, } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(host, {
@@ -26,6 +27,7 @@ async function normalizeOptions(host, options) {
         projectRoot,
         parsedTags,
         importPath,
+        isUsingTsSolutionConfig: (0, ts_solution_setup_1.isUsingTsSolutionSetup)(host),
     };
     return normalized;
 }

package/src/generators/library/library.js

@@ -68,6 +68,10 @@ async function reactNativeLibraryGeneratorInternal(host, schema) {
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(host);
     }
+    // Always run install to link packages.
+    if (options.isUsingTsSolutionConfig) {
+        tasks.push(() => (0, devkit_1.installPackagesTask)(host));
+    }
     tasks.push(() => {
         (0, log_show_project_command_1.logShowProjectCommand)(options.name);
     });
@@ -81,10 +85,17 @@ async function addProject(host, options) {
         tags: options.parsedTags,
         targets: {},
     };
-    if ((0, ts_solution_setup_1.isUsingTsSolutionSetup)(host)) {
+    if (options.isUsingTsSolutionConfig) {
+        const sourceEntry = !options.buildable
+            ? options.js
+                ? './src/index.js'
+                : './src/index.ts'
+            : undefined;
         (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',
+            main: sourceEntry,
+            types: sourceEntry,
             nx: {
                 name: options.name,
                 sourceRoot: (0, devkit_1.joinPathFragments)(options.projectRoot, 'src'),

package/src/generators/library/schema.json

@@ -32,7 +32,7 @@
       "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"
     },
@@ -40,7 +40,7 @@
       "type": "string",
       "enum": ["jest", "none"],
       "description": "Test runner to use for unit tests.",
-      "default": "jest",
+      "default": "none",
       "x-priority": "important"
     },
     "tags": {