-
Notifications
You must be signed in to change notification settings - Fork 41
fix(metro): pin uniwind to a single copy in withUniwindConfig #564
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Closed
Closed
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,10 +1,15 @@ | ||
| import { resolve } from 'node:path' | ||
|
|
||
| import { UniwindBundlerConfig } from '@/bundler/config' | ||
| import type { UniwindConfig } from '@/bundler/types' | ||
| import { Platform } from '@/common/consts' | ||
| import type { MetroConfig } from 'metro-config' | ||
|
|
||
| import { cacheStore, patchMetroGraphToSupportUncachedModules } from './patches' | ||
| import { nativeResolver, webResolver } from './resolvers' | ||
|
|
||
| import type { UniwindConfig } from '@/bundler/types' | ||
| import type { MetroConfig } from 'metro-config' | ||
| import type { CustomResolver } from 'metro-resolver' | ||
|
|
||
| export const withUniwindConfig = <T extends MetroConfig>( | ||
| config: T, | ||
| uniwindConfig: UniwindConfig, | ||
|
|
@@ -22,15 +27,25 @@ export const withUniwindConfig = <T extends MetroConfig>( | |
| }, | ||
| resolver: { | ||
| ...config.resolver, | ||
| sourceExts: [ | ||
| ...config.resolver?.sourceExts ?? [], | ||
| 'css', | ||
| ], | ||
| assetExts: config.resolver?.assetExts?.filter( | ||
| ext => ext !== 'css', | ||
| ), | ||
| sourceExts: [...(config.resolver?.sourceExts ?? []), 'css'], | ||
| assetExts: config.resolver?.assetExts?.filter((ext) => ext !== 'css'), | ||
|
Brentlok marked this conversation as resolved.
Comment on lines
-25
to
+31
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Why this is reformated? |
||
| resolveRequest: (context, moduleName, platform) => { | ||
| const resolver = config.resolver?.resolveRequest ?? context.resolveRequest | ||
| const baseResolver = config.resolver?.resolveRequest ?? context.resolveRequest | ||
| // Pin every `uniwind` specifier to a single physical copy. In monorepos | ||
| // (bun/pnpm) uniwind can be installed as multiple peer-hash copies; mixing | ||
| // them both crashes Hermes ("Maximum call stack size exceeded" via | ||
| // get NativeModules recursion, when the react-native shim redirects across | ||
| // copies) and splits uniwind's theme runtime across instances (no styling, | ||
| // colorKit "invalid" color errors). Resolving every `uniwind` request from | ||
| // a single origin (the project root) collapses them to one instance. | ||
| // Wrapping `resolver` — not just this resolveRequest — ensures the platform | ||
| // resolvers' internal `react-native` -> `uniwind/components` redirects are | ||
| // pinned too. | ||
|
Comment on lines
+34
to
+43
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This comment seems to be too long |
||
| const pinnedOrigin = resolve(config.projectRoot ?? process.cwd(), 'index.js') | ||
| const resolver: CustomResolver = (ctx, name, plat) => | ||
| name.split('/')[0] === 'uniwind' && ctx.originModulePath !== pinnedOrigin | ||
| ? baseResolver({ ...ctx, originModulePath: pinnedOrigin }, name, plat) | ||
| : baseResolver(ctx, name, plat) | ||
| const platformResolver = platform === Platform.Web ? webResolver : nativeResolver | ||
| const resolved = platformResolver({ | ||
| context, | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It's not really common in this repo to separate imports