From 7f9e9b5a6c960b3adc3dd1e309eb701e4dfa283a Mon Sep 17 00:00:00 2001
From: "qing.deng" <dengqing0821@gmail.com>
Date: Mon, 25 Jul 2022 11:37:54 +0800
Subject: [PATCH 1/7] fix: dynamic import path contain `../` and its own
 directory will not work

---
 .../vite/src/node/plugins/dynamicImportVars.ts    | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/packages/vite/src/node/plugins/dynamicImportVars.ts b/packages/vite/src/node/plugins/dynamicImportVars.ts
index b7d5ed5a5f8792..5e429c4467a2e5 100644
--- a/packages/vite/src/node/plugins/dynamicImportVars.ts
+++ b/packages/vite/src/node/plugins/dynamicImportVars.ts
@@ -14,6 +14,7 @@ import {
   requestQuerySplitRE,
   transformStableResult
 } from '../utils'
+import { toAbsoluteGlob } from './importMetaGlob'
 
 export const dynamicImportHelperId = '/@vite/dynamic-import-helper'
 
@@ -105,6 +106,7 @@ export async function transformDynamicImport(
   const params = globParams
     ? `, ${JSON.stringify({ ...globParams, import: '*' })}`
     : ''
+
   const exp = `(import.meta.glob(${JSON.stringify(userPattern)}${params}))`
 
   return {
@@ -198,11 +200,22 @@ export function dynamicImportVarsPlugin(config: ResolvedConfig): Plugin {
 
         const { rawPattern, glob } = result
 
+        let newPattern = posix.relative(
+          posix.dirname(importer),
+          await toAbsoluteGlob(rawPattern, config.root, importer, (im) =>
+            this.resolve(im, importer).then((i) => i?.id || im)
+          )
+        )
+
+        if (!/^\.{1,2}\//.test(newPattern)) {
+          newPattern = `./${newPattern}`
+        }
+
         needDynamicImportHelper = true
         s.overwrite(
           expStart,
           expEnd,
-          `__variableDynamicImportRuntimeHelper(${glob}, \`${rawPattern}\`)`
+          `__variableDynamicImportRuntimeHelper(${glob}, \`${newPattern}\`)`
         )
       }
 

From 840560d5ed68e95ecf9df545aaaab88e857b1b54 Mon Sep 17 00:00:00 2001
From: "qing.deng" <dengqing0821@gmail.com>
Date: Mon, 25 Jul 2022 11:53:13 +0800
Subject: [PATCH 2/7] test: add some test cases

---
 .../__tests__/dynamic-import.spec.ts             | 16 ++++++++++++++++
 playground/dynamic-import/index.html             |  4 ++++
 playground/dynamic-import/nested/index.js        |  9 +++++++++
 playground/dynamic-import/nested/nested/self.js  |  1 +
 playground/dynamic-import/nested/self.js         |  1 +
 5 files changed, 31 insertions(+)
 create mode 100644 playground/dynamic-import/nested/nested/self.js
 create mode 100644 playground/dynamic-import/nested/self.js

diff --git a/playground/dynamic-import/__tests__/dynamic-import.spec.ts b/playground/dynamic-import/__tests__/dynamic-import.spec.ts
index c8a90a32aeaf75..fb113fc552bd03 100644
--- a/playground/dynamic-import/__tests__/dynamic-import.spec.ts
+++ b/playground/dynamic-import/__tests__/dynamic-import.spec.ts
@@ -96,3 +96,19 @@ test('should load dynamic import with css in package', async () => {
   await page.click('.pkg-css')
   await untilUpdated(() => getColor('.pkg-css'), 'blue', true)
 })
+
+test('should work with load ../ and itself directory', async () => {
+  await untilUpdated(
+    () => page.textContent('.dynamic-import-self'),
+    'dynamic-import-self-content',
+    true
+  )
+})
+
+test('should work with load ../ and contain itself directory', async () => {
+  await untilUpdated(
+    () => page.textContent('.dynamic-import-nested-self'),
+    'dynamic-import-nested-self-content',
+    true
+  )
+})
diff --git a/playground/dynamic-import/index.html b/playground/dynamic-import/index.html
index 997ad059ad6821..8eb5e60098a15c 100644
--- a/playground/dynamic-import/index.html
+++ b/playground/dynamic-import/index.html
@@ -21,6 +21,10 @@
 
 <div class="view"></div>
 
+<div class="dynamic-import-self"></div>
+
+<div class="dynamic-import-nested-self"></div>
+
 <script type="module" src="./nested/index.js"></script>
 <style>
   p {
diff --git a/playground/dynamic-import/nested/index.js b/playground/dynamic-import/nested/index.js
index 75d6c0fdd9b224..baad37bc0d9228 100644
--- a/playground/dynamic-import/nested/index.js
+++ b/playground/dynamic-import/nested/index.js
@@ -102,4 +102,13 @@ import(`@/${base}.js`).then((mod) => {
   text('.dynamic-import-with-vars-alias', mod.hi())
 })
 
+base = 'self'
+import(`../nested/${base}.js`).then((mod) => {
+  text('.dynamic-import-self', mod.self)
+})
+
+import(`../nested/nested/${base}.js`).then((mod) => {
+  text('.dynamic-import-nested-self', mod.self)
+})
+
 console.log('index.js')
diff --git a/playground/dynamic-import/nested/nested/self.js b/playground/dynamic-import/nested/nested/self.js
new file mode 100644
index 00000000000000..b18321b2044887
--- /dev/null
+++ b/playground/dynamic-import/nested/nested/self.js
@@ -0,0 +1 @@
+export const self = 'dynamic-import-nested-self-content'
diff --git a/playground/dynamic-import/nested/self.js b/playground/dynamic-import/nested/self.js
new file mode 100644
index 00000000000000..46e122535d86e4
--- /dev/null
+++ b/playground/dynamic-import/nested/self.js
@@ -0,0 +1 @@
+export const self = 'dynamic-import-self-content'

From 8432015796945976c08df591ff63770dd2fc4f0f Mon Sep 17 00:00:00 2001
From: "qing.deng" <dengqing0821@gmail.com>
Date: Thu, 28 Jul 2022 09:15:25 +0800
Subject: [PATCH 3/7] refactor: move logic to transformDynamicImport

---
 .../src/node/plugins/dynamicImportVars.ts     | 34 +++++++++++--------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/packages/vite/src/node/plugins/dynamicImportVars.ts b/packages/vite/src/node/plugins/dynamicImportVars.ts
index 5e429c4467a2e5..93250f74618316 100644
--- a/packages/vite/src/node/plugins/dynamicImportVars.ts
+++ b/packages/vite/src/node/plugins/dynamicImportVars.ts
@@ -78,7 +78,8 @@ export async function transformDynamicImport(
   resolve: (
     url: string,
     importer?: string
-  ) => Promise<string | undefined> | string | undefined
+  ) => Promise<string | undefined> | string | undefined,
+  root: string
 ): Promise<{
   glob: string
   pattern: string
@@ -107,10 +108,19 @@ export async function transformDynamicImport(
     ? `, ${JSON.stringify({ ...globParams, import: '*' })}`
     : ''
 
+  let newRawPattern = posix.relative(
+    posix.dirname(importer),
+    await toAbsoluteGlob(rawPattern, root, importer, resolve)
+  )
+
+  if (!/^\.{1,2}\//.test(newRawPattern)) {
+    newRawPattern = `./${newRawPattern}`
+  }
+
   const exp = `(import.meta.glob(${JSON.stringify(userPattern)}${params}))`
 
   return {
-    rawPattern,
+    rawPattern: newRawPattern,
     pattern: userPattern,
     glob: exp
   }
@@ -185,7 +195,12 @@ export function dynamicImportVarsPlugin(config: ResolvedConfig): Plugin {
           // parenthesis, so we manually remove them for now.
           // See https://github.com/guybedford/es-module-lexer/issues/118
           const importSource = removeComments(source.slice(start, end)).trim()
-          result = await transformDynamicImport(importSource, importer, resolve)
+          result = await transformDynamicImport(
+            importSource,
+            importer,
+            resolve,
+            config.root
+          )
         } catch (error) {
           if (warnOnError) {
             this.warn(error)
@@ -200,22 +215,11 @@ export function dynamicImportVarsPlugin(config: ResolvedConfig): Plugin {
 
         const { rawPattern, glob } = result
 
-        let newPattern = posix.relative(
-          posix.dirname(importer),
-          await toAbsoluteGlob(rawPattern, config.root, importer, (im) =>
-            this.resolve(im, importer).then((i) => i?.id || im)
-          )
-        )
-
-        if (!/^\.{1,2}\//.test(newPattern)) {
-          newPattern = `./${newPattern}`
-        }
-
         needDynamicImportHelper = true
         s.overwrite(
           expStart,
           expEnd,
-          `__variableDynamicImportRuntimeHelper(${glob}, \`${newPattern}\`)`
+          `__variableDynamicImportRuntimeHelper(${glob}, \`${rawPattern}\`)`
         )
       }
 

From b4dd14460a98a0ed9f62353ed11e03e7de5a5154 Mon Sep 17 00:00:00 2001
From: "qing.deng" <dengqing0821@gmail.com>
Date: Thu, 28 Jul 2022 09:15:48 +0800
Subject: [PATCH 4/7] test: add some test

---
 .../__snapshots__/parse.test.ts.snap            |  4 ++++
 .../plugins/dynamicImportVar/parse.test.ts      | 17 +++++++++++++++--
 playground/headless-ui-vite-disclosure-error    |  1 +
 playground/vite-sentry-repro                    |  1 +
 4 files changed, 21 insertions(+), 2 deletions(-)
 create mode 160000 playground/headless-ui-vite-disclosure-error
 create mode 160000 playground/vite-sentry-repro

diff --git a/packages/vite/src/node/__tests__/plugins/dynamicImportVar/__snapshots__/parse.test.ts.snap b/packages/vite/src/node/__tests__/plugins/dynamicImportVar/__snapshots__/parse.test.ts.snap
index be73ec998bc834..b5f649d6bc336b 100644
--- a/packages/vite/src/node/__tests__/plugins/dynamicImportVar/__snapshots__/parse.test.ts.snap
+++ b/packages/vite/src/node/__tests__/plugins/dynamicImportVar/__snapshots__/parse.test.ts.snap
@@ -8,6 +8,10 @@ exports[`parse positives > alias path 1`] = `"__variableDynamicImportRuntimeHelp
 
 exports[`parse positives > basic 1`] = `"__variableDynamicImportRuntimeHelper((import.meta.glob(\\"./mods/*.js\\")), \`./mods/\${base}.js\`)"`;
 
+exports[`parse positives > with ../ and itself 1`] = `"__variableDynamicImportRuntimeHelper((import.meta.glob(\\"../dynamicImportVar/*.js\\")), \`./\${name}.js\`)"`;
+
+exports[`parse positives > with multi ../ and itself 1`] = `"__variableDynamicImportRuntimeHelper((import.meta.glob(\\"../../plugins/dynamicImportVar/*.js\\")), \`./\${name}.js\`)"`;
+
 exports[`parse positives > with query raw 1`] = `"__variableDynamicImportRuntimeHelper((import.meta.glob(\\"./mods/*.js\\", {\\"as\\":\\"raw\\",\\"import\\":\\"*\\"})), \`./mods/\${base}.js\`)"`;
 
 exports[`parse positives > with query url 1`] = `"__variableDynamicImportRuntimeHelper((import.meta.glob(\\"./mods/*.js\\")), \`./mods/\${base}.js\`)"`;
diff --git a/packages/vite/src/node/__tests__/plugins/dynamicImportVar/parse.test.ts b/packages/vite/src/node/__tests__/plugins/dynamicImportVar/parse.test.ts
index ba619c90e509ef..b9fbea192ac262 100644
--- a/packages/vite/src/node/__tests__/plugins/dynamicImportVar/parse.test.ts
+++ b/packages/vite/src/node/__tests__/plugins/dynamicImportVar/parse.test.ts
@@ -7,8 +7,11 @@ const __dirname = resolve(fileURLToPath(import.meta.url), '..')
 
 async function run(input: string) {
   const { glob, rawPattern } =
-    (await transformDynamicImport(input, resolve(__dirname, 'index.js'), (id) =>
-      id.replace('@', resolve(__dirname, './mods/'))
+    (await transformDynamicImport(
+      input,
+      resolve(__dirname, 'index.js'),
+      (id) => id.replace('@', resolve(__dirname, './mods/')),
+      __dirname
     )) || {}
   return `__variableDynamicImportRuntimeHelper(${glob}, \`${rawPattern}\`)`
 }
@@ -37,4 +40,14 @@ describe('parse positives', () => {
   it('? in url', async () => {
     expect(await run('`./mo?ds/${base ?? foo}.js?raw`')).toMatchSnapshot()
   })
+
+  it('with ../ and itself', async () => {
+    expect(await run('`../dynamicImportVar/${name}.js`')).toMatchSnapshot()
+  })
+
+  it('with multi ../ and itself', async () => {
+    expect(
+      await run('`../../plugins/dynamicImportVar/${name}.js`')
+    ).toMatchSnapshot()
+  })
 })
diff --git a/playground/headless-ui-vite-disclosure-error b/playground/headless-ui-vite-disclosure-error
new file mode 160000
index 00000000000000..ca709e3d6954d2
--- /dev/null
+++ b/playground/headless-ui-vite-disclosure-error
@@ -0,0 +1 @@
+Subproject commit ca709e3d6954d2088fb6dfac66dc90e14604ed89
diff --git a/playground/vite-sentry-repro b/playground/vite-sentry-repro
new file mode 160000
index 00000000000000..d4cff9eb04ca09
--- /dev/null
+++ b/playground/vite-sentry-repro
@@ -0,0 +1 @@
+Subproject commit d4cff9eb04ca09b68ece27a3e0537fc616a06b8e

From 73a66306291d8e86a2e88dee963b9d6abeaa9dd7 Mon Sep 17 00:00:00 2001
From: "qing.deng" <dengqing0821@gmail.com>
Date: Thu, 28 Jul 2022 10:14:41 +0800
Subject: [PATCH 5/7] fix: test

---
 playground/headless-ui-vite-disclosure-error | 1 -
 playground/vite-sentry-repro                 | 1 -
 2 files changed, 2 deletions(-)
 delete mode 160000 playground/headless-ui-vite-disclosure-error
 delete mode 160000 playground/vite-sentry-repro

diff --git a/playground/headless-ui-vite-disclosure-error b/playground/headless-ui-vite-disclosure-error
deleted file mode 160000
index ca709e3d6954d2..00000000000000
--- a/playground/headless-ui-vite-disclosure-error
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit ca709e3d6954d2088fb6dfac66dc90e14604ed89
diff --git a/playground/vite-sentry-repro b/playground/vite-sentry-repro
deleted file mode 160000
index d4cff9eb04ca09..00000000000000
--- a/playground/vite-sentry-repro
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit d4cff9eb04ca09b68ece27a3e0537fc616a06b8e

From 91cda6df4522b85f17baed234fc46b486afa26d4 Mon Sep 17 00:00:00 2001
From: dengqing <dengqing0821@gmail.com>
Date: Thu, 28 Jul 2022 13:39:07 +0800
Subject: [PATCH 6/7] fix: normalize importer

---
 .../src/node/__tests__/plugins/dynamicImportVar/parse.test.ts  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/vite/src/node/__tests__/plugins/dynamicImportVar/parse.test.ts b/packages/vite/src/node/__tests__/plugins/dynamicImportVar/parse.test.ts
index b9fbea192ac262..422dcb59ca5b37 100644
--- a/packages/vite/src/node/__tests__/plugins/dynamicImportVar/parse.test.ts
+++ b/packages/vite/src/node/__tests__/plugins/dynamicImportVar/parse.test.ts
@@ -1,5 +1,6 @@
 import { resolve } from 'node:path'
 import { fileURLToPath } from 'node:url'
+import { normalizePath } from 'vite'
 import { describe, expect, it } from 'vitest'
 import { transformDynamicImport } from '../../../plugins/dynamicImportVars'
 
@@ -9,7 +10,7 @@ async function run(input: string) {
   const { glob, rawPattern } =
     (await transformDynamicImport(
       input,
-      resolve(__dirname, 'index.js'),
+      normalizePath(resolve(__dirname, 'index.js')),
       (id) => id.replace('@', resolve(__dirname, './mods/')),
       __dirname
     )) || {}

From 0369b25617517b4f38f7f9373dc18757c1eff1f8 Mon Sep 17 00:00:00 2001
From: "qing.deng" <dengqing0821@gmail.com>
Date: Thu, 28 Jul 2022 15:34:54 +0800
Subject: [PATCH 7/7] ci: fix