fix: isFromTsImporter flag in worker virtual model (#10273)

vitejs · Sep 28, 2022 · 78f74c9 · 78f74c9
1 parent 81d4d04
commit 78f74c9
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 7 deletions.
diff --git a/packages/vite/src/node/plugins/resolve.ts b/packages/vite/src/node/plugins/resolve.ts
@@ -44,6 +44,7 @@ import type { DepsOptimizer } from '../optimizer'
 import type { SSROptions } from '..'
 import type { PackageCache, PackageData } from '../packages'
 import { loadPackageData, resolvePackageData } from '../packages'
+import { isWorkerRequest } from './worker'
 
 const normalizedClientEntry = normalizePath(CLIENT_ENTRY)
 const normalizedEnvEntry = normalizePath(ENV_ENTRY)
@@ -144,13 +145,16 @@ export function resolvePlugin(resolveOptions: InternalResolveOptions): Plugin {
       }
 
       if (importer) {
+        const _importer = isWorkerRequest(importer)
+          ? splitFileAndPostfix(importer).file
+          : importer
         if (
-          isTsRequest(importer) ||
+          isTsRequest(_importer) ||
           resolveOpts.custom?.depScan?.loader?.startsWith('ts')
         ) {
           options.isFromTsImporter = true
         } else {
-          const moduleLang = this.getModuleInfo(importer)?.meta?.vite?.lang
+          const moduleLang = this.getModuleInfo(_importer)?.meta?.vite?.lang
           options.isFromTsImporter = moduleLang && isTsRequest(`.${moduleLang}`)
         }
       }

diff --git a/packages/vite/src/node/plugins/worker.ts b/packages/vite/src/node/plugins/worker.ts
@@ -32,6 +32,14 @@ export type WorkerType = 'classic' | 'module' | 'ignore'
 export const WORKER_FILE_ID = 'worker_file'
 const workerCache = new WeakMap<ResolvedConfig, WorkerCache>()
 
+export function isWorkerRequest(id: string): boolean {
+  const query = parseRequest(id)
+  if (query && query[WORKER_FILE_ID] != null) {
+    return true
+  }
+  return false
+}
+
 function saveEmitWorkerAsset(
   config: ResolvedConfig,
   asset: EmittedAsset

diff --git a/playground/worker/__tests__/es/es-worker.spec.ts b/playground/worker/__tests__/es/es-worker.spec.ts
@@ -57,7 +57,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(28)
+    expect(files.length).toBe(27)
     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/modules/workerImport.js → playground/worker/modules/workerImport.ts b/playground/worker/modules/workerImport.js → playground/worker/modules/workerImport.ts
diff --git a/playground/worker/my-worker.ts b/playground/worker/my-worker.ts
@@ -1,5 +1,5 @@
 import { msg as msgFromDep } from 'dep-to-optimize'
-import { mode, msg } from './modules/workerImport'
+import { mode, msg } from './modules/workerImport.js'
 import { bundleWithPlugin } from './modules/test-plugin'
 import viteSvg from './vite.svg'
 

diff --git a/playground/worker/url-shared-worker.js b/playground/worker/url-shared-worker.js
@@ -1,4 +1,4 @@
-import constant from './modules/module0'
+import constant from './modules/module0.js'
 
 self.onconnect = (event) => {
   const port = event.ports[0]

diff --git a/playground/worker/worker/main-module.js b/playground/worker/worker/main-module.js
@@ -1,5 +1,5 @@
-import myWorker from '../my-worker?worker'
-import InlineWorker from '../my-worker?worker&inline'
+import myWorker from '../my-worker.ts?worker'
+import InlineWorker from '../my-worker.ts?worker&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'