From f7edb4f0bd8983f81ecbbcc5e9e22286befc67b8 Mon Sep 17 00:00:00 2001
From: sapphi-red <green@sapphi.red>
Date: Thu, 14 Jul 2022 11:16:29 +0900
Subject: [PATCH 1/2] fix: resolve drive relative path

---
 packages/vite/src/node/plugins/resolve.ts    | 12 ++++++
 playground/resolve/__tests__/resolve.spec.ts |  6 ++-
 playground/resolve/drive-relative.js         |  1 +
 playground/resolve/index.html                |  4 ++
 playground/resolve/vite.config.js            | 39 ++++++++++++++++++++
 5 files changed, 61 insertions(+), 1 deletion(-)
 create mode 100644 playground/resolve/drive-relative.js

diff --git a/packages/vite/src/node/plugins/resolve.ts b/packages/vite/src/node/plugins/resolve.ts
index 1ebe847359384c..af86ef76193c92 100644
--- a/packages/vite/src/node/plugins/resolve.ts
+++ b/packages/vite/src/node/plugins/resolve.ts
@@ -28,6 +28,7 @@ import {
   isObject,
   isPossibleTsOutput,
   isTsRequest,
+  isWindows,
   nestedResolveFrom,
   normalizePath,
   resolveFrom,
@@ -243,6 +244,17 @@ export function resolvePlugin(resolveOptions: InternalResolveOptions): Plugin {
         }
       }
 
