peachsim 0.1.2229 → 0.1.2232

package/src/vite-plugin.ts

@@ -2542,23 +2542,23 @@ function externalAppResolvePlugin(
 // convert require() calls and handle JSX in .js files from external app sources
 function externalAppTransformPlugin(isAppSource: (p: string) => boolean): Plugin {
   const defines: Record<string, string> = {}
+  let isBuild = false
   return {
     name: 'sootsim-external-app-transform',
     enforce: 'pre',
     configResolved(config) {
+      isBuild = config.command === 'build'
       for (const [name, value] of Object.entries(config.define ?? {}))
         defines[name] = typeof value === 'string' ? value : JSON.stringify(value)
     },
     transform: {
       filter: { code: /require\(|</ },
       async handler(code, id) {
-        // expo's winter polyfills use Metro-local requires in lazy getters.
-        // their module imports must never reach the host's native-package registry.
-        if (!isAppSource(id) && !/\/node_modules\/expo\/(?:src|build)\/winter\//.test(id))
-          return null
+        const isExpoWinter = /\/node_modules\/expo\/(?:src|build)\/winter\//.test(id)
+        if (!isAppSource(id) && !isExpoWinter) return null
 
-        // prune upstream's disabled native branches before lifting module imports.
-        let result = /\/node_modules\/expo\/(?:src|build)\/winter\//.test(id)
+        // prune disabled native branches before resolving their requires.
+        let result = isExpoWinter
           ? minifySync(
               stripViteQuery(id),
               transformSync(stripViteQuery(id), code, { define: defines }).code,
@@ -2567,9 +2567,10 @@ function externalAppTransformPlugin(isAppSource: (p: string) => boolean): Plugin
           : code
         let imports = ''
         let importCounter = 0
-        let hasChanges = false
+        let hasChanges = isExpoWinter
 
-        if (code.includes('require(')) {
+        // rolldown keeps winter's lazy requires at their call sites in builds.
+        if (code.includes('require(') && !(isBuild && isExpoWinter)) {
           const replacements: Array<{ start: number; end: number; varName: string }> = []
           const seenPaths = new Map<string, string>()
           const pending: unknown[] = [parseSync(stripViteQuery(id), result).program]