@nx/expo 19.5.1 → 19.5.2

package/package.json

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

package/plugins/metro-resolver.d.ts

@@ -1 +1 @@
-export declare function getResolveRequest(extensions: string[]): (_context: any, realModuleName: string, platform: string | null) => any;
+export declare function getResolveRequest(extensions: string[], exportsConditionNames?: string[], mainFields?: string[]): (_context: any, realModuleName: string, platform: string | null) => any;

package/plugins/metro-resolver.js

@@ -14,16 +14,14 @@ const devkit_1 = require("@nx/devkit");
  * This resolve function requires projectRoot to be set to
  * workspace root in order modules and assets to be registered and watched.
  */
-function getResolveRequest(extensions) {
+function getResolveRequest(extensions, exportsConditionNames = [], mainFields = []) {
     return function (_context, realModuleName, platform) {
         const debug = process.env.NX_REACT_NATIVE_DEBUG === 'true';
-        if (debug)
-            console.log(chalk.cyan(`[Nx] Resolving: ${realModuleName}`));
         const { resolveRequest, ...context } = _context;
-        const resolvedPath = resolveRequestFromContext(resolveRequest, _context, realModuleName, platform, debug) ||
-            defaultMetroResolver(context, realModuleName, platform, debug) ||
-            tsconfigPathsResolver(context, extensions, realModuleName, platform, debug) ||
-            pnpmResolver(extensions, context, realModuleName, debug);
+        const resolvedPath = resolveRequestFromContext(resolveRequest, _context, realModuleName, platform, debug) ??
+            defaultMetroResolver(context, realModuleName, platform, debug) ??
+            tsconfigPathsResolver(context, extensions, realModuleName, platform, debug) ??
+            pnpmResolver(extensions, context, realModuleName, debug, exportsConditionNames, mainFields);
         if (resolvedPath) {
             return resolvedPath;
         }
@@ -60,7 +58,7 @@ function defaultMetroResolver(context, realModuleName, platform, debug) {
  * @returns path if resolved, else undefined
  * This pnpm resolver is inspired from https://github.com/vjpr/pnpm-react-native-example/blob/main/packages/pnpm-expo-helper/util/make-resolver.js
  */
-function pnpmResolver(extensions, context, realModuleName, debug) {
+function pnpmResolver(extensions, context, realModuleName, debug, exportsConditionNames = [], mainFields = []) {
     try {
         const pnpmResolve = getPnpmResolver(extensions);
         const lookupStartPath = (0, path_1.dirname)(context.originModulePath);
@@ -118,7 +116,7 @@ function getMatcher(debug) {
  * It is inspired form https://github.com/vjpr/pnpm-expo-example/blob/main/packages/pnpm-expo-helper/util/make-resolver.js.
  */
 let resolver;
-function getPnpmResolver(extensions) {
+function getPnpmResolver(extensions, exportsConditionNames = [], mainFields = []) {
     if (!resolver) {
         const fileSystem = new enhanced_resolve_1.CachedInputFileSystem(fs, 4000);
         resolver = enhanced_resolve_1.ResolverFactory.createResolver({
@@ -126,8 +124,16 @@ function getPnpmResolver(extensions) {
             extensions: extensions.map((extension) => '.' + extension),
             useSyncFileSystemCalls: true,
             modules: [(0, path_1.join)(devkit_1.workspaceRoot, 'node_modules'), 'node_modules'],
-            conditionNames: ['native', 'browser', 'require', 'default'],
-            mainFields: ['react-native', 'browser', 'main'],
+            conditionNames: [
+                'native',
+                'browser',
+                'require',
+                'default',
+                'react-native',
+                'node',
+                ...exportsConditionNames,
+            ],
+            mainFields: ['react-native', 'browser', 'main', ...mainFields],
             aliasFields: ['browser'],
         });
     }

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

@@ -1,8 +1,25 @@
 import type { MetroConfig } from 'metro-config';
 interface WithNxOptions {
+    /**
+     * Change this to true to see debugging info.
+     */
     debug?: boolean;
+    /**
+     * A list of additional file extensions to resolve
+     * All the file extensions used for imports other than 'ts', 'tsx', 'js', 'jsx', 'json'
+     */
     extensions?: string[];
+    /**
+     * A list of additional folders to watch for changes
+     * By default, it watches all the folders in the workspace root except 'dist' and 'e2e'
+     */
     watchFolders?: string[];
+    exportsConditionNames?: string[];
+    /**
+     * A list of main fields in package.json files to use for resolution
+     * If a library has a package.json with a main field that can't be resolved with the default conditions, you can add the name of the field to this list.
+     */
+    mainFields?: string[];
 }
 export declare function withNxMetro(userConfig: MetroConfig, opts?: WithNxOptions): Promise<import("metro-config").ConfigT>;
 export {};

package/plugins/with-nx-metro.js

@@ -22,7 +22,7 @@ async function withNxMetro(userConfig, opts = {}) {
     watchFolders = [...new Set(watchFolders)].filter((folder) => (0, fs_extra_1.existsSync)(folder));
     const nxConfig = {
         resolver: {
-            resolveRequest: (0, metro_resolver_1.getResolveRequest)(extensions),
+            resolveRequest: (0, metro_resolver_1.getResolveRequest)(extensions, opts.exportsConditionNames, opts.mainFields),
             nodeModulesPaths: [(0, path_1.join)(devkit_1.workspaceRoot, 'node_modules')],
         },
         watchFolders,