@nx/react-native 18.0.0-beta.0 → 18.0.0-beta.2

package/src/generators/component-story/schema.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/schema",
+  "$schema": "https://json-schema.org/schema",
   "cli": "nx",
   "$id": "NxReactNativeComponentStory",
   "title": "React native component story",
@@ -15,19 +15,27 @@
         "$source": "projectName",
         "index": 0
       },
-      "x-prompt": "What's the name of the project where the component lives?"
+      "x-prompt": "What's name of the project where the component lives?",
+      "x-priority": "important"
     },
     "componentPath": {
       "type": "string",
       "description": "Relative path to the component file from the library root.",
       "examples": ["lib/components"],
-      "x-prompt": "What's path of the component relative to the project's lib root?"
+      "x-prompt": "What's path of the component relative to the project's lib root?",
+      "x-priority": "important"
     },
     "skipFormat": {
       "description": "Skip formatting files.",
       "type": "boolean",
       "default": false,
       "x-priority": "internal"
+    },
+    "interactionTests": {
+      "type": "boolean",
+      "description": "Set up Storybook interaction tests.",
+      "default": true,
+      "x-priority": "important"
     }
   },
   "required": ["project", "componentPath"]

package/src/generators/init/init.d.ts

@@ -1,5 +1,6 @@
 import { GeneratorCallback, Tree } from '@nx/devkit';
 import { Schema } from './schema';
 export declare function reactNativeInitGenerator(host: Tree, schema: Schema): Promise<GeneratorCallback>;
+export declare function reactNativeInitGeneratorInternal(host: Tree, schema: Schema): Promise<GeneratorCallback>;
 export declare function updateDependencies(host: Tree, schema: Schema): GeneratorCallback;
 export default reactNativeInitGenerator;

package/src/generators/init/init.js

@@ -1,14 +1,22 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.updateDependencies = exports.reactNativeInitGenerator = void 0;
+exports.updateDependencies = exports.reactNativeInitGeneratorInternal = exports.reactNativeInitGenerator = void 0;
 const devkit_1 = require("@nx/devkit");
 const update_package_scripts_1 = require("@nx/devkit/src/utils/update-package-scripts");
 const plugin_1 = require("../../../plugins/plugin");
 const versions_1 = require("../../utils/versions");
 const add_git_ignore_entry_1 = require("./lib/add-git-ignore-entry");
