From 1878f465d26d1c61a29ede72882d54d7e95c1042 Mon Sep 17 00:00:00 2001
From: Anthony Fu <anthonyfu117@hotmail.com>
Date: Sun, 8 May 2022 19:55:16 +0800
Subject: [PATCH] refactor: use `import.meta.glob` over `globEager` in tests
 (#8066)

---
 packages/playground/css/main.js                   |  2 +-
 packages/playground/glob-import/dir/index.js      |  4 ++--
 packages/playground/glob-import/dir/nested/bar.js |  2 +-
 packages/playground/glob-import/index.html        | 15 +++++++--------
 packages/playground/optimize-deps/index.html      |  2 +-
 packages/playground/ssr-react/src/App.jsx         |  2 +-
 .../worker/__tests__/es/es-worker.spec.ts         |  2 +-
 .../worker/__tests__/iife/worker.spec.ts          |  2 +-
 .../worker/importMetaGlobEager.worker.js          |  2 +-
 packages/playground/worker/index.html             |  2 +-
 .../vite/src/node/plugins/assetImportMetaUrl.ts   |  2 +-
 packages/vite/src/node/plugins/importMetaGlob.ts  |  3 ---
 12 files changed, 18 insertions(+), 22 deletions(-)

diff --git a/packages/playground/css/main.js b/packages/playground/css/main.js
index f6072ae751df76..90f74c96793c55 100644
--- a/packages/playground/css/main.js
+++ b/packages/playground/css/main.js
@@ -87,7 +87,7 @@ Promise.all(
 })
 
 // globEager
-const globEager = import.meta.globEager('./glob-import/*.css')
+const globEager = import.meta.glob('./glob-import/*.css', { eager: true })
 text('.imported-css-globEager', JSON.stringify(globEager, null, 2))
 
 import postcssSourceInput from './postcss-source-input.css?query=foo'
diff --git a/packages/playground/glob-import/dir/index.js b/packages/playground/glob-import/dir/index.js
index fb87f69f0f3a61..ab298abed485b3 100644
--- a/packages/playground/glob-import/dir/index.js
+++ b/packages/playground/glob-import/dir/index.js
@@ -1,4 +1,4 @@
-const modules = import.meta.globEager('./*.(js|ts)')
-const globWithAlias = import.meta.globEager('@dir/al*.js')
+const modules = import.meta.glob('./*.(js|ts)', { eager: true })
+const globWithAlias = import.meta.glob('@dir/al*.js', { eager: true })
 
 export { modules, globWithAlias }
diff --git a/packages/playground/glob-import/dir/nested/bar.js b/packages/playground/glob-import/dir/nested/bar.js
index a2d2921cca80ad..bb23a5a141de8e 100644
--- a/packages/playground/glob-import/dir/nested/bar.js
+++ b/packages/playground/glob-import/dir/nested/bar.js
@@ -1,4 +1,4 @@
-const modules = import.meta.globEager('../*.json')
+const modules = import.meta.glob('../*.json', { eager: true })
 
 export const msg = 'bar'
 export { modules }
diff --git a/packages/playground/glob-import/index.html b/packages/playground/glob-import/index.html
index 64f456aeb4d6a2..8466a6d0495881 100644
--- a/packages/playground/glob-import/index.html
+++ b/packages/playground/glob-import/index.html
@@ -40,8 +40,9 @@
 </script>
 
 <script type="module">
