fix: handle relative path glob raw import, fix vitejs#7307

Contain test within `glob-import`-folder Remove comments referencing issue number
toshify · Mar 19, 2022 · cb9fd21 · cb9fd21
1 parent d90581a
commit cb9fd21
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git a/packages/playground/glob-import/__tests__/glob-import.spec.ts b/packages/playground/glob-import/__tests__/glob-import.spec.ts
@@ -66,9 +66,10 @@ const rawResult = {
   }
 }
 
-// issue #7307
 const relativeRawResult = {
-  '../dynamic-import/nested/shared.js': 'export const n = 1\n'
+  '../glob-import/dir/baz.json': {
+    msg: 'baz'
+  }
 }
 
 test('should work', async () => {
@@ -86,7 +87,6 @@ test('import glob raw', async () => {
   )
 })
 
-// issue #7307
 test('import relative glob raw', async () => {
   expect(await page.textContent('.relative-glob-raw')).toBe(
     JSON.stringify(relativeRawResult, null, 2)

diff --git a/packages/playground/glob-import/index.html b/packages/playground/glob-import/index.html
@@ -1,7 +1,7 @@
 <pre class="result"></pre>
 <pre class="result-node_modules"></pre>
 <pre class="globraw"></pre>
-<pre class="relative-glob-raw"><!--issue #7307--></pre>
+<pre class="relative-glob-raw"></pre>
 
 <script type="module" src="./dir/index.js"></script>
 <script type="module">
@@ -55,16 +55,15 @@
 </script>
 
 <script type="module">
-  // issue #7307
   const relativeRawModules = import.meta.globEager(
-    '../dynamic-import/nested/shar*.js',
+    '../glob-import/dir/*.json',
     {
       as: 'raw'
     }
   )
   const relativeGlobRaw = {}
   Object.keys(relativeRawModules).forEach((key) => {
-    relativeGlobRaw[key] = relativeRawModules[key]
+    relativeGlobRaw[key] = JSON.parse(relativeRawModules[key])
   })
   document.querySelector('.relative-glob-raw').textContent = JSON.stringify(
     relativeGlobRaw,

diff --git a/packages/vite/src/node/importGlob.ts b/packages/vite/src/node/importGlob.ts
@@ -146,7 +146,6 @@ export async function transformImportGlob(
           )
         )
       }
-      // issue #7307
       entries += ` ${JSON.stringify(file)}: ${JSON.stringify(
         await fsp.readFile(path.join(base, files[i]), 'utf-8')
       )},`