@nx/react-native 17.3.0-beta.3 → 17.3.0-beta.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/react-native",
-  "version": "17.3.0-beta.3",
+  "version": "17.3.0-beta.4",
   "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,14 +36,14 @@
     "node-fetch": "^2.6.7",
     "tsconfig-paths": "^4.1.2",
     "tslib": "^2.3.0",
-    "@nx/detox": "17.3.0-beta.3",
-    "@nx/devkit": "17.3.0-beta.3",
-    "@nx/jest": "17.3.0-beta.3",
-    "@nx/js": "17.3.0-beta.3",
-    "@nx/eslint": "17.3.0-beta.3",
-    "@nx/react": "17.3.0-beta.3",
-    "@nx/workspace": "17.3.0-beta.3",
-    "@nrwl/react-native": "17.3.0-beta.3"
+    "@nx/detox": "17.3.0-beta.4",
+    "@nx/devkit": "17.3.0-beta.4",
+    "@nx/jest": "17.3.0-beta.4",
+    "@nx/js": "17.3.0-beta.4",
+    "@nx/eslint": "17.3.0-beta.4",
+    "@nx/react": "17.3.0-beta.4",
+    "@nx/workspace": "17.3.0-beta.4",
+    "@nrwl/react-native": "17.3.0-beta.4"
   },
   "peerDependencies": {
     "react-native": ">= 0.72.0 < 0.73.0"

package/src/generators/application/application.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.reactNativeApplicationGeneratorInternal = exports.reactNativeApplicationGenerator = void 0;
 const devkit_1 = require("@nx/devkit");
+const js_1 = require("@nx/js");
 const symlink_task_1 = require("../../utils/symlink-task");
 const add_linting_1 = require("../../utils/add-linting");
 const add_jest_1 = require("../../utils/add-jest");
@@ -11,6 +12,7 @@ const init_1 = require("../init/init");
 const add_project_1 = require("./lib/add-project");
 const create_application_files_1 = require("./lib/create-application-files");
 const add_detox_1 = require("./lib/add-detox");
+const ensure_dependencies_1 = require("../../utils/ensure-dependencies");
 async function reactNativeApplicationGenerator(host, schema) {
     return await reactNativeApplicationGeneratorInternal(host, {
         projectNameAndRootFormat: 'derived',
@@ -20,7 +22,17 @@ async function reactNativeApplicationGenerator(host, schema) {
 exports.reactNativeApplicationGenerator = reactNativeApplicationGenerator;
 async function reactNativeApplicationGeneratorInternal(host, schema) {
     const options = await (0, normalize_options_1.normalizeOptions)(host, schema);
+    const tasks = [];
+    const jsInitTask = await (0, js_1.initGenerator)(host, {
+        ...schema,
+        skipFormat: true,
+    });
+    tasks.push(jsInitTask);
     const initTask = await (0, init_1.default)(host, { ...options, skipFormat: true });
+    tasks.push(initTask);
+    if (!options.skipPackageJson) {
+        tasks.push((0, ensure_dependencies_1.ensureDependencies)(host));
+    }
     (0, create_application_files_1.createApplicationFiles)(host, options);
     (0, add_project_1.addProject)(host, options);
     const lintTask = await (0, add_linting_1.addLinting)(host, {
@@ -30,14 +42,19 @@ async function reactNativeApplicationGeneratorInternal(host, schema) {
             (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'tsconfig.app.json'),
         ],
     });
+    tasks.push(lintTask);
     const jestTask = await (0, add_jest_1.addJest)(host, options.unitTestRunner, options.projectName, options.appProjectRoot, options.js, options.skipPackageJson);
+    tasks.push(jestTask);
     const detoxTask = await (0, add_detox_1.addDetox)(host, options);
+    tasks.push(detoxTask);
     const symlinkTask = (0, symlink_task_1.runSymlink)(host.root, options.appProjectRoot);
-    const chmodTaskGradlew = (0, chmod_android_gradle_files_1.chmodAndroidGradlewFilesTask)((0, devkit_1.joinPathFragments)(host.root, options.androidProjectRoot));
+    tasks.push(symlinkTask);
+    const chmodTaskGradlewTask = (0, chmod_android_gradle_files_1.chmodAndroidGradlewFilesTask)((0, devkit_1.joinPathFragments)(host.root, options.androidProjectRoot));
+    tasks.push(chmodTaskGradlewTask);
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(host);
     }
-    return (0, devkit_1.runTasksInSerial)(initTask, lintTask, jestTask, detoxTask, symlinkTask, chmodTaskGradlew);
+    return (0, devkit_1.runTasksInSerial)(...tasks);
 }
 exports.reactNativeApplicationGeneratorInternal = reactNativeApplicationGeneratorInternal;
 exports.default = reactNativeApplicationGenerator;

package/src/generators/init/init.js

@@ -2,37 +2,17 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateDependencies = exports.reactNativeInitGenerator = void 0;
 const devkit_1 = require("@nx/devkit");
-const jest_1 = require("@nx/jest");
-const detox_1 = require("@nx/detox");
-const versions_1 = require("@nx/react/src/utils/versions");
-const js_1 = require("@nx/js");
-const versions_2 = require("../../utils/versions");
+const versions_1 = require("../../utils/versions");
 const add_git_ignore_entry_1 = require("./lib/add-git-ignore-entry");
 async function reactNativeInitGenerator(host, schema) {
     (0, add_git_ignore_entry_1.addGitIgnoreEntry)(host);
+    if (process.env.NX_PCV3 === 'true') {
+        addPlugin(host);
+    }
     const tasks = [];
-    tasks.push(await (0, js_1.initGenerator)(host, {
-        ...schema,
-        skipFormat: true,
-    }));
     if (!schema.skipPackageJson) {
-        const installTask = updateDependencies(host);
         tasks.push(moveDependency(host));
-        tasks.push(installTask);
-    }
-    if (!schema.unitTestRunner || schema.unitTestRunner === 'jest') {
-        const jestTask = await (0, jest_1.jestInitGenerator)(host, schema);
-        tasks.push(jestTask);
-    }
-    if (!schema.e2eTestRunner || schema.e2eTestRunner === 'detox') {
-        const detoxTask = await (0, detox_1.detoxInitGenerator)(host, {
-            ...schema,
-            skipFormat: true,
-        });
-        tasks.push(detoxTask);
-    }
-    if (process.env.NX_PCV3 === 'true') {
-        addPlugin(host);
+        tasks.push(updateDependencies(host));
     }
     if (!schema.skipFormat) {
         await (0, devkit_1.formatFiles)(host);
@@ -41,38 +21,15 @@ async function reactNativeInitGenerator(host, schema) {
 }
 exports.reactNativeInitGenerator = reactNativeInitGenerator;
 function updateDependencies(host) {
-    const isPnpm = (0, devkit_1.detectPackageManager)(host.root) === 'pnpm';
     return (0, devkit_1.addDependenciesToPackageJson)(host, {
-        react: versions_2.reactVersion,
-        'react-dom': versions_2.reactDomVersion,
-        'react-native': versions_2.reactNativeVersion,
+        react: versions_1.reactVersion,
+        'react-dom': versions_1.reactDomVersion,
+        'react-native': versions_1.reactNativeVersion,
     }, {
-        '@nx/react-native': versions_2.nxVersion,
-        '@types/node': versions_2.typesNodeVersion,
-        '@types/react': versions_2.typesReactVersion,
-        '@react-native/metro-config': versions_2.reactNativeMetroConfigVersion,
-        '@react-native-community/cli': versions_2.reactNativeCommunityCli,
-        '@react-native-community/cli-platform-android': versions_2.reactNativeCommunityCliAndroid,
-        '@react-native-community/cli-platform-ios': versions_2.reactNativeCommunityCliIos,
-        '@testing-library/react-native': versions_2.testingLibraryReactNativeVersion,
-        '@testing-library/jest-native': versions_2.testingLibraryJestNativeVersion,
-        'jest-react-native': versions_2.jestReactNativeVersion,
-        metro: versions_2.metroVersion,
-        'metro-config': versions_2.metroVersion,
-        'metro-resolver': versions_2.metroVersion,
-        'metro-babel-register': versions_2.metroVersion,
-        'metro-react-native-babel-preset': versions_2.metroVersion,
-        'metro-react-native-babel-transformer': versions_2.metroVersion,
-        'react-test-renderer': versions_2.reactTestRendererVersion,
-        'react-native-svg-transformer': versions_2.reactNativeSvgTransformerVersion,
-        'react-native-svg': versions_2.reactNativeSvgVersion,
-        '@babel/preset-react': versions_1.babelPresetReactVersion,
-        '@babel/core': versions_1.babelCoreVersion,
-        ...(isPnpm
-            ? {
-                '@babel/runtime': versions_2.babelRuntimeVersion, // @babel/runtime is used by react-native-svg
-            }
-            : {}),
+        '@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,
     });
 }
 exports.updateDependencies = updateDependencies;

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

@@ -1,5 +1,4 @@
-import { NxJsonConfiguration } from '@nx/devkit';
-import { Tree, readJson, updateJson } from '@nx/devkit';
+import { Tree, readJson } from '@nx/devkit';
 import { createTreeWithEmptyWorkspace } from '@nx/devkit/testing';
 import { reactNativeInitGenerator } from './init';
 
@@ -12,12 +11,10 @@ describe('init', () => {
   });
 
   it('should add react native dependencies', async () => {
-    await reactNativeInitGenerator(tree, { e2eTestRunner: 'none' });
+    await reactNativeInitGenerator(tree, {});
     const packageJson = readJson(tree, 'package.json');
     expect(packageJson.dependencies['react']).toBeDefined();
     expect(packageJson.dependencies['react-native']).toBeDefined();
-    expect(packageJson.devDependencies['@types/node']).toBeDefined();
-    expect(packageJson.devDependencies['@types/react']).toBeDefined();
   });
 
   it('should add .gitignore entries for React native files and directories', async () => {
@@ -27,7 +24,7 @@ describe('init', () => {
 /node_modules
 `
     );
-    await reactNativeInitGenerator(tree, { e2eTestRunner: 'none' });
+    await reactNativeInitGenerator(tree, {});
 
     const content = tree.read('/.gitignore').toString();
 

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

@@ -1,7 +1,4 @@
 export interface Schema {
-  unitTestRunner?: 'jest' | 'none';
   skipFormat?: boolean;
-  e2eTestRunner?: 'detox' | 'none';
   skipPackageJson?: boolean; //default is false
-  js?: boolean;
 }

package/src/generators/init/schema.json

@@ -6,29 +6,12 @@
   "description": "Add Nx React native schematics.",
   "type": "object",
   "properties": {
-    "unitTestRunner": {
-      "description": "Adds the specified unit test runner.",
-      "type": "string",
-      "enum": ["jest", "none"],
-      "default": "jest"
-    },
     "skipFormat": {
       "description": "Skip formatting files.",
       "type": "boolean",
       "default": false,
       "x-priority": "internal"
     },
-    "e2eTestRunner": {
-      "description": "Adds the specified E2E test runner.",
-      "type": "string",
-      "enum": ["detox", "none"],
-      "default": "detox"
-    },
-    "js": {
-      "type": "boolean",
-      "default": false,
-      "description": "Use JavaScript instead of TypeScript"
-    },
     "skipPackageJson": {
       "description": "Do not add dependencies to `package.json`.",
       "type": "boolean",

package/src/generators/library/library.js

@@ -8,6 +8,7 @@ const add_linting_1 = require("../../utils/add-linting");
 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");
 async function reactNativeLibraryGenerator(host, schema) {
     return await reactNativeLibraryGeneratorInternal(host, {
         projectNameAndRootFormat: 'derived',
@@ -21,12 +22,16 @@ async function reactNativeLibraryGeneratorInternal(host, schema) {
         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 initTask = await (0, init_1.default)(host, {
-        ...options,
+    const jsInitTask = await (0, js_1.initGenerator)(host, {
+        ...schema,
         skipFormat: true,
-        e2eTestRunner: 'none',
     });
+    tasks.push(jsInitTask);
+    const initTask = await (0, init_1.default)(host, { ...options, skipFormat: true });
     tasks.push(initTask);
+    if (!options.skipPackageJson) {
+        tasks.push((0, ensure_dependencies_1.ensureDependencies)(host));
+    }
     const addProjectTask = await addProject(host, options);
     if (addProjectTask) {
         tasks.push(addProjectTask);
@@ -57,45 +62,45 @@ async function reactNativeLibraryGeneratorInternal(host, schema) {
 }
 exports.reactNativeLibraryGeneratorInternal = reactNativeLibraryGeneratorInternal;
 async function addProject(host, options) {
-    const targets = {};
-    let task;
-    if (options.publishable || options.buildable) {
-        const { rollupInitGenerator } = (0, devkit_1.ensurePackage)('@nx/rollup', versions_1.nxVersion);
-        const external = [
-            'react/jsx-runtime',
-            'react-native',
-            'react',
-            'react-dom',
-        ];
-        targets.build = {
-            executor: '@nx/rollup:rollup',
-            outputs: ['{options.outputPath}'],
-            options: {
-                outputPath: `dist/${options.projectRoot}`,
-                tsConfig: `${options.projectRoot}/tsconfig.lib.json`,
-                project: `${options.projectRoot}/package.json`,
-                entryFile: maybeJs(options, `${options.projectRoot}/src/index.ts`),
-                external,
-                rollupConfig: `@nx/react/plugins/bundle-rollup`,
-                assets: [
-                    {
-                        glob: `${options.projectRoot}/README.md`,
-                        input: '.',
-                        output: '.',
-                    },
-                ],
-            },
-        };
-        task = await rollupInitGenerator(host, { ...options, skipFormat: true });
-    }
-    (0, devkit_1.addProjectConfiguration)(host, options.name, {
+    const project = {
         root: options.projectRoot,
         sourceRoot: (0, devkit_1.joinPathFragments)(options.projectRoot, 'src'),
         projectType: 'library',
         tags: options.parsedTags,
-        targets,
+        targets: {},
+    };
+    (0, devkit_1.addProjectConfiguration)(host, options.name, project);
+    if (!options.publishable && !options.buildable) {
+        return () => { };
+    }
+    const { configurationGenerator } = (0, devkit_1.ensurePackage)('@nx/rollup', versions_1.nxVersion);
+    const rollupConfigTask = await configurationGenerator(host, {
+        ...options,
+        project: options.name,
+        skipFormat: true,
     });
-    return task;
+    const external = ['react/jsx-runtime', 'react-native', 'react', 'react-dom'];
+    project.targets.build = {
+        executor: '@nx/rollup:rollup',
+        outputs: ['{options.outputPath}'],
+        options: {
+            outputPath: `dist/${options.projectRoot}`,
+            tsConfig: `${options.projectRoot}/tsconfig.lib.json`,
+            project: `${options.projectRoot}/package.json`,
+            entryFile: maybeJs(options, `${options.projectRoot}/src/index.ts`),
+            external,
+            rollupConfig: `@nx/react/plugins/bundle-rollup`,
+            assets: [
+                {
+                    glob: `${options.projectRoot}/README.md`,
+                    input: '.',
+                    output: '.',
+                },
+            ],
+        },
+    };
+    (0, devkit_1.updateProjectConfiguration)(host, options.name, project);
+    return rollupConfigTask;
 }
 function updateTsConfig(tree, options) {
     (0, devkit_1.updateJson)(tree, (0, devkit_1.joinPathFragments)(options.projectRoot, 'tsconfig.json'), (json) => {

package/src/utils/ensure-dependencies.d.ts

@@ -0,0 +1,2 @@
+import { GeneratorCallback, Tree } from '@nx/devkit';
+export declare function ensureDependencies(tree: Tree): GeneratorCallback;

package/src/utils/ensure-dependencies.js

@@ -0,0 +1,34 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ensureDependencies = void 0;
+const devkit_1 = require("@nx/devkit");
+const versions_1 = require("@nx/react/src/utils/versions");
+const versions_2 = require("./versions");
+function ensureDependencies(tree) {
+    const isPnpm = (0, devkit_1.detectPackageManager)(tree.root) === 'pnpm';
+    return (0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
+        '@types/node': versions_2.typesNodeVersion,
+        '@types/react': versions_2.typesReactVersion,
+        '@react-native/metro-config': versions_2.reactNativeMetroConfigVersion,
+        '@testing-library/react-native': versions_2.testingLibraryReactNativeVersion,
+        '@testing-library/jest-native': versions_2.testingLibraryJestNativeVersion,
+        'jest-react-native': versions_2.jestReactNativeVersion,
+        metro: versions_2.metroVersion,
+        'metro-config': versions_2.metroVersion,
+        'metro-resolver': versions_2.metroVersion,
+        'metro-babel-register': versions_2.metroVersion,
+        'metro-react-native-babel-preset': versions_2.metroVersion,
+        'metro-react-native-babel-transformer': versions_2.metroVersion,
+        'react-test-renderer': versions_2.reactTestRendererVersion,
+        'react-native-svg-transformer': versions_2.reactNativeSvgTransformerVersion,
+        'react-native-svg': versions_2.reactNativeSvgVersion,
+        '@babel/preset-react': versions_1.babelPresetReactVersion,
+        '@babel/core': versions_1.babelCoreVersion,
+        ...(isPnpm
+            ? {
+                '@babel/runtime': versions_2.babelRuntimeVersion, // @babel/runtime is used by react-native-svg
+            }
+            : {}),
+    });
+}
+exports.ensureDependencies = ensureDependencies;