chore: remove inlineUrl

docs/config/worker-options.md

@@ -9,13 +9,6 @@ Options related to Web Workers.
 
 Output format for worker bundle.
 
-## worker.inlineUrl
-
-- **Type:** `'blob' | 'base64'`
-- **Default:** `'blob'`
-
-URL type for inline worker, when setting to `'blob'`, the worker will be loaded as a blob URL with a fallback to data URL. Set to `'base64'` to load the worker as a data URL. When not set, `inlineUrl` will be `'blob'` for Worker and `'base64'` for SharedWorker as blob URL not works with a shared worker.
-
 ## worker.plugins
 
 - **Type:** [`(Plugin | Plugin[])[]`](./shared-options#plugins)

packages/vite/src/node/config.ts

@@ -250,11 +250,6 @@ export interface UserConfig {
      * @default 'iife'
      */
     format?: 'es' | 'iife'
-    /**
-     * URL type for inline worker
-     * @default 'blob'
-     */
-    inlineUrl?: 'blob' | 'base64'
     /**
      * Vite plugins that apply to worker bundle
      */
@@ -322,7 +317,6 @@ export interface ResolveWorkerOptions extends PluginHookUtils {
   format: 'es' | 'iife'
   plugins: Plugin[]
   rollupOptions: RollupOptions
-  inlineUrl?: 'blob' | 'base64'
 }
 
 export interface InlineConfig extends UserConfig {
@@ -639,7 +633,6 @@ export async function resolveConfig(
   workerConfig = await runConfigHook(workerConfig, workerUserPlugins, configEnv)
   const resolvedWorkerOptions: ResolveWorkerOptions = {
     format: workerConfig.worker?.format || 'iife',
-    inlineUrl: workerConfig.worker?.inlineUrl,
     plugins: [],
     rollupOptions: workerConfig.worker?.rollupOptions || {},
     getSortedPlugins: undefined!,

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

@@ -1,5 +1,4 @@
 import path from 'node:path'
-import colors from 'picocolors'
 import MagicString from 'magic-string'
 import type { EmittedAsset, OutputChunk } from 'rollup'
 import type { ResolvedConfig } from '../config'
@@ -279,7 +278,7 @@ export function webWorkerPlugin(config: ResolvedConfig): Plugin {
 
       // stringified url or `new URL(...)`
       let url: string
-      const { format, inlineUrl } = config.worker
+      const { format } = config.worker
       const workerConstructor =
         query.sharedworker != null ? 'SharedWorker' : 'Worker'
       const workerType = isBuild
@@ -288,6 +287,7 @@ export function webWorkerPlugin(config: ResolvedConfig): Plugin {
           : 'classic'
         : 'module'
       const workerOptions = workerType === 'classic' ? '' : ',{type: "module"}'
+
       if (isBuild) {
         getDepsOptimizer(config, ssr)?.registerWorkersSource(id)
         if (query.inline != null) {
@@ -313,26 +313,9 @@ export function webWorkerPlugin(config: ResolvedConfig): Plugin {
           }
           `
 
-          // If inlineUrl is not specified, use base64 for SharedWorker and blob for Worker
-          const resolvedInlineUrl = inlineUrl
-            ? inlineUrl
-            : workerConstructor === 'SharedWorker'
-            ? 'base64'
-            : 'blob'
-
-          if (
-            workerConstructor === 'SharedWorker' &&
-            resolvedInlineUrl === 'blob'
-          ) {
-            config.logger.warn(
-              colors.yellow(
-                `\nThe inlined SharedWorker: ${id} does not work with blob URL, considering set 'worker.inlineUrl' to 'base64'. \n`,
-              ),
-            )
-          }
-
           return {
-            code: resolvedInlineUrl === 'blob' ? blobCode : base64Code,
+            // SharedWorker does not support blob URL
+            code: workerConstructor === 'Worker' ? blobCode : base64Code,
             // Empty sourcemap to suppress Rollup warning
             map: { mappings: '' },
           }

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

@@ -34,6 +34,10 @@ test('shared worker', async () => {
   await untilUpdated(() => page.textContent('.tick-count'), 'pong', true)
 })
 
+test('inline shared worker', async () => {
+  await untilUpdated(() => page.textContent('.pong-shared-inline'), 'pong')
+})
+
 test('worker emitted and import.meta.url in nested worker (serve)', async () => {
   await untilUpdated(
     () => page.textContent('.nested-worker'),

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

@@ -29,6 +29,10 @@ test('shared worker', async () => {
   await untilUpdated(() => page.textContent('.tick-count'), 'pong')
 })
 
+test('inline shared worker', async () => {
+  await untilUpdated(() => page.textContent('.pong-shared-inline'), 'pong')
+})
+
 test('worker emitted and import.meta.url in nested worker (serve)', async () => {
   await untilUpdated(() => page.textContent('.nested-worker'), '/worker-nested')
   await untilUpdated(

playground/worker/__tests__/relative-base/relative-base-worker.spec.ts

@@ -35,6 +35,10 @@ test('shared worker', async () => {
   await untilUpdated(() => page.textContent('.tick-count'), 'pong', true)
 })
 
+test('inline shared worker', async () => {
+  await untilUpdated(() => page.textContent('.pong-shared-inline'), 'pong')
+})
+
 test('worker emitted and import.meta.url in nested worker (serve)', async () => {
   await untilUpdated(
     () => page.textContent('.nested-worker'),

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

@@ -10,7 +10,7 @@ describe.runIf(isBuild)('build', () => {
 
     const files = fs.readdirSync(assetsDir)
     // should have 2 worker chunk
-    expect(files.length).toBe(31)
+    expect(files.length).toBe(32)
     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/sourcemap-worker.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(31)
+    expect(files.length).toBe(32)
     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/index.html

@@ -26,12 +26,6 @@ <h2 class="format-iife">format iife:</h2>
 </p>
 <code class="pong-inline"></code>
 
-<p>
-  import InlineSharedWorker from '../my-shared-worker?sharedworker&inline'
-  <span class="classname">.pong-shared-inline</span>
-</p>
-<code class="pong-shared-inline"></code>
-
 <p>
   import TSOutputWorker from '../possible-ts-output-worker?worker'
   <span class="classname">.pong-ts-output</span>
@@ -44,6 +38,12 @@ <h2 class="format-iife">format iife:</h2>
 </p>
 <code class="tick-count"></code>
 
+<p>
+  import InlineSharedWorker from '../my-shared-worker?sharedworker&inline'
+  <span class="classname">.pong-shared-inline</span>
+</p>
+<code class="pong-shared-inline"></code>
+
 <p>
   new Worker(new URL('./url-worker.js', import.meta.url), { type: 'module' })
   <span class="classname">.worker-import-meta-url</span>

playground/worker/my-inline-shared-worker.ts

@@ -0,0 +1,13 @@
+let inlineSharedWorkerCount = 0
+
+// @ts-expect-error onconnect exists in worker
+self.onconnect = (event) => {
+  inlineSharedWorkerCount++
+  const port = event.ports[0]
+  if (inlineSharedWorkerCount >= 2) {
+    port.postMessage('pong')
+  }
+}
+
+// for sourcemap
+console.log('my-inline-shared-worker.js')

playground/worker/my-shared-worker.ts

@@ -4,7 +4,7 @@ let sharedWorkerCount = 0
 self.onconnect = (event) => {
   sharedWorkerCount++
   const port = event.ports[0]
-  if (sharedWorkerCount === 2) {
+  if (sharedWorkerCount >= 2) {
     port.postMessage('pong')
   }
 }

playground/worker/package.json

@@ -21,9 +21,6 @@
     "dev:relative-base": "WORKER_MODE=inline vite --config ./vite.config-relative-base.js dev",
     "build:relative-base": "WORKER_MODE=inline vite --config ./vite.config-relative-base.js build",
     "preview:relative-base": "WORKER_MODE=inline vite --config ./vite.config-relative-base.js preview",
-    "dev:inline-url": "vite --config ./vite.config-inline-url.js dev",
-    "build:inline-url": "vite --config ./vite.config-inline-url.js build",
-    "preview:inline-url": "vite --config ./vite.config-inline-url.js preview",
     "debug": "node --inspect-brk ../../packages/vite/bin/vite"
   },
   "dependencies": {

playground/worker/vite.config-es.js

@@ -1,8 +1,6 @@
 import vite from 'vite'
 import workerPluginTestPlugin from './worker-plugin-test-plugin'
 
-/** @type {import('vite').UserConfig} */
-// @ts-expect-error typecast
 export default vite.defineConfig({
   base: '/es/',
   resolve: {

playground/worker/worker/main-module.js

@@ -1,6 +1,6 @@
 import myWorker from '../my-worker.ts?worker'
 import InlineWorker from '../my-worker.ts?worker&inline'
-import InlineSharedWorker from '../my-shared-worker?sharedworker&inline'
+import InlineSharedWorker from '../my-inline-shared-worker?sharedworker&inline'
 import mySharedWorker from '../my-shared-worker?sharedworker&name=shared'
 import TSOutputWorker from '../possible-ts-output-worker?worker'
 import NestedWorker from '../worker-nested-worker?worker'