fix: asset new URL(,import.meta.url) match

packages/vite/src/node/__tests__/plugins/assetImportMetaUrl.spec.ts

@@ -0,0 +1,59 @@
+import { describe, expect, test } from 'vitest'
+import { parseAst } from 'rollup/parseAst'
+import { assetImportMetaUrlPlugin } from '../../plugins/assetImportMetaUrl'
+import { resolveConfig } from '../../config'
+import { PartialEnvironment } from '../../baseEnvironment'
+
+async function createAssetImportMetaurlPluginTransform() {
+  const config = await resolveConfig({ configFile: false }, 'serve')
+  const instance = assetImportMetaUrlPlugin(config)
+  const environment = new PartialEnvironment('client', config)
+
+  return async (code: string) => {
+    // @ts-expect-error transform should exist
+    const result = await instance.transform.call(
+      { environment, parse: parseAst },
+      code,
+      'foo.ts',
+    )
+    return result?.code || result
+  }
+}
+
+describe('assetImportMetaUrlPlugin', async () => {
+  const transform = await createAssetImportMetaurlPluginTransform()
+
+  test('variable between /', async () => {
+    expect(
+      await transform('new URL(`./foo/${dir}/index.js`, import.meta.url)'),
+    ).toMatchInlineSnapshot(
+      `"new URL((import.meta.glob("./foo/**/index.js", {"eager":true,"import":"default","query":"?url"}))[\`./foo/\${dir}/index.js\`], import.meta.url)"`,
+    )
+  })
+
+  test('variable before non-/', async () => {
+    expect(
+      await transform('new URL(`./foo/${dir}.js`, import.meta.url)'),
+    ).toMatchInlineSnapshot(
+      `"new URL((import.meta.glob("./foo/**/*.js", {"eager":true,"import":"default","query":"?url"}))[\`./foo/\${dir}.js\`], import.meta.url)"`,
+    )
+  })
+
+  test('two variables', async () => {
+    expect(
+      await transform('new URL(`./foo/${dir}${file}.js`, import.meta.url)'),
+    ).toMatchInlineSnapshot(
+      `"new URL((import.meta.glob("./foo/**/*.js", {"eager":true,"import":"default","query":"?url"}))[\`./foo/\${dir}\${file}.js\`], import.meta.url)"`,
+    )
+  })
+
+  test('two variables between /', async () => {
+    expect(
+      await transform(
+        'new URL(`./foo/${dir}${dir2}/index.js`, import.meta.url)',
+      ),
+    ).toMatchInlineSnapshot(
+      `"new URL((import.meta.glob("./foo/**/index.js", {"eager":true,"import":"default","query":"?url"}))[\`./foo/\${dir}\${dir2}/index.js\`], import.meta.url)"`,
+    )
+  })
+})

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

@@ -160,19 +160,21 @@ export function assetImportMetaUrlPlugin(config: ResolvedConfig): Plugin {
 
 function buildGlobPattern(ast: any) {
   let pattern = ''
-  let lastElementIndex = -1
-  for (const exp of ast.expressions) {
-    for (let i = lastElementIndex + 1; i < ast.quasis.length; i++) {
-      const el = ast.quasis[i]
-      if (el.end < exp.start) {
-        pattern += el.value.raw
-        lastElementIndex = i
+  let lastIsGlob = false
+  for (let i = 0; i < ast.quasis.length; i++) {
+    const str = ast.quasis[i].value.raw
+    if (str) {
+      if (lastIsGlob && str[0] !== '/') {
+        pattern += '/*'
       }
+      pattern += str
+      lastIsGlob = false
+    }
+
+    if (ast.expressions[i] && !lastIsGlob) {
+      pattern += '**'
+      lastIsGlob = true
     }
-    pattern += '**'
-  }
-  for (let i = lastElementIndex + 1; i < ast.quasis.length; i++) {
-    pattern += ast.quasis[i].value.raw
   }
   return pattern
 }