@nx/expo 21.4.0-beta.11 → 21.4.0-beta.12

package/.eslintrc.json

@@ -24,9 +24,10 @@
           {
             "buildTargets": ["build-base"],
             "ignoredDependencies": [
-              "tslib",
               "nx",
+              "@nx/jest",
               "@nx/rollup",
+              "@nx/web",
               "@nx/webpack",
               "@nx/cypress",
               "@nx/playwright",

package/migrations.json

@@ -17,6 +17,24 @@
       "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"
+    },
+    "update-21-4-0-remove-deprecated-deps": {
+      "version": "21.4.0-beta.0",
+      "cli": "nx",
+      "description": "Remove deprecated dependencies from package.json",
+      "factory": "./src/migrations/update-21-4-0/remove-deprecated-deps"
+    },
+    "update-21-4-0-update-splash-screen-config": {
+      "version": "21.4.0-beta.0",
+      "cli": "nx",
+      "description": "Update Expo splash screen configuration to use the new format",
+      "factory": "./src/migrations/update-21-4-0/update-splash-screen-config"
+    },
+    "update-21-4-0-add-jest-resolver": {
+      "version": "21.4.0-beta.0",
+      "cli": "nx",
+      "description": "Add custom Jest resolver to handle Expo winter runtime issues",
+      "factory": "./src/migrations/update-21-4-0/add-jest-resolver"
     }
   },
   "packageJsonUpdates": {
@@ -210,6 +228,79 @@
           "alwaysAddToPackageJson": false
         }
       }
