22import { dirname , relative , sep } from "node:path" ;
33import { versions } from "node:process" ;
44
5- import connect from "connect" ;
65import debug from "debug" ;
76import type { MetroConfig } from "metro-config" ;
87
@@ -50,9 +49,6 @@ export function withReactNativeCSS<
5049 setupTypeScript ( typescriptEnvPath ) ;
5150 }
5251
53- const originalMiddleware = config . server ?. enhanceMiddleware ;
54- const originalResolver = config . resolver ?. resolveRequest ;
55-
5652 return {
5753 ...config ,
5854 transformerPath : require . resolve ( "./metro-transformer" ) ,
@@ -68,13 +64,14 @@ export function withReactNativeCSS<
6864 return { type : "empty" } ;
6965 }
7066
67+ const parentResolver =
68+ config . resolver ?. resolveRequest ?? context . resolveRequest ;
69+
7170 // Don't hijack the resolution of react-native imports
7271 if ( ! globalClassNamePolyfill ) {
73- const parentResolver = originalResolver ?? context . resolveRequest ;
7472 return parentResolver ( context , moduleName , platform ) ;
7573 }
7674
77- const parentResolver = originalResolver ?? context . resolveRequest ;
7875 const resolver = platform === "web" ? webResolver : nativeResolver ;
7976 const resolved = resolver (
8077 parentResolver ,
@@ -88,8 +85,7 @@ export function withReactNativeCSS<
8885 } ,
8986 server : {
9087 ...config . server ,
91- enhanceMiddleware ( middleware , metroServer ) {
92- const server = connect ( ) ;
88+ enhanceMiddleware ( metroMiddleware , metroServer ) {
9389 const bundler : any = metroServer . getBundler ( ) . getBundler ( ) ;
9490
9591 if ( ! bundler . __react_native_css__patched ) {
@@ -230,9 +226,14 @@ export function withReactNativeCSS<
230226 } ;
231227 }
232228
233- return originalMiddleware
234- ? server . use ( originalMiddleware ( middleware , metroServer ) )
235- : server . use ( middleware ) ;
229+ /**
230+ * We don't modify the middleware, we just use this function to get the metroServer
231+ * So simply return the existing middleware
232+ */
233+ return (
234+ config . server ?. enhanceMiddleware ?.( metroMiddleware , metroServer ) ??
235+ metroMiddleware
236+ ) ;
236237 } ,
237238 } ,
238239 } ;
0 commit comments