@nrwl/expo 14.4.4 → 14.4.6

package/src/executors/export/export.impl.js

@@ -0,0 +1,69 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+const devkit_1 = require("@nrwl/devkit");
+const child_process_1 = require("child_process");
+const path_1 = require("path");
+const ensure_node_modules_symlink_1 = require("../../utils/ensure-node-modules-symlink");
+let childProcess;
+function exportExecutor(options, context) {
+    return tslib_1.__asyncGenerator(this, arguments, function* exportExecutor_1() {
+        const projectRoot = context.projectsConfigurations.projects[context.projectName].root;
+        (0, ensure_node_modules_symlink_1.ensureNodeModulesSymlink)(context.root, projectRoot);
+        try {
+            yield tslib_1.__await(exportAsync(context.root, projectRoot, options));
+            yield yield tslib_1.__await({
+                success: true,
+            });
+        }
+        finally {
+            if (childProcess) {
+                childProcess.kill();
+            }
+        }
+    });
+}
+exports.default = exportExecutor;
+function exportAsync(workspaceRoot, projectRoot, options) {
+    return new Promise((resolve, reject) => {
+        childProcess = (0, child_process_1.fork)((0, path_1.join)(workspaceRoot, './node_modules/@expo/cli/build/bin/cli'), [
+            `export${options.bundler === 'webpack' ? ':web' : ''}`,
+            '.',
+            ...createExportOptions(options),
+        ], { cwd: (0, path_1.join)(workspaceRoot, projectRoot), 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);
+            }
+        });
+    });
+}
+const nxOptions = ['bundler'];
+// options from https://github.com/expo/expo/blob/main/packages/@expo/cli/src/export/index.ts
+function createExportOptions(options) {
+    return Object.keys(options).reduce((acc, k) => {
+        if (!nxOptions.includes(k)) {
+            const v = options[k];
+            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);
+            }
+        }
+        return acc;
+    }, []);
+}
+//# sourceMappingURL=export.impl.js.map

package/src/executors/export/export.impl.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"export.impl.js","sourceRoot":"","sources":["../../../../../../packages/expo/src/executors/export/export.impl.ts"],"names":[],"mappings":";;;AAAA,yCAAsD;AACtD,iDAAmD;AACnD,+BAA4B;AAE5B,yFAAmF;AAOnF,IAAI,YAA0B,CAAC;AAE/B,SAA+B,cAAc,CAC3C,OAA6B,EAC7B,OAAwB;;QAExB,MAAM,WAAW,GACf,OAAO,CAAC,sBAAsB,CAAC,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC;QACpE,IAAA,sDAAwB,EAAC,OAAO,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;QAEpD,IAAI;YACF,sBAAM,WAAW,CAAC,OAAO,CAAC,IAAI,EAAE,WAAW,EAAE,OAAO,CAAC,CAAA,CAAC;YAEtD,4BAAM;gBACJ,OAAO,EAAE,IAAI;aACd,CAAA,CAAC;SACH;gBAAS;YACR,IAAI,YAAY,EAAE;gBAChB,YAAY,CAAC,IAAI,EAAE,CAAC;aACrB;SACF;IACH,CAAC;CAAA;AAnBD,iCAmBC;AAED,SAAS,WAAW,CAClB,aAAqB,EACrB,WAAmB,EACnB,OAA6B;IAE7B,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACrC,YAAY,GAAG,IAAA,oBAAI,EACjB,IAAA,WAAI,EAAC,aAAa,EAAE,wCAAwC,CAAC,EAC7D;YACE,SAAS,OAAO,CAAC,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE;YACtD,GAAG;YACH,GAAG,mBAAmB,CAAC,OAAO,CAAC;SAChC,EACD,EAAE,GAAG,EAAE,IAAA,WAAI,EAAC,aAAa,EAAE,WAAW,CAAC,EAAE,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE,CAC5D,CAAC;QAEF,2DAA2D;QAC3D,OAAO,CAAC,EAAE,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC,YAAY,CAAC,IAAI,EAAE,CAAC,CAAC;QAC9C,OAAO,CAAC,EAAE,CAAC,SAAS,EAAE,GAAG,EAAE,CAAC,YAAY,CAAC,IAAI,EAAE,CAAC,CAAC;QAEjD,YAAY,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE;YAC/B,MAAM,CAAC,GAAG,CAAC,CAAC;QACd,CAAC,CAAC,CAAC;QACH,YAAY,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE;YAC/B,IAAI,IAAI,KAAK,CAAC,EAAE;gBACd,OAAO,CAAC,IAAI,CAAC,CAAC;aACf;iBAAM;gBACL,MAAM,CAAC,IAAI,CAAC,CAAC;aACd;QACH,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC;AAED,MAAM,SAAS,GAAG,CAAC,SAAS,CAAC,CAAC;AAC9B,6FAA6F;AAC7F,SAAS,mBAAmB,CAAC,OAA6B;IACxD,OAAO,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE;QAC5C,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE;YAC1B,MAAM,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;YACrB,IAAI,OAAO,CAAC,KAAK,SAAS,EAAE;gBAC1B,IAAI,CAAC,KAAK,IAAI,EAAE;oBACd,4FAA4F;oBAC5F,GAAG,CAAC,IAAI,CAAC,KAAK,IAAA,cAAK,EAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC;iBACpC;aACF;iBAAM;gBACL,GAAG,CAAC,IAAI,CAAC,KAAK,IAAA,cAAK,EAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,CAAC;aACvC;SACF;QACD,OAAO,GAAG,CAAC;IACb,CAAC,EAAE,EAAE,CAAC,CAAC;AACT,CAAC"}

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

