@nx/expo 17.0.3 → 17.0.4

package/.eslintrc.json

@@ -27,6 +27,9 @@
               "nx",
               "@nx/rollup",
               "@nx/webpack",
+              "@nx/cypress",
+              "@nx/playwright",
+              "@nx/detox",
               "typescript",
               "eslint",
               "expo",

package/LICENSE

@@ -1,6 +1,6 @@
 (The MIT License)
 
-Copyright (c) 2017-2023 Narwhal Technologies Inc.
+Copyright (c) 2017-2024 Narwhal Technologies Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

package/README.md

@@ -1,4 +1,9 @@
-<p style="text-align: center;"><img src="https://raw.githubusercontent.com/nrwl/nx/master/images/nx.png" width="600" alt="Nx - Smart, Fast and Extensible Build System"></p>
+<p style="text-align: center;">
+  <picture>
+    <source media="(prefers-color-scheme: dark)" srcset="https://raw.githubusercontent.com/nrwl/nx/master/images/nx-dark.svg">
+    <img alt="Nx - Smart Monorepos · Fast CI" src="https://raw.githubusercontent.com/nrwl/nx/master/images/nx-light.svg" width="100%">
+  </picture>
+</p>
 
 <div style="text-align: center;">
 
@@ -15,9 +20,9 @@
 
 <hr>
 
-# Nx: Smart, Fast and Extensible Build System
+# Nx: Smart Monorepos · Fast CI
 
-Nx is a next generation build system with first class monorepo support and powerful integrations.
+Nx is a build system with built-in tooling and advanced CI capabilities. It helps you maintain and scale monorepos, both locally and on CI.
 
 This package is a [Expo plugin for Nx](https://nx.dev/expo/overview).
 
@@ -59,5 +64,5 @@ npx nx@latest init
 - [Blog Posts About Nx](https://blog.nrwl.io/nx/home)
 
 <p style="text-align: center;"><a href="https://nx.dev/#learning-materials" target="_blank" rel="noreferrer"><img src="https://raw.githubusercontent.com/nrwl/nx/master/images/nx-courses-and-videos.svg" 
-width="100%" alt="Nx - Smart, Fast and Extensible Build System"></a></p>
+width="100%" alt="Nx - Smart Monorepos · Fast CI"></a></p>
 

package/docs/export-examples.md

@@ -0,0 +1,112 @@
+`project.json`:
+
+```json
+{
+  "name": "mobile",
+  //...
+  "targets": {
+    //...
+    "export": {
+      "executor": "@nx/expo:export",
+      "options": {
+        "outputs": ["{options.outputDir}"],
+        "platform": "all",
+        "outputDir": "dist/apps/mobile"
+      },
+      "dependsOn": ["sync-deps"]
+    }
+    //...
+  }
+}
+```
+
+```shell
+nx run mobile:export
+```
+
+## Examples
+
+{% tabs %}
+{% tab label="Specify outputDir" %}
+The `outputDir` option allows you to specify the output directory of your bundle:
+
+```json
+    "export": {
+      "executor": "@nx/expo:export",
+      "outputs": ["{options.outputDir}"],
+      "options": {
+        "platform": "all",
+        "bundler": "metro",
+        "outputDir": "dist/apps/mobile"
+      },
+      "dependsOn": ["sync-deps"]
+    },
+```
+
+or run command: `nx run mobile:export --outputDir=dist/apps/mobile`.
+
+{% /tab %}
+{% tab label="Specify the platform" %}
+The `platform` option allows you to specify the platform to compile with metro bundler: "ios", "android", "all", and "web".
+
+For example, to bundle for web:
+
+```json
+    "export": {
+      "executor": "@nx/expo:export",
+      "outputs": ["{options.outputDir}"],
+      "options": {
+        "platform": "web",
+        "bundler": "metro",
+        "outputDir": "dist/apps/dogs"
+      },
+      "dependsOn": ["sync-deps"]
+    },
+```
+
+or run command `nx export mobile --platform=web`.
+
+{% /tab %}
+{% tab label="Bundle for development" %}
+
+The `dev` option allows you to bundle for development environments.
+
+```json
+    "export": {
+      "executor": "@nx/expo:export",
+      "outputs": ["{options.outputDir}"],
+      "options": {
+        "platform": "web",
+        "bundler": "metro",
+        "outputDir": "dist/apps/dogs",
+        "dev": true
+      },
+      "dependsOn": ["sync-deps"]
+    },
+```
+
+or run command `nx export mobile --dev`.
+
+{% /tab %}
+{% tab label="Clear bundle cache" %}
+
+The `clear` option allows you to clear bundle cache.
+
+```json
+    "export": {
+      "executor": "@nx/expo:export",
+      "outputs": ["{options.outputDir}"],
+      "options": {
+        "platform": "web",
+        "bundler": "metro",
+        "outputDir": "dist/apps/dogs",
+        "clear": true
+      },
+      "dependsOn": ["sync-deps"]
+    },
+```
+
+or run command `nx export mobile --clear`.
+
+{% /tab %}
+{% /tabs %}

package/docs/start-examples.md

@@ -39,6 +39,8 @@ Opens your app in Expo Go in a currently running iOS simulator on your computer:
     }
 ```
 
+or run command `nx start <your app name> --ios`.
+
 Opens your app in Expo Go on a connected Android device
 
 ```json
@@ -51,6 +53,8 @@ Opens your app in Expo Go on a connected Android device
     }
 ```
 
+or run command `nx start <your app name> --android`.
+
 Opens your app in a web browser:
 
 ```json
