@nx/react-native 0.0.0-pr-28808-8717441 → 0.0.0-pr-29047-57d3073

package/package.json

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

package/src/generators/application/application.js

@@ -5,6 +5,7 @@ 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");
@@ -17,7 +18,6 @@ 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,15 +25,14 @@ 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: schema.useTsSolution,
-        formatter: schema.formatter,
     });
     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) {
@@ -77,15 +76,6 @@ 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,
-        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/lib/add-project.js

@@ -2,8 +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");
-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'
@@ -16,24 +14,9 @@ function addProject(host, options) {
         targets: hasPlugin ? {} : getTargets(options),
         tags: options.parsedTags,
     };
-    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,
-                projectType: 'application',
-                targets: hasPlugin ? {} : getTargets(options),
-                tags: options.parsedTags?.length ? options.parsedTags : undefined,
-            },
-        });
-    }
-    else {
-        (0, devkit_1.addProjectConfiguration)(host, options.projectName, {
-            ...project,
-        });
-    }
+    (0, devkit_1.addProjectConfiguration)(host, options.projectName, {
+        ...project,
+    });
 }
 function getTargets(options) {
     const architect = {};

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

@@ -16,9 +16,6 @@ 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;
-  formatter?: 'prettier' | 'none';
 }

package/src/generators/application/schema.json

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

package/src/generators/init/init.js

@@ -5,6 +5,7 @@ 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");
@@ -15,6 +16,7 @@ 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' &&

package/src/generators/library/library.js

@@ -12,7 +12,6 @@ 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,
@@ -20,16 +19,17 @@ 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,13 +58,6 @@ 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);
     }
@@ -81,18 +74,7 @@ async function addProject(host, options) {
         tags: options.parsedTags,
         targets: {},
     };
-    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);
-    }
+    (0, devkit_1.addProjectConfiguration)(host, options.name, project);
     if (!options.publishable && !options.buildable) {
         return () => { };
     }

package/src/generators/library/schema.json

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

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

@@ -40,11 +40,6 @@ async function webConfigurationGenerator(tree, options) {
                 : null,
         });
     }
-    if (!options.skipPackageJson) {
-        tasks.push((0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
-            '@types/react-dom': versions_1.typesReactDomVersion,
-        }));
-    }
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(tree);
     }
@@ -64,7 +59,6 @@ async function addBundlerConfiguration(tree, normalizedSchema) {
             project: normalizedSchema.project,
             newProject: true,
             includeVitest: false,
-            projectType: 'application',
             compiler: 'babel',
             skipFormat: true,
         });

package/src/utils/versions.d.ts

@@ -9,7 +9,6 @@ export declare const reactVersion = "18.2.0";
 export declare const reactDomVersion = "18.2.0";
 export declare const reactTestRendererVersion = "18.2.0";
 export declare const typesReactVersion = "~18.2.45";
-export declare const typesReactDomVersion = "18.3.0";
 export declare const testingLibraryReactNativeVersion = "~12.5.0";
 export declare const testingLibraryJestNativeVersion = "~5.4.3";
 export declare const jestReactNativeVersion = "18.0.0";

package/src/utils/versions.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.babelRuntimeVersion = exports.reactNativeSvgVersion = exports.reactNativeSvgTransformerVersion = exports.jestReactNativeVersion = exports.testingLibraryJestNativeVersion = exports.testingLibraryReactNativeVersion = exports.typesReactDomVersion = exports.typesReactVersion = exports.reactTestRendererVersion = exports.reactDomVersion = exports.reactVersion = exports.reactNativeWebVersion = exports.reactNativeMetroConfigVersion = exports.reactNativeBabelPresetVersion = exports.reactNativeCommunityCliPlatformAndroidVersion = exports.typesNodeVersion = exports.reactNativeVersion = exports.nxVersion = void 0;
+exports.babelRuntimeVersion = exports.reactNativeSvgVersion = exports.reactNativeSvgTransformerVersion = exports.jestReactNativeVersion = exports.testingLibraryJestNativeVersion = exports.testingLibraryReactNativeVersion = exports.typesReactVersion = exports.reactTestRendererVersion = exports.reactDomVersion = exports.reactVersion = exports.reactNativeWebVersion = exports.reactNativeMetroConfigVersion = exports.reactNativeBabelPresetVersion = exports.reactNativeCommunityCliPlatformAndroidVersion = exports.typesNodeVersion = exports.reactNativeVersion = exports.nxVersion = void 0;
 exports.nxVersion = require('../../package.json').version;
 exports.reactNativeVersion = '0.74.1';
 exports.typesNodeVersion = '18.16.9';
@@ -12,7 +12,6 @@ exports.reactVersion = '18.2.0';
 exports.reactDomVersion = '18.2.0';
 exports.reactTestRendererVersion = '18.2.0';
 exports.typesReactVersion = '~18.2.45';
-exports.typesReactDomVersion = '18.3.0';
 exports.testingLibraryReactNativeVersion = '~12.5.0';
 exports.testingLibraryJestNativeVersion = '~5.4.3';
 exports.jestReactNativeVersion = '18.0.0';