@nx/expo 19.7.3 → 19.8.0-beta.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/expo",
-  "version": "19.7.3",
+  "version": "19.8.0-beta.0",
   "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,7 +28,7 @@
   "main": "./index",
   "types": "index.d.ts",
   "dependencies": {
-    "@nx/devkit": "19.7.3",
+    "@nx/devkit": "19.8.0-beta.0",
     "chalk": "^4.1.0",
     "enhanced-resolve": "^5.8.3",
     "fs-extra": "^11.1.0",
@@ -37,13 +37,13 @@
     "node-fetch": "^2.6.7",
     "tslib": "^2.3.0",
     "tsconfig-paths": "^4.1.2",
-    "@nx/jest": "19.7.3",
-    "@nx/js": "19.7.3",
-    "@nx/eslint": "19.7.3",
-    "@nx/react": "19.7.3",
-    "@nx/web": "19.7.3",
-    "@nx/webpack": "19.7.3",
-    "@nrwl/expo": "19.7.3"
+    "@nx/jest": "19.8.0-beta.0",
+    "@nx/js": "19.8.0-beta.0",
+    "@nx/eslint": "19.8.0-beta.0",
+    "@nx/react": "19.8.0-beta.0",
+    "@nx/web": "19.8.0-beta.0",
+    "@nx/webpack": "19.8.0-beta.0",
+    "@nrwl/expo": "19.8.0-beta.0"
   },
   "executors": "./executors.json",
   "ng-update": {

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

@@ -5,4 +5,3 @@ export interface ExpoInstallOutput {
 }
 export default function installExecutor(options: ExpoInstallOptions, context: ExecutorContext): AsyncGenerator<ExpoInstallOutput>;
 export declare function installAndUpdatePackageJson(context: ExecutorContext, options: ExpoInstallOptions): Promise<void>;
-export declare function installAsync(workspaceRoot: string, options: ExpoInstallOptions): Promise<number>;

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

@@ -2,10 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = installExecutor;
 exports.installAndUpdatePackageJson = installAndUpdatePackageJson;
-exports.installAsync = installAsync;
 const devkit_1 = require("@nx/devkit");
 const fileutils_1 = require("nx/src/utils/fileutils");
-const child_process_1 = require("child_process");
 const path_1 = require("path");
 const sync_deps_impl_1 = require("../sync-deps/sync-deps.impl");
 let childProcess;
@@ -23,54 +21,31 @@ async function* installExecutor(options, context) {
     }
 }
 async function installAndUpdatePackageJson(context, options) {
-    await installAsync(context.root, options);
+    const { installAsync } = require('@expo/cli/build/src/install/installAsync');
+    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']);
     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');
     const workspacePackageJson = (0, fileutils_1.readJsonFile)(workspacePackageJsonPath);
     const projectPackageJson = (0, fileutils_1.readJsonFile)(projectPackageJsonPath);
-    const packages = typeof options.packages === 'string'
-        ? options.packages.split(',')
-        : options.packages;
     (0, sync_deps_impl_1.displayNewlyAddedDepsMessage)(context.projectName, await (0, sync_deps_impl_1.syncDeps)(context.projectName, projectPackageJson, projectPackageJsonPath, workspacePackageJson, context.projectGraph, packages));
 }
