@nx/expo 19.6.3 → 19.6.5

package/migrations.json

@@ -77,6 +77,12 @@
       "cli": "nx",
       "description": "Remove deprecated webpack.config.js",
       "factory": "./src/migrations/update-19-2-0/remove-deprecated-webpack-config"
+    },
+    "update-19-7-0-remove-eas-pre-install": {
+      "version": "19.7.0-beta.4",
+      "cli": "nx",
+      "description": "Remove eas-build-pre-install script from app's package.json",
+      "factory": "./src/migrations/update-19-7-0/remove-eas-pre-install"
     }
   },
   "packageJsonUpdates": {

package/package.json

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

package/plugins/plugin.js

@@ -61,7 +61,7 @@ function buildExpoTargets(projectRoot, options, context) {
         },
         [options.serveTargetName]: {
             command: `expo start --web`,
-            options: { cwd: projectRoot },
+            options: { cwd: projectRoot, args: ['--clear'] },
         },
         [options.runIosTargetName]: {
             command: `expo run:ios`,
@@ -73,7 +73,7 @@ function buildExpoTargets(projectRoot, options, context) {
         },
         [options.exportTargetName]: {
             command: `expo export`,
-            options: { cwd: projectRoot },
+            options: { cwd: projectRoot, args: ['--clear'] },
             cache: true,
             dependsOn: [`^${options.exportTargetName}`],
             inputs: getInputs(namedInputs),
@@ -86,8 +86,7 @@ function buildExpoTargets(projectRoot, options, context) {
             executor: `@nx/expo:prebuild`,
         },
         [options.buildTargetName]: {
-            command: `eas build`,
-            options: { cwd: projectRoot },
+            executor: `@nx/expo:build`,
         },
         [options.submitTargetName]: {
             command: `eas submit`,

package/src/executors/build/build.impl.js

@@ -2,17 +2,22 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = buildExecutor;
 const devkit_1 = require("@nx/devkit");
+const js_1 = require("@nx/js");
+const fs_extra_1 = require("fs-extra");
 const path_1 = require("path");
 const child_process_1 = require("child_process");
 const resolve_eas_1 = require("../../utils/resolve-eas");
 let childProcess;
 async function* buildExecutor(options, context) {
     const projectRoot = context.projectsConfigurations.projects[context.projectName].root;
+    let resetLocalFunction;
     try {
+        resetLocalFunction = copyPackageJsonAndLock((0, devkit_1.detectPackageManager)(context.root), context.root, projectRoot);
         await runCliBuild(context.root, projectRoot, options);
         yield { success: true };
     }
     finally {
+        resetLocalFunction();
         if (childProcess) {
             childProcess.kill();
         }
@@ -68,3 +73,42 @@ function createBuildOptions(options) {
         return acc;
     }, []);
 }
+/**
+ * This function:
+ * - copies the root package.json and lock file to the project directory
+ * - returns a function that resets the project package.json and removes the lock file
+ */
+function copyPackageJsonAndLock(packageManager, workspaceRoot, projectRoot) {
+    const packageJson = (0, path_1.resolve)(workspaceRoot, 'package.json');
+    const rootPackageJson = (0, devkit_1.readJsonFile)(packageJson);
+    // do not copy package.json and lock file if workspaces are enabled
+    if ((packageManager === 'pnpm' &&
+        (0, fs_extra_1.existsSync)((0, path_1.resolve)(workspaceRoot, 'pnpm-workspace.yaml'))) ||
+        rootPackageJson.workspaces) {
+        return;
+    }
+    const packageJsonProject = (0, path_1.resolve)(projectRoot, 'package.json');
+    const projectPackageJson = (0, devkit_1.readJsonFile)(packageJsonProject);
+    const lockFile = (0, js_1.getLockFileName)((0, devkit_1.detectPackageManager)(workspaceRoot));
+    const lockFileProject = (0, path_1.resolve)(projectRoot, lockFile);
+    const rootPackageJsonDependencies = rootPackageJson.dependencies;
+    const projectPackageJsonDependencies = { ...projectPackageJson.dependencies };
+    const rootPackageJsonDevDependencies = rootPackageJson.devDependencies;
+    const projectPackageJsonDevDependencies = {
+        ...projectPackageJson.devDependencies,
+    };
+    projectPackageJson.dependencies = rootPackageJsonDependencies;
+    projectPackageJson.devDependencies = rootPackageJsonDevDependencies;
+    // Copy dependencies from root package.json to project package.json
+    (0, fs_extra_1.writeFileSync)(packageJsonProject, JSON.stringify(projectPackageJson, null, 2));
+    // Copy lock file from root to project
+    (0, fs_extra_1.copyFileSync)(lockFile, lockFileProject);
+    return () => {
+        // Reset project package.json to original state
+        projectPackageJson.dependencies = projectPackageJsonDependencies;
+        projectPackageJson.devDependencies = projectPackageJsonDevDependencies;
+        (0, fs_extra_1.writeFileSync)(packageJsonProject, JSON.stringify(projectPackageJson, null, 2));
+        // Remove lock file from project
+        (0, fs_extra_1.removeSync)(lockFileProject);
+    };
+}

package/src/executors/build/schema.d.ts

@@ -11,4 +11,8 @@ export interface ExpoEasBuildOptions {
   json: boolean; // default is false
   autoSubmit: boolean; // default is false
   autoSubmitWithProfile?: string;
+  message?: string;
+  // values from https://github.com/expo/eas-build/blob/main/packages/logger/src/level.ts
+  buildLoggerLevel: 'trace' | 'debug' | 'info' | 'warn' | 'error' | 'fatal'; // default is info
+  freezeCredentials: boolean; // default is false
 }

package/src/executors/build/schema.json

@@ -77,6 +77,22 @@
       "type": "string",
       "description": "Submit on build complete using the submit profile with provided name",
       "examples": ["production", "development", "preview"]
+    },
+    "message": {
+      "type": "string",
+      "description": "A short message describing the build",
+      "examples": ["My message"]
+    },
+    "buildLoggerLevel": {
+      "type": "string",
+      "description": "The level of logs to output during the build process.",
+      "enum": ["trace", "debug", "info", "warn", "error", "fatal"],
+      "default": "info"
+    },
+    "freezeCredentials": {
+      "type": "boolean",
+      "description": "Prevent the build from updating credentials in non-interactive mode",
+      "default": false
     }
   },
   "required": []

package/src/executors/serve/serve.impl.js

@@ -58,9 +58,8 @@ function serveAsync(workspaceRoot, projectRoot, options) {
         });
         childProcess.stdout.on('data', (data) => {
             process.stdout.write(data);
-            if (data
-                .toString()
-                .includes('Bundling complete' || data.toString().includes('Bundled'))) {
+            if (data.toString().includes('Bundling complete') ||
+                data.toString().includes('Bundled')) {
                 resolve(childProcess);
             }
         });

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

@@ -12,6 +12,7 @@ const { assetExts, sourceExts } = defaultConfig.resolver;
  * @type {import('metro-config').MetroConfig}
  */
 const customConfig = {
+  cacheVersion: "<%= projectName %>",
   transformer: {
     babelTransformerPath: require.resolve('react-native-svg-transformer'),
   },

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

@@ -12,7 +12,6 @@
     "react-native-web": "*"
   },
   "scripts": {
-    "eas-build-pre-install": "cd <%= offsetFromRoot %> && node tools/scripts/eas-build-pre-install.mjs . <%= appProjectRoot %> && cp <%= packageLockFile %> <%= appProjectRoot %>",
     "eas-build-post-install": "cd <%= offsetFromRoot %> && node tools/scripts/eas-build-post-install.mjs . <%= appProjectRoot %>"
   }
 }

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

@@ -1,3 +1,3 @@
-import type { GeneratorCallback, Tree } from '@nx/devkit';
+import { 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

@@ -7,16 +7,18 @@ const versions_1 = require("../../../utils/versions");
 const has_expo_plugin_1 = require("../../../utils/has-expo-plugin");
 const target_defaults_utils_1 = require("@nx/devkit/src/generators/target-defaults-utils");
 const find_plugin_for_config_file_1 = require("@nx/devkit/src/utils/find-plugin-for-config-file");
+const e2e_web_server_info_utils_1 = require("@nx/devkit/src/generators/e2e-web-server-info-utils");
 async function addE2e(tree, options) {
     const hasPlugin = (0, has_expo_plugin_1.hasExpoPlugin)(tree);
+    if (!hasPlugin) {
+        await (0, web_1.webStaticServeGenerator)(tree, {
+            buildTarget: `${options.projectName}:export`,
+            targetName: 'serve-static',
+        });
+    }
+    const e2eWebServerInfo = await getExpoE2EWebServerInfo(tree, options.projectName, (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'app.json'), options.addPlugin);
     switch (options.e2eTestRunner) {
         case 'cypress': {
-            if (!hasPlugin) {
-                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',
@@ -33,12 +35,14 @@ async function addE2e(tree, options) {
                 // 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: hasPlugin
-                    ? `nx run ${options.projectName}:serve-static`
-                    : undefined,
+                devServerTarget: e2eWebServerInfo.e2eDevServerTarget,
+                baseUrl: e2eWebServerInfo.e2eWebServerAddress,
+                ciWebServerCommand: e2eWebServerInfo.e2eCiWebServerCommand,
+                webServerCommands: {
+                    default: e2eWebServerInfo.e2eWebServerCommand,
+                    production: e2eWebServerInfo.e2eCiWebServerCommand,
+                },
+                ciBaseUrl: e2eWebServerInfo.e2eCiBaseUrl,
                 jsx: true,
                 rootProject: options.rootProject,
             });
@@ -74,8 +78,8 @@ async function addE2e(tree, options) {
                 js: false,
                 linter: options.linter,
                 setParserOptionsProject: options.setParserOptionsProject,
-                webServerCommand: `${(0, devkit_1.getPackageManagerCommand)().exec} nx ${options.e2eWebServerTarget} ${options.name}`,
-                webServerAddress: options.e2eWebServerAddress,
+                webServerCommand: e2eWebServerInfo.e2eCiWebServerCommand,
+                webServerAddress: e2eWebServerInfo.e2eCiBaseUrl,
                 rootProject: options.rootProject,
                 addPlugin: options.addPlugin,
             });
@@ -113,3 +117,23 @@ async function addE2e(tree, options) {
             return () => { };
     }
 }
+async function getExpoE2EWebServerInfo(tree, projectName, configFilePath, isPluginBeingAdded) {
+    const nxJson = (0, devkit_1.readNxJson)(tree);
+    let e2ePort = isPluginBeingAdded ? 8081 : 4200;
+    if (nxJson.targetDefaults?.['serve'] &&
+        nxJson.targetDefaults?.['serve'].options?.port) {
+        e2ePort = nxJson.targetDefaults?.['serve'].options?.port;
+    }
+    return (0, e2e_web_server_info_utils_1.getE2EWebServerInfo)(tree, projectName, {
+        plugin: '@nx/expo/plugin',
+        serveTargetName: 'serveTargetName',
+        serveStaticTargetName: 'serveTargetName',
+        configFilePath,
+    }, {
+        defaultServeTargetName: 'serve',
+        defaultServeStaticTargetName: 'serve-static',
+        defaultE2EWebServerAddress: `http://localhost:${e2ePort}`,
+        defaultE2ECiBaseUrl: 'http://localhost:4200',
+        defaultE2EPort: e2ePort,
+    }, isPluginBeingAdded);
+}

package/src/generators/application/lib/add-eas-scripts.js

@@ -1,41 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addEasScripts = addEasScripts;
-const preInstallScript = `
-/*
- * This script is used to patch the '@nx/expo' package to work with EAS Build.
- * It is run as the eas-build-pre-install script in the 'package.json' of expo app.
- * It is executed as 'node tools/scripts/eas-build-pre-install.mjs <workspace root> <project root>'
- * It will copy the dependencies and devDependencies from the workspace package.json to project's package.json.
- * This is needed because EAS Build does the install in project's directory and not workspace's directory.
- */
-import { readFileSync, writeFileSync } from 'fs';
-import { join } from 'path';
-
-const [workspaceRoot, projectRoot] = process.argv.slice(2);
-if (!workspaceRoot) {
-  throw new Error('Missing workspace root');
-}
-if (!projectRoot) {
-  throw new Error('Missing project root');
-}
-try {
-  const workspacePackage = JSON.parse(
-    readFileSync(join(workspaceRoot, 'package.json')).toString()
-  );
-  const projectPackage = JSON.parse(
-    readFileSync(join(projectRoot, 'package.json')).toString()
-  );
-  projectPackage.dependencies = workspacePackage.dependencies;
-  projectPackage.devDependencies = workspacePackage.devDependencies;
-  writeFileSync(
-    join(projectRoot, 'package.json'),
-    JSON.stringify(projectPackage, null, 2)
-  );
-} catch (e) {
-  console.error('Error reading package.json file', e);
-}
-`;
 const postInstallScript = `
 /**
  * This script is used to patch the '@nx/expo' package to work with EAS Build.
@@ -62,11 +27,7 @@ symlink(join(projectRoot, 'node_modules'), join(workspaceRoot, 'node_modules'),
 });
 `;
 function addEasScripts(tree) {
-    const preInstallScriptPath = 'tools/scripts/eas-build-pre-install.mjs';
     const postInstallScriptPath = 'tools/scripts/eas-build-post-install.mjs';
-    if (!tree.exists(preInstallScriptPath)) {
-        tree.write(preInstallScriptPath, preInstallScript);
-    }
     if (!tree.exists(postInstallScriptPath)) {
         tree.write(postInstallScriptPath, postInstallScript);
     }

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

@@ -9,8 +9,5 @@ export interface NormalizedSchema extends Schema {
     rootProject: boolean;
     e2eProjectName: string;
     e2eProjectRoot: string;
-    e2eWebServerAddress: string;
-    e2eWebServerTarget: string;
-    e2ePort: number;
 }
 export declare function normalizeOptions(host: Tree, options: Schema): Promise<NormalizedSchema>;

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

@@ -21,31 +21,12 @@ async function normalizeOptions(host, options) {
         ? 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,
+        e2eTestRunner: options.e2eTestRunner || 'none',
         name: projectNames.projectSimpleName,
         className,
         lowerCaseName: className.toLowerCase(),
@@ -56,8 +37,5 @@ async function normalizeOptions(host, options) {
         rootProject,
         e2eProjectName,
         e2eProjectRoot,
-        e2eWebServerAddress,
-        e2eWebServerTarget,
-        e2ePort,
     };
 }

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

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

package/src/generators/application/schema.json

@@ -76,7 +76,7 @@
       "description": "Adds the specified e2e test runner",
       "type": "string",
       "enum": ["playwright", "cypress", "detox", "none"],
-      "default": "playwright"
+      "default": "none"
     },
     "standaloneConfig": {
       "description": "Split the project configuration into `<projectRoot>/project.json` rather than including it inside `workspace.json`.",

package/src/migrations/update-16-1-4/update-eas-scripts.d.ts

@@ -1,5 +1,5 @@
 import { Tree } from '@nx/devkit';
 /**
- * Update app's package.json to use eas-build-pre-install and eas-build-post-install scripts.
+ * Update app's package.json to use eas-build-post-install scripts.
  */
 export default function update(tree: Tree): void;

package/src/migrations/update-16-1-4/update-eas-scripts.js

@@ -5,16 +5,10 @@ const devkit_1 = require("@nx/devkit");
 const add_eas_scripts_1 = require("../../generators/application/lib/add-eas-scripts");
 const path_1 = require("path");
 /**
- * Update app's package.json to use eas-build-pre-install and eas-build-post-install scripts.
+ * Update app's package.json to use eas-build-post-install scripts.
  */
 function update(tree) {
     const projects = (0, devkit_1.getProjects)(tree);
-    const packageManagerLockFile = {
-        npm: 'package-lock.json',
-        yarn: 'yarn.lock',
-        pnpm: 'pnpm-lock.yaml',
-        bun: 'bun.lockb',
-    };
     for (const [name, config] of projects.entries()) {
         if (config.targets?.['start']?.executor === '@nrwl/expo:start' ||
             config.targets?.['start']?.executor === '@nx/expo:start') {
@@ -24,12 +18,9 @@ function update(tree) {
                     if (packageJson.scripts?.['postinstall']) {
                         delete packageJson.scripts['postinstall'];
                     }
-                    const packageManager = (0, devkit_1.detectPackageManager)(tree.root);
-                    const packageLockFile = packageManagerLockFile[packageManager];
                     const offset = (0, devkit_1.offsetFromRoot)(config.root);
                     packageJson.scripts = {
                         ...packageJson.scripts,
-                        'eas-build-pre-install': `cd ${offset} && node tools/scripts/eas-build-pre-install.mjs . ${config.root} && cp ${packageLockFile} ${config.root}`,
                         'eas-build-post-install': `cd ${offset} && node tools/scripts/eas-build-post-install.mjs . ${config.root}`,
                     };
                     return packageJson;

package/src/migrations/update-19-7-0/remove-eas-pre-install.d.ts

@@ -0,0 +1,6 @@
+import { Tree } from '@nx/devkit';
+/**
+ * Remove eas-build-pre-install script from app's package.json.
+ * This script causes an issue with Yarn 4.
+ */
+export default function update(tree: Tree): void;

package/src/migrations/update-19-7-0/remove-eas-pre-install.js

@@ -0,0 +1,24 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = update;
+const devkit_1 = require("@nx/devkit");
+const path_1 = require("path");
+/**
+ * Remove eas-build-pre-install script from app's package.json.
+ * This script causes an issue with Yarn 4.
+ */
+function update(tree) {
+    const projects = (0, devkit_1.getProjects)(tree);
+    for (const [_, config] of projects.entries()) {
+        const packageJsonPath = (0, path_1.join)(config.root, 'package.json');
+        if (!tree.exists(packageJsonPath)) {
+            continue;
+        }
+        (0, devkit_1.updateJson)(tree, (0, path_1.join)(config.root, 'package.json'), (packageJson) => {
+            if (packageJson.scripts?.['eas-build-pre-install']) {
+                delete packageJson.scripts['eas-build-pre-install'];
+            }
+            return packageJson;
+        });
+    }
+}