bugfix(react-native): watch entire workspace (nrwl#19432)

Coly010 · Oct 4, 2023 · e5654c8 · e5654c8
1 parent 2d12daf
commit e5654c8
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 38 deletions.
diff --git a/packages/expo/plugins/metro-resolver.ts b/packages/expo/plugins/metro-resolver.ts
@@ -133,17 +133,16 @@ function tsconfigPathsResolver(
   platform: string,
   debug: boolean
 ) {
-  const tsConfigPathMatcher = getMatcher(debug);
-  const match = tsConfigPathMatcher(
-    realModuleName,
-    undefined,
-    undefined,
-    extensions.map((ext) => `.${ext}`)
-  );
-
-  if (match) {
+  try {
+    const tsConfigPathMatcher = getMatcher(debug);
+    const match = tsConfigPathMatcher(
+      realModuleName,
+      undefined,
+      undefined,
+      extensions.map((ext) => `.${ext}`)
+    );
     return metroResolver.resolve(context, match, platform);
-  } else {
+  } catch {
     if (debug) {
       console.log(
         chalk.red(`[Nx] Failed to resolve ${chalk.bold(realModuleName)}`)

diff --git a/packages/expo/plugins/with-nx-metro.ts b/packages/expo/plugins/with-nx-metro.ts
@@ -1,7 +1,6 @@
-import { workspaceLayout, workspaceRoot } from '@nx/devkit';
+import { workspaceRoot } from '@nx/devkit';
 import { mergeConfig } from 'metro-config';
 import type { MetroConfig } from 'metro-config';
-import { join } from 'path';
 import { existsSync } from 'fs-extra';
 
 import { getResolveRequest } from './metro-resolver';
@@ -24,12 +23,7 @@ export async function withNxMetro(
   if (opts.debug) process.env.NX_REACT_NATIVE_DEBUG = 'true';
   if (opts.extensions) extensions.push(...opts.extensions);
 
-  let watchFolders = [
-    join(workspaceRoot, 'node_modules'),
-    join(workspaceRoot, workspaceLayout().libsDir),
-    join(workspaceRoot, 'packages'),
-    join(workspaceRoot, '.storybook'),
-  ];
+  let watchFolders = [workspaceRoot];
   if (opts.watchFolders?.length) {
     watchFolders = watchFolders.concat(opts.watchFolders);
   }

diff --git a/packages/expo/src/generators/application/files/metro.config.js.template b/packages/expo/src/generators/application/files/metro.config.js.template
@@ -21,7 +21,7 @@ const customConfig = {
     sourceExts: [...sourceExts, 'svg'],
     blockList: exclusionList([/^(?!.*node_modules).*\/dist\/.*/]),
     unstable_enableSymlinks: true,
-    unstable_enablePackageExports: true,
+    // unstable_enablePackageExports: true,
   },
 };
 

diff --git a/packages/react-native/plugins/metro-resolver.ts b/packages/react-native/plugins/metro-resolver.ts
@@ -133,17 +133,16 @@ function tsconfigPathsResolver(
   platform: string,
   debug: boolean
 ) {
-  const tsConfigPathMatcher = getMatcher(debug);
-  const match = tsConfigPathMatcher(
-    realModuleName,
-    undefined,
-    undefined,
-    extensions.map((ext) => `.${ext}`)
-  );
-
-  if (match) {
+  try {
+    const tsConfigPathMatcher = getMatcher(debug);
+    const match = tsConfigPathMatcher(
+      realModuleName,
+      undefined,
+      undefined,
+      extensions.map((ext) => `.${ext}`)
+    );
     return metroResolver.resolve(context, match, platform);
-  } else {
+  } catch {
     if (debug) {
       console.log(
         chalk.red(`[Nx] Failed to resolve ${chalk.bold(realModuleName)}`)

diff --git a/packages/react-native/plugins/with-nx-metro.ts b/packages/react-native/plugins/with-nx-metro.ts
@@ -1,7 +1,6 @@
-import { workspaceLayout, workspaceRoot } from '@nx/devkit';
+import { workspaceRoot } from '@nx/devkit';
 import { mergeConfig } from 'metro-config';
 import type { MetroConfig } from 'metro-config';
-import { join } from 'path';
 import { existsSync } from 'fs-extra';
 
 import { getResolveRequest } from './metro-resolver';
@@ -24,12 +23,7 @@ export async function withNxMetro(
   if (opts.debug) process.env.NX_REACT_NATIVE_DEBUG = 'true';
   if (opts.extensions) extensions.push(...opts.extensions);
 
-  let watchFolders = [
-    join(workspaceRoot, 'node_modules'),
-    join(workspaceRoot, workspaceLayout().libsDir),
-    join(workspaceRoot, 'packages'),
-    join(workspaceRoot, '.storybook'),
-  ];
+  let watchFolders = [workspaceRoot];
   if (opts.watchFolders?.length) {
     watchFolders = watchFolders.concat(opts.watchFolders);
   }

diff --git a/packages/react-native/src/generators/application/files/app/metro.config.js.template b/packages/react-native/src/generators/application/files/app/metro.config.js.template
@@ -20,7 +20,7 @@ const customConfig = {
     sourceExts: [...sourceExts, 'svg'],
     blockList: exclusionList([/^(?!.*node_modules).*\/dist\/.*/]),
     unstable_enableSymlinks: true,
-    unstable_enablePackageExports: true,
+    // unstable_enablePackageExports: true,
   },
 };