-function installAsync(workspaceRoot, options) {
-    return new Promise((resolve, reject) => {
-        childProcess = (0, child_process_1.fork)(require.resolve('@expo/cli/build/bin/cli'), ['install', ...createInstallOptions(options)], { cwd: workspaceRoot, env: process.env });
-        // Ensure the child process is killed when the parent exits
-        process.on('exit', () => childProcess.kill());
-        process.on('SIGTERM', () => childProcess.kill());
-        childProcess.on('error', (err) => {
-            reject(err);
-        });
-        childProcess.on('exit', (code) => {
-            if (code === 0) {
-                resolve(code);
-            }
-            else {
-                reject(code);
-            }
-        });
-    });
-}
 // options from https://github.com/expo/expo/blob/main/packages/%40expo/cli/src/install/index.ts
 function createInstallOptions(options) {
     return Object.keys(options).reduce((acc, k) => {
         const v = options[k];
-        if (k === 'packages') {
-            const packages = typeof v === 'string' ? v.split(',') : v;
-            acc.push(...packages);
+        if (typeof v === 'boolean') {
+            if (v === true) {
+                // when true, does not need to pass the value true, just need to pass the flag in kebob case
+                acc.push(`--${(0, devkit_1.names)(k).fileName}`);
+            }
         }
         else {
-            if (typeof v === 'boolean') {
-                if (v === true) {
-                    // when true, does not need to pass the value true, just need to pass the flag in kebob case
-                    acc.push(`--${(0, devkit_1.names)(k).fileName}`);
-                }
-            }
-            else {
-                acc.push(`--${(0, devkit_1.names)(k).fileName}`, v);
-            }
+            acc.push(`--${(0, devkit_1.names)(k).fileName}`, v);
         }
         return acc;
     }, []);

package/src/executors/prebuild/prebuild.impl.js

@@ -6,14 +6,14 @@ const devkit_1 = require("@nx/devkit");
 const child_process_1 = require("child_process");
 const path_1 = require("path");
 const pod_install_task_1 = require("../../utils/pod-install-task");
-const install_impl_1 = require("../install/install.impl");
 let childProcess;
 async function* prebuildExecutor(options, context) {
     const projectRoot = context.projectsConfigurations.projects[context.projectName].root;
     try {
         await prebuildAsync(context.root, projectRoot, options);
         if (options.install) {
-            await (0, install_impl_1.installAsync)(devkit_1.workspaceRoot, {});
+            const { installAsync, } = require('@expo/cli/build/src/install/installAsync');
+            await installAsync([], {});
             if (options.platform === 'ios') {
                 (0, pod_install_task_1.podInstall)((0, path_1.join)(context.root, projectRoot, 'ios'));
             }

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

@@ -8,7 +8,6 @@ const os_1 = require("os");
 const fs_extra_1 = require("fs-extra");
 const prebuild_impl_1 = require("../prebuild/prebuild.impl");
 const pod_install_task_1 = require("../../utils/pod-install-task");
-const install_impl_1 = require("../install/install.impl");
 let childProcess;
 async function* runExecutor(options, context) {
     if ((0, os_1.platform)() !== 'darwin' && options.platform === 'ios') {
@@ -23,7 +22,8 @@ async function* runExecutor(options, context) {
         });
     }
     if (options.install) {
-        await (0, install_impl_1.installAsync)(context.root, {});
+        const { installAsync, } = require('@expo/cli/build/src/install/installAsync');
+        await installAsync([], {});
         if (options.platform === 'ios') {
             (0, pod_install_task_1.podInstall)((0, path_1.join)(context.root, projectRoot, 'ios'));
         }

package/src/generators/convert-to-inferred/convert-to-inferred.js

@@ -95,7 +95,7 @@ async function convertToInferred(tree, options) {
         },
     ], options.project);
     if (migratedProjects.size === 0) {
-        throw new Error('Could not find any targets to migrate.');
+        throw new executor_to_plugin_migrator_1.NoTargetsToMigrateError();
     }
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(tree);

package/src/utils/add-linting.js

@@ -5,6 +5,7 @@ const eslint_1 = require("@nx/eslint");
 const devkit_1 = require("@nx/devkit");
 const lint_1 = require("@nx/react/src/utils/lint");
 const eslint_file_1 = require("@nx/eslint/src/generators/utils/eslint-file");
+const flat_config_1 = require("@nx/eslint/src/utils/flat-config");
 async function addLinting(host, options) {
     if (options.linter === eslint_1.Linter.None) {
         return () => { };
@@ -20,7 +21,21 @@ async function addLinting(host, options) {
     });
     tasks.push(lintTask);
     if ((0, eslint_file_1.isEslintConfigSupported)(host)) {
-        (0, eslint_file_1.addExtendsToLintConfig)(host, options.projectRoot, 'plugin:@nx/react');
+        if ((0, flat_config_1.useFlatConfig)(host)) {
+            (0, eslint_file_1.addPredefinedConfigToFlatLintConfig)(host, options.projectRoot, 'flat/react');
+            // Add an empty rules object to users know how to add/override rules
+            (0, eslint_file_1.addOverrideToLintConfig)(host, options.projectRoot, {
+                files: ['*.ts', '*.tsx', '*.js', '*.jsx'],
+                rules: {},
+            });
+        }
+        else {
+            const addExtendsTask = (0, eslint_file_1.addExtendsToLintConfig)(host, options.projectRoot, {
+                name: 'plugin:@nx/react',
+                needCompatFixup: true,
+            });
+            tasks.push(addExtendsTask);
+        }
         (0, eslint_file_1.addIgnoresToLintConfig)(host, options.projectRoot, [
             '.expo',
             'web-build',