@@ -0,0 +1,11 @@
+// options form https://github.com/expo/expo/blob/main/packages/%40expo/cli/src/export/resolveOptions.ts
+export interface ExportExecutorSchema {
+  platform?: 'ios' | 'android' | 'all' | 'web'; // default is 'all'
+  outputDir?: string;
+  clear?: boolean;
+  dev?: boolean;
+  maxWorkers?: number;
+  dumpAssetmap?: boolean;
+  dumpSourcemap?: boolean;
+  bundler: 'metro' | 'webpack';
+}

package/src/executors/export/schema.json

@@ -0,0 +1,48 @@
+{
+  "cli": "nx",
+  "version": 2,
+  "outputCapture": "direct-nodejs",
+  "$id": "NxExpoExport",
+  "$schema": "http://json-schema.org/schema",
+  "title": "Expo Export",
+  "description": "Export the JavaScript and assets for your app using Metro/webpack bundler.",
+  "type": "object",
+  "properties": {
+    "platform": {
+      "description": "Choose the platform to compile for",
+      "enum": ["ios", "android", "all", "web"],
+      "alias": "p",
+      "x-priority": "important"
+    },
+    "dev": {
+      "type": "boolean",
+      "description": "Bundle for development environments without minifying code or stripping the __DEV__ boolean. Configure static files for developing locally using a non-https server."
+    },
+    "clear": {
+      "type": "boolean",
+      "description": "Clear the bundler cache before exporting"
+    },
+    "outputDir": {
+      "type": "string",
+      "description": "The directory to export the static files to. Default: dist"
+    },
+    "maxWorkers": {
+      "type": "number",
+      "description": "Maximum number of tasks to allow Metro to spawn"
+    },
+    "dumpAssetmap": {
+      "type": "string",
+      "description": "Dump the asset map for further processing"
+    },
+    "dumpSourcemap": {
+      "type": "string",
+      "description": "Dump the source map for debugging the JS bundle"
+    },
+    "bundler": {
+      "enum": ["metro", "webpack"],
+      "description": "Choose the bundler to compile for",
+      "default": "metro"
+    }
+  },
+  "required": []
+}

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

@@ -0,0 +1,2 @@
+declare const _default: any;
+export default _default;

package/src/executors/install/compat.js

@@ -0,0 +1,6 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const devkit_1 = require("@nrwl/devkit");
+const install_impl_1 = require("./install.impl");
+exports.default = (0, devkit_1.convertNxExecutor)(install_impl_1.default);
+//# sourceMappingURL=compat.js.map

package/src/executors/install/compat.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"compat.js","sourceRoot":"","sources":["../../../../../../packages/expo/src/executors/install/compat.ts"],"names":[],"mappings":";;AAAA,yCAAiD;AAEjD,iDAA6C;AAE7C,kBAAe,IAAA,0BAAiB,EAAC,sBAAe,CAAC,CAAC"}

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

@@ -0,0 +1,7 @@
+import { ExecutorContext } from '@nrwl/devkit';
+import { ExpoInstallOptions } from './schema';
+export interface ExpoInstallOutput {
+    success: boolean;
+}
+export default function installExecutor(options: ExpoInstallOptions, context: ExecutorContext): AsyncGenerator<ExpoInstallOutput>;
+export declare function installAsync(workspaceRoot: string, options: ExpoInstallOptions): Promise<number>;

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

