@cdx-ui/components 0.0.1-beta.75 → 0.0.1-beta.76

package/lib/commonjs/metro/withForgeMetroConfig.js

@@ -4,7 +4,9 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.withForgeMetroConfig = withForgeMetroConfig;
+var _nodePath = _interopRequireDefault(require("node:path"));
 var _metro = require("uniwind/metro");
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 /**
  * Wraps a Metro config with Forge UI's styling-layer configuration.
  *
@@ -16,9 +18,56 @@ var _metro = require("uniwind/metro");
  * like `withStorybook`).
  */
 function withForgeMetroConfig(config, options) {
-  return (0, _metro.withUniwindConfig)(config, {
+  const withUniwind = (0, _metro.withUniwindConfig)(config, {
     cssEntryFile: options.cssEntryFile,
     dtsFile: options.generatedTypesFile
   });
+  return withUniwindMultiCopyFix(withUniwind);
+}
+
+/**
+ * Fixes Uniwind 1.9's nativeResolver in pnpm monorepos with multiple Uniwind copies.
+ *
+ * Uniwind decides whether to wrap a `react-native` import by comparing
+ * `originModulePath` against a cached internal base path resolved via
+ * `require.resolve('uniwind/package.json')`. In pnpm, the Metro config loaded
+ * by Node and the Uniwind copy bundled for the app may resolve to different
+ * physical paths (different peer-dep hashes in the virtual store), so the
+ * `isInternal` check returns false for Uniwind-internal code. The
+ * nativeResolver then re-routes `react-native` to `uniwind/components`, which
+ * re-exports from `react-native` — a circular `get NativeModules` getter that
+ * overflows the stack at runtime.
+ *
+ * Fix: intercept `react-native` requests originating from inside any Uniwind
+ * copy and resolve them from the app's `projectRoot`, bypassing the broken
+ * `isInternal` check entirely.
+ */
+function withUniwindMultiCopyFix(config) {
+  const resolver = config.resolver;
+  if (!resolver) return config;
+  const innerResolveRequest = resolver.resolveRequest;
+  const uniwindPathFragment = `${_nodePath.default.sep}node_modules${_nodePath.default.sep}uniwind${_nodePath.default.sep}`;
+  const projectRoot = config.projectRoot;
+  const appOriginModulePath = projectRoot ? _nodePath.default.join(projectRoot, 'package.json') : undefined;
+  return {
+    ...config,
+    resolver: {
+      ...resolver,
+      resolveRequest: (context, moduleName, platform) => {
+        const fromUniwind = context.originModulePath?.includes(uniwindPathFragment) ?? false;
+        if (fromUniwind && (moduleName === 'react-native' || moduleName.startsWith('react-native/'))) {
+          const rewrittenContext = appOriginModulePath ? {
+            ...context,
+            originModulePath: appOriginModulePath
+          } : context;
+          return context.resolveRequest(rewrittenContext, moduleName, platform);
+        }
+        if (innerResolveRequest) {
+          return innerResolveRequest(context, moduleName, platform);
+        }
+        return context.resolveRequest(context, moduleName, platform);
+      }
+    }
+  };
 }
 //# sourceMappingURL=withForgeMetroConfig.js.map

package/lib/commonjs/metro/withForgeMetroConfig.js.map

@@ -1 +1 @@
-{"version":3,"names":["_metro","require","withForgeMetroConfig","config","options","withUniwindConfig","cssEntryFile","dtsFile","generatedTypesFile"],"sourceRoot":"../../../src","sources":["metro/withForgeMetroConfig.ts"],"mappings":";;;;;;AACA,IAAAA,MAAA,GAAAC,OAAA;AASA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACO,SAASC,oBAAoBA,CAClCC,MAAS,EACTC,OAAgC,EAC7B;EACH,OAAO,IAAAC,wBAAiB,EAACF,MAAM,EAAE;IAC/BG,YAAY,EAAEF,OAAO,CAACE,YAAY;IAClCC,OAAO,EAAEH,OAAO,CAACI;EACnB,CAAC,CAAC;AACJ","ignoreList":[]}
+{"version":3,"names":["_nodePath","_interopRequireDefault","require","_metro","e","__esModule","default","withForgeMetroConfig","config","options","withUniwind","withUniwindConfig","cssEntryFile","dtsFile","generatedTypesFile","withUniwindMultiCopyFix","resolver","innerResolveRequest","resolveRequest","uniwindPathFragment","path","sep","projectRoot","appOriginModulePath","join","undefined","context","moduleName","platform","fromUniwind","originModulePath","includes","startsWith","rewrittenContext"],"sourceRoot":"../../../src","sources":["metro/withForgeMetroConfig.ts"],"mappings":";;;;;;AAAA,IAAAA,SAAA,GAAAC,sBAAA,CAAAC,OAAA;AAEA,IAAAC,MAAA,GAAAD,OAAA;AAAkD,SAAAD,uBAAAG,CAAA,WAAAA,CAAA,IAAAA,CAAA,CAAAC,UAAA,GAAAD,CAAA,KAAAE,OAAA,EAAAF,CAAA;AASlD;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACO,SAASG,oBAAoBA,CAClCC,MAAS,EACTC,OAAgC,EAC7B;EACH,MAAMC,WAAW,GAAG,IAAAC,wBAAiB,EAACH,MAAM,EAAE;IAC5CI,YAAY,EAAEH,OAAO,CAACG,YAAY;IAClCC,OAAO,EAAEJ,OAAO,CAACK;EACnB,CAAC,CAAM;EAEP,OAAOC,uBAAuB,CAACL,WAAW,CAAC;AAC7C;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAASK,uBAAuBA,CAAwBP,MAAS,EAAK;EACpE,MAAMQ,QAAQ,GAAGR,MAAM,CAACQ,QAAQ;EAChC,IAAI,CAACA,QAAQ,EAAE,OAAOR,MAAM;EAE5B,MAAMS,mBAAmB,GAAGD,QAAQ,CAACE,cAAc;EACnD,MAAMC,mBAAmB,GAAG,GAAGC,iBAAI,CAACC,GAAG,eAAeD,iBAAI,CAACC,GAAG,UAAUD,iBAAI,CAACC,GAAG,EAAE;EAClF,MAAMC,WAAW,GAAGd,MAAM,CAACc,WAAW;EACtC,MAAMC,mBAAmB,GAAGD,WAAW,GAAGF,iBAAI,CAACI,IAAI,CAACF,WAAW,EAAE,cAAc,CAAC,GAAGG,SAAS;EAE5F,OAAO;IACL,GAAGjB,MAAM;IACTQ,QAAQ,EAAE;MACR,GAAGA,QAAQ;MACXE,cAAc,EAAEA,CAACQ,OAAO,EAAEC,UAAU,EAAEC,QAAQ,KAAK;QACjD,MAAMC,WAAW,GAAGH,OAAO,CAACI,gBAAgB,EAAEC,QAAQ,CAACZ,mBAAmB,CAAC,IAAI,KAAK;QACpF,IACEU,WAAW,KACVF,UAAU,KAAK,cAAc,IAAIA,UAAU,CAACK,UAAU,CAAC,eAAe,CAAC,CAAC,EACzE;UACA,MAAMC,gBAAgB,GAAGV,mBAAmB,GACxC;YAAE,GAAGG,OAAO;YAAEI,gBAAgB,EAAEP;UAAoB,CAAC,GACrDG,OAAO;UACX,OAAOA,OAAO,CAACR,cAAc,CAACe,gBAAgB,EAAEN,UAAU,EAAEC,QAAQ,CAAC;QACvE;QACA,IAAIX,mBAAmB,EAAE;UACvB,OAAOA,mBAAmB,CAACS,OAAO,EAAEC,UAAU,EAAEC,QAAQ,CAAC;QAC3D;QACA,OAAOF,OAAO,CAACR,cAAc,CAACQ,OAAO,EAAEC,UAAU,EAAEC,QAAQ,CAAC;MAC9D;IACF;EACF,CAAC;AACH","ignoreList":[]}

package/lib/commonjs/styles.css

@@ -1,6 +1 @@
 @source './**/*.{ts,tsx}';
-
-/* TODO: Can we keep this? Check with Michael/Jack */
-*:focus {
-  outline: none;
-}

package/lib/module/metro/withForgeMetroConfig.js

@@ -1,5 +1,6 @@
 "use strict";
 
+import path from 'node:path';
 import { withUniwindConfig } from 'uniwind/metro';
 /**
  * Wraps a Metro config with Forge UI's styling-layer configuration.
@@ -12,9 +13,56 @@ import { withUniwindConfig } from 'uniwind/metro';
  * like `withStorybook`).
  */
 export function withForgeMetroConfig(config, options) {
-  return withUniwindConfig(config, {
+  const withUniwind = withUniwindConfig(config, {
     cssEntryFile: options.cssEntryFile,
     dtsFile: options.generatedTypesFile
   });
+  return withUniwindMultiCopyFix(withUniwind);
+}
+
+/**
+ * Fixes Uniwind 1.9's nativeResolver in pnpm monorepos with multiple Uniwind copies.
+ *
+ * Uniwind decides whether to wrap a `react-native` import by comparing
+ * `originModulePath` against a cached internal base path resolved via
+ * `require.resolve('uniwind/package.json')`. In pnpm, the Metro config loaded
+ * by Node and the Uniwind copy bundled for the app may resolve to different
+ * physical paths (different peer-dep hashes in the virtual store), so the
+ * `isInternal` check returns false for Uniwind-internal code. The
+ * nativeResolver then re-routes `react-native` to `uniwind/components`, which
+ * re-exports from `react-native` — a circular `get NativeModules` getter that
+ * overflows the stack at runtime.
+ *
+ * Fix: intercept `react-native` requests originating from inside any Uniwind
+ * copy and resolve them from the app's `projectRoot`, bypassing the broken
+ * `isInternal` check entirely.
+ */
+function withUniwindMultiCopyFix(config) {
+  const resolver = config.resolver;
+  if (!resolver) return config;
+  const innerResolveRequest = resolver.resolveRequest;
+  const uniwindPathFragment = `${path.sep}node_modules${path.sep}uniwind${path.sep}`;
+  const projectRoot = config.projectRoot;
+  const appOriginModulePath = projectRoot ? path.join(projectRoot, 'package.json') : undefined;
+  return {
+    ...config,
+    resolver: {
+      ...resolver,
+      resolveRequest: (context, moduleName, platform) => {
+        const fromUniwind = context.originModulePath?.includes(uniwindPathFragment) ?? false;
+        if (fromUniwind && (moduleName === 'react-native' || moduleName.startsWith('react-native/'))) {
+          const rewrittenContext = appOriginModulePath ? {
+            ...context,
+            originModulePath: appOriginModulePath
+          } : context;
+          return context.resolveRequest(rewrittenContext, moduleName, platform);
+        }
+        if (innerResolveRequest) {
+          return innerResolveRequest(context, moduleName, platform);
+        }
+        return context.resolveRequest(context, moduleName, platform);
+      }
+    }
+  };
 }
 //# sourceMappingURL=withForgeMetroConfig.js.map

package/lib/module/metro/withForgeMetroConfig.js.map

@@ -1 +1 @@
-{"version":3,"names":["withUniwindConfig","withForgeMetroConfig","config","options","cssEntryFile","dtsFile","generatedTypesFile"],"sourceRoot":"../../../src","sources":["metro/withForgeMetroConfig.ts"],"mappings":";;AACA,SAASA,iBAAiB,QAAQ,eAAe;AASjD;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASC,oBAAoBA,CAClCC,MAAS,EACTC,OAAgC,EAC7B;EACH,OAAOH,iBAAiB,CAACE,MAAM,EAAE;IAC/BE,YAAY,EAAED,OAAO,CAACC,YAAY;IAClCC,OAAO,EAAEF,OAAO,CAACG;EACnB,CAAC,CAAC;AACJ","ignoreList":[]}
+{"version":3,"names":["path","withUniwindConfig","withForgeMetroConfig","config","options","withUniwind","cssEntryFile","dtsFile","generatedTypesFile","withUniwindMultiCopyFix","resolver","innerResolveRequest","resolveRequest","uniwindPathFragment","sep","projectRoot","appOriginModulePath","join","undefined","context","moduleName","platform","fromUniwind","originModulePath","includes","startsWith","rewrittenContext"],"sourceRoot":"../../../src","sources":["metro/withForgeMetroConfig.ts"],"mappings":";;AAAA,OAAOA,IAAI,MAAM,WAAW;AAE5B,SAASC,iBAAiB,QAAQ,eAAe;AASjD;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASC,oBAAoBA,CAClCC,MAAS,EACTC,OAAgC,EAC7B;EACH,MAAMC,WAAW,GAAGJ,iBAAiB,CAACE,MAAM,EAAE;IAC5CG,YAAY,EAAEF,OAAO,CAACE,YAAY;IAClCC,OAAO,EAAEH,OAAO,CAACI;EACnB,CAAC,CAAM;EAEP,OAAOC,uBAAuB,CAACJ,WAAW,CAAC;AAC7C;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAASI,uBAAuBA,CAAwBN,MAAS,EAAK;EACpE,MAAMO,QAAQ,GAAGP,MAAM,CAACO,QAAQ;EAChC,IAAI,CAACA,QAAQ,EAAE,OAAOP,MAAM;EAE5B,MAAMQ,mBAAmB,GAAGD,QAAQ,CAACE,cAAc;EACnD,MAAMC,mBAAmB,GAAG,GAAGb,IAAI,CAACc,GAAG,eAAed,IAAI,CAACc,GAAG,UAAUd,IAAI,CAACc,GAAG,EAAE;EAClF,MAAMC,WAAW,GAAGZ,MAAM,CAACY,WAAW;EACtC,MAAMC,mBAAmB,GAAGD,WAAW,GAAGf,IAAI,CAACiB,IAAI,CAACF,WAAW,EAAE,cAAc,CAAC,GAAGG,SAAS;EAE5F,OAAO;IACL,GAAGf,MAAM;IACTO,QAAQ,EAAE;MACR,GAAGA,QAAQ;MACXE,cAAc,EAAEA,CAACO,OAAO,EAAEC,UAAU,EAAEC,QAAQ,KAAK;QACjD,MAAMC,WAAW,GAAGH,OAAO,CAACI,gBAAgB,EAAEC,QAAQ,CAACX,mBAAmB,CAAC,IAAI,KAAK;QACpF,IACES,WAAW,KACVF,UAAU,KAAK,cAAc,IAAIA,UAAU,CAACK,UAAU,CAAC,eAAe,CAAC,CAAC,EACzE;UACA,MAAMC,gBAAgB,GAAGV,mBAAmB,GACxC;YAAE,GAAGG,OAAO;YAAEI,gBAAgB,EAAEP;UAAoB,CAAC,GACrDG,OAAO;UACX,OAAOA,OAAO,CAACP,cAAc,CAACc,gBAAgB,EAAEN,UAAU,EAAEC,QAAQ,CAAC;QACvE;QACA,IAAIV,mBAAmB,EAAE;UACvB,OAAOA,mBAAmB,CAACQ,OAAO,EAAEC,UAAU,EAAEC,QAAQ,CAAC;QAC3D;QACA,OAAOF,OAAO,CAACP,cAAc,CAACO,OAAO,EAAEC,UAAU,EAAEC,QAAQ,CAAC;MAC9D;IACF;EACF,CAAC;AACH","ignoreList":[]}

package/lib/module/styles.css

@@ -1,6 +1 @@
 @source './**/*.{ts,tsx}';
-
-/* TODO: Can we keep this? Check with Michael/Jack */
-*:focus {
-  outline: none;
-}

package/lib/typescript/metro/withForgeMetroConfig.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"withForgeMetroConfig.d.ts","sourceRoot":"","sources":["../../../src/metro/withForgeMetroConfig.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAGhD,MAAM,WAAW,uBAAuB;IACtC,2DAA2D;IAC3D,YAAY,EAAE,MAAM,CAAC;IACrB,wEAAwE;IACxE,kBAAkB,CAAC,EAAE,MAAM,CAAC;CAC7B;AAED;;;;;;;;;GASG;AACH,wBAAgB,oBAAoB,CAAC,CAAC,SAAS,WAAW,EACxD,MAAM,EAAE,CAAC,EACT,OAAO,EAAE,uBAAuB,GAC/B,CAAC,CAKH"}
+{"version":3,"file":"withForgeMetroConfig.d.ts","sourceRoot":"","sources":["../../../src/metro/withForgeMetroConfig.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAGhD,MAAM,WAAW,uBAAuB;IACtC,2DAA2D;IAC3D,YAAY,EAAE,MAAM,CAAC;IACrB,wEAAwE;IACxE,kBAAkB,CAAC,EAAE,MAAM,CAAC;CAC7B;AAED;;;;;;;;;GASG;AACH,wBAAgB,oBAAoB,CAAC,CAAC,SAAS,WAAW,EACxD,MAAM,EAAE,CAAC,EACT,OAAO,EAAE,uBAAuB,GAC/B,CAAC,CAOH"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cdx-ui/components",
-  "version": "0.0.1-beta.75",
+  "version": "0.0.1-beta.76",
   "main": "lib/commonjs/index.js",
   "module": "lib/module/index.js",
   "react-native": "src/index.ts",
@@ -66,10 +66,10 @@
   "dependencies": {
     "@gorhom/bottom-sheet": "^5.2.6",
     "class-variance-authority": "^0.7.1",
-    "uniwind": "1.6.1",
-    "@cdx-ui/primitives": "0.0.1-beta.75",
-    "@cdx-ui/icons": "0.0.1-beta.75",
-    "@cdx-ui/utils": "0.0.1-beta.75"
+    "uniwind": "1.10.0",
+    "@cdx-ui/primitives": "0.0.1-beta.76",
+    "@cdx-ui/utils": "0.0.1-beta.76",
+    "@cdx-ui/icons": "0.0.1-beta.76"
   },
   "devDependencies": {
     "@react-navigation/bottom-tabs": "*",

package/src/metro/withForgeMetroConfig.ts

@@ -1,3 +1,4 @@
+import path from 'node:path';
 import type { MetroConfig } from 'metro-config';
 import { withUniwindConfig } from 'uniwind/metro';
 
@@ -22,8 +23,60 @@ export function withForgeMetroConfig<T extends MetroConfig>(
   config: T,
   options: ForgeMetroConfigOptions,
 ): T {
-  return withUniwindConfig(config, {
+  const withUniwind = withUniwindConfig(config, {
     cssEntryFile: options.cssEntryFile,
     dtsFile: options.generatedTypesFile,
   }) as T;
+
+  return withUniwindMultiCopyFix(withUniwind);
+}
+
+/**
+ * Fixes Uniwind 1.9's nativeResolver in pnpm monorepos with multiple Uniwind copies.
+ *
+ * Uniwind decides whether to wrap a `react-native` import by comparing
+ * `originModulePath` against a cached internal base path resolved via
+ * `require.resolve('uniwind/package.json')`. In pnpm, the Metro config loaded
+ * by Node and the Uniwind copy bundled for the app may resolve to different
+ * physical paths (different peer-dep hashes in the virtual store), so the
+ * `isInternal` check returns false for Uniwind-internal code. The
+ * nativeResolver then re-routes `react-native` to `uniwind/components`, which
+ * re-exports from `react-native` — a circular `get NativeModules` getter that
+ * overflows the stack at runtime.
+ *
+ * Fix: intercept `react-native` requests originating from inside any Uniwind
+ * copy and resolve them from the app's `projectRoot`, bypassing the broken
+ * `isInternal` check entirely.
+ */
+function withUniwindMultiCopyFix<T extends MetroConfig>(config: T): T {
+  const resolver = config.resolver;
+  if (!resolver) return config;
+
+  const innerResolveRequest = resolver.resolveRequest;
+  const uniwindPathFragment = `${path.sep}node_modules${path.sep}uniwind${path.sep}`;
+  const projectRoot = config.projectRoot;
+  const appOriginModulePath = projectRoot ? path.join(projectRoot, 'package.json') : undefined;
+
+  return {
+    ...config,
+    resolver: {
+      ...resolver,
+      resolveRequest: (context, moduleName, platform) => {
+        const fromUniwind = context.originModulePath?.includes(uniwindPathFragment) ?? false;
+        if (
+          fromUniwind &&
+          (moduleName === 'react-native' || moduleName.startsWith('react-native/'))
+        ) {
+          const rewrittenContext = appOriginModulePath
+            ? { ...context, originModulePath: appOriginModulePath }
+            : context;
+          return context.resolveRequest(rewrittenContext, moduleName, platform);
+        }
+        if (innerResolveRequest) {
+          return innerResolveRequest(context, moduleName, platform);
+        }
+        return context.resolveRequest(context, moduleName, platform);
+      },
+    },
+  } as T;
 }

package/src/styles.css

@@ -1,6 +1 @@
 @source './**/*.{ts,tsx}';
-
-/* TODO: Can we keep this? Check with Michael/Jack */
-*:focus {
-  outline: none;
-}