fix: token error with inline worker if minify is false

Author: prathameshnetake

packages/playground/worker-thread-node/__tests__/serve.js

@@ -4,13 +4,24 @@ const { join } = require('path')
  * @param {boolean} isProd
  */
 exports.serve = async function serve(root, isProd) {
+  // make a build in either cases
+  // make minified build if prod
   if (isProd) {
     const { build } = require('vite')
     await build({
       configFile: join(root, 'vite.config.ts'),
       root,
       logLevel: 'silent'
     })
+  } else {
+    const { build } = require('vite')
+
+    const config = require(join(root, 'vite.config.ts')).serveConfig
+    await build({
+      ...config,
+      root,
+      logLevel: 'silent'
+    })
   }
 
   return new Promise((resolve, _) => {

packages/playground/worker-thread-node/__tests__/worker-thread-node.spec.ts

@@ -2,19 +2,19 @@ import { isBuild, testDir } from '../../testUtils'
 import fs from 'fs-extra'
 import path from 'path'
 
-if (isBuild) {
-  test('response from worker', async () => {
-    const distDir = path.resolve(testDir, 'dist')
-    const { run } = require(path.join(distDir, 'main.cjs'))
-    expect(await run('ping')).toBe('pong')
-  })
-
-  test('response from inline worker', async () => {
-    const distDir = path.resolve(testDir, 'dist')
-    const { inlineWorker } = require(path.join(distDir, 'main.cjs'))
-    expect(await inlineWorker('ping')).toBe('this is inline node worker')
-  })
+test('response from worker', async () => {
+  const distDir = path.resolve(testDir, 'dist')
+  const { run } = require(path.join(distDir, 'main.cjs'))
+  expect(await run('ping')).toBe('pong')
+})
+
+test('response from inline worker', async () => {
+  const distDir = path.resolve(testDir, 'dist')
+  const { inlineWorker } = require(path.join(distDir, 'main.cjs'))
+  expect(await inlineWorker('ping')).toBe('this is inline node worker')
+})
 
+if (isBuild) {
   test('worker code generation', async () => {
     const assetsDir = path.resolve(testDir, 'dist/assets')
     const distDir = path.resolve(testDir, 'dist')

packages/playground/worker-thread-node/vite.config.ts

@@ -16,3 +16,20 @@ export default defineConfig({
     emptyOutDir: true
   }
 })
+
+export const serveConfig = defineConfig({
+  build: {
+    target: 'node16',
+    outDir: 'dist',
+    lib: {
+      entry: 'main.ts',
+      formats: ['cjs'],
+      fileName: 'main'
+    },
+    rollupOptions: {
+      external: [...builtinModules]
+    },
+    minify: false,
+    emptyOutDir: true
+  }
+})

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

@@ -83,11 +83,14 @@ export function webWorkerPlugin(config: ResolvedConfig): Plugin {
         const content = Buffer.from(code)
         if (query.inline != null) {
           if (isNode) {
+            let code = content.toString().trim()
+            code = code.replace(/\r?\n|\r/g, '')
+
             return `
             import { Worker } from "worker_threads" \n
             import { join } from "path" \n
             export default function WorkerWrapper() {
-              return new Worker(\'${content.toString().trim()}', { eval: true })
+              return new Worker(\'${code}', { eval: true })
             }
           `
           }