@@ -0,0 +1,70 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.installAsync = void 0;
+const tslib_1 = require("tslib");
+const devkit_1 = require("@nrwl/devkit");
+const child_process_1 = require("child_process");
+const path_1 = require("path");
+const ensure_node_modules_symlink_1 = require("../../utils/ensure-node-modules-symlink");
+let childProcess;
+function installExecutor(options, context) {
+    return tslib_1.__asyncGenerator(this, arguments, function* installExecutor_1() {
+        const projectRoot = context.projectsConfigurations.projects[context.projectName].root;
+        try {
+            yield tslib_1.__await(installAsync(context.root, options));
+            (0, ensure_node_modules_symlink_1.ensureNodeModulesSymlink)(context.root, projectRoot);
+            yield yield tslib_1.__await({
+                success: true,
+            });
+        }
+        finally {
+            if (childProcess) {
+                childProcess.kill();
+            }
+        }
+    });
+}
+exports.default = installExecutor;
+function installAsync(workspaceRoot, options) {
+    return new Promise((resolve, reject) => {
+        childProcess = (0, child_process_1.fork)((0, path_1.join)(workspaceRoot, './node_modules/@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);
+            }
+        });
+    });
+}
+exports.installAsync = installAsync;
+// 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);
+        }
+        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);
+            }
+        }
+        return acc;
+    }, []);
+}
+//# sourceMappingURL=install.impl.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"install.impl.js","sourceRoot":"","sources":["../../../../../../packages/expo/src/executors/install/install.impl.ts"],"names":[],"mappings":";;;;AAAA,yCAAsD;AACtD,iDAAmD;AACnD,+BAA4B;AAE5B,yFAAmF;AAOnF,IAAI,YAA0B,CAAC;AAE/B,SAA+B,eAAe,CAC5C,OAA2B,EAC3B,OAAwB;;QAExB,MAAM,WAAW,GACf,OAAO,CAAC,sBAAsB,CAAC,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC;QAEpE,IAAI;YACF,sBAAM,YAAY,CAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,CAAA,CAAC;YAC1C,IAAA,sDAAwB,EAAC,OAAO,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;YAEpD,4BAAM;gBACJ,OAAO,EAAE,IAAI;aACd,CAAA,CAAC;SACH;gBAAS;YACR,IAAI,YAAY,EAAE;gBAChB,YAAY,CAAC,IAAI,EAAE,CAAC;aACrB;SACF;IACH,CAAC;CAAA;AAnBD,kCAmBC;AAED,SAAgB,YAAY,CAC1B,aAAqB,EACrB,OAA2B;IAE3B,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACrC,YAAY,GAAG,IAAA,oBAAI,EACjB,IAAA,WAAI,EAAC,aAAa,EAAE,wCAAwC,CAAC,EAC7D,CAAC,SAAS,EAAE,GAAG,oBAAoB,CAAC,OAAO,CAAC,CAAC,EAC7C,EAAE,GAAG,EAAE,aAAa,EAAE,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE,CACzC,CAAC;QAEF,2DAA2D;QAC3D,OAAO,CAAC,EAAE,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC,YAAY,CAAC,IAAI,EAAE,CAAC,CAAC;QAC9C,OAAO,CAAC,EAAE,CAAC,SAAS,EAAE,GAAG,EAAE,CAAC,YAAY,CAAC,IAAI,EAAE,CAAC,CAAC;QAEjD,YAAY,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE;YAC/B,MAAM,CAAC,GAAG,CAAC,CAAC;QACd,CAAC,CAAC,CAAC;QACH,YAAY,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE;YAC/B,IAAI,IAAI,KAAK,CAAC,EAAE;gBACd,OAAO,CAAC,IAAI,CAAC,CAAC;aACf;iBAAM;gBACL,MAAM,CAAC,IAAI,CAAC,CAAC;aACd;QACH,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC;AA1BD,oCA0BC;AAED,gGAAgG;AAChG,SAAS,oBAAoB,CAAC,OAA2B;IACvD,OAAO,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE;QAC5C,MAAM,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;QACrB,IAAI,CAAC,KAAK,UAAU,EAAE;YACpB,MAAM,QAAQ,GAAG,OAAO,CAAC,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YAC1D,GAAG,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC,CAAC;SACvB;aAAM;YACL,IAAI,OAAO,CAAC,KAAK,SAAS,EAAE;gBAC1B,IAAI,CAAC,KAAK,IAAI,EAAE;oBACd,4FAA4F;oBAC5F,GAAG,CAAC,IAAI,CAAC,KAAK,IAAA,cAAK,EAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC;iBACpC;aACF;iBAAM;gBACL,GAAG,CAAC,IAAI,CAAC,KAAK,IAAA,cAAK,EAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,CAAC;aACvC;SACF;QACD,OAAO,GAAG,CAAC;IACb,CAAC,EAAE,EAAE,CAAC,CAAC;AACT,CAAC"}

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

@@ -0,0 +1,7 @@
+// options from https://github.com/expo/expo/blob/main/packages/@expo/cli/src/install/index.ts
+
+export interface ExpoInstallOptions {
+  packages?: string | string[]; // either a string seperated by comma or a string array
+  check: boolean; // default is true
+  fix: boolean; // default is false
+}

package/src/executors/install/schema.json

@@ -0,0 +1,34 @@
+{
+  "cli": "nx",
+  "version": 2,
+  "outputCapture": "direct-nodejs",
+  "$id": "NxExpoInstall",
+  "$schema": "http://json-schema.org/schema",
+  "title": "Expo Install",
+  "description": "Install a module or other package to a project.",
+  "type": "object",
+  "properties": {
+    "packages": {
+      "type": "array",
+      "items": {
+        "type": "string"
+      },
+      "default": [],
+      "description": "The names of packages to install",
+      "$default": {
+        "$source": "argv",
+        "index": 0
+      }
+    },
+    "check": {
+      "type": "boolean",
+      "description": "Check which installed packages need to be updated",
+      "default": true
+    },
+    "fix": {
+      "type": "boolean",
+      "description": "Automatically update any invalid package versions",
+      "default": false
+    }
+  }
+}

package/src/executors/prebuild/compat.d.ts

@@ -0,0 +1,2 @@
+declare const _default: any;
+export default _default;

package/src/executors/prebuild/compat.js

@@ -0,0 +1,6 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const devkit_1 = require("@nrwl/devkit");
+const prebuild_impl_1 = require("./prebuild.impl");
+exports.default = (0, devkit_1.convertNxExecutor)(prebuild_impl_1.default);
+//# sourceMappingURL=compat.js.map

package/src/executors/prebuild/compat.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"compat.js","sourceRoot":"","sources":["../../../../../../packages/expo/src/executors/prebuild/compat.ts"],"names":[],"mappings":";;AAAA,yCAAiD;AAEjD,mDAA+C;AAE/C,kBAAe,IAAA,0BAAiB,EAAC,uBAAgB,CAAC,CAAC"}

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

@@ -0,0 +1,6 @@
+import { ExecutorContext } from '@nrwl/devkit';
+import { ExpoPrebuildOptions } from './schema';
+export interface ExpoPrebuildOutput {
+    success: boolean;
+}
+export default function prebuildExecutor(options: ExpoPrebuildOptions, context: ExecutorContext): AsyncGenerator<ExpoPrebuildOutput>;

