fix(worker): require(json) result should not be wrapped (#21847)

Author: sapphi-red

packages/vite/src/node/plugins/worker.ts

@@ -204,6 +204,10 @@ async function bundleWorkerEntry(
       ...rollupOptions.moduleTypes,
     },
     preserveEntrySignatures: false,
+    experimental: {
+      ...rollupOptions.experimental,
+      viteMode: true,
+    },
   })
   let result: RolldownOutput
   let watchedFiles: string[] | undefined

playground/worker/__tests__/es/worker-es.spec.ts

@@ -96,7 +96,7 @@ describe.runIf(isBuild)('build', () => {
   test('inlined code generation', async () => {
     const assetsDir = path.resolve(testDir, 'dist/es/assets')
     const files = fs.readdirSync(assetsDir)
-    expect(files.length).toBe(38)
+    expect(files.length).toBe(40)
     const index = files.find((f) => f.includes('main-module'))
     const content = fs.readFileSync(path.resolve(assetsDir, index), 'utf-8')
     const worker = files.find((f) => f.includes('my-worker'))
@@ -191,6 +191,12 @@ test('import.meta.glob with eager in worker', async () => {
     .toMatch('["')
 })
 
+test.runIf(isBuild)('require json in worker', async () => {
+  await expect
+    .poll(() => page.textContent('.worker-require-json'))
+    .toMatch('[{"name":"a"},{"name":"b"}]')
+})
+
 test('self reference worker', async () => {
   await expect
     .poll(() => page.textContent('.self-reference-worker'))

playground/worker/__tests__/iife/worker-iife.spec.ts

@@ -83,7 +83,7 @@ describe.runIf(isBuild)('build', () => {
   test('inlined code generation', async () => {
     const assetsDir = path.resolve(testDir, 'dist/iife/assets')
     const files = fs.readdirSync(assetsDir)
-    expect(files.length).toBe(23)
+    expect(files.length).toBe(24)
     const index = files.find((f) => f.includes('main-module'))
     const content = fs.readFileSync(path.resolve(assetsDir, index), 'utf-8')
     const worker = files.find((f) => f.includes('worker_entry-my-worker'))
@@ -159,6 +159,12 @@ test('import.meta.glob eager in worker', async () => {
     .toMatch('["')
 })
 
+test.runIf(isBuild)('require json in worker', async () => {
+  await expect
+    .poll(() => page.textContent('.worker-require-json'))
+    .toMatch('[{"name":"a"},{"name":"b"}]')
+})
+
 test('self reference worker', async () => {
   await expect
     .poll(() => page.textContent('.self-reference-worker'))

playground/worker/__tests__/sourcemap-hidden/worker-sourcemap-hidden.spec.ts

@@ -10,7 +10,7 @@ describe.runIf(isBuild)('build', () => {
 
     const files = fs.readdirSync(assetsDir)
     // should have 2 worker chunk
-    expect(files.length).toBe(46)
+    expect(files.length).toBe(48)
     const index = files.find((f) => f.includes('main-module'))
     const content = fs.readFileSync(path.resolve(assetsDir, index), 'utf-8')
     const indexSourcemap = getSourceMapUrl(content)

playground/worker/__tests__/sourcemap-inline/worker-sourcemap-inline.spec.ts

@@ -10,7 +10,7 @@ describe.runIf(isBuild)('build', () => {
 
     const files = fs.readdirSync(assetsDir)
     // should have 2 worker chunk
-    expect(files.length).toBe(23)
+    expect(files.length).toBe(24)
     const index = files.find((f) => f.includes('main-module'))
     const content = fs.readFileSync(path.resolve(assetsDir, index), 'utf-8')
     const indexSourcemap = getSourceMapUrl(content)

playground/worker/__tests__/sourcemap/worker-sourcemap.spec.ts

@@ -9,7 +9,7 @@ describe.runIf(isBuild)('build', () => {
     const assetsDir = path.resolve(testDir, 'dist/iife-sourcemap/assets')
     const files = fs.readdirSync(assetsDir)
     // should have 2 worker chunk
-    expect(files.length).toBe(46)
+    expect(files.length).toBe(48)
     const index = files.find((f) => f.includes('main-module'))
     const content = fs.readFileSync(path.resolve(assetsDir, index), 'utf-8')
     const indexSourcemap = getSourceMapUrl(content)

playground/worker/dep-cjs-with-json/data.json

@@ -0,0 +1 @@
+[{ "name": "a" }, { "name": "b" }]

playground/worker/dep-cjs-with-json/importer.cjs

@@ -0,0 +1 @@
+module.exports.content = require('./data.json')

playground/worker/index.html

@@ -191,6 +191,12 @@ <h2 class="format-iife">format iife:</h2>
 </p>
 <code class="deeply-nested-third-worker"></code>
 
+<p>
+  require('./some.json') in worker
+  <span class="classname">.worker-require-json</span>
+</p>
+<code class="worker-require-json"></code>
+
 <hr />
 
 <h2 class="format-es"></h2>

playground/worker/worker-require-json.js

@@ -0,0 +1,7 @@
+import('./dep-cjs-with-json/importer.cjs')
+  .then((mod) => {
+    self.postMessage({ ok: true, content: JSON.stringify(mod.content) })
+  })
+  .catch((err) => {
+    self.postMessage({ ok: false, error: String(err) })
+  })