@@ -63,6 +67,8 @@ Opens your app in a web browser:
     }
 ```
 
+or run command `nx start <your app name> --web`.
+
 {% /tab %}
 {% tab label="Specify the host" %}
 The `host` option allows you to specify the type of host to use. `lan` uses the local network; `tunnel` ues any network by tunnel through ngrok; `localhost` connects to the dev server over localhost.

package/executors.json

@@ -54,6 +54,11 @@
       "implementation": "./src/executors/submit/submit.impl",
       "schema": "./src/executors/submit/schema.json",
       "description": "Submit app binary to App Store and/or Play Store"
+    },
+    "serve": {
+      "implementation": "./src/executors/serve/serve.impl",
+      "schema": "./src/executors/serve/schema.json",
+      "description": "Serve up the Expo web app locally"
     }
   }
 }

package/generators.json

@@ -4,9 +4,9 @@
   "extends": ["@nx/workspace"],
   "generators": {
     "init": {
-      "factory": "./src/generators/init/init#expoInitGenerator",
+      "factory": "./src/generators/init/init#expoInitGeneratorInternal",
       "schema": "./src/generators/init/schema.json",
-      "description": "Initialize the @nrwl/expo plugin",
+      "description": "Initialize the @nx/expo plugin",
       "hidden": true
     },
     "application": {

package/migrations.json

@@ -36,12 +36,6 @@
       "description": "Update package.json eas build lifecycle scripts",
       "implementation": "./src/migrations/update-16-1-4/update-eas-scripts"
     },
-    "add-detox-app-json-16-1-4": {
-      "version": "16.1.4-beta.0",
-      "cli": "nx",
-      "description": "Add app.json for detox",
-      "factory": "./src/migrations/update-16-1-4/add-detox-app-json"
-    },
     "update-16-6-0-add-dependsOn": {
       "cli": "nx",
       "version": "16.6.0-beta.0",
@@ -65,6 +59,30 @@
       "version": "16.9.0-beta.1",
       "description": "Update eas.json cli version",
       "implementation": "./src/migrations/update-16-9-0/update-eas-cli-version"
+    },
+    "update-18-0-0-remove-block-list": {
+      "cli": "nx",
+      "version": "18.0.0-beta.0",
+      "description": "Remove blockList in metro.config.js",
+      "implementation": "./src/migrations/update-18-0-0/remove-block-list"
+    },
+    "update-18-0-0-remove-symlink-target": {
+      "cli": "nx",
+      "version": "18.0.0-beta.0",
+      "description": "Remove symlink target in project.json",
+      "implementation": "./src/migrations/update-18-0-0/remove-symlink-target"
+    },
+    "update-18-0-0-remove-eas-cli": {
+      "cli": "nx",
+      "version": "18.0.0-beta.0",
+      "description": "Remove eas-cli from package.json",
+      "implementation": "./src/migrations/update-18-0-0/remove-eas-cli"
+    },
+    "update-18-0-0-remove-offset-export-outputDir": {
+      "cli": "nx",
+      "version": "18.0.0-beta.0",
+      "description": "Remove the offset from the outputDir of the export target",
+      "implementation": "./src/migrations/update-18-0-0/change-outputDir-export-target"
     }
   },
   "packageJsonUpdates": {
@@ -576,6 +594,96 @@
           "alwaysAddToPackageJson": false
         }
       }
+    },
+    "17.1.0": {
+      "version": "17.1.0-beta.0",
+      "packages": {
+        "expo": {
+          "version": "49.0.16",
+          "alwaysAddToPackageJson": false
+        },
+        "@expo/cli": {
+          "version": "~0.10.13",
+          "alwaysAddToPackageJson": false
+        },
+        "react-native": {
+          "version": "0.72.6",
+          "alwaysAddToPackageJson": false
+        },
+        "react-native-web": {
+          "version": "~0.19.9",
+          "alwaysAddToPackageJson": false
+        },
+        "metro-resolver": {
+          "version": "0.76.8",
+          "alwaysAddToPackageJson": false
+        },
+        "metro": {
+          "version": "0.76.8",
+          "alwaysAddToPackageJson": false
+        }
+      }
+    },
+    "18.0.0": {
+      "version": "18.0.0-beta.0",
+      "packages": {
+        "expo": {
+          "version": "50.0.1",
+          "alwaysAddToPackageJson": false
+        },
+        "expo-splash-screen": {
+          "version": "~0.26.1",
+          "alwaysAddToPackageJson": false
+        },
+        "expo-status-bar": {
+          "version": "~1.11.1",
+          "alwaysAddToPackageJson": false
+        },
+        "@expo/cli": {
+          "version": "~0.16.5",
+          "alwaysAddToPackageJson": false
+        },
+        "babel-preset-expo": {
+          "version": "~10.0.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@types/react": {
+          "version": "~18.2.45",
+          "alwaysAddToPackageJson": false
+        },
+        "react-native": {
+          "version": "~0.73.2",
+          "alwaysAddToPackageJson": false
+        },
+        "react-native-web": {
+          "version": "~0.19.9",
+          "alwaysAddToPackageJson": false
+        },
+        "@expo/metro-config": {
+          "version": "~0.17.3",
+          "alwaysAddToPackageJson": false
+        },
+        "@expo/metro-runtime": {
+          "version": "~3.1.1",
+          "addToPackageJson": "devDependencies"
+        },
+        "react-native-svg-transformer": {
+          "version": "1.2.0",
+          "alwaysAddToPackageJson": false
+        },
+        "react-native-svg": {
+          "version": "14.1.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@testing-library/react-native": {
+          "version": "~12.4.2",
+          "alwaysAddToPackageJson": false
+        },
+        "jest-expo": {
+          "version": "~50.0.1",
+          "alwaysAddToPackageJson": false
+        }
+      }
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/expo",
-  "version": "17.0.3",
+  "version": "17.0.4",
   "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": [
@@ -26,27 +26,23 @@
   "main": "./index.js",
   "types": "index.d.ts",
   "dependencies": {
+    "@nx/devkit": "17.0.4",
     "chalk": "^4.1.0",
     "enhanced-resolve": "^5.8.3",
     "fs-extra": "^11.1.0",
-    "metro-config": "0.76.7",
-    "metro-resolver": "0.76.7",
+    "metro-config": "~0.80.4",
+    "metro-resolver": "~0.80.4",
+    "node-fetch": "^2.6.7",
     "tslib": "^2.3.0",
     "tsconfig-paths": "^4.1.2",
     "tsconfig-paths-webpack-plugin": "^4.0.0",
-    "@nx/detox": "17.0.3",
-    "@nx/devkit": "17.0.3",
-    "@nx/jest": "17.0.3",
-    "@nx/js": "17.0.3",
-    "@nx/eslint": "17.0.3",
-    "@nx/react": "17.0.3",
-    "@nx/webpack": "17.0.3",
-    "@nrwl/expo": "17.0.3"
-  },
-  "peerDependencies": {
-    "expo": ">= 49.0.0",
-    "@expo/cli": ">= 0.10.0",
-    "eas-cli": ">= 3.15.0"
+    "@nx/jest": "17.0.4",
+    "@nx/js": "17.0.4",
+    "@nx/eslint": "17.0.4",
+    "@nx/react": "17.0.4",
+    "@nx/web": "17.0.4",
+    "@nx/webpack": "17.0.4",
+    "@nrwl/expo": "17.0.4"
   },
   "executors": "./executors.json",
   "ng-update": {

package/plugin.d.ts

@@ -0,0 +1 @@
+export { createNodes, createDependencies, ExpoPluginOptions, } from './plugins/plugin';

package/plugin.js

@@ -0,0 +1,6 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createDependencies = exports.createNodes = void 0;
+var plugin_1 = require("./plugins/plugin");
+Object.defineProperty(exports, "createNodes", { enumerable: true, get: function () { return plugin_1.createNodes; } });
+Object.defineProperty(exports, "createDependencies", { enumerable: true, get: function () { return plugin_1.createDependencies; } });

package/plugins/metro-resolver.js

@@ -27,6 +27,9 @@ function getResolveRequest(extensions) {
         if (resolvedPath) {
             return resolvedPath;
         }
+        if (debug) {
+            console.log(chalk.red(`[Nx] Unable to resolve with any resolver: ${realModuleName}`));
+        }
         throw new Error(`Cannot resolve ${chalk.bold(realModuleName)}`);
     };
 }
@@ -84,7 +87,7 @@ function tsconfigPathsResolver(context, extensions, realModuleName, platform, de
     }
     catch {
         if (debug) {
-            console.log(chalk.red(`[Nx] Failed to resolve ${chalk.bold(realModuleName)}`));
+            console.log(chalk.cyan(`[Nx] Failed to resolve ${chalk.bold(realModuleName)}`));
             console.log(chalk.cyan(`[Nx] The following tsconfig paths was used:\n:${chalk.bold(JSON.stringify(paths, null, 2))}`));
         }
     }

package/plugins/plugin.d.ts

@@ -0,0 +1,14 @@
+import { CreateDependencies, CreateNodes } from '@nx/devkit';
+export interface ExpoPluginOptions {
+    startTargetName?: string;
+    serveTargetName?: string;
+    runIosTargetName?: string;
+    runAndroidTargetName?: string;
+    exportTargetName?: string;
+    prebuildTargetName?: string;
+    installTargetName?: string;
+    buildTargetName?: string;
+    submitTargetName?: string;
+}
+export declare const createDependencies: CreateDependencies;
+export declare const createNodes: CreateNodes<ExpoPluginOptions>;

package/plugins/plugin.js

@@ -0,0 +1,150 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createNodes = exports.createDependencies = void 0;
+const devkit_1 = require("@nx/devkit");
+const path_1 = require("path");
+const js_1 = require("@nx/js");
+const get_named_inputs_1 = require("@nx/devkit/src/utils/get-named-inputs");
+const fs_1 = require("fs");
+const calculate_hash_for_create_nodes_1 = require("@nx/devkit/src/utils/calculate-hash-for-create-nodes");
+const cache_directory_1 = require("nx/src/utils/cache-directory");
+const cachePath = (0, path_1.join)(cache_directory_1.projectGraphCacheDirectory, 'expo.hash');
+const targetsCache = (0, fs_1.existsSync)(cachePath) ? readTargetsCache() : {};
+const calculatedTargets = {};
+function readTargetsCache() {
+    return (0, devkit_1.readJsonFile)(cachePath);
+}
+function writeTargetsToCache(targets) {
+    (0, devkit_1.writeJsonFile)(cachePath, targets);
+}
+const createDependencies = () => {
+    writeTargetsToCache(calculatedTargets);
+    return [];
+};
+exports.createDependencies = createDependencies;
+exports.createNodes = [
+    '**/app.{json,config.js}',
+    (configFilePath, options, context) => {
+        options = normalizeOptions(options);
+        const projectRoot = (0, path_1.dirname)(configFilePath);
+        // 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('metro.config.js')) {
+            return {};
+        }
+        const appConfig = getAppConfig(configFilePath, context);
+        // if appConfig.expo is not defined
+        if (!appConfig.expo) {
+            return {};
+        }
+        const hash = (0, calculate_hash_for_create_nodes_1.calculateHashForCreateNodes)(projectRoot, options, context, [
+            (0, js_1.getLockFileName)((0, devkit_1.detectPackageManager)(context.workspaceRoot)),
+        ]);
+        const targets = targetsCache[hash]
+            ? targetsCache[hash]
+            : buildExpoTargets(projectRoot, options, context);
+        calculatedTargets[hash] = targets;
+        return {
+            projects: {
+                [projectRoot]: {
+                    targets,
+                },
+            },
+        };
+    },
+];
+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 },
+        },
+        [options.serveTargetName]: {
+            command: `expo start --web`,
+            options: { cwd: projectRoot },
+        },
+        [options.runIosTargetName]: {
+            command: `expo run:ios`,
+            options: { cwd: projectRoot },
+        },
+        [options.runAndroidTargetName]: {
+            command: `expo run:android`,
+            options: { cwd: projectRoot },
+        },
+        [options.exportTargetName]: {
+            command: `expo export`,
+            options: { cwd: projectRoot },
+            cache: true,
+            dependsOn: [`^${options.exportTargetName}`],
+            inputs: getInputs(namedInputs),
+            outputs: [getOutputs(projectRoot, 'dist')],
+        },
+        [options.installTargetName]: {
+            command: `expo install`,
+            options: { cwd: devkit_1.workspaceRoot }, // install at workspace root
+        },
+        [options.prebuildTargetName]: {
+            executor: `@nx/expo:prebuild`,
+        },
+        [options.buildTargetName]: {
+            command: `eas build`,
+            options: { cwd: projectRoot },
+        },
+        [options.submitTargetName]: {
+            command: `eas submit`,
+            options: { cwd: projectRoot },
+        },
+    };
+    return targets;
+}
+function getAppConfig(configFilePath, context) {
+    const resolvedPath = (0, path_1.join)(context.workspaceRoot, configFilePath);
+    let module = load(resolvedPath);
+    return module.default ?? module;
+}
+function getInputs(namedInputs) {
+    return [
+        ...('production' in namedInputs
+            ? ['default', '^production']
+            : ['default', '^default']),
+        {
+            externalDependencies: ['expo'],
+        },
+    ];
+}
+function getOutputs(projectRoot, dir) {
+    if (projectRoot === '.') {
+        return `{projectRoot}/${dir}`;
+    }
+    else {
+        return `{workspaceRoot}/${projectRoot}/${dir}`;
+    }
+}
+/**
+ * Load the module after ensuring that the require cache is cleared.
+ */
+function load(path) {
+    // Clear cache if the path is in the cache
+    if (require.cache[path]) {
+        for (const k of Object.keys(require.cache)) {
+            delete require.cache[k];
+        }
+    }
+    // Then require
+    return require(path);
+}
+function normalizeOptions(options) {
+    options ??= {};
+    options.startTargetName ??= 'start';
+    options.serveTargetName ??= 'serve';
+    options.runIosTargetName ??= 'run-ios';
+    options.runAndroidTargetName ??= 'run-android';
+    options.exportTargetName ??= 'export';
+    options.prebuildTargetName ??= 'prebuild';
+    options.installTargetName ??= 'install';
+    options.buildTargetName ??= 'build';
+    options.submitTargetName ??= 'submit';
+    return options;
+}

package/plugins/with-nx-metro.js

@@ -11,14 +11,18 @@ async function withNxMetro(userConfig, opts = {}) {
         process.env.NX_REACT_NATIVE_DEBUG = 'true';
     if (opts.extensions)
         extensions.push(...opts.extensions);
-    let watchFolders = [devkit_1.workspaceRoot];
+    let watchFolders = (0, fs_extra_1.readdirSync)(devkit_1.workspaceRoot)
+        .filter((fileName) => !['dist', 'e2e'].includes(fileName) && !fileName.startsWith('.'))
+        .map((fileName) => (0, devkit_1.joinPathFragments)(devkit_1.workspaceRoot, fileName))
+        .filter((filePath) => (0, fs_extra_1.statSync)(filePath).isDirectory());
     if (opts.watchFolders?.length) {
         watchFolders = watchFolders.concat(opts.watchFolders);
     }
-    watchFolders = watchFolders.filter((folder) => (0, fs_extra_1.existsSync)(folder));
+    watchFolders = [...new Set(watchFolders)].filter((folder) => (0, fs_extra_1.existsSync)(folder));
     const nxConfig = {
         resolver: {
             resolveRequest: (0, metro_resolver_1.getResolveRequest)(extensions),
+            nodeModulesPaths: [(0, devkit_1.joinPathFragments)(devkit_1.workspaceRoot, 'node_modules')],
         },
         watchFolders,
     };

package/plugins/with-nx-webpack.d.ts

@@ -1,5 +1,5 @@
 /**
- * @deprecated TODO(v17) use bundler: 'metro' instead, will be removed in 16.0.0
+ * @deprecated TODO(v19) use bundler: 'metro' instead, will be removed in v19
  * This function add additional rules to expo's webpack config to make expo web working
  */
 export declare function withNxWebpack(config: any): Promise<any>;

package/plugins/with-nx-webpack.js

@@ -4,12 +4,12 @@ exports.withNxWebpack = void 0;
 const tsconfig_paths_webpack_plugin_1 = require("tsconfig-paths-webpack-plugin");
 const path_1 = require("path");
 /**
- * @deprecated TODO(v17) use bundler: 'metro' instead, will be removed in 16.0.0
+ * @deprecated TODO(v19) use bundler: 'metro' instead, will be removed in v19
  * This function add additional rules to expo's webpack config to make expo web working
  */
 async function withNxWebpack(config) {
     // add additional rule to load files under libs
-    const rules = config.module.rules[1]?.oneOf;
+    const rules = config.module.rules.find((rule) => Array.isArray(rule.oneOf))?.oneOf;
     if (rules) {
         rules.push({
             test: /\.(mjs|[jt]sx?)$/,
@@ -36,12 +36,16 @@ async function withNxWebpack(config) {
         config.resolve.plugins = [];
     }
     const extensions = ['.ts', '.tsx', '.mjs', '.js', '.jsx'];
-    const tsConfigPath = (0, path_1.resolve)('tsconfig.json');
+    const tsConfigPath = (0, path_1.resolve)(__dirname, 'tsconfig.json');
     config.resolve.plugins.push(new tsconfig_paths_webpack_plugin_1.TsconfigPathsPlugin({
         configFile: tsConfigPath,
         extensions,
     }));
-    config.resolve.symlinks = true;
+    config.resolve.fallback = {
+        ...config.resolve.fallback,
+        crypto: require.resolve('crypto-browserify'),
+        stream: require.resolve('stream-browserify'),
+    };
     return config;
 }
 exports.withNxWebpack = withNxWebpack;