@nx/expo 19.8.2 → 19.8.4

package/.eslintrc.json

@@ -50,6 +50,10 @@
           {
             "name": "chalk",
             "message": "Please use `picocolors` in place of `chalk` for rendering terminal colors"
+          },
+          {
+            "name": "fs-extra",
+            "message": "Please use equivalent utilities from `node:fs` instead."
           }
         ]
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/expo",
-  "version": "19.8.2",
+  "version": "19.8.4",
   "private": false,
   "description": "The Expo Plugin for Nx contains executors and generators for managing and developing an expo application within your workspace. For example, you can directly build for different target platforms as well as generate projects and publish your code.",
   "keywords": [
@@ -28,22 +28,21 @@
   "main": "./index",
   "types": "index.d.ts",
   "dependencies": {
-    "@nx/devkit": "19.8.2",
-    "@nx/eslint": "19.8.2",
-    "@nx/jest": "19.8.2",
-    "@nx/js": "19.8.2",
-    "@nx/react": "19.8.2",
-    "@nx/web": "19.8.2",
-    "@nx/webpack": "19.8.2",
+    "@nx/devkit": "19.8.4",
+    "@nx/eslint": "19.8.4",
+    "@nx/jest": "19.8.4",
+    "@nx/js": "19.8.4",
+    "@nx/react": "19.8.4",
+    "@nx/web": "19.8.4",
+    "@nx/webpack": "19.8.4",
     "enhanced-resolve": "^5.8.3",
-    "fs-extra": "^11.1.0",
     "metro-config": "~0.80.4",
     "metro-resolver": "~0.80.4",
     "node-fetch": "^2.6.7",
     "picocolors": "^1.1.0",
     "tsconfig-paths": "^4.1.2",
     "tslib": "^2.3.0",
-    "@nrwl/expo": "19.8.2"
+    "@nrwl/expo": "19.8.4"
   },
   "executors": "./executors.json",
   "ng-update": {

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/src/executors/build/build.impl.js

@@ -3,9 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = buildExecutor;
 const devkit_1 = require("@nx/devkit");
 const js_1 = require("@nx/js");
-const fs_extra_1 = require("fs-extra");
-const path_1 = require("path");
 const child_process_1 = require("child_process");
+const node_fs_1 = require("node:fs");
+const path_1 = require("path");
 const resolve_eas_1 = require("../../utils/resolve-eas");
 let childProcess;
 async function* buildExecutor(options, context) {
@@ -83,7 +83,7 @@ function copyPackageJsonAndLock(packageManager, workspaceRoot, projectRoot) {
     const rootPackageJson = (0, devkit_1.readJsonFile)(packageJson);
     // do not copy package.json and lock file if workspaces are enabled
     if ((packageManager === 'pnpm' &&
-        (0, fs_extra_1.existsSync)((0, path_1.resolve)(workspaceRoot, 'pnpm-workspace.yaml'))) ||
+        (0, node_fs_1.existsSync)((0, path_1.resolve)(workspaceRoot, 'pnpm-workspace.yaml'))) ||
         rootPackageJson.workspaces) {
         return;
     }
@@ -100,15 +100,15 @@ function copyPackageJsonAndLock(packageManager, workspaceRoot, projectRoot) {
     projectPackageJson.dependencies = rootPackageJsonDependencies;
     projectPackageJson.devDependencies = rootPackageJsonDevDependencies;
     // Copy dependencies from root package.json to project package.json
-    (0, fs_extra_1.writeFileSync)(packageJsonProject, JSON.stringify(projectPackageJson, null, 2));
+    (0, devkit_1.writeJsonFile)(packageJsonProject, projectPackageJson);
     // Copy lock file from root to project
-    (0, fs_extra_1.copyFileSync)(lockFile, lockFileProject);
+    (0, node_fs_1.copyFileSync)(lockFile, lockFileProject);
     return () => {
         // Reset project package.json to original state
         projectPackageJson.dependencies = projectPackageJsonDependencies;
         projectPackageJson.devDependencies = projectPackageJsonDevDependencies;
-        (0, fs_extra_1.writeFileSync)(packageJsonProject, JSON.stringify(projectPackageJson, null, 2));
+        (0, node_fs_1.writeFileSync)(packageJsonProject, JSON.stringify(projectPackageJson, null, 2));
         // Remove lock file from project
-        (0, fs_extra_1.removeSync)(lockFileProject);
+        (0, node_fs_1.rmSync)(lockFileProject, { recursive: true, force: true });
     };
 }

package/src/executors/install/install.impl.js

@@ -25,8 +25,10 @@ async function installAndUpdatePackageJson(context, options) {
     const packages = typeof options.packages === 'string'
         ? options.packages.split(',')
         : options.packages ?? [];
-    // Use force in case there are any unmet peer dependencies.
-    await installAsync(packages, createInstallOptions(options), ['--force']);
+    await installAsync(packages, createInstallOptions({
+        fix: options.fix,
+        check: options.check,
+    }), createInstallOptions({ force: options.force }));
     const projectRoot = context.projectsConfigurations.projects[context.projectName].root;
     const workspacePackageJsonPath = (0, path_1.join)(context.root, 'package.json');
     const projectPackageJsonPath = (0, path_1.join)(context.root, projectRoot, 'package.json');

package/src/executors/install/schema.d.ts

@@ -4,4 +4,5 @@ export interface ExpoInstallOptions {
   packages?: string | string[]; // either a string separated by comma or a string array
   check?: boolean; // default is false
   fix?: boolean; // default is false
+  force?: boolean; // default is false
 }

package/src/executors/install/schema.json

@@ -29,6 +29,11 @@
       "type": "boolean",
       "description": "Automatically update any invalid package versions",
       "default": false
+    },
+    "force": {
+      "type": "boolean",
+      "description": "Force the installation of a package, even if it is already installed",
+      "default": false
     }
   }
 }

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

@@ -2,10 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = runExecutor;
 const devkit_1 = require("@nx/devkit");
-const path_1 = require("path");
 const child_process_1 = require("child_process");
+const node_fs_1 = require("node:fs");
 const os_1 = require("os");
-const fs_extra_1 = require("fs-extra");
+const path_1 = require("path");
 const prebuild_impl_1 = require("../prebuild/prebuild.impl");
 const pod_install_task_1 = require("../../utils/pod-install-task");
 let childProcess;
@@ -14,7 +14,7 @@ async function* runExecutor(options, context) {
         throw new Error(`The run-ios build requires Mac to run`);
     }
     const projectRoot = context.projectsConfigurations.projects[context.projectName].root;
-    if (!(0, fs_extra_1.existsSync)((0, path_1.join)(context.root, projectRoot, options.platform))) {
+    if (!(0, node_fs_1.existsSync)((0, path_1.join)(context.root, projectRoot, options.platform))) {
         await (0, prebuild_impl_1.prebuildAsync)(context.root, projectRoot, {
             install: options.install,
             platform: options.platform,

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.
@@ -13,7 +13,7 @@ async function update(tree) {
         if (config.targets?.['ensure-symlink']?.executor === '@nx/expo: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 pc = require("picocolors");
 const devkit_1 = require("@nx/devkit");
-const fs_extra_1 = require("fs-extra");
-const path_1 = require("path");
 const podInstallErrorMessage = `
 Running ${pc.bold('pod install')} failed, see above.
 Do you have CocoaPods (https://cocoapods.org/) installed?
@@ -33,7 +33,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;
         }
@@ -47,7 +47,7 @@ function podInstall(iosDirectory, options = {
     deployment: 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',