-async function reactNativeInitGenerator(host, schema) {
+function reactNativeInitGenerator(host, schema) {
+    return reactNativeInitGeneratorInternal(host, {
+        addPlugin: false,
+        ...schema,
+    });
+}
+exports.reactNativeInitGenerator = reactNativeInitGenerator;
+async function reactNativeInitGeneratorInternal(host, schema) {
     (0, add_git_ignore_entry_1.addGitIgnoreEntry)(host);
-    if (process.env.NX_PCV3 === 'true') {
+    schema.addPlugin ??= process.env.NX_ADD_PLUGINS !== 'false';
+    if (schema.addPlugin) {
         addPlugin(host);
     }
     const tasks = [];
@@ -24,7 +32,7 @@ async function reactNativeInitGenerator(host, schema) {
     }
     return (0, devkit_1.runTasksInSerial)(...tasks);
 }
-exports.reactNativeInitGenerator = reactNativeInitGenerator;
+exports.reactNativeInitGeneratorInternal = reactNativeInitGeneratorInternal;
 function updateDependencies(host, schema) {
     return (0, devkit_1.addDependenciesToPackageJson)(host, {
         react: versions_1.reactVersion,
@@ -32,9 +40,6 @@ function updateDependencies(host, schema) {
         'react-native': versions_1.reactNativeVersion,
     }, {
         '@nx/react-native': versions_1.nxVersion,
-        '@react-native-community/cli': versions_1.reactNativeCommunityCli,
-        '@react-native-community/cli-platform-android': versions_1.reactNativeCommunityCliAndroid,
-        '@react-native-community/cli-platform-ios': versions_1.reactNativeCommunityCliIos,
     }, undefined, schema.keepExistingVersions);
 }
 exports.updateDependencies = updateDependencies;
@@ -61,6 +66,8 @@ function addPlugin(host) {
             runAndroidTargetName: 'run-android',
             buildIosTargetName: 'build-ios',
             buildAndroidTargetName: 'build-android',
+            syncDepsTargetName: 'sync-deps',
+            upgradeTargetname: 'upgrade',
         },
     });
     (0, devkit_1.updateNxJson)(host, nxJson);

package/src/generators/init/init.spec.ts

@@ -11,7 +11,9 @@ describe('init', () => {
   });
 
   it('should add react native dependencies', async () => {
-    await reactNativeInitGenerator(tree, {});
+    await reactNativeInitGenerator(tree, {
+      addPlugin: true,
+    });
     const packageJson = readJson(tree, 'package.json');
     expect(packageJson.dependencies['react']).toBeDefined();
     expect(packageJson.dependencies['react-native']).toBeDefined();
@@ -24,7 +26,9 @@ describe('init', () => {
 /node_modules
 `
     );
-    await reactNativeInitGenerator(tree, {});
+    await reactNativeInitGenerator(tree, {
+      addPlugin: true,
+    });
 
     const content = tree.read('/.gitignore').toString();
 

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

@@ -3,4 +3,5 @@ export interface Schema {
   skipPackageJson?: boolean; //default is false
   keepExistingVersions?: boolean; //default is false
   updatePackageScripts?: boolean;
+  addPlugin?: boolean;
 }

package/src/generators/init/schema.json

@@ -1,7 +1,7 @@
 {
   "cli": "nx",
   "$id": "NxReactNativeInit",
-  "$schema": "http://json-schema.org/schema",
+  "$schema": "https://json-schema.org/schema",
   "title": "Add Nx React Native Schematics",
   "description": "Add Nx React native schematics.",
   "type": "object",

package/src/generators/library/files/lib/.babelrc.js.template

@@ -0,0 +1,21 @@
+module.exports = function (api) {
+  api.cache(true);
+  
+  return {
+    presets: [
+      [
+        '@nx/react/babel',
+        {
+          runtime: 'automatic',
+          useBuiltIns: 'usage',
+        },
+      ],
+    ],
+    plugins: [],
+    env: {
+      test: {
+        presets: [['module:@react-native/babel-preset',  { "useTransformReactJSX": true }]],
+      },
+    },
+  };
+};

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

@@ -11,6 +11,7 @@ async function normalizeOptions(host, options) {
         projectNameAndRootFormat: options.projectNameAndRootFormat,
         callingGenerator: '@nx/react-native:library',
     });
+    options.addPlugin ??= process.env.NX_ADD_PLUGINS !== 'false';
     const parsedTags = options.tags
         ? options.tags.split(',').map((s) => s.trim())
         : [];

package/src/generators/library/library.js

@@ -9,8 +9,10 @@ const add_jest_1 = require("../../utils/add-jest");
 const versions_1 = require("../../utils/versions");
 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");
 async function reactNativeLibraryGenerator(host, schema) {
     return await reactNativeLibraryGeneratorInternal(host, {
+        addPlugin: false,
         projectNameAndRootFormat: 'derived',
         ...schema,
     });
@@ -45,7 +47,7 @@ async function reactNativeLibraryGeneratorInternal(host, schema) {
         ],
     });
     tasks.push(lintTask);
-    const jestTask = await (0, add_jest_1.addJest)(host, options.unitTestRunner, options.name, options.projectRoot, options.js, options.skipPackageJson);
+    const jestTask = await (0, add_jest_1.addJest)(host, options.unitTestRunner, options.name, options.projectRoot, options.js, options.skipPackageJson, options.addPlugin);
     tasks.push(jestTask);
     if (options.publishable || options.buildable) {
         updateLibPackageNpmScope(host, options);
@@ -58,6 +60,9 @@ async function reactNativeLibraryGeneratorInternal(host, schema) {
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(host);
     }
+    tasks.push(() => {
+        (0, log_show_project_command_1.logShowProjectCommand)(options.name);
+    });
     return (0, devkit_1.runTasksInSerial)(...tasks);
 }
 exports.reactNativeLibraryGeneratorInternal = reactNativeLibraryGeneratorInternal;

package/src/generators/library/library.spec.ts

@@ -20,6 +20,7 @@ describe('lib', () => {
     unitTestRunner: 'jest',
     strict: true,
     projectNameAndRootFormat: 'as-provided',
+    addPlugin: true,
   };
 
   beforeEach(() => {
@@ -28,17 +29,6 @@ describe('lib', () => {
   });
 
   describe('not nested', () => {
-    it('should update project.json', async () => {
-      await libraryGenerator(appTree, { ...defaultSchema, tags: 'one,two' });
-      const projectConfiguration = readProjectConfiguration(appTree, 'my-lib');
-      expect(projectConfiguration.root).toEqual('my-lib');
-      expect(projectConfiguration.targets.build).toBeUndefined();
-      expect(projectConfiguration.targets.lint).toEqual({
-        executor: '@nx/eslint:lint',
-      });
-      expect(projectConfiguration.tags).toEqual(['one', 'two']);
-    });
-
     it('should update root tsconfig.base.json', async () => {
       await libraryGenerator(appTree, defaultSchema);
       const tsconfigJson = readJson(appTree, '/tsconfig.base.json');
@@ -145,19 +135,6 @@ describe('lib', () => {
       });
     });
 
-    it('should update project.json', async () => {
-      await libraryGenerator(appTree, {
-        ...defaultSchema,
-        directory: 'my-dir',
-      });
-      const projectConfiguration = readProjectConfiguration(appTree, 'my-lib');
-
-      expect(projectConfiguration.root).toEqual('my-dir');
-      expect(projectConfiguration.targets.lint).toEqual({
-        executor: '@nx/eslint:lint',
-      });
-    });
-
     it('should update root tsconfig.base.json', async () => {
       await libraryGenerator(appTree, {
         ...defaultSchema,
@@ -229,11 +206,6 @@ describe('lib', () => {
 
       expect(appTree.exists('my-lib/tsconfig.spec.json')).toBeFalsy();
       expect(appTree.exists('my-lib/jest.config.ts')).toBeFalsy();
-      const projectConfiguration = readProjectConfiguration(appTree, 'my-lib');
-      expect(projectConfiguration.targets.test).toBeUndefined();
-      expect(projectConfiguration.targets.lint).toMatchObject({
-        executor: '@nx/eslint:lint',
-      });
     });
 
     it('should generate test configuration', async () => {
@@ -277,22 +249,21 @@ describe('lib', () => {
           moduleNameMapper: {
             '\\\\.svg$': '@nx/react-native/plugins/jest/svg-mock',
           },
+          transform: {
+            '^.+.(js|ts|tsx)$': [
+              'babel-jest',
+              {
+                configFile: __dirname + '/.babelrc.js',
+              },
+            ],
+            '^.+.(bmp|gif|jpg|jpeg|mp4|png|psd|svg|webp)$': require.resolve(
+              'react-native/jest/assetFileTransformer.js'
+            ),
+          },
           coverageDirectory: '../coverage/my-lib',
         };
         "
       `);
-      const projectConfiguration = readProjectConfiguration(appTree, 'my-lib');
-      expect(projectConfiguration.targets.test).toMatchInlineSnapshot(`
-        {
-          "executor": "@nx/jest:jest",
-          "options": {
-            "jestConfig": "my-lib/jest.config.ts",
-          },
-          "outputs": [
-            "{workspaceRoot}/coverage/{projectRoot}",
-          ],
-        }
-      `);
     });
   });
 

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

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

