fix(worker): fix importScripts injection breaking iife code (#17827)

hi-ogawa · web-flow · commit bb4ba9f448da · 2024-08-06T22:08:34.000+08:00
diff --git a/.prettierignore b/.prettierignore
@@ -11,3 +11,4 @@ playground/html/invalid.html
 playground/html/valid.html
 playground/external/public/slash@3.0.0.js
 playground/ssr-html/public/slash@3.0.0.js
+playground/worker/classic-worker.js
diff --git a/packages/vite/src/node/plugins/worker.ts b/packages/vite/src/node/plugins/worker.ts
@@ -265,7 +265,7 @@ export function webWorkerPlugin(config: ResolvedConfig): Plugin {
         }
         if (injectEnv) {
           const s = new MagicString(raw)
-          s.prepend(injectEnv)
+          s.prepend(injectEnv + ';\n')
           return {
             code: s.toString(),
             map: s.generateMap({ hires: 'boundary' }),
diff --git a/playground/worker/classic-worker.js b/playground/worker/classic-worker.js
@@ -1,3 +1,5 @@
+(() => {})() // this is to test `importScripts` injection doesn't break the code
+
 let base = `/${self.location.pathname.split('/')[1]}`
 if (base.endsWith('.js') || base === `/worker-entries`) base = '' // for dev
 

-Original file line number
+Diff line change
 playground/html/valid.html
 playground/external/public/[email protected]
 playground/ssr-html/public/[email protected]
 +playground/worker/classic-worker.js
Original file line number	Diff line number	Diff line change
`@@ -265,7 +265,7 @@ export function webWorkerPlugin(config: ResolvedConfig): Plugin {`
`265`	`265`	`}`
`266`	`266`	`if (injectEnv) {`
`267`	`267`	`const s = new MagicString(raw)`
`268`		`- s.prepend(injectEnv)`
	`268`	`+ s.prepend(injectEnv + ';\n')`
`269`	`269`	`return {`
`270`	`270`	`code: s.toString(),`
`271`	`271`	`map: s.generateMap({ hires: 'boundary' }),`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	+(() => {})() // this is to test `importScripts` injection doesn't break the code
	`2`	`+`
`1`	`3`	let base = `/${self.location.pathname.split('/')[1]}`
`2`	`4`	if (base.endsWith('.js') \|\| base === `/worker-entries`) base = '' // for dev
`3`	`5`