@nx/react-native 18.0.0-canary.20240202-ea5befb → 18.0.0

package/generators.json

@@ -4,7 +4,7 @@
   "extends": ["@nx/workspace"],
   "generators": {
     "init": {
-      "factory": "./src/generators/init/init#reactNativeInitGenerator",
+      "factory": "./src/generators/init/init#reactNativeInitGeneratorInternal",
       "schema": "./src/generators/init/schema.json",
       "description": "Initialize the `@nx/react-native` plugin.",
       "hidden": true
@@ -30,7 +30,7 @@
       "aliases": ["c"]
     },
     "storybook-configuration": {
-      "factory": "./src/generators/storybook-configuration/configuration#storybookConfigurationGenerator",
+      "factory": "./src/generators/storybook-configuration/configuration#storybookConfigurationGeneratorInternal",
       "schema": "./src/generators/storybook-configuration/schema.json",
       "description": "Set up Storybook for a React Native application or library."
     },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/react-native",
-  "version": "18.0.0-canary.20240202-ea5befb",
+  "version": "18.0.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,13 +35,13 @@
     "node-fetch": "^2.6.7",
     "tsconfig-paths": "^4.1.2",
     "tslib": "^2.3.0",
-    "@nx/devkit": "18.0.0-canary.20240202-ea5befb",
-    "@nx/jest": "18.0.0-canary.20240202-ea5befb",
-    "@nx/js": "18.0.0-canary.20240202-ea5befb",
-    "@nx/eslint": "18.0.0-canary.20240202-ea5befb",
-    "@nx/react": "18.0.0-canary.20240202-ea5befb",
-    "@nx/workspace": "18.0.0-canary.20240202-ea5befb",
-    "@nrwl/react-native": "18.0.0-canary.20240202-ea5befb"
+    "@nx/devkit": "18.0.0",
+    "@nx/jest": "18.0.0",
+    "@nx/js": "18.0.0",
+    "@nx/eslint": "18.0.0",
+    "@nx/react": "18.0.0",
+    "@nx/workspace": "18.0.0",
+    "@nrwl/react-native": "18.0.0"
   },
   "executors": "./executors.json",
   "ng-update": {

package/plugins/plugin.d.ts

@@ -7,6 +7,8 @@ export interface ReactNativePluginOptions {
     buildIosTargetName?: string;
     buildAndroidTargetName?: string;
     bundleTargetName?: string;
+    syncDepsTargetName?: string;
+    upgradeTargetname?: string;
 }
 export declare const createDependencies: CreateDependencies;
 export declare const createNodes: CreateNodes<ReactNativePluginOptions>;

package/plugins/plugin.js

@@ -57,11 +57,13 @@ function buildReactNativeTargets(projectRoot, options, context) {
     const namedInputs = (0, get_named_inputs_1.getNamedInputs)(projectRoot, context);
     const targets = {
         [options.startTargetName]: {
-            executor: `@nx/react-native:start`,
+            command: `react-native start`,
+            options: { cwd: projectRoot },
         },
         [options.podInstallTargetName]: {
             command: `pod install`,
             options: { cwd: (0, devkit_1.joinPathFragments)(projectRoot, 'ios') },
+            dependsOn: [`${options.syncDepsTargetName}`],
             cache: true,
             inputs: getInputs(namedInputs),
             outputs: [
@@ -99,6 +101,13 @@ function buildReactNativeTargets(projectRoot, options, context) {
             dependsOn: [`^${options.bundleTargetName}`],
             inputs: getInputs(namedInputs),
         },
+        [options.syncDepsTargetName]: {
+            executor: '@nx/react-native:sync-deps',
+        },
+        [options.upgradeTargetname]: {
+            command: `react-native upgrade`,
+            options: { cwd: projectRoot },
+        },
     };
     return targets;
 }
@@ -147,5 +156,7 @@ function normalizeOptions(options) {
     options.buildIosTargetName ??= 'build-ios';
     options.buildAndroidTargetName ??= 'build-android';
     options.bundleTargetName ??= 'bundle';
+    options.syncDepsTargetName ??= 'sync-deps';
+    options.upgradeTargetname ??= 'upgrade';
     return options;
 }

package/src/generators/application/application.js

@@ -18,6 +18,7 @@ const ensure_dependencies_1 = require("../../utils/ensure-dependencies");
 const sync_deps_impl_1 = require("../../executors/sync-deps/sync-deps.impl");
 async function reactNativeApplicationGenerator(host, schema) {
     return await reactNativeApplicationGeneratorInternal(host, {
+        addPlugin: false,
         projectNameAndRootFormat: 'derived',
         ...schema,
     });
@@ -46,7 +47,7 @@ async function reactNativeApplicationGeneratorInternal(host, schema) {
         ],
     });
     tasks.push(lintTask);
-    const jestTask = await (0, add_jest_1.addJest)(host, options.unitTestRunner, options.projectName, options.appProjectRoot, options.js, options.skipPackageJson);
+    const jestTask = await (0, add_jest_1.addJest)(host, options.unitTestRunner, options.projectName, options.appProjectRoot, options.js, options.skipPackageJson, options.addPlugin);
     tasks.push(jestTask);
     const webTask = await (0, web_configuration_1.webConfigurationGenerator)(host, {
         ...options,

package/src/generators/application/application.spec.ts

@@ -108,8 +108,8 @@ describe('app', () => {
       unitTestRunner: 'jest',
       bundler: 'vite',
     });
-    const targets = readProjectConfiguration(appTree, 'my-app').targets;
-    expect(targets.test).toBeDefined();
+
+    expect(appTree.exists('my-app/jest.config.ts')).toBeTruthy();
   });
 
   it('should extend from root tsconfig.json when no tsconfig.base.json', async () => {

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

@@ -24,7 +24,6 @@ async function addE2e(host, options) {
                 hasStyles: false,
                 unitTestRunner: 'none',
             });
-        case 'detox':
         case 'detox':
             const { detoxApplicationGenerator } = (0, devkit_1.ensurePackage)('@nx/detox', versions_1.nxVersion);
             return detoxApplicationGenerator(host, {

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

@@ -12,6 +12,7 @@ async function normalizeOptions(host, options) {
         callingGenerator: '@nx/react-native:application',
     });
     options.projectNameAndRootFormat = projectNameAndRootFormat;
+    options.addPlugin ??= process.env.NX_ADD_PLUGINS !== 'false';
     const { className, fileName } = (0, devkit_1.names)(options.name);
     const iosProjectRoot = (0, devkit_1.joinPathFragments)(appProjectRoot, 'ios');
     const androidProjectRoot = (0, devkit_1.joinPathFragments)(appProjectRoot, 'android');

package/src/generators/application/lib/normalize-options.spec.ts

@@ -23,6 +23,7 @@ describe('Normalize Options', () => {
     };
     const options = await normalizeOptions(appTree, schema);
     expect(options).toEqual({
+      addPlugin: true,
       androidProjectRoot: 'my-app/android',
       appProjectRoot: 'my-app',
       fileName: 'my-app',
@@ -58,6 +59,7 @@ describe('Normalize Options', () => {
     };
     const options = await normalizeOptions(appTree, schema);
     expect(options).toEqual({
+      addPlugin: true,
       androidProjectRoot: 'myApp/android',
       appProjectRoot: 'myApp',
       className: 'MyApp',
@@ -94,6 +96,7 @@ describe('Normalize Options', () => {
     };
     const options = await normalizeOptions(appTree, schema);
     expect(options).toEqual({
+      addPlugin: true,
       androidProjectRoot: 'directory/my-app/android',
       appProjectRoot: 'directory/my-app',
       className: 'MyApp',
@@ -130,6 +133,7 @@ describe('Normalize Options', () => {
     };
     const options = await normalizeOptions(appTree, schema);
     expect(options).toEqual({
+      addPlugin: true,
       androidProjectRoot: 'directory/my-app/android',
       appProjectRoot: 'directory/my-app',
       className: 'DirectoryMyApp',
@@ -166,6 +170,7 @@ describe('Normalize Options', () => {
     };
     const options = await normalizeOptions(appTree, schema);
     expect(options).toEqual({
+      addPlugin: true,
       androidProjectRoot: 'my-app/android',
       appProjectRoot: 'my-app',
       className: 'MyApp',

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

@@ -19,4 +19,5 @@ export interface Schema {
   bundler: 'webpack' | 'vite'; // default is webpack
   install: boolean; // default is true
   skipPackageJson?: boolean; //default is false
+  addPlugin?: boolean;
 }

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,
@@ -58,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/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

@@ -12,6 +12,7 @@ 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,
     });
@@ -46,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);

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 () => {
@@ -292,18 +264,6 @@ describe('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/storybook-configuration/configuration.d.ts

@@ -1,8 +1,9 @@
 import { Tree } from '@nx/devkit';
 import { StorybookConfigureSchema } from './schema';
+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 storybookConfigurationGenerator(host: Tree, schema: StorybookConfigureSchema): Promise<import("@nx/devkit").GeneratorCallback>;
+export declare function storybookConfigurationGeneratorInternal(host: Tree, schema: StorybookConfigureSchema): Promise<import("@nx/devkit").GeneratorCallback>;
 export default storybookConfigurationGenerator;

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

@@ -1,15 +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 react_1 = require("@nx/react");
+function storybookConfigurationGenerator(tree, schema) {
+    return storybookConfigurationGeneratorInternal(tree, {
+        addPlugin: false,
+        ...schema,
+    });
+}
+exports.storybookConfigurationGenerator = storybookConfigurationGenerator;
 /**
  * This would be a direct pass through to @nx/react:storybook-configuration generator.
  * @TODO (@xiongemi): remove this generator for v19
  */
-async function storybookConfigurationGenerator(host, schema) {
+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.storybookConfigurationGenerator = storybookConfigurationGenerator;
+exports.storybookConfigurationGeneratorInternal = storybookConfigurationGeneratorInternal;
 exports.default = storybookConfigurationGenerator;

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

@@ -9,4 +9,5 @@ export interface StorybookConfigureSchema {
   linter?: Linter;
   ignorePaths?: string[];
   configureStaticServe?: boolean;
+  addPlugin?: boolean;
 }

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

@@ -55,6 +55,7 @@ async function addBundlerConfiguration(tree, normalizedSchema) {
     if (normalizedSchema.bundler === 'vite') {
         const { viteConfigurationGenerator } = (0, devkit_1.ensurePackage)('@nx/vite', versions_1.nxVersion);
         const viteTask = await viteConfigurationGenerator(tree, {
+            ...normalizedSchema,
             uiFramework: 'react',
             project: normalizedSchema.project,
             newProject: true,
@@ -67,6 +68,7 @@ async function addBundlerConfiguration(tree, normalizedSchema) {
     else {
         const { webpackInitGenerator } = (0, devkit_1.ensurePackage)('@nx/webpack', versions_1.nxVersion);
         const webpackInitTask = await webpackInitGenerator(tree, {
+            ...normalizedSchema,
             skipFormat: true,
             skipPackageJson: normalizedSchema.skipPackageJson,
         });

package/src/migrations/update-18-0-0/remove-block-list.js

@@ -13,7 +13,9 @@ async function update(tree) {
                 let content = tree
                     .read((0, devkit_1.joinPathFragments)(config.root, 'metro.config.js'))
                     .toString();
-                content = content.replace(`blockList: exclusionList([/^(?!.*node_modules).*/dist/.*/]),`, '');
+                content = content.replace(/blockList: exclusionList(.+?(?=\n))/, '');
+                content = content.replace('// unstable_enableSymlinks: true,', '');
+                content = content.replace('// unstable_enablePackageExports: true,', '');
                 content = content.replace('unstable_enableSymlinks: true,', '');
                 content = content.replace('unstable_enablePackageExports: true,', '');
                 content = content.replace(`const exclusionList = require('metro-config/src/defaults/exclusionList');`, '');

package/src/utils/add-jest.d.ts

@@ -1,2 +1,2 @@
 import { Tree } from '@nx/devkit';
-export declare function addJest(host: Tree, unitTestRunner: 'jest' | 'none', projectName: string, appProjectRoot: string, js: boolean, skipPackageJson: boolean): Promise<import("@nx/devkit").GeneratorCallback>;
+export declare function addJest(host: Tree, unitTestRunner: 'jest' | 'none', projectName: string, appProjectRoot: string, js: boolean, skipPackageJson: boolean, addPlugin: boolean): Promise<import("@nx/devkit").GeneratorCallback>;

package/src/utils/add-jest.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.addJest = void 0;
 const devkit_1 = require("@nx/devkit");
 const jest_1 = require("@nx/jest");
-async function addJest(host, unitTestRunner, projectName, appProjectRoot, js, skipPackageJson) {
+async function addJest(host, unitTestRunner, projectName, appProjectRoot, js, skipPackageJson, addPlugin) {
     if (unitTestRunner !== 'jest') {
         return () => { };
     }
@@ -16,6 +16,7 @@ async function addJest(host, unitTestRunner, projectName, appProjectRoot, js, sk
         compiler: 'babel',
         skipPackageJson,
         skipFormat: true,
+        addPlugin,
     });
     // overwrite the jest.config.ts file because react native needs to have special transform property
     const configPath = `${appProjectRoot}/jest.config.${js ? 'js' : 'ts'}`;

package/src/utils/add-linting.d.ts

@@ -7,6 +7,7 @@ interface NormalizedSchema {
     setParserOptionsProject?: boolean;
     tsConfigPaths: string[];
     skipPackageJson?: boolean;
+    addPlugin?: boolean;
 }
 export declare function addLinting(host: Tree, options: NormalizedSchema): Promise<GeneratorCallback>;
 export {};

package/src/utils/add-linting.js

@@ -16,6 +16,7 @@ async function addLinting(host, options) {
         tsConfigPaths: options.tsConfigPaths,
         skipFormat: true,
         skipPackageJson: options.skipPackageJson,
+        addPlugin: options.addPlugin,
     });
     tasks.push(lintTask);
     if ((0, eslint_file_1.isEslintConfigSupported)(host)) {

package/src/utils/add-linting.spec.ts

@@ -15,17 +15,15 @@ describe('Add Linting', () => {
     });
   });
 
-  it('should add update configuration when eslint is passed', async () => {
+  it('should add a .eslintrc.json when is passed', async () => {
     await addLinting(tree, {
       projectName: 'my-lib',
       linter: Linter.EsLint,
       tsConfigPaths: ['libs/my-lib/tsconfig.lib.json'],
       projectRoot: 'libs/my-lib',
     });
-    const project = readProjectConfiguration(tree, 'my-lib');
 
-    expect(project.targets.lint).toBeDefined();
-    expect(project.targets.lint.executor).toEqual('@nx/eslint:lint');
+    expect(tree.exists('libs/my-lib/.eslintrc.json')).toBeTruthy();
   });
 
   it('should not add lint target when "none" is passed', async () => {