@nx/react-native 17.0.0-beta.8 → 17.0.0-rc.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/react-native",
-  "version": "17.0.0-beta.8",
+  "version": "17.0.0-rc.1",
   "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.0.0-beta.8",
-    "@nx/devkit": "17.0.0-beta.8",
-    "@nx/jest": "17.0.0-beta.8",
-    "@nx/js": "17.0.0-beta.8",
-    "@nx/eslint": "17.0.0-beta.8",
-    "@nx/react": "17.0.0-beta.8",
-    "@nx/workspace": "17.0.0-beta.8",
-    "@nrwl/react-native": "17.0.0-beta.8"
+    "@nx/detox": "17.0.0-rc.1",
+    "@nx/devkit": "17.0.0-rc.1",
+    "@nx/jest": "17.0.0-rc.1",
+    "@nx/js": "17.0.0-rc.1",
+    "@nx/eslint": "17.0.0-rc.1",
+    "@nx/react": "17.0.0-rc.1",
+    "@nx/workspace": "17.0.0-rc.1",
+    "@nrwl/react-native": "17.0.0-rc.1"
   },
   "peerDependencies": {
     "react-native": ">= 0.72.0 < 0.73.0"

package/src/executors/build-android/build-android.impl.js

@@ -46,13 +46,7 @@ function runCliBuild(workspaceRoot, projectRoot, options) {
         });
     });
 }
-const nxOptions = ['sync', 'packager'];
 const startOptions = ['port', 'resetCache'];
-const deprecatedOptions = ['apk', 'debug', 'gradleTask'];
 function createBuildAndroidOptions(options) {
-    return (0, get_cli_options_1.getCliOptions)(options, [
-        ...nxOptions,
-        ...startOptions,
-        ...deprecatedOptions,
-    ]);
+    return (0, get_cli_options_1.getCliOptions)(options, startOptions);
 }

package/src/executors/build-android/build-android.impl.ts

@@ -66,14 +66,8 @@ function runCliBuild(
   });
 }
 
-const nxOptions = ['sync', 'packager'];
 const startOptions = ['port', 'resetCache'];
-const deprecatedOptions = ['apk', 'debug', 'gradleTask'];
 
 function createBuildAndroidOptions(options: ReactNativeBuildAndroidOptions) {
-  return getCliOptions<ReactNativeBuildAndroidOptions>(options, [
-    ...nxOptions,
-    ...startOptions,
-    ...deprecatedOptions,
-  ]);
+  return getCliOptions<ReactNativeBuildAndroidOptions>(options, startOptions);
 }

package/src/executors/build-ios/build-ios.impl.js

@@ -47,8 +47,9 @@ function runCliBuildIOS(workspaceRoot, projectRoot, options) {
         });
     });
 }
-const nxOptions = ['sync', 'install', 'packager'];
 const startOptions = ['port', 'resetCache'];
 function createBuildIOSOptions(options) {
-    return (0, get_cli_options_1.getCliOptions)(options, [...nxOptions, ...startOptions], ['buildFolder']);
+    return (0, get_cli_options_1.getCliOptions)(options, startOptions, [
+        'buildFolder',
+    ]);
 }

package/src/executors/build-ios/build-ios.impl.ts

@@ -68,13 +68,10 @@ function runCliBuildIOS(
   });
 }
 
-const nxOptions = ['sync', 'install', 'packager'];
 const startOptions = ['port', 'resetCache'];
 
 function createBuildIOSOptions(options: ReactNativeBuildIosOptions) {
-  return getCliOptions<ReactNativeBuildIosOptions>(
-    options,
-    [...nxOptions, ...startOptions],
-    ['buildFolder']
-  );
+  return getCliOptions<ReactNativeBuildIosOptions>(options, startOptions, [
+    'buildFolder',
+  ]);
 }

package/src/executors/run-android/run-android.impl.js

@@ -68,9 +68,11 @@ function runCliRunAndroid(workspaceRoot, projectRoot, options) {
         });
     });
 }
-const nxOptions = ['sync', 'packager'];
 const startOptions = ['port', 'resetCache'];
-const deprecatedOptions = ['variant', 'jetifier'];
 function createRunAndroidOptions(options) {
-    return (0, get_cli_options_1.getCliOptions)(options, [...nxOptions, ...startOptions, ...deprecatedOptions], ['appId', 'appIdSuffix', 'deviceId']);
+    return (0, get_cli_options_1.getCliOptions)(options, startOptions, [
+        'appId',
+        'appIdSuffix',
+        'deviceId',
+    ]);
 }

package/src/executors/run-android/run-android.impl.ts

@@ -92,14 +92,12 @@ function runCliRunAndroid(
   });
 }
 
-const nxOptions = ['sync', 'packager'];
 const startOptions = ['port', 'resetCache'];