+    },
+    "21.4.0": {
+      "version": "21.4.0-beta.0",
+      "packages": {
+        "expo": {
+          "version": "~53.0.10",
+          "alwaysAddToPackageJson": false
+        },
+        "expo-splash-screen": {
+          "version": "~0.30.9",
+          "alwaysAddToPackageJson": false
+        },
+        "expo-status-bar": {
+          "version": "~2.2.3",
+          "alwaysAddToPackageJson": false
+        },
+        "@expo/cli": {
+          "version": "~0.24.14",
+          "alwaysAddToPackageJson": false
+        },
+        "babel-preset-expo": {
+          "version": "~13.2.0",
+          "alwaysAddToPackageJson": false
+        },
+        "react": {
+          "version": "19.0.0",
+          "alwaysAddToPackageJson": false
+        },
+        "react-dom": {
+          "version": "19.0.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@types/react": {
+          "version": "~19.0.10",
+          "alwaysAddToPackageJson": false
+        },
+        "react-native": {
+          "version": "~0.79.3",
+          "alwaysAddToPackageJson": false
+        },
+        "react-native-web": {
+          "version": "~0.20.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@expo/metro-config": {
+          "version": "~0.20.14",
+          "alwaysAddToPackageJson": false
+        },
+        "@expo/metro-runtime": {
+          "version": "~5.0.4",
+          "alwaysAddToPackageJson": false
+        },
+        "react-native-svg-transformer": {
+          "version": "~1.5.1",
+          "alwaysAddToPackageJson": false
+        },
+        "react-native-svg": {
+          "version": "~15.11.2",
+          "alwaysAddToPackageJson": false
+        },
+        "@testing-library/react-native": {
+          "version": "~13.2.0",
+          "alwaysAddToPackageJson": false
+        },
+        "jest-expo": {
+          "version": "~53.0.7",
+          "alwaysAddToPackageJson": false
+        },
+        "@babel/runtime": {
+          "version": "~7.27.6",
+          "alwaysAddToPackageJson": false
+        }
+      }
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/expo",
-  "version": "21.4.0-beta.11",
+  "version": "21.4.0-beta.12",
   "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,24 +28,22 @@
   "main": "./index.js",
   "types": "index.d.ts",
   "dependencies": {
-    "@nx/detox": "21.4.0-beta.11",
-    "@nx/devkit": "21.4.0-beta.11",
-    "@nx/eslint": "21.4.0-beta.11",
-    "@nx/jest": "21.4.0-beta.11",
-    "@nx/js": "21.4.0-beta.11",
-    "@nx/react": "21.4.0-beta.11",
-    "@nx/rollup": "21.4.0-beta.11",
-    "@nx/web": "21.4.0-beta.11",
-    "@nx/webpack": "21.4.0-beta.11",
+    "@nx/devkit": "21.4.0-beta.12",
+    "@nx/eslint": "21.4.0-beta.12",
+    "@nx/js": "21.4.0-beta.12",
+    "@nx/react": "21.4.0-beta.12",
     "enhanced-resolve": "^5.8.3",
-    "metro-config": "~0.80.4",
-    "metro-resolver": "~0.80.4",
     "picocolors": "^1.1.0",
     "tsconfig-paths": "^4.1.2",
     "tslib": "^2.3.0"
   },
-  "devDepndencies": {
-    "nx": "workspace:*"
+  "peerDependencies": {
+    "metro-config": ">= 0.82.0",
+    "metro-resolver": ">= 0.82.0"
+  },
+  "optionalDependencies": {
+    "@nx/detox": "21.4.0-beta.12",
+    "@nx/rollup": "21.4.0-beta.12"
   },
   "executors": "./executors.json",
   "ng-update": {

package/plugins/metro-resolver.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"metro-resolver.d.ts","sourceRoot":"","sources":["../../../../packages/expo/plugins/metro-resolver.ts"],"names":[],"mappings":"AAeA,wBAAgB,iBAAiB,CAC/B,UAAU,EAAE,MAAM,EAAE,EACpB,qBAAqB,GAAE,MAAM,EAAO,EACpC,UAAU,GAAE,MAAM,EAAO,IAGvB,UAAU,GAAG,EACb,gBAAgB,MAAM,EACtB,UAAU,MAAM,GAAG,IAAI,SAwC1B"}
+{"version":3,"file":"metro-resolver.d.ts","sourceRoot":"","sources":["../../../../packages/expo/plugins/metro-resolver.ts"],"names":[],"mappings":"AAiCA,wBAAgB,iBAAiB,CAC/B,UAAU,EAAE,MAAM,EAAE,EACpB,qBAAqB,GAAE,MAAM,EAAO,EACpC,UAAU,GAAE,MAAM,EAAO,IAGvB,UAAU,GAAG,EACb,gBAAgB,MAAM,EACtB,UAAU,MAAM,GAAG,IAAI,SAwC1B"}

package/plugins/metro-resolver.js

@@ -1,13 +1,28 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getResolveRequest = getResolveRequest;
-const metroResolver = require("metro-resolver");
 const tsconfig_paths_1 = require("tsconfig-paths");
 const pc = require("picocolors");
 const enhanced_resolve_1 = require("enhanced-resolve");
 const path_1 = require("path");
 const fs = require("fs");
 const devkit_1 = require("@nx/devkit");
+// Cache for metro-resolver module
+let metroResolver = null;
+/**
+ * Lazily require metro-resolver to handle cases where it might not be installed
+ */
+function getMetroResolver() {
+    if (!metroResolver) {
+        try {
+            metroResolver = require('metro-resolver');
+        }
+        catch (error) {
+            throw new Error('metro-resolver is required but not installed. Please install metro-resolver >= 0.82.0');
+        }
+    }
+    return metroResolver;
+}
 /*
  * Use tsconfig to resolve additional workspace libs.
  *
@@ -46,7 +61,8 @@ function resolveRequestFromContext(resolveRequest, context, realModuleName, plat
  */
 function defaultMetroResolver(context, realModuleName, platform, debug) {
     try {
-        return metroResolver.resolve(context, realModuleName, platform);
+        const resolver = getMetroResolver();
+        return resolver.resolve(context, realModuleName, platform);
     }
     catch {
         if (debug)
@@ -60,7 +76,7 @@ function defaultMetroResolver(context, realModuleName, platform, debug) {
  */
 function pnpmResolver(extensions, context, realModuleName, debug, exportsConditionNames = [], mainFields = []) {
     try {
-        const pnpmResolve = getPnpmResolver(extensions);
+        const pnpmResolve = getPnpmResolver(extensions, exportsConditionNames, mainFields);
         const lookupStartPath = (0, path_1.dirname)(context.originModulePath);
         const filePath = pnpmResolve.resolveSync({}, lookupStartPath, realModuleName);
         if (filePath) {
@@ -80,7 +96,8 @@ function tsconfigPathsResolver(context, extensions, realModuleName, platform, de
     try {
         const tsConfigPathMatcher = getMatcher(debug);
         const match = tsConfigPathMatcher(realModuleName, undefined, undefined, extensions.map((ext) => `.${ext}`));
-        return metroResolver.resolve(context, match, platform);
+        const resolver = getMetroResolver();
+        return resolver.resolve(context, match, platform);
     }
     catch {
         if (debug) {
@@ -115,15 +132,15 @@ function getMatcher(debug) {
  * This function returns resolver for pnpm.
  * It is inspired form https://github.com/vjpr/pnpm-expo-example/blob/main/packages/pnpm-expo-helper/util/make-resolver.js.
  */
-let resolver;
+let pnpmpResolver;
 function getPnpmResolver(extensions, exportsConditionNames = [], mainFields = []) {
-    if (!resolver) {
+    if (!pnpmpResolver) {
         // Create a filesystem adapter that matches enhanced-resolve's expected interface
         // The issue is that Node.js fs types allow withFileTypes: true, but enhanced-resolve expects withFileTypes?: false
         // This is compatible with the latest version of enhanced-resolve and is the intended way to use it.
         // See https://github.com/webpack/enhanced-resolve/commit/d55471f20c17bce4def0b53cfe0b7027e7b48d82
         const fileSystem = new enhanced_resolve_1.CachedInputFileSystem(fs, 4000);
-        resolver = enhanced_resolve_1.ResolverFactory.createResolver({
+        pnpmpResolver = enhanced_resolve_1.ResolverFactory.createResolver({
             fileSystem,
             extensions: extensions.map((extension) => '.' + extension),
             useSyncFileSystemCalls: true,
@@ -141,5 +158,5 @@ function getPnpmResolver(extensions, exportsConditionNames = [], mainFields = []
             aliasFields: ['browser'],
         });
     }
-    return resolver;
+    return pnpmpResolver;
 }

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

@@ -1,4 +1,4 @@
-import type { MetroConfig } from 'metro-config';
+type MetroConfig = any;
 interface WithNxOptions {
     /**
      * Change this to true to see debugging info.
@@ -21,6 +21,6 @@ interface WithNxOptions {
      */
     mainFields?: string[];
 }
-export declare function withNxMetro(userConfig: MetroConfig, opts?: WithNxOptions): Promise<import("metro-config").ConfigT>;
+export declare function withNxMetro(userConfig: MetroConfig, opts?: WithNxOptions): Promise<any>;
 export {};
 //# sourceMappingURL=with-nx-metro.d.ts.map

package/plugins/with-nx-metro.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"with-nx-metro.d.ts","sourceRoot":"","sources":["../../../../packages/expo/plugins/with-nx-metro.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAMhD,UAAU,aAAa;IACrB;;OAEG;IACH,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB;;;OAGG;IACH,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;IACtB;;;OAGG;IACH,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;IAKxB,qBAAqB,CAAC,EAAE,MAAM,EAAE,CAAC;IACjC;;;OAGG;IACH,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;CACvB;AAED,wBAAsB,WAAW,CAC/B,UAAU,EAAE,WAAW,EACvB,IAAI,GAAE,aAAkB,2CAmCzB"}
+{"version":3,"file":"with-nx-metro.d.ts","sourceRoot":"","sources":["../../../../packages/expo/plugins/with-nx-metro.ts"],"names":[],"mappings":"AAuBA,KAAK,WAAW,GAAG,GAAG,CAAC;AAIvB,UAAU,aAAa;IACrB;;OAEG;IACH,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB;;;OAGG;IACH,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;IACtB;;;OAGG;IACH,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;IAKxB,qBAAqB,CAAC,EAAE,MAAM,EAAE,CAAC;IACjC;;;OAGG;IACH,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;CACvB;AAED,wBAAsB,WAAW,CAC/B,UAAU,EAAE,WAAW,EACvB,IAAI,GAAE,aAAkB,gBAoCzB"}

package/plugins/with-nx-metro.js

@@ -2,9 +2,24 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.withNxMetro = withNxMetro;
 const devkit_1 = require("@nx/devkit");
-const metro_config_1 = require("metro-config");
 const node_fs_1 = require("node:fs");
 const path_1 = require("path");
+// Cache for metro-config module
+let metroConfig = null;
+/**
+ * Lazily require metro-config to handle cases where it might not be installed
+ */
+function getMetroConfig() {
+    if (!metroConfig) {
+        try {
+            metroConfig = require('metro-config');
+        }
+        catch (error) {
+            throw new Error('metro-config is required but not installed. Please install metro-config >= 0.82.0');
+        }
+    }
+    return metroConfig;
+}
 const metro_resolver_1 = require("./metro-resolver");
 async function withNxMetro(userConfig, opts = {}) {
     const extensions = ['', 'ts', 'tsx', 'js', 'jsx', 'json'];
@@ -27,5 +42,6 @@ async function withNxMetro(userConfig, opts = {}) {
         },
         watchFolders,
     };
-    return (0, metro_config_1.mergeConfig)(userConfig, nxConfig);
+    const { mergeConfig } = getMetroConfig();
+    return mergeConfig(userConfig, nxConfig);
 }

package/src/generators/application/application.js

@@ -6,7 +6,7 @@ const devkit_1 = require("@nx/devkit");
 const js_1 = require("@nx/js");
 const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 const add_linting_1 = require("../../utils/add-linting");
-const add_jest_1 = require("../../utils/add-jest");
+const add_jest_1 = require("../../utils/jest/add-jest");
 const normalize_options_1 = require("./lib/normalize-options");
 const init_1 = require("../init/init");
 const add_project_1 = require("./lib/add-project");

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

@@ -4,30 +4,23 @@
     "slug": "<%= projectName %>",
     "version": "1.0.0",
     "orientation": "portrait",
-    "icon": "./assets/icon.png",
-    "splash": {
-      "image": "./assets/splash.png",
-      "resizeMode": "contain",
-      "backgroundColor": "#ffffff"
-    },
-    "updates": {
-      "fallbackToCacheTimeout": 0
-    },
-    "assetBundlePatterns": [
-      "**/*"
-    ],
+    "icon": "./assets/images/icon.png",
+    "scheme": "<%= projectName %>",
+    "userInterfaceStyle": "automatic",
+    "newArchEnabled": true,
     "ios": {
       "supportsTablet": true
     },
     "android": {
       "adaptiveIcon": {
-        "foregroundImage": "./assets/adaptive-icon.png",
-        "backgroundColor": "#FFFFFF"
-      }
+        "foregroundImage": "./assets/images/adaptive-icon.png",
+        "backgroundColor": "#ffffff"
+      },
+      "edgeToEdgeEnabled": true
     },
     "web": {
-      "favicon": "./assets/favicon.png",
-      "bundler": "metro"
+      "bundler": "metro",
+      "favicon": "./assets/images/favicon.png"
     },
     "plugins": [
       <% if (e2eTestRunner === 'detox') { %>
@@ -37,8 +30,17 @@
           "skipProguard": false,
           "subdomains": ["10.0.2.2", "localhost"]
         }
-      ]
+      ],
       <% } %>
+      [
+        "expo-splash-screen",
+        {
+          "image": "./assets/images/splash-icon.png",
+          "imageWidth": 200,
+          "resizeMode": "contain",
+          "backgroundColor": "#ffffff"
+        }
+      ]
     ]
   }
 }

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

@@ -3,12 +3,19 @@
   "version": "0.0.1",
   "private": true,
   "dependencies": {
-    "@testing-library/jest-native": "*",
+    "@expo/metro-config": "*",
     "@testing-library/react-native": "*",
+    "expo": "*",
+    "expo-splash-screen": "*",
+    "expo-status-bar": "*",
+    "expo-system-ui": "*",
+    "jest-expo": "*",
     "metro-config": "*",
+    "metro-resolver": "*",
+    "react": "*",
     "react-native": "*",
-    "expo": "*",
     "react-native-svg": "*",
+    "react-native-svg-transformer": "*",
     "react-native-web": "*"
   },
   "scripts": {

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

@@ -16,5 +16,5 @@
     "**/*.spec.jsx",
     "src/test-setup.ts"
   ],
-  "include": ["**/*.ts", "**/*.tsx", "**/*.js", "**/*.jsx"]
+  "include": ["**/*.ts", "**/*.tsx", "**/*.js", "**/*.jsx", ".expo/types/**/*.ts", "expo-env.d.ts"]
 }

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

@@ -1 +1 @@
-{"version":3,"file":"add-e2e.d.ts","sourceRoot":"","sources":["../../../../../../../packages/expo/src/generators/application/lib/add-e2e.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,iBAAiB,EAGjB,IAAI,EAEL,MAAM,YAAY,CAAC;AAMpB,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAEvD,wBAAsB,MAAM,CAC1B,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,gBAAgB,GACxB,OAAO,CAAC,iBAAiB,CAAC,CA4I5B"}
+{"version":3,"file":"add-e2e.d.ts","sourceRoot":"","sources":["../../../../../../../packages/expo/src/generators/application/lib/add-e2e.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,iBAAiB,EAGjB,IAAI,EAEL,MAAM,YAAY,CAAC;AAKpB,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAEvD,wBAAsB,MAAM,CAC1B,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,gBAAgB,GACxB,OAAO,CAAC,iBAAiB,CAAC,CAiJ5B"}

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

@@ -3,13 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.addE2e = addE2e;
 const devkit_1 = require("@nx/devkit");
 const e2e_web_server_info_utils_1 = require("@nx/devkit/src/generators/e2e-web-server-info-utils");
-const web_1 = require("@nx/web");
 const has_expo_plugin_1 = require("../../../utils/has-expo-plugin");
 const versions_1 = require("../../../utils/versions");
 async function addE2e(tree, options) {
     const hasPlugin = (0, has_expo_plugin_1.hasExpoPlugin)(tree);
     if (!hasPlugin) {
-        await (0, web_1.webStaticServeGenerator)(tree, {
+        const { webStaticServeGenerator } = (0, devkit_1.ensurePackage)('@nx/web', versions_1.nxVersion);
+        await webStaticServeGenerator(tree, {
             buildTarget: `${options.projectName}:export`,
             targetName: 'serve-static',
         });

package/src/generators/application/lib/add-project.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"add-project.d.ts","sourceRoot":"","sources":["../../../../../../../packages/expo/src/generators/application/lib/add-project.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,IAAI,EAEL,MAAM,YAAY,CAAC;AAIpB,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAEvD,wBAAgB,UAAU,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,gBAAgB,QAiD/D"}
+{"version":3,"file":"add-project.d.ts","sourceRoot":"","sources":["../../../../../../../packages/expo/src/generators/application/lib/add-project.ts"],"names":[],"mappings":"AAAA,OAAO,EAML,IAAI,EAEL,MAAM,YAAY,CAAC;AAIpB,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAEvD,wBAAgB,UAAU,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,gBAAgB,QAuD/D"}

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

@@ -16,7 +16,9 @@ function addProject(host, options) {
         targets: hasPlugin ? {} : getTargets(options),
         tags: options.parsedTags,
     };
+    const templatedPackageJson = (0, devkit_1.readJson)(host, (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'package.json'));
     const packageJson = {
+        ...templatedPackageJson,
         name: options.importPath,
         version: '0.0.1',
         private: true,

package/src/generators/application/schema.json

@@ -45,6 +45,7 @@
       "type": "string",
       "enum": ["eslint", "none"],
       "default": "none",
+      "x-prompt": "Which linter would you like to use?",
       "x-priority": "important"
     },
     "unitTestRunner": {
@@ -52,6 +53,7 @@
       "enum": ["jest", "none"],
       "description": "Test runner to use for unit tests",
       "default": "none",
+      "x-prompt": "Which unit test runner would you like to use?",
       "x-priority": "important"
     },
     "tags": {

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

@@ -1 +1 @@
-{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../../../../../packages/expo/src/generators/init/init.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,iBAAiB,EAIjB,IAAI,EACL,MAAM,YAAY,CAAC;AAapB,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAElC,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,8BAE3D;AAED,wBAAsB,yBAAyB,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,8BAwDzE;AAED,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,qBAgB5D;AAMD,eAAe,iBAAiB,CAAC"}
+{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../../../../../packages/expo/src/generators/init/init.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,iBAAiB,EAIjB,IAAI,EACL,MAAM,YAAY,CAAC;AAcpB,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAElC,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,8BAE3D;AAED,wBAAsB,yBAAyB,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,8BAwDzE;AAED,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,qBAkB5D;AAMD,eAAe,iBAAiB,CAAC"}

package/src/generators/init/init.js

@@ -63,6 +63,8 @@ function updateDependencies(host, schema) {
     }, {
         '@nx/expo': versions_1.nxVersion,
         '@expo/cli': versions_1.expoCliVersion,
+        'metro-config': versions_1.metroVersion,
+        'metro-resolver': versions_1.metroVersion,
     }, undefined, schema.keepExistingVersions);
 }
 function moveDependency(host) {

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

@@ -1 +1 @@
-{"version":3,"file":"library.d.ts","sourceRoot":"","sources":["../../../../../../packages/expo/src/generators/library/library.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,iBAAiB,EAOjB,IAAI,EAGL,MAAM,YAAY,CAAC;AAWpB,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAiBlC,wBAAsB,oBAAoB,CACxC,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,iBAAiB,CAAC,CAM5B;AAED,wBAAsB,4BAA4B,CAChD,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,iBAAiB,CAAC,CA8G5B;AAuJD,eAAe,oBAAoB,CAAC"}
+{"version":3,"file":"library.d.ts","sourceRoot":"","sources":["../../../../../../packages/expo/src/generators/library/library.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,iBAAiB,EAOjB,IAAI,EAGL,MAAM,YAAY,CAAC;AAWpB,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAiBlC,wBAAsB,oBAAoB,CACxC,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,iBAAiB,CAAC,CAM5B;AAED,wBAAsB,4BAA4B,CAChD,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,iBAAiB,CAAC,CAiH5B;AAsJD,eAAe,oBAAoB,CAAC"}

package/src/generators/library/library.js

@@ -6,7 +6,7 @@ const devkit_1 = require("@nx/devkit");
 const js_1 = require("@nx/js");
 const init_1 = require("../init/init");
 const add_linting_1 = require("../../utils/add-linting");
-const add_jest_1 = require("../../utils/add-jest");
+const add_jest_1 = require("../../utils/jest/add-jest");
 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");
@@ -60,8 +60,6 @@ async function expoLibraryGeneratorInternal(host, schema) {
         ],
     });
     tasks.push(lintTask);
-    const jestTask = await (0, add_jest_1.addJest)(host, options.unitTestRunner, options.projectName, options.projectRoot, options.js, options.skipPackageJson, options.addPlugin);
-    tasks.push(jestTask);
     const relativeCwd = (0, artifact_name_and_directory_utils_1.getRelativeCwd)();
     const path = (0, devkit_1.joinPathFragments)(options.projectRoot, 'src/lib', options.fileName);
     const componentTask = await (0, component_1.expoComponentGenerator)(host, {
@@ -84,6 +82,11 @@ async function expoLibraryGeneratorInternal(host, schema) {
     }, options.linter === 'eslint'
         ? ['eslint.config.js', 'eslint.config.cjs', 'eslint.config.mjs']
         : undefined);
+    // Update Jest tsconfig after general tsconfig updates to ensure Jest resolver configuration is preserved
+    if (options.unitTestRunner === 'jest') {
+        const jestTask = await (0, add_jest_1.addJest)(host, options.unitTestRunner, options.projectName, options.projectRoot, options.js, options.skipPackageJson, options.addPlugin);
+        tasks.push(jestTask);
+    }
     (0, sort_fields_1.sortPackageJsonFields)(host, options.projectRoot);
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(host);
@@ -150,7 +153,6 @@ async function addProject(host, options) {
             name: options.projectName,
             format: ['cjs', 'esm'],
             style: 'none',
-            js: options.js,
             skipFormat: true,
         }, external);
         (0, devkit_1.updateJson)(host, `${options.projectRoot}/package.json`, (json) => {

package/src/generators/library/schema.json

@@ -38,6 +38,7 @@
       "enum": ["jest", "none"],
       "description": "Test runner to use for unit tests.",
       "default": "none",
+      "x-prompt": "Which unit test runner would you like to use?",
       "x-priority": "important"
     },
     "tags": {
@@ -88,7 +89,8 @@
     "skipPackageJson": {
       "type": "boolean",
       "description": "Do not add dependencies to `package.json`.",
-      "default": false
+      "default": false,
+      "x-priority": "internal"
     },
     "useProjectJson": {
       "type": "boolean",

package/src/migrations/update-21-4-0/add-jest-resolver.d.ts

@@ -0,0 +1,3 @@
+import { Tree } from '@nx/devkit';
+export default function addJestResolver(tree: Tree): Promise<void>;
+//# sourceMappingURL=add-jest-resolver.d.ts.map

package/src/migrations/update-21-4-0/add-jest-resolver.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"add-jest-resolver.d.ts","sourceRoot":"","sources":["../../../../../../packages/expo/src/migrations/update-21-4-0/add-jest-resolver.ts"],"names":[],"mappings":"AAAA,OAAO,EAA4B,IAAI,EAAE,MAAM,YAAY,CAAC;AAK5D,wBAA8B,eAAe,CAAC,IAAI,EAAE,IAAI,iBAgEvD"}

package/src/migrations/update-21-4-0/add-jest-resolver.js

@@ -0,0 +1,59 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = addJestResolver;
+const devkit_1 = require("@nx/devkit");
+const path_1 = require("path");
+const update_tsconfig_files_1 = require("../../utils/update-tsconfig-files");
+const expo_project_detection_1 = require("../../utils/expo-project-detection");
+async function addJestResolver(tree) {
+    const projects = (0, devkit_1.getProjects)(tree);
+    for (const [, config] of projects) {
+        if (config.targets?.test?.executor === '@nx/jest:jest') {
+            // Check if this is an Expo project
+            const expoProjectDetectionResult = (0, expo_project_detection_1.isExpoProject)(tree, config.root);
+            if (!(await expoProjectDetectionResult).isExpo) {
+                continue;
+            }
+            // Check if this is an Expo project by looking for jest.config file with expo preset
+            const jestConfigPath = (0, path_1.join)(config.root, 'jest.config.ts');
+            const jestConfigJsPath = (0, path_1.join)(config.root, 'jest.config.js');
+            let jestConfigContent = '';
+            let configPath = '';
+            if (tree.exists(jestConfigPath)) {
+                jestConfigContent = tree.read(jestConfigPath, 'utf-8');
+                configPath = jestConfigPath;
+            }
+            else if (tree.exists(jestConfigJsPath)) {
+                jestConfigContent = tree.read(jestConfigJsPath, 'utf-8');
+                configPath = jestConfigJsPath;
+            }
+            if (jestConfigContent && jestConfigContent.includes('jest-expo')) {
+                // This is an Expo project with Jest configuration
+                const resolverPath = (0, path_1.join)(config.root, 'jest.resolver.js');
+                // Create the custom resolver if it doesn't exist
+                if (!tree.exists(resolverPath)) {
+                    const resolverContent = `const defaultResolver = require('@nx/jest/plugins/resolver');
+
+module.exports = (request, options) => {
+  // Check if we're resolving from the winter directory and request is for runtime
+  if (options.basedir && options.basedir.includes('expo/src/winter') && request === './runtime') {
+    // Force resolution to non-native version to avoid runtime.native.ts
+    return defaultResolver('./runtime.ts', options);
+  }
+  
+  return defaultResolver(request, options);
+};`;
+                    tree.write(resolverPath, resolverContent);
+                }
+                // Update Jest config to use custom resolver
+                if (configPath && jestConfigContent) {
+                    const updatedConfig = jestConfigContent.replace(/resolver:\s*['"]@nx\/jest\/plugins\/resolver['"],?/, "resolver: require.resolve('./jest.resolver.js'),");
+                    tree.write(configPath, updatedConfig);
+                }
+                // Update tsconfig files to handle jest.resolver.js properly
+                (0, update_tsconfig_files_1.updateTsConfigFiles)(tree, config.name, config.root);
+            }
+        }
+    }
+    await (0, devkit_1.formatFiles)(tree);
+}

package/src/migrations/update-21-4-0/remove-deprecated-deps.d.ts

@@ -0,0 +1,6 @@
+import { Tree } from '@nx/devkit';
+/**
+ * Remove deprecated dependencies from the root and app package.json.
+ */
+export default function update(tree: Tree): void;
+//# sourceMappingURL=remove-deprecated-deps.d.ts.map

package/src/migrations/update-21-4-0/remove-deprecated-deps.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"remove-deprecated-deps.d.ts","sourceRoot":"","sources":["../../../../../../packages/expo/src/migrations/update-21-4-0/remove-deprecated-deps.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,IAAI,EAIL,MAAM,YAAY,CAAC;AAGpB;;GAEG;AACH,MAAM,CAAC,OAAO,UAAU,MAAM,CAAC,IAAI,EAAE,IAAI,QA4BxC"}