-  const rawModules = import.meta.globEager('/dir/*.json', {
-    as: 'raw'
+  const rawModules = import.meta.glob('/dir/*.json', {
+    as: 'raw',
+    eager: true
   })
   const globraw = {}
   Object.keys(rawModules).forEach((key) => {
@@ -55,12 +56,10 @@
 </script>
 
 <script type="module">
-  const relativeRawModules = import.meta.globEager(
-    '../glob-import/dir/*.json',
-    {
-      as: 'raw'
-    }
-  )
+  const relativeRawModules = import.meta.glob('../glob-import/dir/*.json', {
+    as: 'raw',
+    eager: true
+  })
   const relativeGlobRaw = {}
   Object.keys(relativeRawModules).forEach((key) => {
     relativeGlobRaw[key] = JSON.parse(relativeRawModules[key])
diff --git a/packages/playground/optimize-deps/index.html b/packages/playground/optimize-deps/index.html
index 521d54379863d9..d11383bfcb3e04 100644
--- a/packages/playground/optimize-deps/index.html
+++ b/packages/playground/optimize-deps/index.html
@@ -76,7 +76,7 @@ <h2>Reused variable names</h2>
 
 <script type="module">
   // test dep detection in globbed files
-  const globbed = import.meta.globEager('./glob/*.js')
+  const globbed = import.meta.glob('./glob/*.js', { eager: true })
 
   import { camelCase } from 'dep-linked'
   text('.deps-linked', camelCase('foo-bar-baz'))
diff --git a/packages/playground/ssr-react/src/App.jsx b/packages/playground/ssr-react/src/App.jsx
index 1c598add666efb..59e14cd5c3eea0 100644
--- a/packages/playground/ssr-react/src/App.jsx
+++ b/packages/playground/ssr-react/src/App.jsx
@@ -2,7 +2,7 @@ import { Link, Route, Switch } from 'react-router-dom'
 
 // Auto generates routes from files under ./pages
 // https://vitejs.dev/guide/features.html#glob-import
-const pages = import.meta.globEager('./pages/*.jsx')
+const pages = import.meta.glob('./pages/*.jsx', { eager: true })
 
 const routes = Object.keys(pages).map((path) => {
   const name = path.match(/\.\/pages\/(.*)\.jsx$/)[1]
diff --git a/packages/playground/worker/__tests__/es/es-worker.spec.ts b/packages/playground/worker/__tests__/es/es-worker.spec.ts
index 27f81b010df74f..61215f931c77dc 100644
--- a/packages/playground/worker/__tests__/es/es-worker.spec.ts
+++ b/packages/playground/worker/__tests__/es/es-worker.spec.ts
@@ -118,6 +118,6 @@ test('import.meta.glob in worker', async () => {
   expect(await page.textContent('.importMetaGlob-worker')).toMatch('["')
 })
 
-test('import.meta.globEager in worker', async () => {
+test('import.meta.glob with eager in worker', async () => {
   expect(await page.textContent('.importMetaGlobEager-worker')).toMatch('["')
 })
diff --git a/packages/playground/worker/__tests__/iife/worker.spec.ts b/packages/playground/worker/__tests__/iife/worker.spec.ts
index 16750a893cb073..f49666e4918a25 100644
--- a/packages/playground/worker/__tests__/iife/worker.spec.ts
+++ b/packages/playground/worker/__tests__/iife/worker.spec.ts
@@ -105,6 +105,6 @@ test('classic worker', async () => {
   expect(await page.textContent('.classic-shared-worker')).toMatch('A classic')
 })
 
-test('import.meta.globEager in worker', async () => {
+test('import.meta.glob eager in worker', async () => {
   expect(await page.textContent('.importMetaGlobEager-worker')).toMatch('["')
 })
diff --git a/packages/playground/worker/importMetaGlobEager.worker.js b/packages/playground/worker/importMetaGlobEager.worker.js
index 7947f65ab8c7f9..23245818ee7485 100644
--- a/packages/playground/worker/importMetaGlobEager.worker.js
+++ b/packages/playground/worker/importMetaGlobEager.worker.js
@@ -1,4 +1,4 @@
-const modules = import.meta.globEager('./modules/*js')
+const modules = import.meta.glob('./modules/*js', { eager: true })
 
 self.onmessage = function (e) {
   self.postMessage(Object.keys(modules))
diff --git a/packages/playground/worker/index.html b/packages/playground/worker/index.html
index b0c524305fc33e..eae8c44119e3a6 100644
--- a/packages/playground/worker/index.html
+++ b/packages/playground/worker/index.html
@@ -73,7 +73,7 @@ <h2 class="format-iife">format iife:</h2>
 <code class="classic-shared-worker"></code>
 
 <p>
-  use import.meta.globEager in iife worker
+  use import.meta.glob with eager in iife worker
   <span class="classname">.importMetaGlobEager-worker</span>
 </p>
 <code class="importMetaGlobEager-worker"></code>
diff --git a/packages/vite/src/node/plugins/assetImportMetaUrl.ts b/packages/vite/src/node/plugins/assetImportMetaUrl.ts
index b9030e09c8b632..73932bfb29a411 100644
--- a/packages/vite/src/node/plugins/assetImportMetaUrl.ts
+++ b/packages/vite/src/node/plugins/assetImportMetaUrl.ts
@@ -12,7 +12,7 @@ import { stripLiteral } from 'strip-literal'
  * ```
  * new URL(`./dir/${name}.png`, import.meta.url)
  * // transformed to
- * import.meta.globEager('./dir/**.png')[`./dir/${name}.png`].default
+ * import.meta.glob('./dir/**.png', { eager: true, import: 'default' })[`./dir/${name}.png`]
  * ```
  */
 export function assetImportMetaUrlPlugin(config: ResolvedConfig): Plugin {
diff --git a/packages/vite/src/node/plugins/importMetaGlob.ts b/packages/vite/src/node/plugins/importMetaGlob.ts
index 00bdc70012958f..20bc10f8296ed4 100644
--- a/packages/vite/src/node/plugins/importMetaGlob.ts
+++ b/packages/vite/src/node/plugins/importMetaGlob.ts
@@ -157,9 +157,6 @@ export async function parseImportGlob(
       throw err('Could only use literals')
     }
 
-    // if (!globs.every(i => i.match(/^[.\/!]/)))
-    //   throw err('pattern must start with "." or "/" (relative to project root) or alias path')
-
     // arg2
     const options: GeneralImportGlobOptions = {}
     if (arg2) {