@nx/expo 17.0.2 → 17.0.4

package/src/generators/application/lib/normalize-options.js

@@ -12,14 +12,40 @@ async function normalizeOptions(host, options) {
         callingGenerator: '@nx/expo:application',
     });
     options.projectNameAndRootFormat = projectNameAndRootFormat;
+    const nxJson = (0, devkit_1.readNxJson)(host);
+    const addPluginDefault = process.env.NX_ADD_PLUGINS !== 'false' &&
+        nxJson.useInferencePlugins !== false;
+    options.addPlugin ??= addPluginDefault;
     const { className } = (0, devkit_1.names)(options.name);
     const parsedTags = options.tags
         ? options.tags.split(',').map((s) => s.trim())
         : [];
+    const rootProject = appProjectRoot === '.';
+    let e2eWebServerTarget = 'serve';
+    if (options.addPlugin) {
+        if (nxJson.plugins) {
+            for (const plugin of nxJson.plugins) {
+                if (typeof plugin === 'object' &&
+                    plugin.plugin === '@nx/expo/plugin' &&
+                    plugin.options.serveTargetName) {
+                    e2eWebServerTarget = plugin.options
+                        .serveTargetName;
+                }
+            }
+        }
+    }
+    let e2ePort = options.addPlugin ? 8081 : 4200;
+    if (nxJson.targetDefaults?.[e2eWebServerTarget] &&
+        nxJson.targetDefaults?.[e2eWebServerTarget].options?.port) {
+        e2ePort = nxJson.targetDefaults?.[e2eWebServerTarget].options.port;
+    }
+    const e2eProjectName = rootProject ? 'e2e' : `${appProjectName}-e2e`;
+    const e2eProjectRoot = rootProject ? 'e2e' : `${appProjectRoot}-e2e`;
+    const e2eWebServerAddress = `http://localhost:${e2ePort}`;
     return {
         ...options,
         unitTestRunner: options.unitTestRunner || 'jest',
-        e2eTestRunner: options.e2eTestRunner || 'detox',
+        e2eTestRunner: options.e2eTestRunner,
         name: projectNames.projectSimpleName,
         className,
         lowerCaseName: className.toLowerCase(),
@@ -27,6 +53,12 @@ async function normalizeOptions(host, options) {
         projectName: appProjectName,
         appProjectRoot,
         parsedTags,
+        rootProject,
+        e2eProjectName,
+        e2eProjectRoot,
+        e2eWebServerAddress,
+        e2eWebServerTarget,
+        e2ePort,
     };
 }
 exports.normalizeOptions = normalizeOptions;

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

@@ -15,7 +15,8 @@ export interface Schema {
   js: boolean; // default is false
   linter: Linter; // default is eslint
   setParserOptionsProject?: boolean; // default is false
-  e2eTestRunner: 'detox' | 'none'; // default is detox
+  e2eTestRunner: 'cypress' | 'playwright' | 'detox' | 'none'; // default is cypress
   standaloneConfig?: boolean;
   skipPackageJson?: boolean; // default is false
+  addPlugin?: boolean;
 }

package/src/generators/application/schema.json