-const deprecatedOptions = ['variant', 'jetifier'];
 
 function createRunAndroidOptions(options: ReactNativeRunAndroidOptions) {
-  return getCliOptions<ReactNativeRunAndroidOptions>(
-    options,
-    [...nxOptions, ...startOptions, ...deprecatedOptions],
-    ['appId', 'appIdSuffix', 'deviceId']
-  );
+  return getCliOptions<ReactNativeRunAndroidOptions>(options, startOptions, [
+    'appId',
+    'appIdSuffix',
+    'deviceId',
+  ]);
 }

package/src/executors/run-android/schema.json

@@ -54,11 +54,6 @@
       "examples": ["debug", "release"],
       "x-priority": "important"
     },
-    "packager": {
-      "type": "boolean",
-      "description": "Launch packager while building",
-      "default": true
-    },
     "port": {
       "type": "number",
       "description": "The port where the packager server is listening on.",
@@ -95,12 +90,6 @@
       "type": "boolean",
       "description": "Explicitly select build type and flavour to use before running a build"
     },
-    "sync": {
-      "type": "boolean",
-      "description": "Syncs npm dependencies to `package.json` (for React Native autolink).",
-      "x-deprecated": "Add sync-deps to dependsOn for this target in project.json instead",
-      "default": true
-    },
     "resetCache": {
       "type": "boolean",
       "description": "Resets metro cache.",

package/src/executors/run-ios/run-ios.impl.js

@@ -69,9 +69,9 @@ function runCliRunIOS(workspaceRoot, projectRoot, options) {
         });
     });
 }
-const nxOptions = ['sync', 'install', 'packager'];
 const startOptions = ['port', 'resetCache'];
-const deprecatedOptions = ['xcodeConfiguration'];
 function createRunIOSOptions(options) {
-    return (0, get_cli_options_1.getCliOptions)(options, [...nxOptions, ...startOptions, ...deprecatedOptions], ['buildFolder']);
+    return (0, get_cli_options_1.getCliOptions)(options, startOptions, [
+        'buildFolder',
+    ]);
 }

package/src/executors/run-ios/run-ios.impl.ts

@@ -92,14 +92,10 @@ function runCliRunIOS(
   });
 }
 
-const nxOptions = ['sync', 'install', 'packager'];
 const startOptions = ['port', 'resetCache'];
-const deprecatedOptions = ['xcodeConfiguration'];
 
 function createRunIOSOptions(options: ReactNativeRunIosOptions) {
-  return getCliOptions<ReactNativeRunIosOptions>(
-    options,
-    [...nxOptions, ...startOptions, ...deprecatedOptions],
-    ['buildFolder']
-  );
+  return getCliOptions<ReactNativeRunIosOptions>(options, startOptions, [
+    'buildFolder',
+  ]);
 }

package/src/executors/run-ios/schema.json

@@ -82,28 +82,11 @@
       ],
       "description": "Custom params that will be passed to xcodebuild command."
     },
-    "install": {
-      "type": "boolean",
-      "description": "Runs `pod install` for native modules before building iOS app.",
-      "default": true,
-      "x-deprecated": "Add `pod-install` to dependsOn for this target in project.json instead."
-    },
-    "sync": {
-      "type": "boolean",
-      "description": "Syncs npm dependencies to `package.json` (for React Native autolink).",
-      "x-deprecated": "Add `sync-deps` to dependsOn for this target in project.json instead.",
-      "default": true
-    },
     "resetCache": {
       "type": "boolean",
       "description": "Resets metro cache.",
       "default": false
     },
