@nx/react-native 0.0.0-pr-27957-a99d5ea → 0.0.0-pr-28218-5048fd1

package/.eslintrc.json

@@ -43,6 +43,18 @@
           }
         ]
       }
+    },
+    {
+      "files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
+      "rules": {
+        "no-restricted-imports": [
+          "error",
+          {
+            "name": "fs-extra",
+            "message": "Please use equivalent utilities from `node:fs` instead."
+          }
+        ]
+      }
     }
   ]
 }

package/generators.json

@@ -24,7 +24,7 @@
       "description": "Create a React Native library."
     },
     "component": {
-      "factory": "./src/generators/component/component#reactNativeComponentGeneratorInternal",
+      "factory": "./src/generators/component/component",
       "schema": "./src/generators/component/schema.json",
       "description": "Create a React Native component.",
       "aliases": ["c"]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/react-native",
-  "version": "0.0.0-pr-27957-a99d5ea",
+  "version": "0.0.0-pr-28218-5048fd1",
   "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": [
@@ -29,7 +29,6 @@
     "ajv": "^8.12.0",
     "chalk": "^4.1.0",
     "enhanced-resolve": "^5.8.3",
-    "fs-extra": "^11.1.0",
     "glob": "7.1.4",
     "ignore": "^5.0.4",
     "metro-config": "~0.80.4",
@@ -37,13 +36,12 @@
     "node-fetch": "^2.6.7",
     "tsconfig-paths": "^4.1.2",
     "tslib": "^2.3.0",
-    "@nx/devkit": "0.0.0-pr-27957-a99d5ea",
-    "@nx/jest": "0.0.0-pr-27957-a99d5ea",
-    "@nx/js": "0.0.0-pr-27957-a99d5ea",
-    "@nx/eslint": "0.0.0-pr-27957-a99d5ea",
-    "@nx/react": "0.0.0-pr-27957-a99d5ea",
-    "@nx/workspace": "0.0.0-pr-27957-a99d5ea",
-    "@nrwl/react-native": "0.0.0-pr-27957-a99d5ea"
+    "@nx/devkit": "0.0.0-pr-28218-5048fd1",
+    "@nx/jest": "0.0.0-pr-28218-5048fd1",
+    "@nx/js": "0.0.0-pr-28218-5048fd1",
+    "@nx/eslint": "0.0.0-pr-28218-5048fd1",
+    "@nx/react": "0.0.0-pr-28218-5048fd1",
+    "@nx/workspace": "0.0.0-pr-28218-5048fd1"
   },
   "executors": "./executors.json",
   "ng-update": {
@@ -55,4 +53,4 @@
     "access": "public"
   },
   "type": "commonjs"
-}
+}

package/plugins/with-nx-metro.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.withNxMetro = withNxMetro;
 const devkit_1 = require("@nx/devkit");
 const metro_config_1 = require("metro-config");
