@nx/expo 19.3.0 → 19.3.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/expo",
-  "version": "19.3.0",
+  "version": "19.3.2",
   "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.3.0",
+    "@nx/devkit": "19.3.2",
     "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.3.0",
-    "@nx/js": "19.3.0",
-    "@nx/eslint": "19.3.0",
-    "@nx/react": "19.3.0",
-    "@nx/web": "19.3.0",
-    "@nx/webpack": "19.3.0",
-    "@nrwl/expo": "19.3.0"
+    "@nx/jest": "19.3.2",
+    "@nx/js": "19.3.2",
+    "@nx/eslint": "19.3.2",
+    "@nx/react": "19.3.2",
+    "@nx/web": "19.3.2",
+    "@nx/webpack": "19.3.2",
+    "@nrwl/expo": "19.3.2"
   },
   "executors": "./executors.json",
   "ng-update": {

package/plugins/plugin.js

@@ -57,8 +57,7 @@ function buildExpoTargets(projectRoot, options, context) {
     const namedInputs = (0, get_named_inputs_1.getNamedInputs)(projectRoot, context);
     const targets = {
         [options.startTargetName]: {
-            command: `expo start`,
-            options: { cwd: projectRoot },
+            executor: `@nx/expo:start`,
         },
         [options.serveTargetName]: {
             command: `expo start --web`,
@@ -81,8 +80,7 @@ function buildExpoTargets(projectRoot, options, context) {
             outputs: [getOutputs(projectRoot, 'dist')],
         },
         [options.installTargetName]: {
-            command: `expo install`,
-            options: { cwd: devkit_1.workspaceRoot }, // install at workspace root
+            executor: '@nx/expo:install',
         },
         [options.prebuildTargetName]: {
             executor: `@nx/expo:prebuild`,

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

@@ -4,4 +4,5 @@ export interface ExpoInstallOutput {
     success: boolean;
 }
 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

@@ -1,13 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.installAsync = void 0;
+exports.installAsync = exports.installAndUpdatePackageJson = void 0;
 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;
 async function* installExecutor(options, context) {
-    const projectRoot = context.projectsConfigurations.projects[context.projectName].root;
     try {
-        await installAsync(context.root, options);
+        await installAndUpdatePackageJson(context, options);
         yield {
             success: true,
         };
@@ -19,6 +21,19 @@ async function* installExecutor(options, context) {
     }
 }
 exports.default = installExecutor;
+async function installAndUpdatePackageJson(context, options) {
+    await installAsync(context.root, options);
+    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));
+}
+exports.installAndUpdatePackageJson = installAndUpdatePackageJson;
 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 });

package/src/executors/update/update.impl.js

@@ -4,18 +4,14 @@ const devkit_1 = require("@nx/devkit");
 const path_1 = require("path");
 const child_process_1 = require("child_process");
 const resolve_eas_1 = require("../../utils/resolve-eas");
-const sync_deps_impl_1 = require("../sync-deps/sync-deps.impl");
 const install_impl_1 = require("../install/install.impl");
 let childProcess;
 async function* buildExecutor(options, context) {
     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, devkit_1.readJsonFile)(workspacePackageJsonPath);
-    const projectPackageJson = (0, devkit_1.readJsonFile)(projectPackageJsonPath);
-    await (0, install_impl_1.installAsync)(context.root, { packages: ['expo-updates'] });
-    (0, sync_deps_impl_1.displayNewlyAddedDepsMessage)(context.projectName, await (0, sync_deps_impl_1.syncDeps)(context.projectName, projectPackageJson, projectPackageJsonPath, workspacePackageJson, context.projectGraph, ['expo-updates']));
     try {
+        await (0, install_impl_1.installAndUpdatePackageJson)(context, {
+            packages: ['expo-updates'],
+        });
         await runCliUpdate(context.root, projectRoot, options);
         yield { success: true };
     }