@medway-ui/native 1.9.1 → 1.9.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@medway-ui/native",
-  "version": "1.9.1",
+  "version": "1.9.2",
   "description": "Medway UI components for React Native (iOS/Android via Expo)",
   "author": "Alekcarvalho",
   "license": "MIT",
@@ -67,7 +67,7 @@
   },
   "peerDependencies": {
     "@medway-ui/core": "^1.0.0",
-    "@medway-ui/icons": "^1.15.1",
+    "@medway-ui/icons": "^1.17.0",
     "@react-native-masked-view/masked-view": ">=0.3.0",
     "@react-navigation/native": ">=6.0.0",
     "@react-navigation/native-stack": ">=6.0.0",
@@ -110,7 +110,7 @@
     }
   },
   "devDependencies": {
-    "@medway-ui/icons": "1.15.1",
+    "@medway-ui/icons": "1.17.0",
     "@react-native-masked-view/masked-view": "^0.3.2",
     "@react-navigation/native": "^7.3.18",
     "@react-navigation/native-stack": "^7.18.10",

package/setup/metro.js

@@ -14,6 +14,8 @@ const NATIVE_SOURCE_SUBPATHS = {
   '@medway-ui/native/editor/protocol': 'editor/protocol.ts',
 };
 
+const PACKAGE_NOT_FOUND = new Set(['FailedToResolveNameError', 'FailedToResolvePathError']);
+
 function loadWithNativeWind(projectRoot) {
   return require(require.resolve('nativewind/metro', { paths: [projectRoot] }))
     .withNativeWind;
@@ -48,65 +50,6 @@ function resolveMedwayAlias(moduleName, medwayUiNativeSrc, medwayUiSharedSrc) {
   );
 }
 
-function resolvePackageEntry(packageDir, entry) {
-  const withoutExt = entry.replace(/\.(tsx|ts|jsx|js)$/, '');
-  const candidates = [
-    path.resolve(packageDir, entry),
-    path.resolve(packageDir, withoutExt),
-    ...['.tsx', '.ts', '.jsx', '.js'].map((ext) =>
-      path.resolve(packageDir, `${withoutExt}${ext}`),
-    ),
-  ];
-
-  for (const candidate of candidates) {
-    if (fs.existsSync(candidate)) return candidate;
-  }
-
-  return null;
-}
-
-function getAppPackageJsonPath(moduleName, projectRoot) {
-  const directPath = path.join(projectRoot, 'node_modules', moduleName, 'package.json');
-
-  if (fs.existsSync(directPath)) {
-    return directPath;
-  }
-
-  try {
-    return require.resolve(`${moduleName}/package.json`, { paths: [projectRoot] });
-  } catch {
-    return null;
-  }
-}
-
-function resolveBareModule(moduleName, searchRoots) {
-  for (const root of searchRoots) {
-    try {
-      const packageJsonPath = getAppPackageJsonPath(moduleName, root);
-
-      if (packageJsonPath) {
-        const pkg = require(packageJsonPath);
-        const packageDir = path.dirname(packageJsonPath);
-        const reactNativeEntry = pkg['react-native'];
-
-        if (typeof reactNativeEntry === 'string' && !reactNativeEntry.endsWith('cli.js')) {
-          const resolved = resolvePackageEntry(packageDir, reactNativeEntry);
-
-          if (resolved) {
-            return resolved;
-          }
-        }
-      }
-
-      return require.resolve(moduleName, { paths: [root] });
-    } catch {
-      // try next root
-    }
-  }
-
-  return null;
-}
-
 /**
  * Metro + NativeWind para @medway-ui/native (npm ou clone do medway-ui linkado).
  *
@@ -168,12 +111,30 @@ function withMedwayUi(config, options = {}) {
     );
   }
 
-  function isBareImport(moduleName) {
-    return !moduleName.startsWith('.') && !moduleName.startsWith('/');
+  function isPackageImport(moduleName) {
+    return !/^(\.|\/|@\/)/.test(moduleName);
   }
 
   const defaultResolveRequest = config.resolver.resolveRequest;
 
+  function resolveDefault(context, moduleName, platform) {
+    return (defaultResolveRequest ?? context.resolveRequest)(context, moduleName, platform);
+  }
+
+  // Metro's own rules (exports conditions, platform files) from the app, so the lib and the app share one copy.
+  function resolveFromApp(context, moduleName, platform) {
+    try {
+      return resolveDefault(
+        { ...context, originModulePath: path.join(projectRoot, 'package.json') },
+        moduleName,
+        platform,
+      );
+    } catch (error) {
+      if (PACKAGE_NOT_FOUND.has(error?.constructor?.name)) return null;
+      throw error;
+    }
+  }
+
   const portalEntry = require.resolve('@rn-primitives/portal', {
     paths: [projectRoot, nativePackageRoot],
   });
@@ -213,24 +174,16 @@ function withMedwayUi(config, options = {}) {
         }
       }
 
-      if (isBareImport(moduleName)) {
-        const resolved = resolveBareModule(moduleName, [
-          projectRoot,
-          nativePackageRoot,
-          medwayUiNativeRoot,
-        ]);
+      if (isPackageImport(moduleName)) {
+        const resolved = resolveFromApp(context, moduleName, platform);
 
         if (resolved) {
-          return { filePath: resolved, type: 'sourceFile' };
+          return resolved;
         }
       }
     }
 
-    if (defaultResolveRequest) {
-      return defaultResolveRequest(context, moduleName, platform);
-    }
-
-    return context.resolveRequest(context, moduleName, platform);
+    return resolveDefault(context, moduleName, platform);
   };
 
   const withNativeWind = loadWithNativeWind(projectRoot);