+      // drive relative fs paths (only windows)
+      if (isWindows && id.startsWith('/')) {
+        const basedir = importer ? path.dirname(importer) : process.cwd()
+        const fsPath = path.resolve(basedir, id)
+        if ((res = tryFsResolve(fsPath, options))) {
+          isDebug &&
+            debug(`[drive-relative] ${colors.cyan(id)} -> ${colors.dim(res)}`)
+          return res
+        }
+      }
+
       // absolute fs paths
       if (
         isNonDriveRelativeAbsolutePath(id) &&
diff --git a/playground/resolve/__tests__/resolve.spec.ts b/playground/resolve/__tests__/resolve.spec.ts
index 79ab9dce6409c3..d00f6fb7e711de 100644
--- a/playground/resolve/__tests__/resolve.spec.ts
+++ b/playground/resolve/__tests__/resolve.spec.ts
@@ -1,4 +1,4 @@
-import { isBuild, page } from '~utils'
+import { isBuild, isWindows, page } from '~utils'
 
 test('bom import', async () => {
   expect(await page.textContent('.utf8-bom')).toMatch('[success]')
@@ -75,6 +75,10 @@ test('filename with dot', async () => {
   expect(await page.textContent('.dot')).toMatch('[success]')
 })
 
+test.runIf(isWindows)('drive-relative path', async () => {
+  expect(await page.textContent('.drive-relative')).toMatch('[success]')
+})
+
 test('browser field', async () => {
   expect(await page.textContent('.browser')).toMatch('[success]')
 })
diff --git a/playground/resolve/drive-relative.js b/playground/resolve/drive-relative.js
new file mode 100644
index 00000000000000..188ac36e661b35
--- /dev/null
+++ b/playground/resolve/drive-relative.js
@@ -0,0 +1 @@
+export default '[success] drive relative'
diff --git a/playground/resolve/index.html b/playground/resolve/index.html
index 1920ebb675d24c..cda2f2f2bab315 100644
--- a/playground/resolve/index.html
+++ b/playground/resolve/index.html
@@ -55,6 +55,9 @@ <h2>
 <h2>Resolve file name containing dot</h2>
 <p class="dot">fail</p>
 
+<h2>Resolve drive-relative path (Windows only)</h2>
+<p class="drive-relative">fail</p>
+
 <h2>Browser Field</h2>
 <p class="browser">fail</p>
 
@@ -89,6 +92,7 @@ <h2>resolve package that contains # in path</h2>
 <p class="path-contains-sharp-symbol"></p>
 
 <script type="module">
+  import '@generated-content-virtual-file'
   function text(selector, text) {
     document.querySelector(selector).textContent = text
   }
diff --git a/playground/resolve/vite.config.js b/playground/resolve/vite.config.js
index 0550d1ecf6f044..c363bb092cf2f7 100644
--- a/playground/resolve/vite.config.js
+++ b/playground/resolve/vite.config.js
@@ -1,9 +1,22 @@
+const path = require('node:path')
+const { normalizePath } = require('vite')
+
 const virtualFile = '@virtual-file'
 const virtualId = '\0' + virtualFile
 
 const customVirtualFile = '@custom-virtual-file'
 const { a } = require('./config-dep')
 
+const generatedContentVirtualFile = '@generated-content-virtual-file'
+const generatedContentImports = [
+  {
+    specifier: normalizePath(
+      path.resolve(__dirname, './drive-relative.js').replace(/^[a-zA-Z]:/, '')
+    ),
+    elementQuery: '.drive-relative'
+  }
+]
+
 module.exports = {
   resolve: {
     extensions: ['.mjs', '.js', '.es', '.ts'],
@@ -39,6 +52,32 @@ module.exports = {
           return `export const msg = "[success] from custom virtual file"`
         }
       }
+    },
+    {
+      name: 'generated-content',
+      resolveId(id) {
+        if (id === generatedContentVirtualFile) {
+          return id
+        }
+      },
+      load(id) {
+        if (id === generatedContentVirtualFile) {
+          const tests = generatedContentImports
+            .map(
+              ({ specifier, elementQuery }, i) =>
+                `import content${i} from ${JSON.stringify(specifier)}\n` +
+                `text(${JSON.stringify(elementQuery)}, content${i})`
+            )
+            .join('\n')
+
+          return (
+            'function text(selector, text) {\n' +
+            '  document.querySelector(selector).textContent = text\n' +
+            '}\n\n' +
+            tests
+          )
+        }
+      }
     }
   ],
   optimizeDeps: {

From 841301d113c5e52cc7977be95c68bf67b4690b2c Mon Sep 17 00:00:00 2001
From: sapphi-red <green@sapphi.red>
Date: Thu, 14 Jul 2022 11:20:46 +0900
Subject: [PATCH 2/2] test: resolve absolute path

---
 playground/resolve/__tests__/resolve.spec.ts | 4 ++++
 playground/resolve/absolute.js               | 1 +
 playground/resolve/index.html                | 3 +++
 playground/resolve/vite.config.js            | 4 ++++
 4 files changed, 12 insertions(+)
 create mode 100644 playground/resolve/absolute.js

diff --git a/playground/resolve/__tests__/resolve.spec.ts b/playground/resolve/__tests__/resolve.spec.ts
index d00f6fb7e711de..e95e6d78c409c5 100644
--- a/playground/resolve/__tests__/resolve.spec.ts
+++ b/playground/resolve/__tests__/resolve.spec.ts
@@ -79,6 +79,10 @@ test.runIf(isWindows)('drive-relative path', async () => {
   expect(await page.textContent('.drive-relative')).toMatch('[success]')
 })
 
+test('absolute path', async () => {
+  expect(await page.textContent('.absolute')).toMatch('[success]')
+})
+
 test('browser field', async () => {
   expect(await page.textContent('.browser')).toMatch('[success]')
 })
diff --git a/playground/resolve/absolute.js b/playground/resolve/absolute.js
new file mode 100644
index 00000000000000..c0581888ebb90b
--- /dev/null
+++ b/playground/resolve/absolute.js
@@ -0,0 +1 @@
+export default '[success] absolute'
diff --git a/playground/resolve/index.html b/playground/resolve/index.html
index cda2f2f2bab315..a1befcc2757348 100644
--- a/playground/resolve/index.html
+++ b/playground/resolve/index.html
@@ -58,6 +58,9 @@ <h2>Resolve file name containing dot</h2>
 <h2>Resolve drive-relative path (Windows only)</h2>
 <p class="drive-relative">fail</p>
 
+<h2>Resolve absolute path</h2>
+<p class="absolute">fail</p>
+
 <h2>Browser Field</h2>
 <p class="browser">fail</p>
 
diff --git a/playground/resolve/vite.config.js b/playground/resolve/vite.config.js
index c363bb092cf2f7..e2fa303598a26a 100644
--- a/playground/resolve/vite.config.js
+++ b/playground/resolve/vite.config.js
@@ -14,6 +14,10 @@ const generatedContentImports = [
       path.resolve(__dirname, './drive-relative.js').replace(/^[a-zA-Z]:/, '')
     ),
     elementQuery: '.drive-relative'
+  },
+  {
+    specifier: normalizePath(path.resolve(__dirname, './absolute.js')),
+    elementQuery: '.absolute'
   }
 ]