package/src/executors/{eject/eject.impl.js → prebuild/prebuild.impl.js}

@@ -1,18 +1,24 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
+const devkit_1 = require("@nrwl/devkit");
 const child_process_1 = require("child_process");
 const path_1 = require("path");
 const ensure_node_modules_symlink_1 = require("../../utils/ensure-node-modules-symlink");
 const pod_install_task_1 = require("../../utils/pod-install-task");
+const install_impl_1 = require("../install/install.impl");
 let childProcess;
-function ejectExecutor(options, context) {
-    return tslib_1.__asyncGenerator(this, arguments, function* ejectExecutor_1() {
-        const projectRoot = context.workspace.projects[context.projectName].root;
+function prebuildExecutor(options, context) {
+    return tslib_1.__asyncGenerator(this, arguments, function* prebuildExecutor_1() {
+        const projectRoot = context.projectsConfigurations.projects[context.projectName].root;
         (0, ensure_node_modules_symlink_1.ensureNodeModulesSymlink)(context.root, projectRoot);
         try {
-            yield tslib_1.__await(ejectAsync(context.root, projectRoot, options));
+            yield tslib_1.__await(prebuildAsync(context.root, projectRoot, options));
             if (options.install) {
+                yield tslib_1.__await((0, install_impl_1.installAsync)(context.root, {
+                    check: true,
+                    fix: false,
+                }));
                 yield tslib_1.__await((0, pod_install_task_1.podInstall)((0, path_1.join)(context.root, projectRoot, 'ios')));
             }
             yield yield tslib_1.__await({
@@ -26,10 +32,10 @@ function ejectExecutor(options, context) {
         }
     });
 }
-exports.default = ejectExecutor;
-function ejectAsync(workspaceRoot, projectRoot, options) {
+exports.default = prebuildExecutor;
+function prebuildAsync(workspaceRoot, projectRoot, options) {
     return new Promise((resolve, reject) => {
-        childProcess = (0, child_process_1.fork)((0, path_1.join)(workspaceRoot, './node_modules/expo-cli/bin/expo.js'), ['eject', ...createEjectOptions(options), '--no-install'], { cwd: (0, path_1.join)(workspaceRoot, projectRoot) });
+        childProcess = (0, child_process_1.fork)((0, path_1.join)(workspaceRoot, './node_modules/@expo/cli/build/bin/cli'), ['prebuild', ...createPrebuildOptions(options), '--no-install'], { cwd: (0, path_1.join)(workspaceRoot, projectRoot), env: process.env });
         // Ensure the child process is killed when the parent exits
         process.on('exit', () => childProcess.kill());
         process.on('SIGTERM', () => childProcess.kill());
@@ -46,14 +52,15 @@ function ejectAsync(workspaceRoot, projectRoot, options) {
         });
     });
 }
-const nxOptions = ['install'];
-function createEjectOptions(options) {
+const nxOptions = ['install', 'interactive'];
+// options from https://github.com/expo/expo/blob/main/packages/%40expo/cli/src/prebuild/index.ts
+function createPrebuildOptions(options) {
     return Object.keys(options).reduce((acc, k) => {
-        const v = options[k];
         if (!nxOptions.includes(k)) {
-            acc.push(`--${k}`, v);
+            const v = options[k];
+            acc.push(`--${(0, devkit_1.names)(k).fileName}=${v}`);
         }
         return acc;
     }, []);
 }
-//# sourceMappingURL=eject.impl.js.map
+//# sourceMappingURL=prebuild.impl.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"prebuild.impl.js","sourceRoot":"","sources":["../../../../../../packages/expo/src/executors/prebuild/prebuild.impl.ts"],"names":[],"mappings":"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"}

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

@@ -0,0 +1,10 @@
+// options from https://github.com/expo/expo/blob/main/packages/%40expo/cli/src/prebuild/index.ts
+
+import { string } from 'yargs';
+
+export interface ExpoPrebuildOptions {
+  clean: boolean; // default is false
+  install: boolean; // default is true
+  platform: 'all' | 'android' | 'ios'; // default is all
+  template?: string;
+}

package/src/executors/prebuild/schema.json

@@ -0,0 +1,34 @@
+{
+  "cli": "nx",
+  "version": 2,
+  "outputCapture": "direct-nodejs",
+  "$id": "NxExpoPrebuild",
+  "$schema": "http://json-schema.org/schema",
+  "title": "Expo Prebuild",
+  "description": "Create native iOS and Android project files for building natively.",
+  "type": "object",
+  "properties": {
+    "clean": {
+      "type": "boolean",
+      "description": "Delete the native folders and regenerate them before applying changes",
+      "default": false
+    },
+    "install": {
+      "type": "boolean",
+      "description": "Installing npm packages and CocoaPods.",
+      "default": false,
+      "x-priority": "internal"
+    },
+    "platform": {
+      "description": "Platforms to sync",
+      "default": "all",
+      "enum": ["ios", "android", "all"],
+      "alias": "p",
+      "x-priority": "important"
+    },
+    "template": {
+      "type": "string",
+      "description": "Project template to clone from. File path pointing to a local tar file or a github repo"
+    }
+  }
+}

package/src/executors/publish/publish.impl.js

@@ -9,10 +9,11 @@ const sync_deps_impl_1 = require("../sync-deps/sync-deps.impl");
 let childProcess;
 function publishExecutor(options, context) {
     return tslib_1.__asyncGenerator(this, arguments, function* publishExecutor_1() {
-        const projectRoot = context.workspace.projects[context.projectName].root;
+        devkit_1.logger.warn('@nrwl/expo:publish is deprecated and will be removed in Nx 16.');
+        const projectRoot = context.projectsConfigurations.projects[context.projectName].root;
         (0, ensure_node_modules_symlink_1.ensureNodeModulesSymlink)(context.root, projectRoot);
         if (options.sync) {
-            (0, sync_deps_impl_1.displayNewlyAddedDepsMessage)(context.projectName, yield tslib_1.__await((0, sync_deps_impl_1.syncDeps)(context.projectName, projectRoot)));
+            (0, sync_deps_impl_1.displayNewlyAddedDepsMessage)(context.projectName, yield tslib_1.__await((0, sync_deps_impl_1.syncDeps)(context.projectName, projectRoot, context.root, context.projectGraph)));
         }
         try {
             yield tslib_1.__await(runCliPublish(context.root, projectRoot, options));

package/src/executors/publish/publish.impl.js.map

@@ -1 +1 @@
-{"version":3,"file":"publish.impl.js","sourceRoot":"","sources":["../../../../../../packages/expo/src/executors/publish/publish.impl.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"publish.impl.js","sourceRoot":"","sources":["../../../../../../packages/expo/src/executors/publish/publish.impl.ts"],"names":[],"mappings":"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"}

package/src/executors/publish/schema.json

@@ -1,9 +1,11 @@
 {
+  "version": 2,
+  "outputCapture": "direct-nodejs",
   "cli": "nx",
   "$id": "NxExpoPublish",
   "$schema": "http://json-schema.org/schema",
   "title": "Publish for Expo",
-  "description": "Deploy a project to Expo hosting",
+  "description": "Deploy a project to Expo hosting.",
   "type": "object",
   "properties": {
     "quiet": {
@@ -27,7 +29,8 @@
       "enum": ["managed", "bare"],
       "default": "managed",
       "description": "Target environment for which this publish is intended. Options are managed or bare.",
-      "alias": "t"
+      "alias": "t",
+      "x-priority": "important"
     },
     "maxWorkers": {
       "type": "number",

package/src/executors/publish-set/publish-set.impl.js

@@ -8,7 +8,8 @@ const ensure_node_modules_symlink_1 = require("../../utils/ensure-node-modules-s
 let childProcess;
 function publishSetExecutor(options, context) {
     return tslib_1.__asyncGenerator(this, arguments, function* publishSetExecutor_1() {
-        const projectRoot = context.workspace.projects[context.projectName].root;
+        devkit_1.logger.warn('@nrwl/expo:publish-set is deprecated and will be removed in Nx 16.');
+        const projectRoot = context.projectsConfigurations.projects[context.projectName].root;
         (0, ensure_node_modules_symlink_1.ensureNodeModulesSymlink)(context.root, projectRoot);
         try {
             yield tslib_1.__await(runCliPublishSet(context.root, projectRoot, options));

package/src/executors/publish-set/publish-set.impl.js.map

@@ -1 +1 @@
-{"version":3,"file":"publish-set.impl.js","sourceRoot":"","sources":["../../../../../../packages/expo/src/executors/publish-set/publish-set.impl.ts"],"names":[],"mappings":";;;AAAA,yCAAsD;AACtD,+BAA4B;AAC5B,iDAAmD;AAEnD,yFAAmF;AAOnF,IAAI,YAA0B,CAAC;AAE/B,SAA+B,kBAAkB,CAC/C,OAA8B,EAC9B,OAAwB;;QAExB,MAAM,WAAW,GAAG,OAAO,CAAC,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC;QACzE,IAAA,sDAAwB,EAAC,OAAO,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;QAEpD,IAAI;YACF,sBAAM,gBAAgB,CAAC,OAAO,CAAC,IAAI,EAAE,WAAW,EAAE,OAAO,CAAC,CAAA,CAAC;YAE3D,4BAAM,EAAE,OAAO,EAAE,IAAI,EAAE,CAAA,CAAC;SACzB;gBAAS;YACR,IAAI,YAAY,EAAE;gBAChB,YAAY,CAAC,IAAI,EAAE,CAAC;aACrB;SACF;IACH,CAAC;CAAA;AAhBD,qCAgBC;AAED,SAAS,gBAAgB,CACvB,aAAqB,EACrB,WAAmB,EACnB,OAA8B;IAE9B,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACrC,YAAY,GAAG,IAAA,oBAAI,EACjB,IAAA,WAAI,EAAC,aAAa,EAAE,qCAAqC,CAAC,EAC1D,CAAC,aAAa,EAAE,GAAG,uBAAuB,CAAC,OAAO,CAAC,CAAC,EACpD;YACE,GAAG,EAAE,WAAW;SACjB,CACF,CAAC;QAEF,2DAA2D;QAC3D,OAAO,CAAC,EAAE,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC,YAAY,CAAC,IAAI,EAAE,CAAC,CAAC;QAC9C,OAAO,CAAC,EAAE,CAAC,SAAS,EAAE,GAAG,EAAE,CAAC,YAAY,CAAC,IAAI,EAAE,CAAC,CAAC;QAEjD,YAAY,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE;YAC/B,MAAM,CAAC,GAAG,CAAC,CAAC;QACd,CAAC,CAAC,CAAC;QACH,YAAY,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE;YAC/B,IAAI,IAAI,KAAK,CAAC,EAAE;gBACd,OAAO,CAAC,IAAI,CAAC,CAAC;aACf;iBAAM;gBACL,MAAM,CAAC,IAAI,CAAC,CAAC;aACd;QACH,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAS,uBAAuB,CAAC,OAA8B;IAC7D,OAAO,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE;QAC5C,MAAM,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;QACrB,IAAI,OAAO,CAAC,KAAK,SAAS,EAAE;YAC1B,IAAI,CAAC,KAAK,IAAI,EAAE;gBACd,4FAA4F;gBAC5F,GAAG,CAAC,IAAI,CAAC,KAAK,IAAA,cAAK,EAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC;aACpC;SACF;aAAM;YACL,GAAG,CAAC,IAAI,CAAC,KAAK,IAAA,cAAK,EAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,CAAC;SACvC;QACD,OAAO,GAAG,CAAC;IACb,CAAC,EAAE,EAAE,CAAC,CAAC;AACT,CAAC"}
+{"version":3,"file":"publish-set.impl.js","sourceRoot":"","sources":["../../../../../../packages/expo/src/executors/publish-set/publish-set.impl.ts"],"names":[],"mappings":";;;AAAA,yCAA8D;AAC9D,+BAA4B;AAC5B,iDAAmD;AAEnD,yFAAmF;AAOnF,IAAI,YAA0B,CAAC;AAE/B,SAA+B,kBAAkB,CAC/C,OAA8B,EAC9B,OAAwB;;QAExB,eAAM,CAAC,IAAI,CACT,oEAAoE,CACrE,CAAC;QAEF,MAAM,WAAW,GACf,OAAO,CAAC,sBAAsB,CAAC,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC;QACpE,IAAA,sDAAwB,EAAC,OAAO,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;QAEpD,IAAI;YACF,sBAAM,gBAAgB,CAAC,OAAO,CAAC,IAAI,EAAE,WAAW,EAAE,OAAO,CAAC,CAAA,CAAC;YAE3D,4BAAM,EAAE,OAAO,EAAE,IAAI,EAAE,CAAA,CAAC;SACzB;gBAAS;YACR,IAAI,YAAY,EAAE;gBAChB,YAAY,CAAC,IAAI,EAAE,CAAC;aACrB;SACF;IACH,CAAC;CAAA;AArBD,qCAqBC;AAED,SAAS,gBAAgB,CACvB,aAAqB,EACrB,WAAmB,EACnB,OAA8B;IAE9B,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACrC,YAAY,GAAG,IAAA,oBAAI,EACjB,IAAA,WAAI,EAAC,aAAa,EAAE,qCAAqC,CAAC,EAC1D,CAAC,aAAa,EAAE,GAAG,uBAAuB,CAAC,OAAO,CAAC,CAAC,EACpD;YACE,GAAG,EAAE,WAAW;SACjB,CACF,CAAC;QAEF,2DAA2D;QAC3D,OAAO,CAAC,EAAE,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC,YAAY,CAAC,IAAI,EAAE,CAAC,CAAC;QAC9C,OAAO,CAAC,EAAE,CAAC,SAAS,EAAE,GAAG,EAAE,CAAC,YAAY,CAAC,IAAI,EAAE,CAAC,CAAC;QAEjD,YAAY,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE;YAC/B,MAAM,CAAC,GAAG,CAAC,CAAC;QACd,CAAC,CAAC,CAAC;QACH,YAAY,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE;YAC/B,IAAI,IAAI,KAAK,CAAC,EAAE;gBACd,OAAO,CAAC,IAAI,CAAC,CAAC;aACf;iBAAM;gBACL,MAAM,CAAC,IAAI,CAAC,CAAC;aACd;QACH,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAS,uBAAuB,CAAC,OAA8B;IAC7D,OAAO,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE;QAC5C,MAAM,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;QACrB,IAAI,OAAO,CAAC,KAAK,SAAS,EAAE;YAC1B,IAAI,CAAC,KAAK,IAAI,EAAE;gBACd,4FAA4F;gBAC5F,GAAG,CAAC,IAAI,CAAC,KAAK,IAAA,cAAK,EAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC;aACpC;SACF;aAAM;YACL,GAAG,CAAC,IAAI,CAAC,KAAK,IAAA,cAAK,EAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,CAAC;SACvC;QACD,OAAO,GAAG,CAAC;IACb,CAAC,EAAE,EAAE,CAAC,CAAC;AACT,CAAC"}

package/src/executors/publish-set/schema.json

@@ -1,9 +1,11 @@
 {
+  "version": 2,
+  "outputCapture": "direct-nodejs",
   "cli": "nx",
   "$id": "NxExpoPublishSet",
   "$schema": "http://json-schema.org/schema",
   "title": "Set Publish Channel for Expo",
-  "description": "Specify the channel to serve a published release",
+  "description": "Specify the channel to serve a published release.",
   "type": "object",
   "properties": {
     "releaseChannel": {

package/src/executors/rollback/rollback.impl.js

@@ -8,7 +8,8 @@ const ensure_node_modules_symlink_1 = require("../../utils/ensure-node-modules-s
 let childProcess;
 function rollbackExecutor(options, context) {
     return tslib_1.__asyncGenerator(this, arguments, function* rollbackExecutor_1() {
-        const projectRoot = context.workspace.projects[context.projectName].root;
+        devkit_1.logger.warn('@nrwl/expo:rollback is deprecated and will be removed in Nx 16.');
+        const projectRoot = context.projectsConfigurations.projects[context.projectName].root;
         (0, ensure_node_modules_symlink_1.ensureNodeModulesSymlink)(context.root, projectRoot);
         try {
             yield tslib_1.__await(runCliRollback(context.root, projectRoot, options));

package/src/executors/rollback/rollback.impl.js.map

@@ -1 +1 @@
-{"version":3,"file":"rollback.impl.js","sourceRoot":"","sources":["../../../../../../packages/expo/src/executors/rollback/rollback.impl.ts"],"names":[],"mappings":";;;AAAA,yCAAsD;AACtD,+BAA4B;AAC5B,iDAAmD;AAEnD,yFAAmF;AAOnF,IAAI,YAA0B,CAAC;AAE/B,SAA+B,gBAAgB,CAC7C,OAA4B,EAC5B,OAAwB;;QAExB,MAAM,WAAW,GAAG,OAAO,CAAC,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC;QACzE,IAAA,sDAAwB,EAAC,OAAO,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;QAEpD,IAAI;YACF,sBAAM,cAAc,CAAC,OAAO,CAAC,IAAI,EAAE,WAAW,EAAE,OAAO,CAAC,CAAA,CAAC;YAEzD,4BAAM,EAAE,OAAO,EAAE,IAAI,EAAE,CAAA,CAAC;SACzB;gBAAS;YACR,IAAI,YAAY,EAAE;gBAChB,YAAY,CAAC,IAAI,EAAE,CAAC;aACrB;SACF;IACH,CAAC;CAAA;AAhBD,mCAgBC;AAED,SAAS,cAAc,CACrB,aAAqB,EACrB,WAAmB,EACnB,OAA4B;IAE5B,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACrC,YAAY,GAAG,IAAA,oBAAI,EACjB,IAAA,WAAI,EAAC,aAAa,EAAE,qCAAqC,CAAC,EAC1D,CAAC,kBAAkB,EAAE,GAAG,qBAAqB,CAAC,OAAO,CAAC,CAAC,EACvD;YACE,GAAG,EAAE,WAAW;SACjB,CACF,CAAC;QAEF,2DAA2D;QAC3D,OAAO,CAAC,EAAE,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC,YAAY,CAAC,IAAI,EAAE,CAAC,CAAC;QAC9C,OAAO,CAAC,EAAE,CAAC,SAAS,EAAE,GAAG,EAAE,CAAC,YAAY,CAAC,IAAI,EAAE,CAAC,CAAC;QAEjD,YAAY,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE;YAC/B,MAAM,CAAC,GAAG,CAAC,CAAC;QACd,CAAC,CAAC,CAAC;QACH,YAAY,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE;YAC/B,IAAI,IAAI,KAAK,CAAC,EAAE;gBACd,OAAO,CAAC,IAAI,CAAC,CAAC;aACf;iBAAM;gBACL,MAAM,CAAC,IAAI,CAAC,CAAC;aACd;QACH,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAS,qBAAqB,CAAC,OAA4B;IACzD,OAAO,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE;QAC5C,MAAM,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;QACrB,IAAI,OAAO,CAAC,KAAK,SAAS,EAAE;YAC1B,IAAI,CAAC,KAAK,IAAI,EAAE;gBACd,4FAA4F;gBAC5F,GAAG,CAAC,IAAI,CAAC,KAAK,IAAA,cAAK,EAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC;aACpC;SACF;aAAM;YACL,GAAG,CAAC,IAAI,CAAC,KAAK,IAAA,cAAK,EAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,CAAC;SACvC;QACD,OAAO,GAAG,CAAC;IACb,CAAC,EAAE,EAAE,CAAC,CAAC;AACT,CAAC"}
+{"version":3,"file":"rollback.impl.js","sourceRoot":"","sources":["../../../../../../packages/expo/src/executors/rollback/rollback.impl.ts"],"names":[],"mappings":";;;AAAA,yCAA8D;AAC9D,+BAA4B;AAC5B,iDAAmD;AAEnD,yFAAmF;AAOnF,IAAI,YAA0B,CAAC;AAE/B,SAA+B,gBAAgB,CAC7C,OAA4B,EAC5B,OAAwB;;QAExB,eAAM,CAAC,IAAI,CACT,iEAAiE,CAClE,CAAC;QAEF,MAAM,WAAW,GACf,OAAO,CAAC,sBAAsB,CAAC,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC;QACpE,IAAA,sDAAwB,EAAC,OAAO,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;QAEpD,IAAI;YACF,sBAAM,cAAc,CAAC,OAAO,CAAC,IAAI,EAAE,WAAW,EAAE,OAAO,CAAC,CAAA,CAAC;YAEzD,4BAAM,EAAE,OAAO,EAAE,IAAI,EAAE,CAAA,CAAC;SACzB;gBAAS;YACR,IAAI,YAAY,EAAE;gBAChB,YAAY,CAAC,IAAI,EAAE,CAAC;aACrB;SACF;IACH,CAAC;CAAA;AArBD,mCAqBC;AAED,SAAS,cAAc,CACrB,aAAqB,EACrB,WAAmB,EACnB,OAA4B;IAE5B,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACrC,YAAY,GAAG,IAAA,oBAAI,EACjB,IAAA,WAAI,EAAC,aAAa,EAAE,qCAAqC,CAAC,EAC1D,CAAC,kBAAkB,EAAE,GAAG,qBAAqB,CAAC,OAAO,CAAC,CAAC,EACvD;YACE,GAAG,EAAE,WAAW;SACjB,CACF,CAAC;QAEF,2DAA2D;QAC3D,OAAO,CAAC,EAAE,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC,YAAY,CAAC,IAAI,EAAE,CAAC,CAAC;QAC9C,OAAO,CAAC,EAAE,CAAC,SAAS,EAAE,GAAG,EAAE,CAAC,YAAY,CAAC,IAAI,EAAE,CAAC,CAAC;QAEjD,YAAY,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE;YAC/B,MAAM,CAAC,GAAG,CAAC,CAAC;QACd,CAAC,CAAC,CAAC;QACH,YAAY,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE;YAC/B,IAAI,IAAI,KAAK,CAAC,EAAE;gBACd,OAAO,CAAC,IAAI,CAAC,CAAC;aACf;iBAAM;gBACL,MAAM,CAAC,IAAI,CAAC,CAAC;aACd;QACH,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAS,qBAAqB,CAAC,OAA4B;IACzD,OAAO,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE;QAC5C,MAAM,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;QACrB,IAAI,OAAO,CAAC,KAAK,SAAS,EAAE;YAC1B,IAAI,CAAC,KAAK,IAAI,EAAE;gBACd,4FAA4F;gBAC5F,GAAG,CAAC,IAAI,CAAC,KAAK,IAAA,cAAK,EAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC;aACpC;SACF;aAAM;YACL,GAAG,CAAC,IAAI,CAAC,KAAK,IAAA,cAAK,EAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,CAAC;SACvC;QACD,OAAO,GAAG,CAAC;IACb,CAAC,EAAE,EAAE,CAAC,CAAC;AACT,CAAC"}

package/src/executors/rollback/schema.json

@@ -1,9 +1,11 @@
 {
+  "version": 2,
+  "outputCapture": "direct-nodejs",
   "cli": "nx",
   "$id": "NxExpoRollback",
   "$schema": "http://json-schema.org/schema",
   "title": "Rollback Publish Command for Expo",
-  "description": "Undo an update to a channel",
+  "description": "Undo an update to a channel.",
   "type": "object",
   "properties": {
     "releaseChannel": {

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

@@ -13,10 +13,10 @@ function runExecutor(options, context) {
         if ((0, os_1.platform)() !== 'darwin' && options.platform === 'ios') {
             throw new Error(`The run-ios build requires Mac to run`);
         }
-        const projectRoot = context.workspace.projects[context.projectName].root;
+        const projectRoot = context.projectsConfigurations.projects[context.projectName].root;
         (0, ensure_node_modules_symlink_1.ensureNodeModulesSymlink)(context.root, projectRoot);
         if (options.sync) {
-            (0, sync_deps_impl_1.displayNewlyAddedDepsMessage)(context.projectName, yield tslib_1.__await((0, sync_deps_impl_1.syncDeps)(context.projectName, projectRoot)));
+            (0, sync_deps_impl_1.displayNewlyAddedDepsMessage)(context.projectName, yield tslib_1.__await((0, sync_deps_impl_1.syncDeps)(context.projectName, projectRoot, context.root, context.projectGraph)));
         }
         try {
             yield tslib_1.__await(runCliRun(context.root, projectRoot, options));
@@ -32,7 +32,7 @@ function runExecutor(options, context) {
 exports.default = runExecutor;
 function runCliRun(workspaceRoot, projectRoot, options) {
     return new Promise((resolve, reject) => {
-        childProcess = (0, child_process_1.fork)((0, path_1.join)(workspaceRoot, './node_modules/expo-cli/bin/expo.js'), ['run:' + options.platform, ...createRunOptions(options)], {
+        childProcess = (0, child_process_1.fork)((0, path_1.join)(workspaceRoot, './node_modules/@expo/cli/build/bin/cli'), ['run:' + options.platform, ...createRunOptions(options)], {
             cwd: projectRoot,
         });
         // Ensure the child process is killed when the parent exits
@@ -54,6 +54,11 @@ function runCliRun(workspaceRoot, projectRoot, options) {
 const nxOptions = ['sync', 'platform'];
 const iOSOptions = ['xcodeConfiguration', 'schema'];
 const androidOptions = ['variant'];
+/*
+ * run options:
+ * ios: https://github.com/expo/expo/blob/main/packages/@expo/cli/src/run/ios/index.ts
+ * android: https://github.com/expo/expo/blob/main/packages/@expo/cli/src/run/android/index.ts
+ */
 function createRunOptions(options) {
     return Object.keys(options).reduce((acc, k) => {
         if (nxOptions.includes(k) ||
@@ -66,15 +71,10 @@ function createRunOptions(options) {
             if (k === 'xcodeConfiguration') {
                 acc.push('--configuration', v);
             }
-            else if (k === 'bundler') {
-                if (v === false) {
-                    acc.push('--no-bundler');
-                }
-            }
             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}`);
+                // no need to pass in the flag when it is true, pass the --no-<flag> when it is false
+                if (v === false) {
+                    acc.push(`--no-${(0, devkit_1.names)(k).fileName}`);
                 }
             }
             else {

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

@@ -1 +1 @@
-{"version":3,"file":"run.impl.js","sourceRoot":"","sources":["../../../../../../packages/expo/src/executors/run/run.impl.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"run.impl.js","sourceRoot":"","sources":["../../../../../../packages/expo/src/executors/run/run.impl.ts"],"names":[],"mappings":"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"}