@@ -1,7 +1,7 @@
 {
   "cli": "nx",
   "$id": "NxExpoApplication",
-  "$schema": "http://json-schema.org/schema",
+  "$schema": "https://json-schema.org/schema",
   "description": "Create an Expo Application for Nx.",
   "examples": [
     {
@@ -48,7 +48,7 @@
     "linter": {
       "description": "The tool to use for running lint checks.",
       "type": "string",
-      "enum": ["eslint"],
+      "enum": ["eslint", "none"],
       "default": "eslint"
     },
     "unitTestRunner": {
@@ -75,8 +75,8 @@
     "e2eTestRunner": {
       "description": "Adds the specified e2e test runner",
       "type": "string",
-      "enum": ["detox", "none"],
-      "default": "detox"
+      "enum": ["cypress", "playwright", "detox", "none"],
+      "default": "cypress"
     },
     "standaloneConfig": {
       "description": "Split the project configuration into `<projectRoot>/project.json` rather than including it inside `workspace.json`.",

package/src/generators/component/files/__fileName__.tsx.template

@@ -26,7 +26,7 @@ export function <%= className %>(props: <%= className %>Props) {
       <Text>Welcome to <%= name %>!</Text>
     </View>
   );
-};
+}
 <% } %>
 
 export default <%= className %>;

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

@@ -4,21 +4,21 @@
 export interface Schema {
   name: string;
   /**
-   * @deprecated Provide the `directory` option instead and use the `as-provided` format. The project will be determined from the directory provided. It will be removed in Nx v18.
+   * @deprecated Provide the `directory` option instead and use the `as-provided` format. The project will be determined from the directory provided. It will be removed in Nx v19.
    */
   project: string;
   directory?: string;
   skipFormat: boolean; // default is false
   skipTests: boolean; // default is false
   /**
-   * @deprecated Provide the name in pascal-case and use the `as-provided` format. This option will be removed in Nx v18.
+   * @deprecated Provide the name in pascal-case and use the `as-provided` format. This option will be removed in Nx v19.
    */
   export: boolean; // default is false
   pascalCaseFiles: boolean; // default is false
   classComponent: boolean; // default is false
   js: boolean; // default is false
   /**
-   * @deprecated Provide the `directory` option instead and use the `as-provided` format. This option will be removed in Nx v18.
+   * @deprecated Provide the `directory` option instead and use the `as-provided` format. This option will be removed in Nx v19.
    */
   flat: boolean; // default is false
   nameAndDirectoryFormat?: 'as-provided' | 'derived';

package/src/generators/component/schema.json

@@ -1,7 +1,7 @@
 {
   "cli": "nx",
   "$id": "NxExpoComponent",
-  "$schema": "http://json-schema.org/schema",
+  "$schema": "https://json-schema.org/schema",
   "description": "Create a Expo Component for Nx.",
   "type": "object",
   "examples": [
@@ -22,7 +22,7 @@
       "$default": {
         "$source": "projectName"
       },
-      "x-deprecated": "Provide the `directory` option instead and use the `as-provided` format. The project will be determined from the directory provided. It will be removed in Nx v18."
+      "x-deprecated": "Provide the `directory` option instead and use the `as-provided` format. The project will be determined from the directory provided. It will be removed in Nx v19."
     },
     "name": {
       "type": "string",
@@ -63,7 +63,7 @@
       "type": "boolean",
       "description": "Create component at the source root rather than its own directory.",
       "default": false,
-      "x-deprecated": "Provide the `directory` option instead and use the `as-provided` format. This option will be removed in Nx v18."
+      "x-deprecated": "Provide the `directory` option instead and use the `as-provided` format. This option will be removed in Nx v19."
     },
     "export": {
       "type": "boolean",
@@ -77,7 +77,7 @@
       "description": "Use pascal case component file name (e.g. App.tsx).",
       "alias": "P",
       "default": false,
-      "x-deprecated": "Provide the `name` in pascal-case and use the `as-provided` format. This option will be removed in Nx v18."
+      "x-deprecated": "Provide the `name` in pascal-case and use the `as-provided` format. This option will be removed in Nx v19."
     },
     "classComponent": {
       "type": "boolean",

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

@@ -1,5 +1,6 @@
 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 expoInitGenerator(tree: Tree, schema: Schema): Promise<GeneratorCallback>;
+export declare function expoInitGeneratorInternal(host: Tree, schema: Schema): Promise<GeneratorCallback>;
+export declare function updateDependencies(host: Tree, schema: Schema): GeneratorCallback;
 export default expoInitGenerator;

package/src/generators/init/init.js

@@ -1,70 +1,74 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.updateDependencies = exports.expoInitGenerator = void 0;
+exports.updateDependencies = exports.expoInitGeneratorInternal = exports.expoInitGenerator = void 0;
 const devkit_1 = require("@nx/devkit");
+const update_package_scripts_1 = require("@nx/devkit/src/utils/update-package-scripts");
+const plugin_1 = require("../../../plugins/plugin");
 const versions_1 = require("../../utils/versions");
-const jest_1 = require("@nx/jest");
-const detox_1 = require("@nx/detox");
-const js_1 = require("@nx/js");
+const has_expo_plugin_1 = require("../../utils/has-expo-plugin");
 const add_git_ignore_entry_1 = require("./lib/add-git-ignore-entry");
-const init_root_babel_config_1 = require("./lib/init-root-babel-config");
-async function expoInitGenerator(host, schema) {
+function expoInitGenerator(tree, schema) {
+    return expoInitGeneratorInternal(tree, { addPlugin: false, ...schema });
+}
+exports.expoInitGenerator = expoInitGenerator;
+async function expoInitGeneratorInternal(host, schema) {
+    const nxJson = (0, devkit_1.readNxJson)(host);
+    const addPluginDefault = process.env.NX_ADD_PLUGINS !== 'false' &&
+        nxJson.useInferencePlugins !== false;
+    schema.addPlugin ??= addPluginDefault;
     (0, add_git_ignore_entry_1.addGitIgnoreEntry)(host);
-    (0, init_root_babel_config_1.initRootBabelConfig)(host);
+    if (schema.addPlugin) {
+        addPlugin(host);
+    }
     const tasks = [];
-    tasks.push(await (0, js_1.initGenerator)(host, {
-        ...schema,
-        skipFormat: true,
-    }));
     if (!schema.skipPackageJson) {
         tasks.push(moveDependency(host));
-        tasks.push(updateDependencies(host));
+        tasks.push(updateDependencies(host, schema));
     }
-    if (!schema.unitTestRunner || schema.unitTestRunner === 'jest') {
-        const jestTask = await (0, jest_1.jestInitGenerator)(host, schema);
-        tasks.push(jestTask);
-    }
-    if (!schema.e2eTestRunner || schema.e2eTestRunner === 'detox') {
-        const detoxTask = await (0, detox_1.detoxInitGenerator)(host, {
-            ...schema,
-            skipFormat: true,
-        });
-        tasks.push(detoxTask);
+    if (schema.updatePackageScripts) {
+        await (0, update_package_scripts_1.updatePackageScripts)(host, plugin_1.createNodes);
     }
     if (!schema.skipFormat) {
         await (0, devkit_1.formatFiles)(host);
     }
     return (0, devkit_1.runTasksInSerial)(...tasks);
 }
-exports.expoInitGenerator = expoInitGenerator;
-function updateDependencies(host) {
+exports.expoInitGeneratorInternal = expoInitGeneratorInternal;
+function updateDependencies(host, schema) {
     return (0, devkit_1.addDependenciesToPackageJson)(host, {
         react: versions_1.reactVersion,
         'react-dom': versions_1.reactDomVersion,
         'react-native': versions_1.reactNativeVersion,
         expo: versions_1.expoVersion,
-        'expo-splash-screen': versions_1.expoSplashScreenVersion,
-        'expo-status-bar': versions_1.expoStatusBarVersion,
-        'react-native-web': versions_1.reactNativeWebVersion,
-        '@expo/metro-config': versions_1.expoMetroConfigVersion,
-        'react-native-svg-transformer': versions_1.reactNativeSvgTransformerVersion,
-        'react-native-svg': versions_1.reactNativeSvgVersion,
     }, {
         '@nx/expo': versions_1.nxVersion,
-        '@types/react': versions_1.typesReactVersion,
-        metro: versions_1.metroVersion,
-        'metro-resolver': versions_1.metroVersion,
-        'react-test-renderer': versions_1.reactTestRendererVersion,
-        '@testing-library/react-native': versions_1.testingLibraryReactNativeVersion,
-        '@testing-library/jest-native': versions_1.testingLibraryJestNativeVersion,
-        'jest-expo': versions_1.jestExpoVersion,
         '@expo/cli': versions_1.expoCliVersion,
-        'eas-cli': versions_1.easCliVersion,
-        'babel-preset-expo': versions_1.babelPresetExpoVersion,
-    });
+    }, undefined, schema.keepExistingVersions);
 }
 exports.updateDependencies = updateDependencies;
 function moveDependency(host) {
     return (0, devkit_1.removeDependenciesFromPackageJson)(host, ['@nx/react-native'], []);
 }
+function addPlugin(host) {
+    const nxJson = (0, devkit_1.readNxJson)(host);
+    if ((0, has_expo_plugin_1.hasExpoPlugin)(host)) {
+        return;
+    }
+    nxJson.plugins ??= [];
+    nxJson.plugins.push({
+        plugin: '@nx/expo/plugin',
+        options: {
+            startTargetName: 'start',
+            serveTargetName: 'serve',
+            runIosTargetName: 'run-ios',
+            runAndroidTargetName: 'run-android',
+            exportTargetName: 'export',
+            prebuildTargetName: 'prebuild',
+            installTargetName: 'install',
+            buildTargetName: 'build',
+            submitTargetName: 'submit',
+        },
+    });
+    (0, devkit_1.updateNxJson)(host, nxJson);
+}
 exports.default = expoInitGenerator;

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

@@ -1,7 +1,7 @@
 export interface Schema {
-  unitTestRunner?: 'jest' | 'none';
   skipFormat?: boolean;
-  e2eTestRunner?: 'detox' | 'none';
   skipPackageJson?: boolean; // default is false
-  js?: boolean;
+  keepExistingVersions?: boolean; // default is false
+  updatePackageScripts?: boolean;
+  addPlugin?: boolean;
 }

package/src/generators/init/schema.json

@@ -1,37 +1,32 @@
 {
   "cli": "nx",
   "$id": "NxExpoInit",
-  "$schema": "http://json-schema.org/schema",
+  "$schema": "https://json-schema.org/schema",
   "description": "Add Nx Expo Schematics.",
   "type": "object",
   "properties": {
-    "unitTestRunner": {
-      "description": "Adds the specified unit test runner",
-      "type": "string",
-      "enum": ["jest", "none"],
-      "default": "jest"
-    },
     "skipFormat": {
       "description": "Skip formatting files",
       "type": "boolean",
       "default": false,
       "x-priority": "internal"
     },
-    "e2eTestRunner": {
-      "description": "Adds the specified e2e test runner",
-      "type": "string",
-      "enum": ["detox", "none"],
-      "default": "detox"
-    },
     "skipPackageJson": {
       "type": "boolean",
       "default": false,
       "description": "Do not add dependencies to `package.json`."
     },
-    "js": {
+    "keepExistingVersions": {
       "type": "boolean",
-      "default": false,
-      "description": "Use JavaScript instead of TypeScript"
+      "x-priority": "internal",
+      "description": "Keep existing dependencies versions",
+      "default": false
+    },
+    "updatePackageScripts": {
+      "type": "boolean",
+      "x-priority": "internal",
+      "description": "Update `package.json` scripts with inferred targets",
+      "default": false
     }
   },
   "required": []

package/src/generators/library/files/lib/.babelrc.js.template

@@ -0,0 +1,21 @@
+module.exports = function (api) {
+  api.cache(true);
+
+  return {
+    presets: [
+      [
+        '@nx/react/babel',
+        {
+          runtime: 'automatic',
+          useBuiltIns: 'usage',
+        },
+      ],
+    ],
+    plugins: [],
+    env: {
+      test: {
+        presets: ['babel-preset-expo'],
+      },
+    },
+  };
+};

package/src/generators/library/lib/normalize-options.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeOptions = void 0;
+const devkit_1 = require("@nx/devkit");
 const project_name_and_root_utils_1 = require("@nx/devkit/src/generators/project-name-and-root-utils");
 async function normalizeOptions(host, options) {
     const { projectName, names: projectNames, projectRoot, importPath, } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(host, {
@@ -11,6 +12,10 @@ async function normalizeOptions(host, options) {
         projectNameAndRootFormat: options.projectNameAndRootFormat,
         callingGenerator: '@nx/expo:library',
     });
+    const nxJson = (0, devkit_1.readNxJson)(host);
+    const addPluginDefault = process.env.NX_ADD_PLUGINS !== 'false' &&
+        nxJson.useInferencePlugins !== false;
+    options.addPlugin ??= addPluginDefault;
     const parsedTags = options.tags
         ? options.tags.split(',').map((s) => s.trim())
         : [];

package/src/generators/library/library.js

@@ -8,8 +8,13 @@ const add_linting_1 = require("../../utils/add-linting");
 const add_jest_1 = require("../../utils/add-jest");
 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");
+const log_show_project_command_1 = require("@nx/devkit/src/utils/log-show-project-command");
 async function expoLibraryGenerator(host, schema) {
     return await expoLibraryGeneratorInternal(host, {
+        addPlugin: false,
         projectNameAndRootFormat: 'derived',
         ...schema,
     });
@@ -21,12 +26,17 @@ async function expoLibraryGeneratorInternal(host, schema) {
         throw new Error(`For publishable libs you have to provide a proper "--importPath" which needs to be a valid npm package name (e.g. my-awesome-lib or @myorg/my-lib)`);
     }
     const tasks = [];
-    const initTask = await (0, init_1.default)(host, {
-        ...options,
+    const jsInitTask = await (0, js_1.initGenerator)(host, {
+        ...schema,
         skipFormat: true,
-        e2eTestRunner: 'none',
     });
+    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);
     const addProjectTask = await addProject(host, options);
     if (addProjectTask) {
         tasks.push(addProjectTask);
@@ -40,7 +50,7 @@ async function expoLibraryGeneratorInternal(host, schema) {
         ],
     });
     tasks.push(lintTask);
-    const jestTask = await (0, add_jest_1.addJest)(host, options.unitTestRunner, options.name, options.projectRoot, options.js, options.skipPackageJson);
+    const jestTask = await (0, add_jest_1.addJest)(host, options.unitTestRunner, options.name, options.projectRoot, options.js, options.skipPackageJson, options.addPlugin);
     tasks.push(jestTask);
     if (options.publishable || options.buildable) {
         updateLibPackageNpmScope(host, options);
@@ -53,49 +63,53 @@ async function expoLibraryGeneratorInternal(host, schema) {
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(host);
     }
+    tasks.push(() => {
+        (0, log_show_project_command_1.logShowProjectCommand)(options.name);
+    });
     return (0, devkit_1.runTasksInSerial)(...tasks);
 }
 exports.expoLibraryGeneratorInternal = expoLibraryGeneratorInternal;
 async function addProject(host, options) {
-    const targets = {};
-    let task;
-    if (options.publishable || options.buildable) {
-        const { rollupInitGenerator } = (0, devkit_1.ensurePackage)('@nx/rollup', versions_1.nxVersion);
-        const external = [
-            'react/jsx-runtime',
-            'react-native',
-            'react',
-            'react-dom',
-        ];
-        targets.build = {
-            executor: '@nx/rollup:rollup',
-            outputs: ['{options.outputPath}'],
-            options: {
-                outputPath: `dist/${options.projectRoot}`,
-                tsConfig: `${options.projectRoot}/tsconfig.lib.json`,
-                project: `${options.projectRoot}/package.json`,
-                entryFile: maybeJs(options, `${options.projectRoot}/src/index.ts`),
-                external,
-                rollupConfig: `@nx/react/plugins/bundle-rollup`,
-                assets: [
-                    {
-                        glob: `${options.projectRoot}/README.md`,
-                        input: '.',
-                        output: '.',
-                    },
-                ],
-            },
-        };
-        task = await rollupInitGenerator(host, { ...options, skipFormat: true });
-    }
-    (0, devkit_1.addProjectConfiguration)(host, options.name, {
+    const project = {
         root: options.projectRoot,
         sourceRoot: (0, devkit_1.joinPathFragments)(options.projectRoot, 'src'),
         projectType: 'library',
         tags: options.parsedTags,
-        targets,
+        targets: {},
+    };
+    (0, devkit_1.addProjectConfiguration)(host, options.name, project);
+    if (!options.publishable && !options.buildable) {
+        return () => { };
+    }
+    const { configurationGenerator } = (0, devkit_1.ensurePackage)('@nx/rollup', versions_1.nxVersion);
+    const rollupConfigTask = await configurationGenerator(host, {
+        ...options,
+        project: options.name,
+        skipFormat: true,
     });
-    return task;
+    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}'],
+        options: {
+            outputPath: `dist/${options.projectRoot}`,
+            tsConfig: `${options.projectRoot}/tsconfig.lib.json`,
+            project: `${options.projectRoot}/package.json`,
+            entryFile: maybeJs(options, `${options.projectRoot}/src/index.ts`),
+            external,
+            rollupConfig: `@nx/react/plugins/bundle-rollup`,
+            assets: [
+                {
+                    glob: `${options.projectRoot}/README.md`,
+                    input: '.',
+                    output: '.',
+                },
+            ],
+        },
+    };
+    (0, devkit_1.updateProjectConfiguration)(host, options.name, project);
+    return rollupConfigTask;
 }
 function updateTsConfig(tree, options) {
     (0, devkit_1.updateJson)(tree, (0, devkit_1.joinPathFragments)(options.projectRoot, 'tsconfig.json'), (json) => {

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

@@ -21,4 +21,5 @@ export interface Schema {
   strict: boolean; // default is true
   setParserOptionsProject?: boolean;
   skipPackageJson?: boolean; // default is false
+  addPlugin?: boolean;
 }

package/src/generators/library/schema.json

@@ -1,7 +1,7 @@
 {
   "cli": "nx",
   "$id": "NxExpoLibrary",
-  "$schema": "http://json-schema.org/schema",
+  "$schema": "https://json-schema.org/schema",
   "description": "Create a Expo Library for Nx.",
   "type": "object",
   "examples": [
@@ -34,7 +34,7 @@
     "linter": {
       "description": "The tool to use for running lint checks.",
       "type": "string",
-      "enum": ["eslint"],
+      "enum": ["eslint", "none"],
       "default": "eslint"
     },
     "unitTestRunner": {

package/src/migrations/update-16-6-0/update-metro-config.js

@@ -32,7 +32,6 @@ const content = `
 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;
@@ -49,10 +48,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/migrations/update-16-9-0/remove-types-react-native.js

@@ -7,14 +7,7 @@ const devkit_1 = require("@nx/devkit");
  * @returns
  */
 async function update(tree) {
-    const packageJson = (0, devkit_1.readJson)(tree, 'package.json');
-    if (!packageJson.devDependencies['@types/react-native'] ||
-        !packageJson.dependencies['react-native']) {
-        return;
-    }
-    (0, devkit_1.updateJson)(tree, 'package.json', (packageJson) => {
-        delete packageJson.devDependencies['@types/react-native'];
-        return packageJson;
-    });
+    (0, devkit_1.removeDependenciesFromPackageJson)(tree, [], ['@types/react-native']);
+    await (0, devkit_1.formatFiles)(tree);
 }
 exports.default = update;

package/src/migrations/update-16-9-0/update-eas-cli-version.js

@@ -1,14 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const devkit_1 = require("@nx/devkit");
-const versions_1 = require("../../utils/versions");
 async function update(tree) {
     const projects = (0, devkit_1.getProjects)(tree);
     for (const [name, config] of projects.entries()) {
         if (config.targets?.['start']?.executor === '@nx/expo:start') {
             (0, devkit_1.updateJson)(tree, `${config.root}/eas.json`, (easJson) => {
                 if (easJson?.cli?.version) {
-                    easJson.cli.version = `>= ${versions_1.easCliVersion.replace('~', '')}`;
+                    easJson.cli.version = `>= 5`;
                 }
                 return easJson;
             });

package/src/migrations/{update-16-1-4/add-detox-app-json.d.ts → update-18-0-0/change-outputDir-export-target.d.ts}

@@ -1,5 +1,5 @@
 import { Tree } from '@nx/devkit';
 /**
- * Add detox plugin to app.json for expo
+ * Remove the offset from the outputDir of the export target
  */
 export default function update(tree: Tree): Promise<void>;

package/src/migrations/update-18-0-0/change-outputDir-export-target.js

@@ -0,0 +1,25 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const devkit_1 = require("@nx/devkit");
+/**
+ * Remove the offset from the outputDir of the export target
+ */
+async function update(tree) {
+    const projects = (0, devkit_1.getProjects)(tree);
+    for (const [projectName, config] of projects.entries()) {
+        if (config.targets?.['export']?.executor === '@nx/expo:export') {
+            const target = config.targets['export'];
+            if (target.options?.outputDir) {
+                const offset = (0, devkit_1.offsetFromRoot)(config.root);
+                target.options.outputDir = target.options.outputDir.replace(offset, '');
+                target.outputs = ['{options.outputDir}'];
+                (0, devkit_1.updateProjectConfiguration)(tree, projectName, config);
+            }
+        }
+        if (config.targets?.['export-web']?.executor === '@nx/expo:export') {
+            delete config.targets['export-web'];
+            (0, devkit_1.updateProjectConfiguration)(tree, projectName, config);
+        }
+    }
+}
+exports.default = update;

package/src/migrations/update-18-0-0/remove-block-list.d.ts

@@ -0,0 +1,6 @@
+import { Tree } from '@nx/devkit';
+/**
+ * This migration remove blockList in metro.config.js.
+ * It is now excluding dist folder in watchFolders in withNxMetro.
+ */
+export default function update(tree: Tree): Promise<void>;