fix(optimizer): scan is not resolving sub path import if used in a glob import (#22018)

Co-authored-by: Kalven Schraut <kalvens@rtvision.com>

Author: sapphi-red

packages/vite/src/node/__tests__/fixtures/scan-subpath-import-glob/entry.ts

@@ -0,0 +1 @@
+export const modules = import.meta.glob('#src/foo/*.ts')

packages/vite/src/node/__tests__/fixtures/scan-subpath-import-glob/package.json

@@ -0,0 +1,7 @@
+{
+  "name": "scan-subpath-import-glob",
+  "private": true,
+  "imports": {
+    "#src/*": "./src/*"
+  }
+}

packages/vite/src/node/__tests__/fixtures/scan-subpath-import-glob/src/foo/a.ts

@@ -0,0 +1 @@
+export const value = 'a'

packages/vite/src/node/__tests__/scan.spec.ts

@@ -1,6 +1,12 @@
 import path from 'node:path'
 import { describe, expect, test } from 'vitest'
-import { commentRE, importsRE, scriptRE } from '../optimizer/scan'
+import {
+  commentRE,
+  devToScanEnvironment,
+  importsRE,
+  scanImports,
+  scriptRE,
+} from '../optimizer/scan'
 import { multilineCommentsRE, singlelineCommentsRE } from '../utils'
 import { createServer, createServerModuleRunner } from '..'
 
@@ -168,3 +174,28 @@ test('scan jsx-runtime', async (ctx) => {
   expect((globalThis as any).__test_scan_jsx_runtime).toBe(1)
   expect(mod1).toBe(mod2)
 })
+
+test('scan import.meta.glob package imports patterns', async (ctx) => {
+  const server = await createServer({
+    configFile: false,
+    logLevel: 'error',
+    root: path.join(
+      import.meta.dirname,
+      'fixtures',
+      'scan-subpath-import-glob',
+    ),
+    optimizeDeps: {
+      entries: ['./entry.ts'],
+      force: true,
+      noDiscovery: false,
+    },
+  })
+  ctx.onTestFinished(() => server.close())
+
+  const { cancel, result } = scanImports(
+    devToScanEnvironment(server.environments.client),
+  )
+  ctx.onTestFinished(cancel)
+
+  await expect(result).resolves.toEqual({ deps: {}, missing: {} })
+})

packages/vite/src/node/optimizer/scan.ts

@@ -348,19 +348,28 @@ function rolldownScanPlugin(
   async function resolveId(
     id: string,
     importer?: string,
+    options?: Parameters<EnvironmentPluginContainer['resolveId']>[2],
   ): Promise<PartialResolvedId | null> {
     return environment.pluginContainer.resolveId(
       id,
       importer && normalizePath(importer),
-      { scan: true },
+      { scan: true, ...options },
     )
   }
-  const resolve = async (id: string, importer?: string) => {
-    const key = id + (importer && path.dirname(importer))
+  const resolve = async (
+    id: string,
+    importer?: string,
+    options?: Parameters<typeof resolveId>[2],
+  ) => {
+    const key = JSON.stringify([
+      id,
+      importer && path.dirname(importer),
+      options,
+    ])
     if (seen.has(key)) {
       return seen.get(key)
     }
-    const resolved = await resolveId(id, importer)
+    const resolved = await resolveId(id, importer, options)
     const res = resolved?.id
     seen.set(key, res)
     return res