package/src/generators/library/schema.json

@@ -1,7 +1,7 @@
 {
   "cli": "nx",
   "$id": "NxReactNativeLibrary",
-  "$schema": "http://json-schema.org/schema",
+  "$schema": "https://json-schema.org/schema",
   "title": "Create a React Native Library for Nx",
   "description": "Create a React Native Library for Nx.",
   "type": "object",
@@ -36,7 +36,7 @@
     "linter": {
       "description": "The tool to use for running lint checks.",
       "type": "string",
-      "enum": ["eslint"],
+      "enum": ["eslint", "none"],
       "default": "eslint"
     },
     "unitTestRunner": {

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

@@ -1,5 +1,7 @@
 export interface StorybookStoriesSchema {
   project: string;
+  interactionTests?: boolean;
+  js?: boolean;
   ignorePaths?: string[];
   skipFormat?: boolean;
 }

package/src/generators/stories/schema.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/schema",
+  "$schema": "https://json-schema.org/schema",
   "cli": "nx",
   "$id": "NxReactNativeStorybookStories",
   "title": "Generate React Native Storybook stories",
@@ -14,7 +14,20 @@
         "$source": "projectName",
         "index": 0
       },
-      "x-prompt": "For which project do you want to generate stories?"
+      "x-prompt": "For which project do you want to generate stories?",
+      "x-priority": "important"
+    },
+    "interactionTests": {
+      "type": "boolean",
+      "description": "Set up Storybook interaction tests.",
+      "x-prompt": "Do you want to set up Storybook interaction tests?",
+      "x-priority": "important",
+      "default": true
+    },
+    "js": {
+      "type": "boolean",
+      "description": "Generate JavaScript files rather than TypeScript files.",
+      "default": false
     },
     "ignorePaths": {
       "type": "array",

package/src/generators/stories/stories.d.ts

@@ -1,5 +1,8 @@
 import { Tree } from '@nx/devkit';
 import { StorybookStoriesSchema } from './schema';
-export declare function createAllStories(tree: Tree, projectName: string, ignorePaths?: string[]): Promise<void>;
-export declare function storiesGenerator(host: Tree, schema: StorybookStoriesSchema): Promise<void>;
+/**
+ * @deprecated This would be a direct pass through to @nx/react:stories generator.
+ * TODO (@xiongemi): remove this generator for v19
+ */
+export declare function storiesGenerator(host: Tree, schema: StorybookStoriesSchema): Promise<import("@nx/devkit").GeneratorCallback>;
 export default storiesGenerator;

package/src/generators/stories/stories.js

@@ -1,56 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.storiesGenerator = exports.createAllStories = void 0;
-const devkit_1 = require("@nx/devkit");
-const path_1 = require("path");
-const component_story_1 = require("../component-story/component-story");
-const stories_1 = require("@nx/react/src/generators/stories/stories");
-const minimatch_1 = require("minimatch");
-const versions_1 = require("../../utils/versions");
-async function createAllStories(tree, projectName, ignorePaths) {
-    (0, devkit_1.ensurePackage)('@nx/storybook', versions_1.nxVersion);
-    const { isTheFileAStory } = await Promise.resolve().then(() => require('@nx/storybook/src/utils/utilities'));
-    const projects = (0, devkit_1.getProjects)(tree);
-    const projectConfiguration = projects.get(projectName);
-    const { sourceRoot } = projectConfiguration;
-    const projectPath = await (0, stories_1.projectRootPath)(tree, projectConfiguration);
-    let componentPaths = [];
-    (0, devkit_1.visitNotIgnoredFiles)(tree, projectPath, (path) => {
-        if (ignorePaths?.some((pattern) => (0, minimatch_1.minimatch)(path, pattern)))
-            return;
-        if ((path.endsWith('.tsx') && !path.endsWith('.spec.tsx')) ||
-            (path.endsWith('.js') && !path.endsWith('.spec.js')) ||
-            (path.endsWith('.jsx') && !path.endsWith('.spec.jsx'))) {
-            // Check if file is NOT a story (either ts/tsx or js/jsx)
-            if (!isTheFileAStory(tree, path)) {
-                // Since the file is not a story
-                // Let's see if the .stories.* file exists
-                const ext = path.slice(path.lastIndexOf('.'));
-                const storyPath = `${path.split(ext)[0]}.stories${ext}`;
-                if (!tree.exists(storyPath)) {
-                    componentPaths.push(path);
-                }
-            }
-        }
-    });
-    await Promise.all(componentPaths.map(async (componentPath) => {
-        const relativeCmpDir = componentPath.replace((0, path_1.join)(sourceRoot, '/'), '');
-        if (!(0, stories_1.containsComponentDeclaration)(tree, componentPath)) {
-            return;
-        }
-        await (0, component_story_1.default)(tree, {
-            componentPath: relativeCmpDir,
-            project: projectName,
-            skipFormat: true,
-        });
-    }));
-}
-exports.createAllStories = createAllStories;
+exports.storiesGenerator = void 0;
+const react_1 = require("@nx/react");
+/**
+ * @deprecated This would be a direct pass through to @nx/react:stories generator.
+ * TODO (@xiongemi): remove this generator for v19
+ */
 async function storiesGenerator(host, schema) {
-    await createAllStories(host, schema.project, schema.ignorePaths);
-    if (!schema.skipFormat) {
-        await (0, devkit_1.formatFiles)(host);
-    }
+    return (0, react_1.storiesGenerator)(host, schema);
 }
 exports.storiesGenerator = storiesGenerator;
 exports.default = storiesGenerator;

package/src/generators/storybook-configuration/configuration.d.ts

@@ -1,4 +1,9 @@
-import { GeneratorCallback, Tree } from '@nx/devkit';
+import { Tree } from '@nx/devkit';
 import { StorybookConfigureSchema } from './schema';
-export declare function storybookConfigurationGenerator(host: Tree, schema: StorybookConfigureSchema): Promise<GeneratorCallback>;
+export declare function storybookConfigurationGenerator(tree: Tree, schema: StorybookConfigureSchema): Promise<import("@nx/devkit").GeneratorCallback>;
+/**
+ * This would be a direct pass through to @nx/react:storybook-configuration generator.
+ * @TODO (@xiongemi): remove this generator for v19
+ */
+export declare function storybookConfigurationGeneratorInternal(host: Tree, schema: StorybookConfigureSchema): Promise<import("@nx/devkit").GeneratorCallback>;
 export default storybookConfigurationGenerator;

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

@@ -1,56 +1,23 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.storybookConfigurationGenerator = void 0;
+exports.storybookConfigurationGeneratorInternal = exports.storybookConfigurationGenerator = void 0;
 const devkit_1 = require("@nx/devkit");
-const versions_1 = require("../../utils/versions");
-const stories_1 = require("../stories/stories");
-const add_resolver_main_fields_to_metro_config_1 = require("./lib/add-resolver-main-fields-to-metro-config");
-const create_storybook_files_1 = require("./lib/create-storybook-files");
-const replace_app_import_with_storybook_toggle_1 = require("./lib/replace-app-import-with-storybook-toggle");
-async function generateStories(host, schema) {
-    await (0, stories_1.default)(host, {
-        project: schema.name,
-        ignorePaths: schema.ignorePaths,
-        skipFormat: true,
+const react_1 = require("@nx/react");
+function storybookConfigurationGenerator(tree, schema) {
+    return storybookConfigurationGeneratorInternal(tree, {
+        addPlugin: false,
+        ...schema,
     });
 }
-async function storybookConfigurationGenerator(host, schema) {
-    const { configurationGenerator } = (0, devkit_1.ensurePackage)('@nx/storybook', versions_1.nxVersion);
-    const installTask = await configurationGenerator(host, {
-        project: schema.name,
-        uiFramework: '@storybook/react-native',
-        configureCypress: false,
-        js: false,
-        linter: schema.linter,
-        standaloneConfig: schema.standaloneConfig,
-        tsConfiguration: schema.tsConfiguration,
-        skipFormat: true,
-    });
-    const installRequiredPackagesTask = await (0, devkit_1.addDependenciesToPackageJson)(host, {}, {
-        '@react-native-async-storage/async-storage': versions_1.reactNativeAsyncStorageVersion,
-        'react-native-safe-area-context': versions_1.reactNativeSafeAreaContextVersion,
-    });
-    addStorybookTask(host, schema.name);
-    (0, create_storybook_files_1.createStorybookFiles)(host, schema);
-    (0, replace_app_import_with_storybook_toggle_1.replaceAppImportWithStorybookToggle)(host, schema);
-    (0, add_resolver_main_fields_to_metro_config_1.addResolverMainFieldsToMetroConfig)(host, schema);
-    if (schema.generateStories) {
-        await generateStories(host, schema);
-    }
-    await (0, devkit_1.formatFiles)(host);
-    return (0, devkit_1.runTasksInSerial)(installTask, installRequiredPackagesTask);
-}
 exports.storybookConfigurationGenerator = storybookConfigurationGenerator;
-function addStorybookTask(host, projectName) {
-    const projectConfig = (0, devkit_1.readProjectConfiguration)(host, projectName);
-    projectConfig.targets['storybook'] = {
-        executor: '@nx/react-native:storybook',
-        options: {
-            searchDir: [projectConfig.sourceRoot],
-            outputFile: './.storybook/story-loader.js',
-            pattern: '**/*.stories.@(js|jsx|ts|tsx|md)',
-        },
-    };
-    (0, devkit_1.updateProjectConfiguration)(host, projectName, projectConfig);
+/**
+ * This would be a direct pass through to @nx/react:storybook-configuration generator.
+ * @TODO (@xiongemi): remove this generator for v19
+ */
+async function storybookConfigurationGeneratorInternal(host, schema) {
+    devkit_1.logger.warn(`Please run 'nx run @nx/react:storybook-configuration ${schema.project}' instead.`);
+    schema.addPlugin ??= process.env.NX_ADD_PLUGINS !== 'false';
+    return (0, react_1.storybookConfigurationGenerator)(host, schema);
 }
+exports.storybookConfigurationGeneratorInternal = storybookConfigurationGeneratorInternal;
 exports.default = storybookConfigurationGenerator;

package/src/generators/storybook-configuration/schema.d.ts

@@ -1,11 +1,13 @@
 import { Linter } from '@nx/eslint';
 
 export interface StorybookConfigureSchema {
-  name: string;
+  project: string;
+  interactionTests?: boolean;
   generateStories?: boolean;
   js?: boolean;
   tsConfiguration?: boolean;
   linter?: Linter;
-  standaloneConfig?: boolean;
   ignorePaths?: string[];
+  configureStaticServe?: boolean;
+  addPlugin?: boolean;
 }

package/src/generators/storybook-configuration/schema.json

@@ -1,29 +1,45 @@
 {
-  "$schema": "http://json-schema.org/schema",
+  "$schema": "https://json-schema.org/schema",
   "cli": "nx",
   "$id": "NxReactNativeStorybookConfigure",
   "title": "React native Storybook configuration",
   "description": "Set up Storybook for a React-Native app or library.",
   "type": "object",
   "properties": {
-    "name": {
+    "project": {
       "type": "string",
-      "aliases": ["project", "projectName"],
+      "aliases": ["name", "projectName"],
       "description": "Project for which to generate Storybook configuration.",
       "$default": {
         "$source": "argv",
         "index": 0
       },
       "x-prompt": "For which project do you want to generate Storybook configuration?",
-      "x-dropdown": "projects"
+      "x-dropdown": "projects",
+      "x-priority": "important"
+    },
+    "interactionTests": {
+      "type": "boolean",
+      "description": "Set up Storybook interaction tests.",
+      "x-prompt": "Do you want to set up Storybook interaction tests?",
+      "x-priority": "important",
+      "alias": ["configureTestRunner"],
+      "default": true
     },
     "generateStories": {
       "type": "boolean",
-      "description": "Automatically generate *.stories.ts files for components declared in this project?",
+      "description": "Automatically generate `*.stories.ts` files for components declared in this project?",
       "x-prompt": "Automatically generate *.stories.ts files for components declared in this project?",
       "default": true,
       "x-priority": "important"
     },
+    "configureStaticServe": {
+      "type": "boolean",
+      "description": "Specifies whether to configure a static file server target for serving storybook. Helpful for speeding up CI build/test times.",
+      "x-prompt": "Configure a static file server for the storybook instance?",
+      "default": true,
+      "x-priority": "important"
+    },
     "js": {
       "type": "boolean",
       "description": "Generate JavaScript story files rather than TypeScript story files.",
@@ -40,12 +56,6 @@
       "enum": ["eslint"],
       "default": "eslint"
     },
-    "standaloneConfig": {
-      "description": "Split the project configuration into `<projectRoot>/project.json` rather than including it inside `workspace.json`.",
-      "type": "boolean",
-      "default": true,
-      "x-deprecated": "Nx only supports standaloneConfig"
-    },
     "ignorePaths": {
       "type": "array",
       "description": "Paths to ignore when looking for components.",
@@ -65,5 +75,5 @@
       ]
     }
   },
-  "required": ["name"]
+  "required": ["project"]
 }

package/src/generators/upgrade-native/lib/normalize-options.d.ts

@@ -6,7 +6,7 @@ export interface NormalizedSchema {
     lowerCaseName: string;
     entryFile: string;
     entryFileIos: string;
-    e2eTestRunner: 'detox' | 'none';
+    e2eTestRunner: 'cypress' | 'playwright' | 'detox' | 'none';
     offsetFromRoot: string;
 }
 export declare function normalizeOptions(options: UpgradeNativeConfigureSchema, appProjectRoot: string): NormalizedSchema;

package/src/generators/upgrade-native/schema.d.ts

@@ -4,6 +4,6 @@ export interface UpgradeNativeConfigureSchema {
   name: string;
   displayName?: string;
   js: boolean; // default is false
-  e2eTestRunner: 'detox' | 'none'; // default is detox
+  e2eTestRunner: 'cypress' | 'playwright' | 'detox' | 'none'; // default is cypress
   install: boolean; // default is true
 }

package/src/generators/upgrade-native/schema.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/schema",
+  "$schema": "https://json-schema.org/schema",
   "cli": "nx",
   "$id": "NxReactNativeUpgradeNativeConfigure",
   "title": "React native upgrade native configuration",
@@ -27,8 +27,8 @@
     "e2eTestRunner": {
       "description": "Adds the specified e2e test runner.",
       "type": "string",
-      "enum": ["detox", "none"],
-      "default": "detox"
+      "enum": ["cypress", "playwright", "detox", "none"],
+      "default": "cypress"
     },
     "install": {
       "type": "boolean",

package/src/generators/upgrade-native/upgrade-native.d.ts

@@ -1,4 +1,6 @@
 /**
+ * @deprecated use `nx run @nx/react-native:upgrade` instead.
+ * TODO (@xiongemi): remove this generator for nx v19
  * This function is a destructive command that replace React Native iOS and Android code with latest.
  * It would replace the Android and iOS folder entirely.
  */