From a481a477caa861d1ce76eaee04c79c7bbf8095d2 Mon Sep 17 00:00:00 2001
From: Danielku15 <danielku15@coderline.net>
Date: Sat, 13 Apr 2024 15:17:21 +0200
Subject: [PATCH 1/7] fix: broken worker urls in 3rd party modules (fix #10838)

---
 .../src/node/plugins/workerImportMetaUrl.ts   | 23 ++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/packages/vite/src/node/plugins/workerImportMetaUrl.ts b/packages/vite/src/node/plugins/workerImportMetaUrl.ts
index 22a5de2ec67b06..d438de991caf73 100644
--- a/packages/vite/src/node/plugins/workerImportMetaUrl.ts
+++ b/packages/vite/src/node/plugins/workerImportMetaUrl.ts
@@ -7,6 +7,7 @@ import type { Plugin } from '../plugin'
 import { evalValue, injectQuery, transformStableResult } from '../utils'
 import type { ResolveFn } from '..'
 import { cleanUrl, slash } from '../../shared/utils'
+import { getDepsOptimizer, optimizedDepInfoFromFile } from '../optimizer'
 import type { WorkerType } from './worker'
 import { WORKER_FILE_ID, workerFileToUrl } from './worker'
 import { fileToUrl } from './asset'
@@ -114,6 +115,22 @@ export function workerImportMetaUrlPlugin(config: ResolvedConfig): Plugin {
     asSrc: true,
   }
 
+  function tryOptimizedDepResolve(ssr: boolean, url: string, depId: string) {
+    const depsOptimizer = getDepsOptimizer(config, ssr)
+
+    if (depsOptimizer?.isOptimizedDepFile(depId)) {
+      const depFile = cleanUrl(depId)
+      const info = optimizedDepInfoFromFile(depsOptimizer.metadata, depFile)
+      const depSrc = info?.src
+      if (depSrc) {
+        const resolvedFile = path.resolve(path.dirname(depSrc), url)
+        return tryFsResolve(resolvedFile, fsResolveOptions)
+      }
+    }
+
+    return undefined
+  }
+
   return {
     name: 'vite:worker-import-meta-url',
 
@@ -148,10 +165,14 @@ export function workerImportMetaUrlPlugin(config: ResolvedConfig): Plugin {
           s ||= new MagicString(code)
           const workerType = getWorkerType(code, cleanString, endIndex)
           const url = rawUrl.slice(1, -1)
+
           let file: string | undefined
           if (url[0] === '.') {
             file = path.resolve(path.dirname(id), url)
-            file = tryFsResolve(file, fsResolveOptions) ?? file
+            file =
+              tryFsResolve(file, fsResolveOptions) ??
+              tryOptimizedDepResolve(options?.ssr === true, url, id) ??
+              file
           } else {
             workerResolver ??= config.createResolver({
               extensions: [],

From 8543320af1f76af1a8c7564f033439d080a4dbe1 Mon Sep 17 00:00:00 2001
From: Danielku15 <danielku15@coderline.net>
Date: Sat, 13 Apr 2024 15:18:03 +0200
Subject: [PATCH 2/7] test: add integration test for worker in 3rd party module

---
 .../worker/__tests__/es/worker-es.spec.ts     |  6 ++++++
 .../worker/__tests__/iife/worker-iife.spec.ts |  6 ++++++
 .../worker-relative-base.spec.ts              |  6 ++++++
 .../worker/dep-with-worker/dep-worker.js      | 19 +++++++++++++++++++
 playground/worker/dep-with-worker/index.js    | 16 ++++++++++++++++
 .../worker/dep-with-worker/package.json       |  7 +++++++
 playground/worker/dep-with-worker/shared.js   |  9 +++++++++
 playground/worker/index.html                  |  6 ++++++
 playground/worker/package.json                |  3 ++-
 playground/worker/worker/main-module.js       |  3 +++
 pnpm-lock.yaml                                | 10 ++++++++++
 11 files changed, 90 insertions(+), 1 deletion(-)
 create mode 100644 playground/worker/dep-with-worker/dep-worker.js
 create mode 100644 playground/worker/dep-with-worker/index.js
 create mode 100644 playground/worker/dep-with-worker/package.json
 create mode 100644 playground/worker/dep-with-worker/shared.js

diff --git a/playground/worker/__tests__/es/worker-es.spec.ts b/playground/worker/__tests__/es/worker-es.spec.ts
index 3656b07c18d576..7a0d388138d2e0 100644
--- a/playground/worker/__tests__/es/worker-es.spec.ts
+++ b/playground/worker/__tests__/es/worker-es.spec.ts
@@ -240,3 +240,9 @@ test('self reference url worker', async () => {
     'pong: main\npong: nested\n',
   )
 })
+
+test('dep with worker', async () => {
+  expectWithRetry(() => page.textContent('.dep-with-worker')).toBe(
+    'ping: main\npong: worker',
+  )
+})
diff --git a/playground/worker/__tests__/iife/worker-iife.spec.ts b/playground/worker/__tests__/iife/worker-iife.spec.ts
index 77547e8426fbd1..0f1ffdc22fcdd2 100644
--- a/playground/worker/__tests__/iife/worker-iife.spec.ts
+++ b/playground/worker/__tests__/iife/worker-iife.spec.ts
@@ -192,3 +192,9 @@ function decodeSourceMapUrl(content: string) {
     ).toString(),
   )
 }
+
+test('dep with worker', async () => {
+  expectWithRetry(() => page.textContent('.dep-with-worker')).toBe(
+    'ping: main\npong: worker',
+  )
+})
diff --git a/playground/worker/__tests__/relative-base/worker-relative-base.spec.ts b/playground/worker/__tests__/relative-base/worker-relative-base.spec.ts
index 6c3180c7e2aa31..bff516e7428271 100644
--- a/playground/worker/__tests__/relative-base/worker-relative-base.spec.ts
+++ b/playground/worker/__tests__/relative-base/worker-relative-base.spec.ts
@@ -173,3 +173,9 @@ test('self reference url worker', async () => {
     'pong: main\npong: nested\n',
   )
 })
+
+test('dep with worker', async () => {
+  expectWithRetry(() => page.textContent('.dep-with-worker')).toBe(
+    'ping: main\npong: worker',
+  )
+})
diff --git a/playground/worker/dep-with-worker/dep-worker.js b/playground/worker/dep-with-worker/dep-worker.js
new file mode 100644
index 00000000000000..df0ece2e1852de
--- /dev/null
+++ b/playground/worker/dep-with-worker/dep-worker.js
@@ -0,0 +1,19 @@
+import { sharedBetweenWorkerAndMain } from './shared'
+
+self.onmessage = (e) => {
+  if (e.data === 'ping') {
+    self.postMessage({ msg })
+  }
+}
+self.postMessage({
+  msg,
+  mode,
+  bundleWithPlugin,
+  msgFromDep,
+  viteSvg,
+  metaUrl,
+  name,
+})
+
+// for sourcemap
+sharedBetweenWorkerAndMain('dep-worker')
diff --git a/playground/worker/dep-with-worker/index.js b/playground/worker/dep-with-worker/index.js
new file mode 100644
index 00000000000000..3cbf9f496d7a92
--- /dev/null
+++ b/playground/worker/dep-with-worker/index.js
@@ -0,0 +1,16 @@
+import { sharedBetweenWorkerAndMain } from './shared'
+
+export function startWorker(el) {
+  sharedBetweenWorkerAndMain(el, 'ping: main')
+
+  const worker = new Worker(
+    new URL('./dep-worker.mjs?worker', import.meta.url),
+    {
+      type: 'module ',
+    },
+  )
+  worker.postMessage('pong: worker')
+  worker.addEventListener('message', (e) => {
+    sharedBetweenWorkerAndMain(el, e.data.msg)
+  })
+}
diff --git a/playground/worker/dep-with-worker/package.json b/playground/worker/dep-with-worker/package.json
new file mode 100644
index 00000000000000..b5c609a362842a
--- /dev/null
+++ b/playground/worker/dep-with-worker/package.json
@@ -0,0 +1,7 @@
+{
+  "name": "@vitejs/test-dep-with-worker",
+  "private": true,
+  "version": "1.0.0",
+  "type": "module",
+  "main": "index.js"
+}
diff --git a/playground/worker/dep-with-worker/shared.js b/playground/worker/dep-with-worker/shared.js
new file mode 100644
index 00000000000000..891f0314f1f2f7
--- /dev/null
+++ b/playground/worker/dep-with-worker/shared.js
@@ -0,0 +1,9 @@
+export function sharedBetweenWorkerAndMain(el, text) {
+  if (self && self.postMessage) {
+    self.postMessage({ msg: text })
+  } else if (document.querySelector(el).textContent.length) {
+    document.querySelector(el).textContent += '\n' + text
+  } else {
+    document.querySelector(el).textContent += text
+  }
+}
diff --git a/playground/worker/index.html b/playground/worker/index.html
index c1944046af6998..436342fef4aae0 100644
--- a/playground/worker/index.html
+++ b/playground/worker/index.html
@@ -215,6 +215,12 @@ <h2 class="format-es"></h2>
 </p>
 <code class="module-and-worker-worker"></code>
 
+<p>
+  worker within dependency
+  <span class="classname">.dep-with-worker</span>
+</p>
+<code class="dep-with-worker"></code>
+
 <style>
   p {
     background: rgba(0, 0, 0, 0.1);
diff --git a/playground/worker/package.json b/playground/worker/package.json
index 90d4068a580f4a..cc25b935c35dff 100644
--- a/playground/worker/package.json
+++ b/playground/worker/package.json
@@ -28,6 +28,7 @@
     "debug": "node --inspect-brk ../../packages/vite/bin/vite"
   },
   "dependencies": {
-    "@vitejs/test-dep-to-optimize": "file:./dep-to-optimize"
+    "@vitejs/test-dep-to-optimize": "file:./dep-to-optimize",
+    "@vitejs/test-dep-with-worker": "file:./dep-with-worker"
   }
 }
diff --git a/playground/worker/worker/main-module.js b/playground/worker/worker/main-module.js
index e210654402ab84..58cb90e2e793ff 100644
--- a/playground/worker/worker/main-module.js
+++ b/playground/worker/worker/main-module.js
@@ -1,3 +1,4 @@
+import { startWorker as startDepWorker } from '@vitejs/test-dep-to-optimize'
 import myWorker from '../my-worker.ts?worker'
 import InlineWorker from '../my-worker.ts?worker&inline'
 import InlineSharedWorker from '../my-inline-shared-worker?sharedworker&inline'
@@ -174,3 +175,5 @@ selfReferenceUrlWorker.addEventListener('message', (e) => {
   document.querySelector('.self-reference-url-worker').textContent +=
     `${e.data}\n`
 })
+
+startDepWorker('.dep-with-worker')
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index a13f7fa3d9f191..d54f95b5105f89 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -1561,9 +1561,14 @@ importers:
       '@vitejs/test-dep-to-optimize':
         specifier: file:./dep-to-optimize
         version: file:playground/worker/dep-to-optimize
+      '@vitejs/test-dep-with-worker':
+        specifier: file:./dep-with-worker
+        version: file:playground/worker/dep-with-worker
 
   playground/worker/dep-to-optimize: {}
 
+  playground/worker/dep-with-worker: {}
+
 packages:
 
   '@aashutoshrathi/word-wrap@1.2.6':
@@ -3405,6 +3410,9 @@ packages:
       foobar:
         optional: true
 
+  '@vitejs/test-dep-with-worker@file:playground/worker/dep-with-worker':
+    resolution: {directory: playground/worker/dep-with-worker, type: directory}
+
   '@vitejs/test-entries@file:playground/ssr-resolve/entries':
     resolution: {directory: playground/ssr-resolve/entries, type: directory}
 
@@ -8631,6 +8639,8 @@ snapshots:
 
   '@vitejs/test-dep-with-optional-peer-dep@file:playground/optimize-deps/dep-with-optional-peer-dep': {}
 
+  '@vitejs/test-dep-with-worker@file:playground/worker/dep-with-worker': {}
+
   '@vitejs/test-entries@file:playground/ssr-resolve/entries': {}
 
   '@vitejs/test-external-cjs@file:playground/ssr-noexternal/external-cjs': {}

From c3cab9a87689a466e8dd16bb41219a646c657a4b Mon Sep 17 00:00:00 2001
From: Danielku15 <danielku15@coderline.net>
Date: Sat, 13 Apr 2024 16:48:34 +0200
Subject: [PATCH 3/7] fix: tests working in serve

---
 playground/worker/__tests__/es/worker-es.spec.ts |  6 ++++--
 playground/worker/dep-with-worker/dep-worker.js  | 16 ++--------------
 playground/worker/dep-with-worker/index.js       | 11 ++++++-----
 playground/worker/dep-with-worker/shared.js      |  6 +++---
 playground/worker/worker/main-module.js          |  2 +-
 5 files changed, 16 insertions(+), 25 deletions(-)

diff --git a/playground/worker/__tests__/es/worker-es.spec.ts b/playground/worker/__tests__/es/worker-es.spec.ts
index 7a0d388138d2e0..7935c58b724f4e 100644
--- a/playground/worker/__tests__/es/worker-es.spec.ts
+++ b/playground/worker/__tests__/es/worker-es.spec.ts
@@ -242,7 +242,9 @@ test('self reference url worker', async () => {
 })
 
 test('dep with worker', async () => {
-  expectWithRetry(() => page.textContent('.dep-with-worker')).toBe(
-    'ping: main\npong: worker',
+  await untilUpdated(
+    () => page.textContent('.dep-with-worker'),
+    'entry: main\nentry: worker\npong: worker',
+    true,
   )
 })
diff --git a/playground/worker/dep-with-worker/dep-worker.js b/playground/worker/dep-with-worker/dep-worker.js
index df0ece2e1852de..e316a601145b40 100644
--- a/playground/worker/dep-with-worker/dep-worker.js
+++ b/playground/worker/dep-with-worker/dep-worker.js
@@ -1,19 +1,7 @@
 import { sharedBetweenWorkerAndMain } from './shared'
 
 self.onmessage = (e) => {
-  if (e.data === 'ping') {
-    self.postMessage({ msg })
-  }
+  self.postMessage(e.data)
 }
-self.postMessage({
-  msg,
-  mode,
-  bundleWithPlugin,
-  msgFromDep,
-  viteSvg,
-  metaUrl,
-  name,
-})
 
-// for sourcemap
-sharedBetweenWorkerAndMain('dep-worker')
+sharedBetweenWorkerAndMain('', 'entry: worker')
diff --git a/playground/worker/dep-with-worker/index.js b/playground/worker/dep-with-worker/index.js
index 3cbf9f496d7a92..22e83fd7fd04fa 100644
--- a/playground/worker/dep-with-worker/index.js
+++ b/playground/worker/dep-with-worker/index.js
@@ -1,16 +1,17 @@
-import { sharedBetweenWorkerAndMain } from './shared'
+import { sharedBetweenWorkerAndMain } from './shared.js'
 
 export function startWorker(el) {
-  sharedBetweenWorkerAndMain(el, 'ping: main')
+  sharedBetweenWorkerAndMain(el, 'entry: main')
 
   const worker = new Worker(
-    new URL('./dep-worker.mjs?worker', import.meta.url),
+    new URL('./dep-worker.js?worker', import.meta.url),
     {
-      type: 'module ',
+      type: 'module',
     },
   )
-  worker.postMessage('pong: worker')
   worker.addEventListener('message', (e) => {
+    console.log('message', e)
     sharedBetweenWorkerAndMain(el, e.data.msg)
   })
+  worker.postMessage({ msg: 'pong: worker' })
 }
diff --git a/playground/worker/dep-with-worker/shared.js b/playground/worker/dep-with-worker/shared.js
index 891f0314f1f2f7..d89a1ecec5b3f2 100644
--- a/playground/worker/dep-with-worker/shared.js
+++ b/playground/worker/dep-with-worker/shared.js
@@ -1,9 +1,9 @@
 export function sharedBetweenWorkerAndMain(el, text) {
-  if (self && self.postMessage) {
+  if ('WorkerGlobalScope' in globalThis) {
     self.postMessage({ msg: text })
-  } else if (document.querySelector(el).textContent.length) {
+  } else if (document.querySelector(el).textContent.length > 0) {
     document.querySelector(el).textContent += '\n' + text
   } else {
-    document.querySelector(el).textContent += text
+    document.querySelector(el).textContent = text
   }
 }
diff --git a/playground/worker/worker/main-module.js b/playground/worker/worker/main-module.js
index 58cb90e2e793ff..d080b31d01fbc9 100644
--- a/playground/worker/worker/main-module.js
+++ b/playground/worker/worker/main-module.js
@@ -1,4 +1,4 @@
-import { startWorker as startDepWorker } from '@vitejs/test-dep-to-optimize'
+import { startWorker as startDepWorker } from '@vitejs/test-dep-with-worker'
 import myWorker from '../my-worker.ts?worker'
 import InlineWorker from '../my-worker.ts?worker&inline'
 import InlineSharedWorker from '../my-inline-shared-worker?sharedworker&inline'

From 4e135b76d0e5041bc1bf91846020181dbf9583ab Mon Sep 17 00:00:00 2001
From: Danielku15 <danielku15@coderline.net>
Date: Sat, 13 Apr 2024 17:32:33 +0200
Subject: [PATCH 4/7] test: update file count after new tests

---
 playground/worker/__tests__/es/worker-es.spec.ts                | 2 +-
 playground/worker/__tests__/iife/worker-iife.spec.ts            | 2 +-
 .../__tests__/sourcemap-hidden/worker-sourcemap-hidden.spec.ts  | 2 +-
 .../__tests__/sourcemap-inline/worker-sourcemap-inline.spec.ts  | 2 +-
 playground/worker/__tests__/sourcemap/worker-sourcemap.spec.ts  | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/playground/worker/__tests__/es/worker-es.spec.ts b/playground/worker/__tests__/es/worker-es.spec.ts
index 7935c58b724f4e..feb1f0a1f31358 100644
--- a/playground/worker/__tests__/es/worker-es.spec.ts
+++ b/playground/worker/__tests__/es/worker-es.spec.ts
@@ -111,7 +111,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(34)
+    expect(files.length).toBe(35)
     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'))
diff --git a/playground/worker/__tests__/iife/worker-iife.spec.ts b/playground/worker/__tests__/iife/worker-iife.spec.ts
index 0f1ffdc22fcdd2..a1c1ccd3ecfcd1 100644
--- a/playground/worker/__tests__/iife/worker-iife.spec.ts
+++ b/playground/worker/__tests__/iife/worker-iife.spec.ts
@@ -75,7 +75,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(22)
+    expect(files.length).toBe(23)
     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'))
diff --git a/playground/worker/__tests__/sourcemap-hidden/worker-sourcemap-hidden.spec.ts b/playground/worker/__tests__/sourcemap-hidden/worker-sourcemap-hidden.spec.ts
index f5034cbe6c0d05..6d6e33123f547a 100644
--- a/playground/worker/__tests__/sourcemap-hidden/worker-sourcemap-hidden.spec.ts
+++ b/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(44)
+    expect(files.length).toBe(46)
     const index = files.find((f) => f.includes('main-module'))
     const content = fs.readFileSync(path.resolve(assetsDir, index), 'utf-8')
     const indexSourcemap = getSourceMapUrl(content)
diff --git a/playground/worker/__tests__/sourcemap-inline/worker-sourcemap-inline.spec.ts b/playground/worker/__tests__/sourcemap-inline/worker-sourcemap-inline.spec.ts
index 3e7392b82d8a7b..e696caf6e18a44 100644
--- a/playground/worker/__tests__/sourcemap-inline/worker-sourcemap-inline.spec.ts
+++ b/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(22)
+    expect(files.length).toBe(23)
     const index = files.find((f) => f.includes('main-module'))
     const content = fs.readFileSync(path.resolve(assetsDir, index), 'utf-8')
     const indexSourcemap = getSourceMapUrl(content)
diff --git a/playground/worker/__tests__/sourcemap/worker-sourcemap.spec.ts b/playground/worker/__tests__/sourcemap/worker-sourcemap.spec.ts
index e3e98c036852af..721b59cfd202e0 100644
--- a/playground/worker/__tests__/sourcemap/worker-sourcemap.spec.ts
+++ b/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(44)
+    expect(files.length).toBe(46)
     const index = files.find((f) => f.includes('main-module'))
     const content = fs.readFileSync(path.resolve(assetsDir, index), 'utf-8')
     const indexSourcemap = getSourceMapUrl(content)

From 6f04ff023801044e4271b05dc9104a383fad686a Mon Sep 17 00:00:00 2001
From: Danielku15 <danielku15@coderline.net>
Date: Sat, 20 Apr 2024 21:14:48 +0200
Subject: [PATCH 5/7] fix: import meta urls for assets in 3rd party
 dependencies

---
 packages/vite/src/node/optimizer/index.ts     |  26 +++++++++++++++++-
 .../src/node/plugins/assetImportMetaUrl.ts    |  12 +++++++-
 .../src/node/plugins/workerImportMetaUrl.ts   |  26 ++++++------------
 playground/assets/__tests__/assets.spec.ts    |  11 ++++++++
 playground/assets/dep-with-asset/asset.png    | Bin 0 -> 12772 bytes
 playground/assets/dep-with-asset/index.js     |   1 +
 playground/assets/dep-with-asset/package.json |   7 +++++
 playground/assets/index.html                  |   9 ++++++
 playground/assets/package.json                |   3 ++
 pnpm-lock.yaml                                |  13 ++++++++-
 10 files changed, 87 insertions(+), 21 deletions(-)
 create mode 100644 playground/assets/dep-with-asset/asset.png
 create mode 100644 playground/assets/dep-with-asset/index.js
 create mode 100644 playground/assets/dep-with-asset/package.json

diff --git a/packages/vite/src/node/optimizer/index.ts b/packages/vite/src/node/optimizer/index.ts
index e62d78fdf1b956..4196e3eca4bee0 100644
--- a/packages/vite/src/node/optimizer/index.ts
+++ b/packages/vite/src/node/optimizer/index.ts
@@ -27,10 +27,12 @@ import {
   transformWithEsbuild,
 } from '../plugins/esbuild'
 import { ESBUILD_MODULES_TARGET, METADATA_FILENAME } from '../constants'
-import { isWindows } from '../../shared/utils'
+import { cleanUrl, isWindows } from '../../shared/utils'
+import { type InternalResolveOptions, tryFsResolve } from '../plugins/resolve'
 import { esbuildCjsExternalPlugin, esbuildDepPlugin } from './esbuildDepPlugin'
 import { scanImports } from './scan'
 import { createOptimizeDepsIncludeResolver, expandGlobIds } from './resolve'
+import { getDepsOptimizer } from './optimizer'
 export {
   initDepsOptimizer,
   initDevSsrDepsOptimizer,
@@ -1350,3 +1352,25 @@ const safeRename = promisify(function gracefulRename(
     if (cb) cb(er)
   })
 })
+
+export function tryOptimizedDepResolve(
+  config: ResolvedConfig,
+  ssr: boolean,
+  url: string,
+  depId: string,
+  fsResolveOptions: InternalResolveOptions,
+): string | undefined {
+  const depsOptimizer = getDepsOptimizer(config, ssr)
+
+  if (depsOptimizer?.isOptimizedDepFile(depId)) {
+    const depFile = cleanUrl(depId)
+    const info = optimizedDepInfoFromFile(depsOptimizer.metadata, depFile)
+    const depSrc = info?.src
+    if (depSrc) {
+      const resolvedFile = path.resolve(path.dirname(depSrc), url)
+      return tryFsResolve(resolvedFile, fsResolveOptions)
+    }
+  }
+
+  return undefined
+}
diff --git a/packages/vite/src/node/plugins/assetImportMetaUrl.ts b/packages/vite/src/node/plugins/assetImportMetaUrl.ts
index 588f6e08b07c3d..6c9b33e916c3fb 100644
--- a/packages/vite/src/node/plugins/assetImportMetaUrl.ts
+++ b/packages/vite/src/node/plugins/assetImportMetaUrl.ts
@@ -7,6 +7,7 @@ import type { ResolveFn } from '../'
 import { injectQuery, isParentDirectory, transformStableResult } from '../utils'
 import { CLIENT_ENTRY } from '../constants'
 import { slash } from '../../shared/utils'
+import { tryOptimizedDepResolve } from '../optimizer'
 import { fileToUrl } from './asset'
 import { preloadHelperId } from './importAnalysisBuild'
 import type { InternalResolveOptions } from './resolve'
@@ -104,7 +105,16 @@ export function assetImportMetaUrlPlugin(config: ResolvedConfig): Plugin {
           let file: string | undefined
           if (url[0] === '.') {
             file = slash(path.resolve(path.dirname(id), url))
-            file = tryFsResolve(file, fsResolveOptions) ?? file
+            file =
+              tryFsResolve(file, fsResolveOptions) ??
+              tryOptimizedDepResolve(
+                config,
+                options?.ssr === true,
+                url,
+                id,
+                fsResolveOptions,
+              ) ??
+              file
           } else {
             assetResolver ??= config.createResolver({
               extensions: [],
diff --git a/packages/vite/src/node/plugins/workerImportMetaUrl.ts b/packages/vite/src/node/plugins/workerImportMetaUrl.ts
index d438de991caf73..aaf89d3ac7c0b7 100644
--- a/packages/vite/src/node/plugins/workerImportMetaUrl.ts
+++ b/packages/vite/src/node/plugins/workerImportMetaUrl.ts
@@ -7,7 +7,7 @@ import type { Plugin } from '../plugin'
 import { evalValue, injectQuery, transformStableResult } from '../utils'
 import type { ResolveFn } from '..'
 import { cleanUrl, slash } from '../../shared/utils'
-import { getDepsOptimizer, optimizedDepInfoFromFile } from '../optimizer'
+import { tryOptimizedDepResolve } from '../optimizer'
 import type { WorkerType } from './worker'
 import { WORKER_FILE_ID, workerFileToUrl } from './worker'
 import { fileToUrl } from './asset'
@@ -115,22 +115,6 @@ export function workerImportMetaUrlPlugin(config: ResolvedConfig): Plugin {
     asSrc: true,
   }
 
-  function tryOptimizedDepResolve(ssr: boolean, url: string, depId: string) {
-    const depsOptimizer = getDepsOptimizer(config, ssr)
-
-    if (depsOptimizer?.isOptimizedDepFile(depId)) {
-      const depFile = cleanUrl(depId)
-      const info = optimizedDepInfoFromFile(depsOptimizer.metadata, depFile)
-      const depSrc = info?.src
-      if (depSrc) {
-        const resolvedFile = path.resolve(path.dirname(depSrc), url)
-        return tryFsResolve(resolvedFile, fsResolveOptions)
-      }
-    }
-
-    return undefined
-  }
-
   return {
     name: 'vite:worker-import-meta-url',
 
@@ -171,7 +155,13 @@ export function workerImportMetaUrlPlugin(config: ResolvedConfig): Plugin {
             file = path.resolve(path.dirname(id), url)
             file =
               tryFsResolve(file, fsResolveOptions) ??
-              tryOptimizedDepResolve(options?.ssr === true, url, id) ??
+              tryOptimizedDepResolve(
+                config,
+                options?.ssr === true,
+                url,
+                id,
+                fsResolveOptions,
+              ) ??
               file
           } else {
             workerResolver ??= config.createResolver({
diff --git a/playground/assets/__tests__/assets.spec.ts b/playground/assets/__tests__/assets.spec.ts
index 6f193cc43cd9ca..71a65d028ead32 100644
--- a/playground/assets/__tests__/assets.spec.ts
+++ b/playground/assets/__tests__/assets.spec.ts
@@ -570,3 +570,14 @@ test.runIf(isBuild)('assets inside <noscript> is rewrote', async () => {
     /<img class="noscript" src="\/foo\/bar\/assets\/asset-[-\w]+\.png" \/>/,
   )
 })
+
+test('import.meta.url in dependency', async () => {
+  const match = isBuild
+    ? /\/foo\/bar\/assets\/asset-[-\w]{8}\.png/
+    : /node_modules\/@vitejs\/test-dep-with-asset\/asset.png/
+
+  expect(await page.textContent('.import-meta-url-dependency')).toMatch(match)
+  expect(
+    await page.getAttribute('.import-meta-url-img-dependency', 'src'),
+  ).toMatch(match)
+})
diff --git a/playground/assets/dep-with-asset/asset.png b/playground/assets/dep-with-asset/asset.png
new file mode 100644
index 0000000000000000000000000000000000000000..1b3356a746b8bb5510aaee51f7df5aea4378ee8d
GIT binary patch
literal 12772
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

literal 0
HcmV?d00001

diff --git a/playground/assets/dep-with-asset/index.js b/playground/assets/dep-with-asset/index.js
new file mode 100644
index 00000000000000..a401c8b145872e
--- /dev/null
+++ b/playground/assets/dep-with-asset/index.js
@@ -0,0 +1 @@
+export const imageUrl = new URL('./asset.png', import.meta.url).href
diff --git a/playground/assets/dep-with-asset/package.json b/playground/assets/dep-with-asset/package.json
new file mode 100644
index 00000000000000..adefbf16b0a4ea
--- /dev/null
+++ b/playground/assets/dep-with-asset/package.json
@@ -0,0 +1,7 @@
+{
+  "name": "@vitejs/test-dep-with-asset",
+  "private": true,
+  "version": "1.0.0",
+  "type": "module",
+  "main": "index.js"
+}
diff --git a/playground/assets/index.html b/playground/assets/index.html
index 2fd63f46f63960..8c4dc7f6d8271a 100644
--- a/playground/assets/index.html
+++ b/playground/assets/index.html
@@ -578,3 +578,12 @@ <h3>assets in noscript</h3>
     document.querySelector(el).textContent = text
   }
 </script>
+
+<h2>import.meta.url in dependency</h2>
+<img class="import-meta-url-img-dependency" />
+<code class="import-meta-url-dependency"></code>
+<script type="module">
+  import { imageUrl } from '@vitejs/test-dep-with-asset'
+  text('.import-meta-url-dependency', imageUrl)
+  document.querySelector('.import-meta-url-img-dependency').src = imageUrl
+</script>
diff --git a/playground/assets/package.json b/playground/assets/package.json
index eeec51861fe068..ed1f3f68592e37 100644
--- a/playground/assets/package.json
+++ b/playground/assets/package.json
@@ -17,5 +17,8 @@
     "dev:url-base": "vite --config ./vite.config-url-base.js dev",
     "build:url-base": "vite --config ./vite.config-url-base.js build",
     "preview:url-base": "vite --config ./vite.config-url-base.js preview"
+  },
+  "dependencies": {
+    "@vitejs/test-dep-with-asset": "file:./dep-with-asset"
   }
 }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index d54f95b5105f89..5e67639f28e83c 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -493,10 +493,16 @@ importers:
 
   playground/alias/dir/module: {}
 
-  playground/assets: {}
+  playground/assets:
+    dependencies:
+      '@vitejs/test-dep-with-asset':
+        specifier: file:./dep-with-asset
+        version: file:playground/assets/dep-with-asset
 
   playground/assets-sanitize: {}
 
+  playground/assets/dep-with-asset: {}
+
   playground/backend-integration:
     devDependencies:
       fast-glob:
@@ -3385,6 +3391,9 @@ packages:
   '@vitejs/test-dep-to-optimize@file:playground/worker/dep-to-optimize':
     resolution: {directory: playground/worker/dep-to-optimize, type: directory}
 
+  '@vitejs/test-dep-with-asset@file:playground/assets/dep-with-asset':
+    resolution: {directory: playground/assets/dep-with-asset, type: directory}
+
   '@vitejs/test-dep-with-builtin-module-cjs@file:playground/optimize-deps/dep-with-builtin-module-cjs':
     resolution: {directory: playground/optimize-deps/dep-with-builtin-module-cjs, type: directory}
 
@@ -8629,6 +8638,8 @@ snapshots:
 
   '@vitejs/test-dep-to-optimize@file:playground/worker/dep-to-optimize': {}
 
+  '@vitejs/test-dep-with-asset@file:playground/assets/dep-with-asset': {}
+
   '@vitejs/test-dep-with-builtin-module-cjs@file:playground/optimize-deps/dep-with-builtin-module-cjs': {}
 
   '@vitejs/test-dep-with-builtin-module-esm@file:playground/optimize-deps/dep-with-builtin-module-esm': {}

From 3cb19b9d53b9a634c02a1cdbaa530c42a60c278e Mon Sep 17 00:00:00 2001
From: Danielku15 <danielku15@coderline.net>
Date: Sat, 20 Apr 2024 21:35:36 +0200
Subject: [PATCH 6/7] test: Restore errors on files which cannot be resolved in
 deps

---
 playground/optimize-deps/dep-incompatible/sub.js | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 playground/optimize-deps/dep-incompatible/sub.js

diff --git a/playground/optimize-deps/dep-incompatible/sub.js b/playground/optimize-deps/dep-incompatible/sub.js
deleted file mode 100644
index 26f9a8a9430bf8..00000000000000
--- a/playground/optimize-deps/dep-incompatible/sub.js
+++ /dev/null
@@ -1 +0,0 @@
-export default 'sub'

From a44fb22c917c8d52968e6fb9dec6101cba5d2d07 Mon Sep 17 00:00:00 2001
From: sapphi-red <49056869+sapphi-red@users.noreply.github.com>
Date: Tue, 2 Jul 2024 20:37:56 +0900
Subject: [PATCH 7/7] test: dependency with multiple files

---
 playground/assets/dep-with-asset/dir/path.js | 1 +
 playground/assets/dep-with-asset/index.js    | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
 create mode 100644 playground/assets/dep-with-asset/dir/path.js

diff --git a/playground/assets/dep-with-asset/dir/path.js b/playground/assets/dep-with-asset/dir/path.js
new file mode 100644
index 00000000000000..400b19cc12233c
--- /dev/null
+++ b/playground/assets/dep-with-asset/dir/path.js
@@ -0,0 +1 @@
+export const imageUrl = new URL('../asset.png', import.meta.url).href
diff --git a/playground/assets/dep-with-asset/index.js b/playground/assets/dep-with-asset/index.js
index a401c8b145872e..3036771f8b0096 100644
--- a/playground/assets/dep-with-asset/index.js
+++ b/playground/assets/dep-with-asset/index.js
@@ -1 +1 @@
-export const imageUrl = new URL('./asset.png', import.meta.url).href
+export { imageUrl } from './dir/path.js'