-    "packager": {
-      "type": "boolean",
-      "description": "Launch packager while building",
-      "default": true
-    },
     "binaryPath": {
       "type": "string",
       "description": "Path relative to project root where pre-built .app binary lives."

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

@@ -18,7 +18,7 @@ describe('app', () => {
 
   it('should update configuration', async () => {
     await reactNativeApplicationGenerator(appTree, {
-      name: 'myApp',
+      name: 'my-app',
       displayName: 'myApp',
       linter: Linter.EsLint,
       e2eTestRunner: 'none',
@@ -32,7 +32,7 @@ describe('app', () => {
 
   it('should update nx.json', async () => {
     await reactNativeApplicationGenerator(appTree, {
-      name: 'myApp',
+      name: 'my-app',
       displayName: 'myApp',
       tags: 'one,two',
       linter: Linter.EsLint,
@@ -49,7 +49,7 @@ describe('app', () => {
 
   it('should generate files', async () => {
     await reactNativeApplicationGenerator(appTree, {
-      name: 'myApp',
+      name: 'my-app',
       displayName: 'myApp',
       linter: Linter.EsLint,
       e2eTestRunner: 'none',
@@ -82,7 +82,7 @@ describe('app', () => {
 
   it('should generate targets', async () => {
     await reactNativeApplicationGenerator(appTree, {
-      name: 'myApp',
+      name: 'my-app',
       displayName: 'myApp',
       linter: Linter.EsLint,
       e2eTestRunner: 'none',
@@ -97,7 +97,7 @@ describe('app', () => {
     appTree.rename('tsconfig.base.json', 'tsconfig.json');
 
     await reactNativeApplicationGenerator(appTree, {
-      name: 'myApp',
+      name: 'my-app',
       displayName: 'myApp',
       linter: Linter.EsLint,
       e2eTestRunner: 'none',
@@ -112,8 +112,8 @@ describe('app', () => {
   describe('detox', () => {
     it('should create e2e app with directory', async () => {
       await reactNativeApplicationGenerator(appTree, {
-        name: 'myApp',
-        directory: 'myDir',
+        name: 'my-app',
+        directory: 'my-dir',
         linter: Linter.EsLint,
         e2eTestRunner: 'detox',
         install: false,
@@ -163,7 +163,7 @@ describe('app', () => {
 
     it('should create e2e app without directory', async () => {
       await reactNativeApplicationGenerator(appTree, {
-        name: 'myApp',
+        name: 'my-app',
         linter: Linter.EsLint,
         e2eTestRunner: 'detox',
         install: false,
@@ -216,7 +216,7 @@ describe('app', () => {
       const packageJsonBefore = readJson(appTree, 'package.json');
 
       await reactNativeApplicationGenerator(appTree, {
-        name: 'myApp',
+        name: 'my-app',
         displayName: 'myApp',
         linter: Linter.EsLint,
         e2eTestRunner: 'none',

package/src/generators/application/files/app/metro.config.js.template

@@ -19,7 +19,7 @@ const customConfig = {
     assetExts: assetExts.filter((ext) => ext !== 'svg'),
     sourceExts: [...sourceExts, 'svg'],
     blockList: exclusionList([/^(?!.*node_modules).*\/dist\/.*/]),
-    unstable_enableSymlinks: true,
+    // unstable_enableSymlinks: true,
     // unstable_enablePackageExports: true,
   },
 };

package/src/generators/application/lib/{nomalize-options.spec.ts → normalize-options.spec.ts}

@@ -48,15 +48,15 @@ describe('Normalize Options', () => {
     };
     const options = await normalizeOptions(appTree, schema);
     expect(options).toEqual({
-      androidProjectRoot: 'my-app/android',
-      appProjectRoot: 'my-app',
+      androidProjectRoot: 'myApp/android',
+      appProjectRoot: 'myApp',
       className: 'MyApp',
       displayName: 'MyApp',
-      iosProjectRoot: 'my-app/ios',
+      iosProjectRoot: 'myApp/ios',
       lowerCaseName: 'myapp',
-      name: 'my-app',
+      name: 'myApp',
       parsedTags: [],
-      projectName: 'my-app',
+      projectName: 'myApp',
       projectNameAndRootFormat: 'as-provided',
       entryFile: 'src/main.tsx',
       e2eTestRunner: 'none',

package/src/generators/component/component.js

@@ -44,7 +44,7 @@ function addExportsToBarrel(host, options) {
         tsModule = (0, ensure_typescript_1.ensureTypescript)();
     }
     const workspace = (0, devkit_1.getProjects)(host);
-    const isApp = workspace.get(options.project).projectType === 'application';
+    const isApp = workspace.get(options.projectName).projectType === 'application';
     if (options.export && !isApp) {
         const indexFilePath = (0, devkit_1.joinPathFragments)(options.projectSourceRoot, options.js ? 'index.js' : 'index.ts');
         const indexSource = host.read(indexFilePath, 'utf-8');

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

@@ -5,5 +5,6 @@ export interface NormalizedSchema extends Schema {
     fileName: string;
     className: string;
     filePath: string;
+    projectName: string;
 }
 export declare function normalizeOptions(host: Tree, options: Schema): Promise<NormalizedSchema>;

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

@@ -31,6 +31,7 @@ async function normalizeOptions(host, options) {
         fileName,
         filePath,
         projectSourceRoot,
+        projectName,
     };
 }
 exports.normalizeOptions = normalizeOptions;

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

@@ -13,7 +13,7 @@ describe('lib', () => {
   let appTree: Tree;
 
   const defaultSchema: Schema = {
-    name: 'myLib',
+    name: 'my-lib',
     linter: Linter.EsLint,
     skipFormat: false,
     skipTsConfig: false,
@@ -124,7 +124,7 @@ describe('lib', () => {
     it('should update nx.json', async () => {
       await libraryGenerator(appTree, {
         ...defaultSchema,
-        directory: 'myDir',
+        directory: 'my-dir',
         tags: 'one',
       });
 
@@ -135,8 +135,8 @@ describe('lib', () => {
 
       await libraryGenerator(appTree, {
         ...defaultSchema,
-        name: 'myLib2',
-        directory: 'myDir2',
+        name: 'my-lib2',
+        directory: 'my-dir2',
         tags: 'one,two',
       });
 
@@ -150,7 +150,10 @@ describe('lib', () => {
     });
 
     it('should update project.json', async () => {
-      await libraryGenerator(appTree, { ...defaultSchema, directory: 'myDir' });
+      await libraryGenerator(appTree, {
+        ...defaultSchema,
+        directory: 'my-dir',
+      });
       const projectConfiguration = readProjectConfiguration(appTree, 'my-lib');
 
       expect(projectConfiguration.root).toEqual('my-dir');
@@ -164,7 +167,10 @@ describe('lib', () => {
     });
 
     it('should update root tsconfig.base.json', async () => {
-      await libraryGenerator(appTree, { ...defaultSchema, directory: 'myDir' });
+      await libraryGenerator(appTree, {
+        ...defaultSchema,
+        directory: 'my-dir',
+      });
       const tsconfigJson = readJson(appTree, '/tsconfig.base.json');
       expect(tsconfigJson.compilerOptions.paths['@proj/my-lib']).toEqual([
         'my-dir/src/index.ts',
@@ -177,7 +183,10 @@ describe('lib', () => {
     it('should update root tsconfig.json when no tsconfig.base.json', async () => {
       appTree.rename('tsconfig.base.json', 'tsconfig.json');
 
-      await libraryGenerator(appTree, { ...defaultSchema, directory: 'myDir' });
+      await libraryGenerator(appTree, {
+        ...defaultSchema,
+        directory: 'my-dir',
+      });
 
       const tsconfigJson = readJson(appTree, '/tsconfig.json');
       expect(tsconfigJson.compilerOptions.paths['@proj/my-lib']).toEqual([
@@ -189,7 +198,10 @@ describe('lib', () => {
     });
 
     it('should create a local tsconfig.json', async () => {
-      await libraryGenerator(appTree, { ...defaultSchema, directory: 'myDir' });
+      await libraryGenerator(appTree, {
+        ...defaultSchema,
+        directory: 'my-dir',
+      });
 
       const tsconfigJson = readJson(appTree, 'my-dir/tsconfig.json');
       expect(tsconfigJson.extends).toBe('../tsconfig.base.json');
@@ -206,7 +218,10 @@ describe('lib', () => {
     it('should extend from root tsconfig.json when no tsconfig.base.json', async () => {
       appTree.rename('tsconfig.base.json', 'tsconfig.json');
 
-      await libraryGenerator(appTree, { ...defaultSchema, directory: 'myDir' });
+      await libraryGenerator(appTree, {
+        ...defaultSchema,
+        directory: 'my-dir',
+      });
 
       const tsconfigJson = readJson(appTree, 'my-dir/tsconfig.json');
       expect(tsconfigJson.extends).toBe('../tsconfig.json');
@@ -343,7 +358,7 @@ describe('lib', () => {
       try {
         await libraryGenerator(appTree, {
           ...defaultSchema,
-          directory: 'myDir',
+          directory: 'my-dir',
           publishable: true,
         });
       } catch (e) {
@@ -382,7 +397,7 @@ describe('lib', () => {
       await libraryGenerator(appTree, {
         ...defaultSchema,
         publishable: true,
-        directory: 'myDir',
+        directory: 'my-dir',
         importPath: '@myorg/lib',
       });
       const packageJson = readJson(appTree, 'my-dir/package.json');
@@ -397,7 +412,7 @@ describe('lib', () => {
     it('should fail if the same importPath has already been used', async () => {
       await libraryGenerator(appTree, {
         ...defaultSchema,
-        name: 'myLib1',
+        name: 'my-lib1',
         publishable: true,
         importPath: '@myorg/lib',
       });
@@ -405,7 +420,7 @@ describe('lib', () => {
       try {
         await libraryGenerator(appTree, {
           ...defaultSchema,
-          name: 'myLib2',
+          name: 'my-lib2',
           publishable: true,
           importPath: '@myorg/lib',
         });

package/src/generators/stories/schema.json

@@ -23,6 +23,9 @@
         "type": "string",
         "description": "Path to ignore."
       },
+      "default": [
+        "*.stories.ts,*.stories.tsx,*.stories.js,*.stories.jsx,*.stories.mdx"
+      ],
       "examples": [
         "apps/my-app/src/not-stories/**",
         "**/**/src/**/not-stories/**",

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

@@ -53,6 +53,9 @@
         "type": "string",
         "description": "Path to ignore."
       },
+      "default": [
+        "*.stories.ts,*.stories.tsx,*.stories.js,*.stories.jsx,*.stories.mdx"
+      ],
       "examples": [
         "apps/my-app/src/not-stories/**",
         "**/**/src/**/not-stories/**",