@nx/expo 17.3.0-beta.4 → 17.3.0-beta.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/expo",
-  "version": "17.3.0-beta.4",
+  "version": "17.3.0-beta.6",
   "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": [
@@ -34,14 +34,14 @@
     "tslib": "^2.3.0",
     "tsconfig-paths": "^4.1.2",
     "tsconfig-paths-webpack-plugin": "^4.0.0",
-    "@nx/detox": "17.3.0-beta.4",
-    "@nx/devkit": "17.3.0-beta.4",
-    "@nx/jest": "17.3.0-beta.4",
-    "@nx/js": "17.3.0-beta.4",
-    "@nx/eslint": "17.3.0-beta.4",
-    "@nx/react": "17.3.0-beta.4",
-    "@nx/webpack": "17.3.0-beta.4",
-    "@nrwl/expo": "17.3.0-beta.4"
+    "@nx/detox": "17.3.0-beta.6",
+    "@nx/devkit": "17.3.0-beta.6",
+    "@nx/jest": "17.3.0-beta.6",
+    "@nx/js": "17.3.0-beta.6",
+    "@nx/eslint": "17.3.0-beta.6",
+    "@nx/react": "17.3.0-beta.6",
+    "@nx/webpack": "17.3.0-beta.6",
+    "@nrwl/expo": "17.3.0-beta.6"
   },
   "peerDependencies": {
     "expo": ">= 49.0.0",

package/plugins/plugin.d.ts

@@ -1,6 +1,7 @@
 import { CreateDependencies, CreateNodes } from '@nx/devkit';
 export interface ExpoPluginOptions {
     startTargetName?: string;
+    serveTargetName?: string;
     runIosTargetName?: string;
     runAndroidTargetName?: string;
     exportTargetName?: string;

package/plugins/plugin.js

@@ -30,7 +30,6 @@ exports.createNodes = [
         // Do not create a project if package.json or project.json or metro.config.js isn't there.
         const siblingFiles = (0, fs_1.readdirSync)((0, path_1.join)(context.workspaceRoot, projectRoot));
         if (!siblingFiles.includes('package.json') ||
-            !siblingFiles.includes('project.json') ||
             !siblingFiles.includes('metro.config.js')) {
             return {};
         }
@@ -59,16 +58,17 @@ function buildExpoTargets(projectRoot, options, context) {
     const namedInputs = (0, get_named_inputs_1.getNamedInputs)(projectRoot, context);
     const targets = {
         [options.startTargetName]: {
-            command: `expo start`,
+            executor: `@nx/expo:start`,
+        },
+        [options.serveTargetName]: {
+            command: `expo start --web`,
             options: { cwd: projectRoot },
         },
         [options.runIosTargetName]: {
-            command: `expo run:ios`,
-            options: { cwd: projectRoot },
+            executor: `@nx/expo:run-ios`,
         },
         [options.runAndroidTargetName]: {
-            command: `expo run:android`,
-            options: { cwd: projectRoot },
+            executor: `@nx/expo:run-android`,
         },
         [options.exportTargetName]: {
             command: `expo export`,
@@ -91,18 +91,15 @@ function buildExpoTargets(projectRoot, options, context) {
             options: { cwd: devkit_1.workspaceRoot }, // install at workspace root
         },
         [options.prebuildTargetName]: {
-            command: `expo prebuild`,
-            options: { cwd: projectRoot },
+            executor: `@nx/expo:prebuild`,
         },
         [options.buildTargetName]: {
-            command: `eas build`,
-            options: { cwd: projectRoot },
+            executor: `@nx/expo:build`,
             dependsOn: [`^${options.buildTargetName}`],
             inputs: getInputs(namedInputs),
         },
         [options.submitTargetName]: {
-            command: `eas submit`,
-            options: { cwd: projectRoot },
+            executor: `@nx/expo:submit`,
             dependsOn: [`^${options.submitTargetName}`],
             inputs: getInputs(namedInputs),
         },
@@ -148,6 +145,7 @@ function load(path) {
 function normalizeOptions(options) {
     options ??= {};
     options.startTargetName ??= 'start';
+    options.serveTargetName ??= 'serve';
     options.runIosTargetName ??= 'run-ios';
     options.runAndroidTargetName ??= 'run-android';
     options.exportTargetName ??= 'export';

package/src/generators/application/lib/add-project.js

@@ -2,11 +2,14 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addProject = void 0;
 const devkit_1 = require("@nx/devkit");
+const has_expo_plugin_1 = require("../../../utils/has-expo-plugin");
+const add_build_target_defaults_1 = require("@nx/devkit/src/generators/add-build-target-defaults");
 function addProject(host, options) {
     const nxJson = (0, devkit_1.readNxJson)(host);
-    const hasPlugin = nxJson.plugins?.some((p) => typeof p === 'string'
-        ? p === '@nx/expo/plugin'
-        : p.plugin === '@nx/expo/plugin');
+    const hasPlugin = (0, has_expo_plugin_1.hasExpoPlugin)(host);
+    if (!hasPlugin) {
+        (0, add_build_target_defaults_1.addBuildTargetDefaults)(host, '@nx/expo:build');
+    }
     const projectConfiguration = {
         root: options.appProjectRoot,
         sourceRoot: `${options.appProjectRoot}/src`,

package/src/generators/init/init.d.ts

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

package/src/generators/init/init.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateDependencies = exports.expoInitGenerator = void 0;
 const devkit_1 = require("@nx/devkit");
 const versions_1 = require("../../utils/versions");
+const has_expo_plugin_1 = require("../../utils/has-expo-plugin");
 const add_git_ignore_entry_1 = require("./lib/add-git-ignore-entry");
 async function expoInitGenerator(host, schema) {
     (0, add_git_ignore_entry_1.addGitIgnoreEntry)(host);
@@ -12,7 +13,7 @@ async function expoInitGenerator(host, schema) {
     const tasks = [];
     if (!schema.skipPackageJson) {
         tasks.push(moveDependency(host));
-        tasks.push(updateDependencies(host));
+        tasks.push(updateDependencies(host, schema));
     }
     if (!schema.skipFormat) {
         await (0, devkit_1.formatFiles)(host);
@@ -20,7 +21,7 @@ async function expoInitGenerator(host, schema) {
     return (0, devkit_1.runTasksInSerial)(...tasks);
 }
 exports.expoInitGenerator = expoInitGenerator;
-function updateDependencies(host) {
+function updateDependencies(host, schema) {
     return (0, devkit_1.addDependenciesToPackageJson)(host, {
         react: versions_1.reactVersion,
         'react-dom': versions_1.reactDomVersion,
@@ -30,7 +31,7 @@ function updateDependencies(host) {
         '@nx/expo': versions_1.nxVersion,
         '@expo/cli': versions_1.expoCliVersion,
         'eas-cli': versions_1.easCliVersion,
-    });
+    }, undefined, schema.keepExistingVersions);
 }
 exports.updateDependencies = updateDependencies;
 function moveDependency(host) {
@@ -38,14 +39,10 @@ function moveDependency(host) {
 }
 function addPlugin(host) {
     const nxJson = (0, devkit_1.readNxJson)(host);
-    nxJson.plugins ??= [];
-    for (const plugin of nxJson.plugins) {
-        if (typeof plugin === 'string'
-            ? plugin === '@nx/expo/plugin'
-            : plugin.plugin === '@nx/expo/plugin') {
-            return;
-        }
+    if ((0, has_expo_plugin_1.hasExpoPlugin)(host)) {
+        return;
     }
+    nxJson.plugins ??= [];
     nxJson.plugins.push({
         plugin: '@nx/expo/plugin',
         options: {

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

@@ -1,4 +1,5 @@
 export interface Schema {
   skipFormat?: boolean;
   skipPackageJson?: boolean; // default is false
+  keepExistingVersions?: boolean; // default is false
 }

package/src/generators/init/schema.json

@@ -15,6 +15,12 @@
       "type": "boolean",
       "default": false,
       "description": "Do not add dependencies to `package.json`."
+    },
+    "keepExistingVersions": {
+      "type": "boolean",
+      "x-priority": "internal",
+      "description": "Keep existing dependencies versions",
+      "default": false
     }
   },
   "required": []

package/src/generators/library/library.js

@@ -10,6 +10,7 @@ const versions_1 = require("../../utils/versions");
 const normalize_options_1 = require("./lib/normalize-options");
 const ensure_dependencies_1 = require("../../utils/ensure-dependencies");
 const init_root_babel_config_1 = require("../../utils/init-root-babel-config");
+const add_build_target_defaults_1 = require("@nx/devkit/src/generators/add-build-target-defaults");
 async function expoLibraryGenerator(host, schema) {
     return await expoLibraryGeneratorInternal(host, {
         projectNameAndRootFormat: 'derived',
@@ -82,6 +83,7 @@ async function addProject(host, options) {
         skipFormat: true,
     });
     const external = ['react/jsx-runtime', 'react-native', 'react', 'react-dom'];
+    (0, add_build_target_defaults_1.addBuildTargetDefaults)(host, '@nx/rollup:rollup');
     project.targets.build = {
         executor: '@nx/rollup:rollup',
         outputs: ['{options.outputPath}'],

package/src/utils/has-expo-plugin.d.ts

@@ -0,0 +1,2 @@
+import { Tree } from '@nx/devkit';
+export declare function hasExpoPlugin(tree: Tree): boolean;

package/src/utils/has-expo-plugin.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.hasExpoPlugin = void 0;
+const devkit_1 = require("@nx/devkit");
+function hasExpoPlugin(tree) {
+    const nxJson = (0, devkit_1.readNxJson)(tree);
+    return !!nxJson.plugins?.some((p) => typeof p === 'string'
+        ? p === '@nx/expo/plugin'
+        : p.plugin === '@nx/expo/plugin');
+}
+exports.hasExpoPlugin = hasExpoPlugin;