Merge branch 'main' into nav-client-events

webpack.config.js

@@ -41,32 +41,6 @@ function patchSourceMapFilter(rules, pathPattern) {
   }
 }
 
-// Walk a rule tree and add `.cjs` support everywhere the config assumes only
-// `.js|.mjs|.jsx|.ts|.tsx`. Mutates in place.
-function patchCjsSupport(rules) {
-  if (!rules) return
-  const addCjs = pattern => {
-    if (!(pattern instanceof RegExp)) return pattern
-    if (pattern.source.includes('cjs')) return pattern
-    return new RegExp(
-      pattern.source.replace(/\|tsx\)/g, '|tsx|cjs)'),
-      pattern.flags,
-    )
-  }
-  const patch = value => {
-    if (value instanceof RegExp) return addCjs(value)
-    if (Array.isArray(value)) return value.map(patch)
-    return value
-  }
-  for (const rule of rules) {
-    if (!rule || typeof rule !== 'object') continue
-    if (rule.oneOf) patchCjsSupport(rule.oneOf)
-    if (rule.rules) patchCjsSupport(rule.rules)
-    if (rule.test !== undefined) rule.test = patch(rule.test)
-    if (rule.exclude !== undefined) rule.exclude = patch(rule.exclude)
-  }
-}
-
 module.exports = async function (env, argv) {
   env.babel = {
     dangerouslyAddModulePathsToTranspile: ['@bsky.app/expo'],
@@ -78,13 +52,7 @@ module.exports = async function (env, argv) {
     'react-native-gesture-handler': false, // RNGH should not be used on web, so let's cause a build error if it sneaks in
     '@sentry-internal/replay': false, // not used, ~300kb of dead weight
   })
-  // TEMP HACK: hopefully won't be an issue when we switch to metro
-  // @expo/webpack-config's babel-loader and source-map-loader tests do not
-  // include .cjs, and its fallback "asset/resource" loader doesn't exclude
-  // .cjs — so any dependency whose `require` entrypoint is a .cjs file
-  // (e.g. zod 3.24+, unicode-segmenter) gets served as a static asset URL
-  // instead of a module. Patch the tests to cover .cjs.
-  patchCjsSupport(config.module.rules)
+
   // react-native-uuid ships sourceMappingURL comments but no .map files.
   patchSourceMapFilter(config.module.rules, /react-native-uuid/)
   config.module.rules = [