-const fs_extra_1 = require("fs-extra");
+const node_fs_1 = require("node:fs");
 const path_1 = require("path");
 const metro_resolver_1 = require("./metro-resolver");
 async function withNxMetro(userConfig, opts = {}) {
@@ -12,14 +12,14 @@ async function withNxMetro(userConfig, opts = {}) {
         process.env.NX_REACT_NATIVE_DEBUG = 'true';
     if (opts.extensions)
         extensions.push(...opts.extensions);
-    let watchFolders = (0, fs_extra_1.readdirSync)(devkit_1.workspaceRoot)
+    let watchFolders = (0, node_fs_1.readdirSync)(devkit_1.workspaceRoot)
         .filter((fileName) => !['dist', 'e2e'].includes(fileName) && !fileName.startsWith('.'))
         .map((fileName) => (0, path_1.join)(devkit_1.workspaceRoot, fileName))
-        .filter((filePath) => (0, fs_extra_1.statSync)(filePath).isDirectory());
+        .filter((filePath) => (0, node_fs_1.statSync)(filePath).isDirectory());
     if (opts.watchFolders?.length) {
         watchFolders = watchFolders.concat(opts.watchFolders);
     }
-    watchFolders = [...new Set(watchFolders)].filter((folder) => (0, fs_extra_1.existsSync)(folder));
+    watchFolders = [...new Set(watchFolders)].filter((folder) => (0, node_fs_1.existsSync)(folder));
     const nxConfig = {
         resolver: {
             resolveRequest: (0, metro_resolver_1.getResolveRequest)(extensions, opts.exportsConditionNames, opts.mainFields),

package/project.json

@@ -44,9 +44,6 @@
       "options": {
         "command": "node ./scripts/copy-readme.js react-native"
       }
-    },
-    "add-extra-dependencies": {
-      "command": "node ./scripts/add-dependency-to-build.js react-native @nrwl/react-native"
     }
   }
 }

package/src/executors/storybook/storybook.impl.js

@@ -2,13 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = reactNativeStorybookExecutor;
 exports.runCliStorybook = runCliStorybook;
+const node_fs_1 = require("node:fs");
 const path_1 = require("path");
 const devkit_1 = require("@nx/devkit");
 const fileutils_1 = require("@nx/workspace/src/utilities/fileutils");
 const chalk = require("chalk");
 const glob_1 = require("glob");
 const sync_deps_impl_1 = require("../sync-deps/sync-deps.impl");
-const fs_extra_1 = require("fs-extra");
 /**
  * TODO (@xiongemi): remove this function in v20.
  * @deprecated Going to use the default react storybook target. Use @nx/react:storybook executor instead.
@@ -53,5 +53,5 @@ export function loadStories() {
     ${storiesFiles.map((story) => `require('${story}')`).join(',\n')}
   ];
 }`;
-    (0, fs_extra_1.writeFileSync)((0, path_1.join)(workspaceRoot, options.outputFile), newContents);
+    (0, node_fs_1.writeFileSync)((0, path_1.join)(workspaceRoot, options.outputFile), newContents);
 }

package/src/generators/application/application.js

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

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

@@ -9,7 +9,6 @@ async function normalizeOptions(host, options) {
         projectType: 'application',
         directory: options.directory,
         projectNameAndRootFormat: options.projectNameAndRootFormat,
-        callingGenerator: '@nx/react-native:application',
     });
     options.projectNameAndRootFormat = projectNameAndRootFormat;
     const nxJson = (0, devkit_1.readNxJson)(host);

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

@@ -10,7 +10,6 @@ export interface Schema {
   projectNameAndRootFormat?: ProjectNameAndRootFormat;
   tags?: string;
   unitTestRunner: 'jest' | 'none'; // default is jest
-  pascalCaseFiles?: boolean;
   classComponent?: boolean;
   js?: boolean;
   linter: Linter | LinterType;

package/src/generators/component/component.d.ts

@@ -1,5 +1,4 @@
 import { Schema } from './schema';
 import { Tree } from '@nx/devkit';
 export declare function reactNativeComponentGenerator(host: Tree, schema: Schema): Promise<void>;
-export declare function reactNativeComponentGeneratorInternal(host: Tree, schema: Schema): Promise<void>;
 export default reactNativeComponentGenerator;

package/src/generators/component/component.js

@@ -1,19 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.reactNativeComponentGenerator = reactNativeComponentGenerator;
-exports.reactNativeComponentGeneratorInternal = reactNativeComponentGeneratorInternal;
 const devkit_1 = require("@nx/devkit");
 const normalize_options_1 = require("./lib/normalize-options");
 const add_import_1 = require("./lib/add-import");
 const ensure_typescript_1 = require("@nx/js/src/utils/typescript/ensure-typescript");
 const path_1 = require("path");
 async function reactNativeComponentGenerator(host, schema) {
-    return reactNativeComponentGeneratorInternal(host, {
-        nameAndDirectoryFormat: 'derived',
-        ...schema,
-    });
-}
-async function reactNativeComponentGeneratorInternal(host, schema) {
     const options = await (0, normalize_options_1.normalizeOptions)(host, schema);
     createComponentFiles(host, options);
     addExportsToBarrel(host, options);

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

@@ -6,16 +6,10 @@ const artifact_name_and_directory_utils_1 = require("@nx/devkit/src/generators/a
 async function normalizeOptions(host, options) {
     assertValidOptions(options);
     const { artifactName: name, directory, fileName, filePath, project: projectName, } = await (0, artifact_name_and_directory_utils_1.determineArtifactNameAndDirectoryOptions)(host, {
-        artifactType: 'component',
-        callingGenerator: '@nx/react-native:component',
         name: options.name,
         directory: options.directory,
-        derivedDirectory: options.directory,
-        flat: options.flat,
         nameAndDirectoryFormat: options.nameAndDirectoryFormat,
-        project: options.project,
         fileExtension: 'tsx',
-        pascalCaseFile: options.pascalCaseFiles,
     });
     const project = (0, devkit_1.getProjects)(host).get(projectName);
     const { className } = (0, devkit_1.names)(name);

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

@@ -1,24 +1,14 @@
+import type { NameAndDirectoryFormat } from '@nx/devkit/src/generators/artifact-name-and-directory-utils';
+
 /**
  * Same as the @nx/react library schema, except it removes keys: style, routing, globalCss
  */
 export interface Schema {
   name: string;
-  /**
-   * @deprecated Provide the `directory` option instead and use the `as-provided` format. The project will be determined from the directory provided. It will be removed in Nx v20.
-   */
-  project: string;
   skipTests?: boolean;
   directory?: string;
   export?: boolean;
-  /**
-   * @deprecated Provide the `directory` option instead and use the `as-provided` format. This option will be removed in Nx v19.
-   */
-  pascalCaseFiles?: boolean;
   classComponent?: boolean;
   js?: boolean;
-  /**
-   * @deprecated Provide the `name` in pascal-case and use the `as-provided` format. This option will be removed in Nx v19.
-   */
-  flat?: boolean;
-  nameAndDirectoryFormat?: 'as-provided' | 'derived';
+  nameAndDirectoryFormat?: NameAndDirectoryFormat;
 }

package/src/generators/component/schema.json

@@ -7,24 +7,15 @@
   "type": "object",
   "examples": [
     {
-      "command": "nx g @nx/react-native:component my-component --project=mylib",
+      "command": "nx g @nx/react-native:component my-component --directory=mylib/src/lib/my-component",
       "description": "Generate a component in the `mylib` library"
     },
     {
-      "command": "nx g @nx/react-native:component my-component --project=mylib --classComponent",
+      "command": "nx g @nx/react-native:component my-component --directory=mylib/src/lib/my-component --classComponent",
       "description": "Generate a class component in the `mylib` library"
     }
   ],
   "properties": {
-    "project": {
-      "type": "string",
-      "description": "The name of the project.",
-      "alias": "p",
-      "$default": {
-        "$source": "projectName"
-      },
-      "x-deprecated": "Provide the `directory` option instead and use the `as-provided` format. The project will be determined from the directory provided. It will be removed in Nx v20."
-    },
     "name": {
       "type": "string",
       "description": "The name of the component.",
@@ -54,12 +45,6 @@
       "type": "string",
       "enum": ["as-provided", "derived"]
     },
-    "flat": {
-      "type": "boolean",
-      "description": "Create component at the source root rather than its own directory.",
-      "default": false,
-      "x-deprecated": "Provide the `directory` option instead and use the `as-provided` format. This option will be removed in Nx v19."
-    },
     "export": {
       "type": "boolean",
       "description": "When true, the component is exported from the project `index.ts` (if it exists).",
@@ -67,13 +52,6 @@
       "default": false,
       "x-prompt": "Should this component be exported in the project?"
     },
-    "pascalCaseFiles": {
-      "type": "boolean",
-      "description": "Use pascal case component file name (e.g. `App.tsx`).",
-      "alias": "P",
-      "default": false,
-      "x-deprecated": "Provide the `name` in pascal-case and use the `as-provided` format. This option will be removed in Nx v19."
-    },
     "classComponent": {
       "type": "boolean",
       "alias": "C",

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

@@ -10,7 +10,6 @@ async function normalizeOptions(host, options) {
         directory: options.directory,
         importPath: options.importPath,
         projectNameAndRootFormat: options.projectNameAndRootFormat,
-        callingGenerator: '@nx/react-native:library',
     });
     const nxJson = (0, devkit_1.readNxJson)(host);
     const addPluginDefault = process.env.NX_ADD_PLUGINS !== 'false' &&

package/src/generators/library/library.js

@@ -14,7 +14,6 @@ const log_show_project_command_1 = require("@nx/devkit/src/utils/log-show-projec
 async function reactNativeLibraryGenerator(host, schema) {
     return await reactNativeLibraryGeneratorInternal(host, {
         addPlugin: false,
-        projectNameAndRootFormat: 'derived',
         ...schema,
     });
 }

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

@@ -11,7 +11,6 @@ export interface Schema {
   skipTsConfig: boolean;
   skipFormat: boolean;
   tags?: string;
-  pascalCaseFiles?: boolean;
   unitTestRunner: 'jest' | 'none';
   linter: Linter | LinterType;
   publishable?: boolean;

package/src/generators/library/schema.json

@@ -62,12 +62,6 @@
       "description": "Do not update `tsconfig.json` for development experience.",
       "x-priority": "internal"
     },
-    "pascalCaseFiles": {
-      "type": "boolean",
-      "description": "Use pascal case component file name (e.g. `App.tsx`).",
-      "alias": "P",
-      "default": false
-    },
     "publishable": {
       "type": "boolean",
       "description": "Create a publishable library."

package/src/generators/web-configuration/files/base-vite/vite.config.ts__tmpl__

@@ -34,14 +34,12 @@ export default defineConfig({
   define: {
     global: 'window',
   },
-
   resolve: {
     extensions,
     alias: {
       'react-native': 'react-native-web',
     },
   },
-
   build: {
     reportCompressedSize: true,
     commonjsOptions: { transformMixedEsModules: true },
@@ -50,7 +48,6 @@ export default defineConfig({
       plugins: [rollupPlugin([/react-native-vector-icons/])],
     },
   },
-
   server: {
     port: 4200,
     host: 'localhost',
@@ -59,12 +56,10 @@ export default defineConfig({
       allow: ['..'],
     },
   },
-
   preview: {
     port: 4300,
     host: 'localhost',
   },
-
   optimizeDeps: {
     esbuildOptions: {
       resolveExtensions: extensions,
@@ -72,9 +67,7 @@ export default defineConfig({
       loader: { '.js': 'jsx' },
     },
   },
-
   plugins: [react(), nxViteTsPaths()],
-
   // Uncomment this if you are using workers.
   // worker: {
   //  plugins: [ nxViteTsPaths() ],

package/src/migrations/update-18-0-0/remove-symlink-target.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = update;
 const devkit_1 = require("@nx/devkit");
-const fs_extra_1 = require("fs-extra");
+const node_fs_1 = require("node:fs");
 /**
  * Remove ensure-symlink target.
  * It is going to be supported by react-native version 0.73 by default.
@@ -14,7 +14,7 @@ async function update(tree) {
             '@nx/react-native:ensure-symlink') {
             removeTargets(config.targets, 'ensure-symlink');
             (0, devkit_1.updateProjectConfiguration)(tree, projectName, config);
-            (0, fs_extra_1.removeSync)(`${config.root}/node_modules`);
+            (0, node_fs_1.rmSync)(`${config.root}/node_modules`, { recursive: true, force: true });
         }
     }
 }

package/src/utils/ensure-node-modules-symlink.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ensureNodeModulesSymlink = ensureNodeModulesSymlink;
-const path_1 = require("path");
+const node_fs_1 = require("node:fs");
 const os_1 = require("os");
-const fs_extra_1 = require("fs-extra");
+const path_1 = require("path");
 /**
  * This function symlink workspace node_modules folder with app project's node_mdules folder.
  * For yarn and npm, it will symlink the entire node_modules folder.
@@ -14,14 +14,14 @@ const fs_extra_1 = require("fs-extra");
  */
 function ensureNodeModulesSymlink(workspaceRoot, projectRoot) {
     const worksapceNodeModulesPath = (0, path_1.join)(workspaceRoot, 'node_modules');
-    if (!(0, fs_extra_1.existsSync)(worksapceNodeModulesPath)) {
+    if (!(0, node_fs_1.existsSync)(worksapceNodeModulesPath)) {
         throw new Error(`Cannot find ${worksapceNodeModulesPath}`);
     }
     const appNodeModulesPath = (0, path_1.join)(workspaceRoot, projectRoot, 'node_modules');
     // `mklink /D` requires admin privilege in Windows so we need to use junction
     const symlinkType = (0, os_1.platform)() === 'win32' ? 'junction' : 'dir';
-    if ((0, fs_extra_1.existsSync)(appNodeModulesPath)) {
-        (0, fs_extra_1.removeSync)(appNodeModulesPath);
+    if ((0, node_fs_1.existsSync)(appNodeModulesPath)) {
+        (0, node_fs_1.rmSync)(appNodeModulesPath, { recursive: true, force: true });
     }
-    (0, fs_extra_1.symlinkSync)(worksapceNodeModulesPath, appNodeModulesPath, symlinkType);
+    (0, node_fs_1.symlinkSync)(worksapceNodeModulesPath, appNodeModulesPath, symlinkType);
 }

package/src/utils/pod-install-task.js

@@ -3,11 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.runPodInstall = runPodInstall;
 exports.podInstall = podInstall;
 const child_process_1 = require("child_process");
+const node_fs_1 = require("node:fs");
 const os_1 = require("os");
+const path_1 = require("path");
 const chalk = require("chalk");
 const devkit_1 = require("@nx/devkit");
-const fs_extra_1 = require("fs-extra");
-const path_1 = require("path");
 const podInstallErrorMessage = `
 Running ${chalk.bold('pod install')} failed, see above.
 Do you have CocoaPods (https://cocoapods.org/) installed?
@@ -34,7 +34,7 @@ function runPodInstall(iosDirectory, install = true, options = {
             devkit_1.logger.info('Skipping `pod install` on non-darwin platform');
             return;
         }
-        if (!install || !(0, fs_extra_1.existsSync)((0, path_1.join)(iosDirectory, 'Podfile'))) {
+        if (!install || !(0, node_fs_1.existsSync)((0, path_1.join)(iosDirectory, 'Podfile'))) {
             devkit_1.logger.info('Skipping `pod install`');
             return;
         }
@@ -49,10 +49,11 @@ function podInstall(iosDirectory, options = {
     useBundler: false,
 }) {
     try {
-        if ((0, fs_extra_1.existsSync)((0, path_1.join)(iosDirectory, '.xcode.env'))) {
+        if ((0, node_fs_1.existsSync)((0, path_1.join)(iosDirectory, '.xcode.env'))) {
             (0, child_process_1.execSync)('touch .xcode.env', {
                 cwd: iosDirectory,
                 stdio: 'inherit',
+                windowsHide: true,
             });
         }
         const podCommand = [
@@ -63,6 +64,7 @@ function podInstall(iosDirectory, options = {
         (0, child_process_1.execSync)(podCommand, {
             cwd: iosDirectory,
             stdio: 'inherit',
+            windowsHide: true,
         });
     }
     catch (e) {