refactor

Author: hi-ogawa

packages/plugin-rsc/src/plugin.ts

@@ -40,6 +40,7 @@ import {
 import { cjsModuleRunnerPlugin } from './plugins/cjs'
 import { evalValue, parseIdQuery } from './plugins/utils'
 import { createDebug } from '@hiogawa/utils'
+import { transformScanBuildStrip } from './plugins/scan'
 
 // state for build orchestration
 let serverReferences: Record<string, string> = {}
@@ -901,9 +902,6 @@ globalThis.AsyncLocalStorage = __viteRscAyncHooks.AsyncLocalStorage;
   ]
 }
 
-// https://github.com/vitejs/vite/blob/86d2e8be50be535494734f9f5f5236c61626b308/packages/vite/src/node/plugins/importMetaGlob.ts#L113
-const importGlobRE = /\bimport\.meta\.glob(?:<\w+>)?\s*\(/g
-
 // During scan build, we strip all code but imports to
 // traverse module graph faster and just discover client/server references.
 function scanBuildStripPlugin(): Plugin {
@@ -914,17 +912,10 @@ function scanBuildStripPlugin(): Plugin {
     transform(code, _id, _options) {
       if (!isScanBuild) return
 
-      // bail out if import.meta.glob
-      // https://github.com/vitejs/rolldown-vite/issues/373
-      if (importGlobRE.test(code)) return
-
-      const [imports] = esModuleLexer.parse(code)
-      let output = imports
-        .map((e) => e.n && `import ${JSON.stringify(e.n)};\n`)
-        .filter(Boolean)
-        .join('')
-      output += 'module.exports = {};\n'
-      return { code: output, map: { mappings: '' } }
+      const output = transformScanBuildStrip(code)
+      if (output) {
+        return { code: output, map: { mappings: '' } }
+      }
     },
   }
 }

packages/plugin-rsc/src/plugins/scan.ts

@@ -0,0 +1,19 @@
+import * as esModuleLexer from 'es-module-lexer'
+
+// https://github.com/vitejs/vite/blob/86d2e8be50be535494734f9f5f5236c61626b308/packages/vite/src/node/plugins/importMetaGlob.ts#L113
+const importGlobRE = /\bimport\.meta\.glob(?:<\w+>)?\s*\(/g
+
+export function transformScanBuildStrip(code: string): string | undefined {
+  // bail out if import.meta.glob
+  // https://github.com/vitejs/rolldown-vite/issues/373
+  if (importGlobRE.test(code)) return
+
+  const [imports] = esModuleLexer.parse(code)
+  let output = imports
+    .map((e) => e.n && `import ${JSON.stringify(e.n)};\n`)
+    .filter(Boolean)
+    .join('')
+  output += 'module.exports = {};\n'
+
+  return output
+}