@nx/expo 17.0.3 → 17.0.4

package/src/executors/sync-deps/sync-deps.impl.js

@@ -7,22 +7,29 @@ const devkit_1 = require("@nx/devkit");
 const find_all_npm_dependencies_1 = require("../../utils/find-all-npm-dependencies");
 async function* syncDepsExecutor(options, context) {
     const projectRoot = context.projectsConfigurations.projects[context.projectName].root;
-    displayNewlyAddedDepsMessage(context.projectName, await syncDeps(context.projectName, projectRoot, context.root, context.projectGraph, typeof options.include === 'string'
+    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);
+    displayNewlyAddedDepsMessage(context.projectName, await syncDeps(context.projectName, projectPackageJson, projectPackageJsonPath, workspacePackageJson, context.projectGraph, typeof options.include === 'string'
         ? options.include.split(',')
         : options.include, typeof options.exclude === 'string'
         ? options.exclude.split(',')
-        : options.exclude));
+        : options.exclude, options.all));
     yield { success: true };
 }
 exports.default = syncDepsExecutor;
-async function syncDeps(projectName, projectRoot, workspaceRoot, projectGraph, include = [], exclude = []) {
-    let npmDeps = (0, find_all_npm_dependencies_1.findAllNpmDependencies)(projectGraph, projectName);
-    const packageJsonPath = (0, path_1.join)(workspaceRoot, projectRoot, 'package.json');
-    const packageJson = (0, devkit_1.readJsonFile)(packageJsonPath);
+async function syncDeps(projectName, projectPackageJson, projectPackageJsonPath, workspacePackageJson, projectGraph = (0, devkit_1.readCachedProjectGraph)(), include = [], exclude = [], all = false) {
+    let npmDeps = all
+        ? Object.keys(workspacePackageJson.dependencies || {})
+        : (0, find_all_npm_dependencies_1.findAllNpmDependencies)(projectGraph, projectName);
+    let npmDevdeps = all
+        ? Object.keys(workspacePackageJson.devDependencies || {})
+        : [];
     const newDeps = [];
     let updated = false;
-    if (!packageJson.dependencies) {
-        packageJson.dependencies = {};
+    if (!projectPackageJson.dependencies) {
+        projectPackageJson.dependencies = {};
         updated = true;
     }
     if (include && include.length) {
@@ -31,15 +38,30 @@ async function syncDeps(projectName, projectRoot, workspaceRoot, projectGraph, i
     if (exclude && exclude.length) {
         npmDeps = npmDeps.filter((dep) => !exclude.includes(dep));
     }
+    if (!projectPackageJson.devDependencies) {
+        projectPackageJson.devDependencies = {};
+    }
+    if (!projectPackageJson.dependencies) {
+        projectPackageJson.dependencies = {};
+    }
     npmDeps.forEach((dep) => {
-        if (!packageJson.dependencies[dep]) {
-            packageJson.dependencies[dep] = '*';
+        if (!projectPackageJson.dependencies[dep] &&
+            !projectPackageJson.devDependencies[dep]) {
+            projectPackageJson.dependencies[dep] = '*';
+            newDeps.push(dep);
+            updated = true;
+        }
+    });
+    npmDevdeps.forEach((dep) => {
+        if (!projectPackageJson.dependencies[dep] &&
+            !projectPackageJson.devDependencies[dep]) {
+            projectPackageJson.devDependencies[dep] = '*';
             newDeps.push(dep);
             updated = true;
         }
     });
     if (updated) {
-        (0, devkit_1.writeJsonFile)(packageJsonPath, packageJson);
+        (0, devkit_1.writeJsonFile)(projectPackageJsonPath, projectPackageJson);
     }
     return newDeps;
 }

package/src/executors/update/schema.json

@@ -1,7 +1,7 @@
 {
   "version": 2,
   "outputCapture": "direct-nodejs",
-  "$schema": "http://json-schema.org/schema",
+  "$schema": "https://json-schema.org/schema",
   "$id": "NxExpoEasUpdate",
   "cli": "nx",
   "title": "Expo EAS Update executor",

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

@@ -3,15 +3,18 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const devkit_1 = require("@nx/devkit");
 const path_1 = require("path");
 const child_process_1 = require("child_process");
-const ensure_node_modules_symlink_1 = require("../../utils/ensure-node-modules-symlink");
+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, projectRoot, context.root, context.projectGraph, ['expo-updates']));
-    (0, ensure_node_modules_symlink_1.ensureNodeModulesSymlink)(context.root, projectRoot);
+    (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 runCliUpdate(context.root, projectRoot, options);
         yield { success: true };
@@ -25,7 +28,7 @@ async function* buildExecutor(options, context) {
 exports.default = buildExecutor;
 function runCliUpdate(workspaceRoot, projectRoot, options) {
     return new Promise((resolve, reject) => {
-        childProcess = (0, child_process_1.fork)(require.resolve('eas-cli/bin/run'), ['update', ...createUpdateOptions(options)], { cwd: (0, path_1.resolve)(workspaceRoot, projectRoot), env: process.env });
+        childProcess = (0, child_process_1.fork)((0, resolve_eas_1.resolveEas)(workspaceRoot), ['update', ...createUpdateOptions(options)], { cwd: (0, path_1.resolve)(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());

package/src/generators/application/application.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.expoApplicationGeneratorInternal = exports.expoApplicationGenerator = void 0;
 const devkit_1 = require("@nx/devkit");
-const symlink_task_1 = require("../../utils/symlink-task");
+const js_1 = require("@nx/js");
 const add_linting_1 = require("../../utils/add-linting");
 const add_jest_1 = require("../../utils/add-jest");
 const normalize_options_1 = require("./lib/normalize-options");
@@ -10,9 +10,13 @@ const init_1 = require("../init/init");
 const add_project_1 = require("./lib/add-project");
 const create_application_files_1 = require("./lib/create-application-files");
 const add_eas_scripts_1 = require("./lib/add-eas-scripts");
-const add_detox_1 = require("./lib/add-detox");
+const add_e2e_1 = require("./lib/add-e2e");
+const ensure_dependencies_1 = require("../../utils/ensure-dependencies");
+const init_root_babel_config_1 = require("../../utils/init-root-babel-config");
+const log_show_project_command_1 = require("@nx/devkit/src/utils/log-show-project-command");
 async function expoApplicationGenerator(host, schema) {
     return await expoApplicationGeneratorInternal(host, {
+        addPlugin: false,
         projectNameAndRootFormat: 'derived',
         ...schema,
     });
@@ -20,9 +24,20 @@ async function expoApplicationGenerator(host, schema) {
 exports.expoApplicationGenerator = expoApplicationGenerator;
 async function expoApplicationGeneratorInternal(host, schema) {
     const options = await (0, normalize_options_1.normalizeOptions)(host, schema);
+    const tasks = [];
+    const jsInitTask = await (0, js_1.initGenerator)(host, {
+        ...schema,
+        skipFormat: true,
+    });
+    tasks.push(jsInitTask);
+    const initTask = await (0, init_1.default)(host, { ...options, skipFormat: true });
+    tasks.push(initTask);
+    if (!options.skipPackageJson) {
+        tasks.push((0, ensure_dependencies_1.ensureDependencies)(host));
+    }
+    (0, init_root_babel_config_1.initRootBabelConfig)(host);
     (0, create_application_files_1.createApplicationFiles)(host, options);
     (0, add_project_1.addProject)(host, options);
-    const initTask = await (0, init_1.default)(host, { ...options, skipFormat: true });
     const lintTask = await (0, add_linting_1.addLinting)(host, {
         ...options,
         projectRoot: options.appProjectRoot,
@@ -30,14 +45,19 @@ async function expoApplicationGeneratorInternal(host, schema) {
             (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'tsconfig.app.json'),
         ],
     });
-    const jestTask = await (0, add_jest_1.addJest)(host, options.unitTestRunner, options.projectName, options.appProjectRoot, options.js, options.skipPackageJson);
-    const detoxTask = await (0, add_detox_1.addDetox)(host, options);
-    const symlinkTask = (0, symlink_task_1.runSymlink)(host.root, options.appProjectRoot);
+    tasks.push(lintTask);
+    const jestTask = await (0, add_jest_1.addJest)(host, options.unitTestRunner, options.projectName, options.appProjectRoot, options.js, options.skipPackageJson, options.addPlugin);
+    tasks.push(jestTask);
+    const e2eTask = await (0, add_e2e_1.addE2e)(host, options);
+    tasks.push(e2eTask);
     (0, add_eas_scripts_1.addEasScripts)(host);
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(host);
     }
-    return (0, devkit_1.runTasksInSerial)(initTask, lintTask, jestTask, detoxTask, symlinkTask);
+    tasks.push(() => {
+        (0, log_show_project_command_1.logShowProjectCommand)(options.projectName);
+    });
+    return (0, devkit_1.runTasksInSerial)(...tasks);
 }
 exports.expoApplicationGeneratorInternal = expoApplicationGeneratorInternal;
 exports.default = expoApplicationGenerator;

package/src/generators/application/files/app.json.template

@@ -30,6 +30,7 @@
       "bundler": "metro"
     },
     "plugins": [
+      <% if (e2eTestRunner === 'detox') { %>
       [
         "@config-plugins/detox",
         {
@@ -37,6 +38,7 @@
           "subdomains": ["10.0.2.2", "localhost"]
         }
       ]
+      <% } %>
     ]
   }
 }

package/src/generators/application/files/eas.json.template

@@ -21,8 +21,5 @@
   },
   "submit": {
     "production": {}
-  },
-  "cli": {
-    "version": ">= <%= easCliVersion.replace('~', '') %>"
   }
 }

package/src/generators/application/files/metro.config.js.template

@@ -1,7 +1,6 @@
 const { withNxMetro } = require('@nx/expo');
 const { getDefaultConfig } = require('@expo/metro-config');
 const { mergeConfig } = require('metro-config');
-const exclusionList = require('metro-config/src/defaults/exclusionList');
 
 const defaultConfig = getDefaultConfig(__dirname);
 const { assetExts, sourceExts } = defaultConfig.resolver;
@@ -18,10 +17,7 @@ const customConfig = {
   },
   resolver: {
     assetExts: assetExts.filter((ext) => ext !== 'svg'),
-    sourceExts: [...sourceExts, 'svg'],
-    blockList: exclusionList([/^(?!.*node_modules).*\/dist\/.*/]),
-    // unstable_enableSymlinks: true,
-    // unstable_enablePackageExports: true,
+    sourceExts: [...sourceExts, 'cjs', 'mjs', 'svg'],
   },
 };
 

package/src/generators/application/files/src/app/App.tsx.template

@@ -10,7 +10,7 @@ import {
   TouchableOpacity,
   Linking,
 } from 'react-native';
-import Svg, { Path } from 'react-native-svg';
+import Svg, { G, Path } from 'react-native-svg';
 
 export const App = () => {
   const [whatsNextYCoord, setWhatsNextYCoord] = useState<number>(0);
@@ -19,7 +19,10 @@ export const App = () => {
   return (
     <>
       <StatusBar barStyle="dark-content" />
-      <SafeAreaView>
+      <SafeAreaView
+       style={{
+          flex: 1,
+        }}>
         <ScrollView
           ref={(ref) => {
             scrollViewRef.current = ref;
@@ -29,7 +32,7 @@ export const App = () => {
         >
           <View style={styles.section}>
             <Text style={styles.textLg}>Hello there,</Text>
-            <Text style={[styles.textXL, styles.appTitleText]} testID="heading">
+            <Text style={[styles.textXL, styles.appTitleText]} testID="heading" role="heading">
               Welcome <%= displayName %> 👋
             </Text>
           </View>
@@ -308,11 +311,14 @@ export const App = () => {
                     Install Nx Console for VSCode
                   </Text>
                   <Text style={[styles.textXS, styles.textLight]}>
-                    The official VSCode plugin for Nx.
+                    The official VSCode extension for Nx.
                   </Text>
                 </View>
               </View>
             </TouchableOpacity>
+          </View>
+
+            <View style={[styles.section, styles.shadowBox]}>
             <TouchableOpacity
               onPress={() =>
                 Linking.openURL(
@@ -321,13 +327,20 @@ export const App = () => {
               }
             >
               <View style={[styles.listItem, styles.learning]}>
-                <Svg
-                  width={48}
-                  height={48}
-                  fill="rgba(0, 122, 204, 1)"
-                  viewBox="0 0 24 24"
-                >
-                  <Path d="M0 0v24h24V0zm3.723 3.111h5v1.834h-1.39v6.277h1.39v1.834h-5v-1.834h1.444V4.945H3.723zm11.055 0H17v6.5c0 .612-.055 1.111-.222 1.556-.167.444-.39.777-.723 1.11-.277.279-.666.557-1.11.668a3.933 3.933 0 0 1-1.445.278c-.778 0-1.444-.167-1.944-.445a4.81 4.81 0 0 1-1.279-1.056l1.39-1.555c.277.334.555.555.833.722.277.167.611.278.945.278.389 0 .721-.111 1-.389.221-.278.333-.667.333-1.278zM2.222 19.5h9V21h-9z" />
+                <Svg width={48} height={48} viewBox="20 20 60 60">
+                  <Path d="m22.5 22.5h60v60h-60z" />
+                  <G fill="#fff">
+                    <Path d="m29.03 71.25h22.5v3.75h-22.5z" />
+                    <Path d="m28.09 38 1.67-1.58a1.88 1.88 0 0 0 1.47.87c.64 0 1.06-.44 1.06-1.31v-5.98h2.58v6a3.48 3.48 0 0 1 -.87 2.6 3.56 3.56 0 0 1 -2.57.95 3.84 3.84 0 0 1 -3.34-1.55z" />
+                    <Path d="m36 30h7.53v2.19h-5v1.44h4.49v2h-4.42v1.49h5v2.21h-7.6z" />
+                    <Path d="m47.23 32.29h-2.8v-2.29h8.21v2.27h-2.81v7.1h-2.6z" />
+                    <Path d="m29.13 43.08h4.42a3.53 3.53 0 0 1 2.55.83 2.09 2.09 0 0 1 .6 1.53 2.16 2.16 0 0 1 -1.44 2.09 2.27 2.27 0 0 1 1.86 2.29c0 1.61-1.31 2.59-3.55 2.59h-4.44zm5 2.89c0-.52-.42-.8-1.18-.8h-1.29v1.64h1.24c.79 0 1.25-.26 1.25-.81zm-.9 2.66h-1.57v1.73h1.62c.8 0 1.24-.31 1.24-.86 0-.5-.4-.87-1.27-.87z" />
+                    <Path d="m38 43.08h4.1a4.19 4.19 0 0 1 3 1 2.93 2.93 0 0 1 .9 2.19 3 3 0 0 1 -1.93 2.89l2.24 3.27h-3l-1.88-2.84h-.87v2.84h-2.56zm4 4.5c.87 0 1.39-.43 1.39-1.11 0-.75-.54-1.12-1.4-1.12h-1.44v2.26z" />
+                    <Path d="m49.59 43h2.5l4 9.44h-2.79l-.67-1.69h-3.63l-.67 1.69h-2.71zm2.27 5.73-1-2.65-1.06 2.65z" />
+                    <Path d="m56.46 43.05h2.6v9.37h-2.6z" />
+                    <Path d="m60.06 43.05h2.42l3.37 5v-5h2.57v9.37h-2.26l-3.53-5.14v5.14h-2.57z" />
+                    <Path d="m68.86 51 1.45-1.73a4.84 4.84 0 0 0 3 1.13c.71 0 1.08-.24 1.08-.65 0-.4-.31-.6-1.59-.91-2-.46-3.53-1-3.53-2.93 0-1.74 1.37-3 3.62-3a5.89 5.89 0 0 1 3.86 1.25l-1.26 1.84a4.63 4.63 0 0 0 -2.62-.92c-.63 0-.94.25-.94.6 0 .42.32.61 1.63.91 2.14.46 3.44 1.16 3.44 2.91 0 1.91-1.51 3-3.79 3a6.58 6.58 0 0 1 -4.35-1.5z" />
+                  </G>
                 </Svg>
                 <View style={styles.listItemTextContainer}>
                   <Text
@@ -374,7 +387,7 @@ export const App = () => {
                   </View>
                 </View>
                 <View style={styles.codeBlock}>
-                  <Text style={[styles.monospace]}>nx connect-to-nx-cloud</Text>
+                  <Text style={[styles.monospace]}>nx connect</Text>
                 </View>
               </View>
             </TouchableOpacity>
@@ -462,9 +475,33 @@ export const App = () => {
                   @nx/expo:component \
                 </Text>
                 <Text style={[styles.textXS, styles.monospace]}>
-                  button --project ui
+                  ui/src/lib/button
                 </Text>
               </View>
+              <View style={styles.listItem}>
+                <Svg
+                  width={24}
+                  height={24}
+                  stroke="#000000"
+                  fill="none"
+                  viewBox="0 0 24 24"
+                >
+                  <Path
+                    strokeLinecap="round"
+                    strokeLinejoin="round"
+                    strokeWidth="2"
+                    d="M8 9l3 3-3 3m5 0h3M5 20h14a2 2 0 002-2V6a2 2 0 00-2-2H5a2 2 0 00-2 2v12a2 2 0 002 2z"
+                  />
+                </Svg>
+                <View style={styles.listItemTextContainer}>
+                  <Text style={styles.textSm}>
+                    View project details
+                  </Text>
+                </View>
+              </View>
+              <View style={[styles.codeBlock, styles.marginBottomLg]}>
+                <Text style={[styles.textXS, styles.monospace]}>nx show project <%= displayName %> --web</Text>
+              </View>
               <View style={styles.listItem}>
                 <Svg
                   width={24}

package/src/generators/application/files/webpack.config.js.template

@@ -0,0 +1,57 @@
+const createExpoWebpackConfigAsync = require('@expo/webpack-config');
+const { TsconfigPathsPlugin } = require('tsconfig-paths-webpack-plugin');
+const { resolve } = require('path');
+
+/**
+ * @deprecated use bundler: 'metro' instead
+ */
+module.exports = async function (env, argv) {
+  const config = await createExpoWebpackConfigAsync(env, argv);
+
+  // Customize the config before returning it.
+  // add additional rule to load files under libs
+  const rules = config.module.rules.find((rule) =>
+    Array.isArray(rule.oneOf)
+  )?.oneOf;
+  if (rules) {
+    rules.push({
+      test: /\.(mjs|[jt]sx?)$/,
+      exclude: /node_modules/,
+      use: {
+        loader: require.resolve('@nx/webpack/src/utils/web-babel-loader.js'),
+        options: {
+          presets: [
+            [
+              '@nx/react/babel',
+              {
+                runtime: 'automatic',
+              },
+            ],
+          ],
+        },
+      },
+    });
+  }
+
+  if (!config.resolve) {
+    config.resolve = {};
+  }
+  if (!config.resolve.plugins) {
+    config.resolve.plugins = [];
+  }
+  const extensions = ['.ts', '.tsx', '.mjs', '.js', '.jsx'];
+  const tsConfigPath = resolve(__dirname, 'tsconfig.json');
+  config.resolve.plugins.push(
+    new TsconfigPathsPlugin({
+      configFile: tsConfigPath,
+      extensions,
+    })
+  );
+  config.resolve.fallback = {
+    ...config.resolve.fallback,
+    crypto: require.resolve('crypto-browserify'),
+    stream: require.resolve('stream-browserify'),
+  };
+
+  return config;
+};

package/src/generators/application/lib/add-e2e.d.ts

@@ -0,0 +1,3 @@
+import type { GeneratorCallback, Tree } from '@nx/devkit';
+import { NormalizedSchema } from './normalize-options';
+export declare function addE2e(tree: Tree, options: NormalizedSchema): Promise<GeneratorCallback>;

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

@@ -0,0 +1,86 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.addE2e = void 0;
+const devkit_1 = require("@nx/devkit");
+const web_1 = require("@nx/web");
+const versions_1 = require("../../../utils/versions");
+const has_expo_plugin_1 = require("../../../utils/has-expo-plugin");
+async function addE2e(tree, options) {
+    const hasPlugin = (0, has_expo_plugin_1.hasExpoPlugin)(tree);
+    switch (options.e2eTestRunner) {
+        case 'cypress': {
+            const hasNxExpoPlugin = (0, has_expo_plugin_1.hasExpoPlugin)(tree);
+            if (!hasNxExpoPlugin) {
+                await (0, web_1.webStaticServeGenerator)(tree, {
+                    buildTarget: `${options.projectName}:export`,
+                    targetName: 'serve-static',
+                });
+            }
+            const { configurationGenerator } = (0, devkit_1.ensurePackage)('@nx/cypress', versions_1.nxVersion);
+            (0, devkit_1.addProjectConfiguration)(tree, options.e2eProjectName, {
+                projectType: 'application',
+                root: options.e2eProjectRoot,
+                sourceRoot: (0, devkit_1.joinPathFragments)(options.e2eProjectRoot, 'src'),
+                targets: {},
+                implicitDependencies: [options.projectName],
+                tags: [],
+            });
+            return await configurationGenerator(tree, {
+                ...options,
+                project: options.e2eProjectName,
+                directory: 'src',
+                // the name and root are already normalized, instruct the generator to use them as is
+                bundler: 'none',
+                skipFormat: true,
+                devServerTarget: `${options.projectName}:${options.e2eWebServerTarget}`,
+                port: options.e2ePort,
+                baseUrl: options.e2eWebServerAddress,
+                ciWebServerCommand: hasNxExpoPlugin
+                    ? `nx run ${options.projectName}:serve-static`
+                    : undefined,
+                jsx: true,
+                rootProject: options.rootProject,
+            });
+        }
+        case 'playwright': {
+            const { configurationGenerator } = (0, devkit_1.ensurePackage)('@nx/playwright', versions_1.nxVersion);
+            (0, devkit_1.addProjectConfiguration)(tree, options.e2eProjectName, {
+                projectType: 'application',
+                root: options.e2eProjectRoot,
+                sourceRoot: (0, devkit_1.joinPathFragments)(options.e2eProjectRoot, 'src'),
+                targets: {},
+                implicitDependencies: [options.projectName],
+            });
+            return configurationGenerator(tree, {
+                project: options.e2eProjectName,
+                skipFormat: true,
+                skipPackageJson: options.skipPackageJson,
+                directory: 'src',
+                js: false,
+                linter: options.linter,
+                setParserOptionsProject: options.setParserOptionsProject,
+                webServerCommand: `${(0, devkit_1.getPackageManagerCommand)().exec} nx ${options.e2eWebServerTarget} ${options.name}`,
+                webServerAddress: options.e2eWebServerAddress,
+                rootProject: options.rootProject,
+            });
+        }
+        case 'detox':
+            const { detoxApplicationGenerator } = (0, devkit_1.ensurePackage)('@nx/detox', versions_1.nxVersion);
+            return detoxApplicationGenerator(tree, {
+                ...options,
+                e2eName: options.e2eProjectName,
+                e2eDirectory: options.e2eProjectRoot,
+                projectNameAndRootFormat: 'as-provided',
+                appProject: options.projectName,
+                appDisplayName: options.displayName,
+                appName: options.name,
+                framework: 'expo',
+                setParserOptionsProject: options.setParserOptionsProject,
+                skipFormat: true,
+            });
+        case 'none':
+        default:
+            return () => { };
+    }
+}
+exports.addE2e = addE2e;

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

@@ -2,12 +2,19 @@
 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 = (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`,
         projectType: 'application',
-        targets: { ...getTargets(options) },
+        targets: hasPlugin ? {} : getTargets(options),
         tags: options.parsedTags,
     };
     (0, devkit_1.addProjectConfiguration)(host, options.projectName, projectConfiguration, options.standaloneConfig);
@@ -17,33 +24,33 @@ function getTargets(options) {
     const architect = {};
     architect.start = {
         executor: '@nx/expo:start',
-        dependsOn: ['ensure-symlink', 'sync-deps'],
-        options: {
-            port: 8081,
-        },
+        dependsOn: ['sync-deps'],
+        options: {},
     };
     architect.serve = {
-        executor: 'nx:run-commands',
+        executor: '@nx/expo:serve',
+        dependsOn: ['sync-deps'],
         options: {
-            command: `nx start ${options.projectName}`,
+            port: 4200,
         },
     };
     architect['run-ios'] = {
         executor: '@nx/expo:run',
-        dependsOn: ['ensure-symlink', 'sync-deps'],
+        dependsOn: ['sync-deps'],
         options: {
             platform: 'ios',
         },
     };
     architect['run-android'] = {
         executor: '@nx/expo:run',
-        dependsOn: ['ensure-symlink', 'sync-deps'],
+        dependsOn: ['sync-deps'],
         options: {
             platform: 'android',
         },
     };
     architect['build'] = {
         executor: '@nx/expo:build',
+        dependsOn: ['sync-deps'],
         options: {},
     };
     architect['submit'] = {
@@ -58,13 +65,9 @@ function getTargets(options) {
         executor: '@nx/expo:sync-deps',
         options: {},
     };
-    architect['ensure-symlink'] = {
-        executor: '@nx/expo:ensure-symlink',
-        options: {},
-    };
     architect['prebuild'] = {
         executor: '@nx/expo:prebuild',
-        dependsOn: ['ensure-symlink', 'sync-deps'],
+        dependsOn: ['sync-deps'],
         options: {},
     };
     architect['install'] = {
@@ -77,16 +80,11 @@ function getTargets(options) {
     };
     architect['export'] = {
         executor: '@nx/expo:export',
-        dependsOn: ['ensure-symlink', 'sync-deps'],
+        dependsOn: ['sync-deps'],
+        outputs: ['{options.outputDir}'],
         options: {
             platform: 'all',
-            outputDir: `${(0, devkit_1.offsetFromRoot)(options.appProjectRoot)}dist/${options.appProjectRoot}`,
-        },
-    };
-    architect['export-web'] = {
-        executor: '@nx/expo:export',
-        options: {
-            bundler: 'metro',
+            outputDir: `dist/${options.appProjectRoot}`,
         },
     };
     return architect;

package/src/generators/application/lib/create-application-files.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createApplicationFiles = void 0;
 const devkit_1 = require("@nx/devkit");
 const path_1 = require("path");
-const versions_1 = require("../../../utils/versions");
 function createApplicationFiles(host, options) {
     const packageManagerLockFile = {
         npm: 'package-lock.json',
@@ -17,7 +16,6 @@ function createApplicationFiles(host, options) {
         offsetFromRoot: (0, devkit_1.offsetFromRoot)(options.appProjectRoot),
         packageManager,
         packageLockFile,
-        easCliVersion: versions_1.easCliVersion,
     });
     if (options.unitTestRunner === 'none') {
         host.delete((0, path_1.join)(options.appProjectRoot, `App.spec.tsx`));

package/src/generators/application/lib/normalize-options.d.ts

@@ -6,5 +6,11 @@ export interface NormalizedSchema extends Schema {
     appProjectRoot: string;
     lowerCaseName: string;
     parsedTags: string[];
+    rootProject: boolean;
+    e2eProjectName: string;
+    e2eProjectRoot: string;
+    e2eWebServerAddress: string;
+    e2eWebServerTarget: string;
+    e2ePort: number;
 }
 export declare function normalizeOptions(host: Tree, options: Schema): Promise<NormalizedSchema>;