From 60fa6ba082c50d57ec4abecb196573f4100636d2 Mon Sep 17 00:00:00 2001
From: Bjorn Lu <bjornlu.dev@gmail.com>
Date: Thu, 14 Jul 2022 16:41:54 +0800
Subject: [PATCH 1/5] docs: update library mode info (#9102)

---
 docs/guide/build.md | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/docs/guide/build.md b/docs/guide/build.md
index a6bd0a5106587a..5fe3c2a78e25f8 100644
--- a/docs/guide/build.md
+++ b/docs/guide/build.md
@@ -163,8 +163,8 @@ Running `vite build` with this config uses a Rollup preset that is oriented towa
 ```
 $ vite build
 building for production...
-[write] my-lib.mjs 0.08kb, brotli: 0.07kb
-[write] my-lib.umd.js 0.30kb, brotli: 0.16kb
+dist/my-lib.js      0.08 KiB / gzip: 0.07 KiB
+dist/my-lib.umd.cjs 0.30 KiB / gzip: 0.16 KiB
 ```
 
 Recommended `package.json` for your lib:
@@ -172,18 +172,23 @@ Recommended `package.json` for your lib:
 ```json
 {
   "name": "my-lib",
+  "type": "module",
   "files": ["dist"],
-  "main": "./dist/my-lib.umd.js",
-  "module": "./dist/my-lib.mjs",
+  "main": "./dist/my-lib.umd.cjs",
+  "module": "./dist/my-lib.js",
   "exports": {
     ".": {
-      "import": "./dist/my-lib.mjs",
-      "require": "./dist/my-lib.umd.js"
+      "import": "./dist/my-lib.js",
+      "require": "./dist/my-lib.umd.cjs"
     }
   }
 }
 ```
 
+::: tip Note
+If the `package.json` does not contain `"type": "module"`, Vite will generate different file extensions for Node.js compatibility. `.js` will become `.mjs` and `.cjs` will become `.js`.
+:::
+
 ## Advanced Base Options
 
 ::: warning

From b3934516431659b36ccfbfe1a87a3e73595982a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=BF=A0=20/=20green?= <green@sapphi.red>
Date: Thu, 14 Jul 2022 18:26:40 +0900
Subject: [PATCH 2/5] fix: resolve drive relative path (#9097)

---
 packages/vite/src/node/plugins/resolve.ts    | 12 ++++++
 playground/resolve/__tests__/resolve.spec.ts | 10 ++++-
 playground/resolve/absolute.js               |  1 +
 playground/resolve/drive-relative.js         |  1 +
 playground/resolve/index.html                |  7 ++++
 playground/resolve/vite.config.js            | 43 ++++++++++++++++++++
 6 files changed, 73 insertions(+), 1 deletion(-)
 create mode 100644 playground/resolve/absolute.js
 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..e95e6d78c409c5 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,14 @@ 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('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/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..a1befcc2757348 100644
--- a/playground/resolve/index.html
+++ b/playground/resolve/index.html
@@ -55,6 +55,12 @@ <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>Resolve absolute path</h2>
+<p class="absolute">fail</p>
+
 <h2>Browser Field</h2>
 <p class="browser">fail</p>
 
@@ -89,6 +95,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..e2fa303598a26a 100644
--- a/playground/resolve/vite.config.js
+++ b/playground/resolve/vite.config.js
@@ -1,9 +1,26 @@
+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'
+  },
+  {
+    specifier: normalizePath(path.resolve(__dirname, './absolute.js')),
+    elementQuery: '.absolute'
+  }
+]
+
 module.exports = {
   resolve: {
     extensions: ['.mjs', '.js', '.es', '.ts'],
@@ -39,6 +56,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 d12d469dfb8d7466615b085aac0d461ff18a4465 Mon Sep 17 00:00:00 2001
From: Bjorn Lu <bjornlu.dev@gmail.com>
Date: Thu, 14 Jul 2022 17:51:52 +0800
Subject: [PATCH 3/5] fix: check server after tsconfig reload (#9106)

---
 packages/vite/src/node/plugins/esbuild.ts | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/packages/vite/src/node/plugins/esbuild.ts b/packages/vite/src/node/plugins/esbuild.ts
index 42e5bbac76316a..16edee000fbb82 100644
--- a/packages/vite/src/node/plugins/esbuild.ts
+++ b/packages/vite/src/node/plugins/esbuild.ts
@@ -437,11 +437,14 @@ function reloadOnTsconfigChange(changedFile: string) {
 
     // reset tsconfck so that recompile works with up2date configs
     initTSConfck(server.config).finally(() => {
-      // force full reload
-      server.ws.send({
-        type: 'full-reload',
-        path: '*'
-      })
+      // server may not be available if vite config is updated at the same time
+      if (server) {
+        // force full reload
+        server.ws.send({
+          type: 'full-reload',
+          path: '*'
+        })
+      }
     })
   }
 }

From c2426d15c0c000f56cdcbd0a57853407f3ec5911 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=BF=A0=20/=20green?= <green@sapphi.red>
Date: Fri, 15 Jul 2022 03:49:41 +0900
Subject: [PATCH 4/5] fix: server.proxy ws error causes crash (#9123)

---
 .../vite/src/node/server/middlewares/proxy.ts | 32 +++++++++++++------
 1 file changed, 23 insertions(+), 9 deletions(-)

diff --git a/packages/vite/src/node/server/middlewares/proxy.ts b/packages/vite/src/node/server/middlewares/proxy.ts
index 7fc576ba91252c..78095080157b4e 100644
--- a/packages/vite/src/node/server/middlewares/proxy.ts
+++ b/packages/vite/src/node/server/middlewares/proxy.ts
@@ -1,4 +1,5 @@
 import type * as http from 'node:http'
+import type * as net from 'node:net'
 import httpProxy from 'http-proxy'
 import type { Connect } from 'types/connect'
 import type { HttpProxy } from 'types/http-proxy'
@@ -43,16 +44,29 @@ export function proxyMiddleware(
     }
     const proxy = httpProxy.createProxyServer(opts) as HttpProxy.Server
 
-    proxy.on('error', (err, req, res) => {
-      config.logger.error(`${colors.red(`http proxy error:`)}\n${err.stack}`, {
-        timestamp: true,
-        error: err
-      })
-      res
-        .writeHead(500, {
-          'Content-Type': 'text/plain'
+    proxy.on('error', (err, req, originalRes) => {
+      // When it is ws proxy, res is net.Socket
+      const res = originalRes as http.ServerResponse | net.Socket
+      if ('req' in res) {
+        config.logger.error(
+          `${colors.red(`http proxy error:`)}\n${err.stack}`,
+          {
+            timestamp: true,
+            error: err
+          }
+        )
+        res
+          .writeHead(500, {
+            'Content-Type': 'text/plain'
+          })
+          .end()
+      } else {
+        config.logger.error(`${colors.red(`ws proxy error:`)}\n${err.stack}`, {
+          timestamp: true,
+          error: err
         })
-        .end()
+        res.end()
+      }
     })
 
     if (opts.configure) {

From a2b313126abdf2e0652502cbcd4b94353c37f91a Mon Sep 17 00:00:00 2001
From: Bjorn Lu <bjornlu.dev@gmail.com>
Date: Fri, 15 Jul 2022 02:51:27 +0800
Subject: [PATCH 5/5] refactor: always load config with esbuild bundled code
 (#9121)

---
 packages/vite/src/node/config.ts  | 95 +++++++++++++------------------
 packages/vite/src/node/utils.ts   |  2 -
 playground/ssr-vue/vite.config.js |  5 ++
 3 files changed, 45 insertions(+), 57 deletions(-)

diff --git a/packages/vite/src/node/config.ts b/packages/vite/src/node/config.ts
index 3ece9213dab76a..259c371fe619d6 100644
--- a/packages/vite/src/node/config.ts
+++ b/packages/vite/src/node/config.ts
@@ -27,7 +27,6 @@ import {
   dynamicImport,
   isExternalUrl,
   isObject,
-  isTS,
   lookupFile,
   mergeAlias,
   mergeConfig,
@@ -816,7 +815,6 @@ export async function loadConfigFromFile(
   const getTime = () => `${(performance.now() - start).toFixed(2)}ms`
 
   let resolvedPath: string | undefined
-  let dependencies: string[] = []
 
   if (configFile) {
     // explicit config path is always resolved from cwd
@@ -852,42 +850,13 @@ export async function loadConfigFromFile(
   }
 
   try {
-    let userConfig: UserConfigExport | undefined
-
-    if (isESM) {
-      const fileUrl = pathToFileURL(resolvedPath)
-      const bundled = await bundleConfigFile(resolvedPath, true)
-      dependencies = bundled.dependencies
-
-      if (isTS(resolvedPath)) {
-        // before we can register loaders without requiring users to run node
-        // with --experimental-loader themselves, we have to do a hack here:
-        // bundle the config file w/ ts transforms first, write it to disk,
-        // load it with native Node ESM, then delete the file.
-        fs.writeFileSync(resolvedPath + '.mjs', bundled.code)
-        try {
-          userConfig = (await dynamicImport(`${fileUrl}.mjs?t=${Date.now()}`))
-            .default
-        } finally {
-          fs.unlinkSync(resolvedPath + '.mjs')
-        }
-        debug(`TS + native esm config loaded in ${getTime()}`, fileUrl)
-      } else {
-        // using Function to avoid this from being compiled away by TS/Rollup
-        // append a query so that we force reload fresh config in case of
-        // server restart
-        userConfig = (await dynamicImport(`${fileUrl}?t=${Date.now()}`)).default
-        debug(`native esm config loaded in ${getTime()}`, fileUrl)
-      }
-    }
-
-    if (!userConfig) {
-      // Bundle config file and transpile it to cjs using esbuild.
-      const bundled = await bundleConfigFile(resolvedPath)
-      dependencies = bundled.dependencies
-      userConfig = await loadConfigFromBundledFile(resolvedPath, bundled.code)
-      debug(`bundled config file loaded in ${getTime()}`)
-    }
+    const bundled = await bundleConfigFile(resolvedPath, isESM)
+    const userConfig = await loadConfigFromBundledFile(
+      resolvedPath,
+      bundled.code,
+      isESM
+    )
+    debug(`bundled config file loaded in ${getTime()}`)
 
     const config = await (typeof userConfig === 'function'
       ? userConfig(configEnv)
@@ -898,7 +867,7 @@ export async function loadConfigFromFile(
     return {
       path: normalizePath(resolvedPath),
       config,
-      dependencies
+      dependencies: bundled.dependencies
     }
   } catch (e) {
     createLogger(logLevel).error(
@@ -911,7 +880,7 @@ export async function loadConfigFromFile(
 
 async function bundleConfigFile(
   fileName: string,
-  isESM = false
+  isESM: boolean
 ): Promise<{ code: string; dependencies: string[] }> {
   const importMetaUrlVarName = '__vite_injected_original_import_meta_url'
   const result = await build({
@@ -954,7 +923,7 @@ async function bundleConfigFile(
               )};`
 
             return {
-              loader: isTS(args.path) ? 'ts' : 'js',
+              loader: args.path.endsWith('ts') ? 'ts' : 'js',
               contents: injectValues + contents
             }
           })
@@ -976,22 +945,38 @@ interface NodeModuleWithCompile extends NodeModule {
 const _require = createRequire(import.meta.url)
 async function loadConfigFromBundledFile(
   fileName: string,
-  bundledCode: string
-): Promise<UserConfig> {
-  const realFileName = fs.realpathSync(fileName)
-  const defaultLoader = _require.extensions['.js']
-  _require.extensions['.js'] = (module: NodeModule, filename: string) => {
-    if (filename === realFileName) {
-      ;(module as NodeModuleWithCompile)._compile(bundledCode, filename)
-    } else {
-      defaultLoader(module, filename)
+  bundledCode: string,
+  isESM: boolean
+): Promise<UserConfigExport> {
+  // for esm, before we can register loaders without requiring users to run node
+  // with --experimental-loader themselves, we have to do a hack here:
+  // write it to disk, load it with native Node ESM, then delete the file.
+  if (isESM) {
+    const fileUrl = pathToFileURL(fileName)
+    fs.writeFileSync(fileName + '.mjs', bundledCode)
+    try {
+      return (await dynamicImport(`${fileUrl}.mjs?t=${Date.now()}`)).default
+    } finally {
+      fs.unlinkSync(fileName + '.mjs')
+    }
+  }
+  // for cjs, we can register a custom loader via `_require.extensions`
+  else {
+    const realFileName = fs.realpathSync(fileName)
+    const defaultLoader = _require.extensions['.js']
+    _require.extensions['.js'] = (module: NodeModule, filename: string) => {
+      if (filename === realFileName) {
+        ;(module as NodeModuleWithCompile)._compile(bundledCode, filename)
+      } else {
+        defaultLoader(module, filename)
+      }
     }
+    // clear cache in case of server restart
+    delete _require.cache[_require.resolve(fileName)]
+    const raw = _require(fileName)
+    _require.extensions['.js'] = defaultLoader
+    return raw.__esModule ? raw.default : raw
   }
-  // clear cache in case of server restart
-  delete _require.cache[_require.resolve(fileName)]
-  const raw = _require(fileName)
-  _require.extensions['.js'] = defaultLoader
-  return raw.__esModule ? raw.default : raw
 }
 
 export function getDepOptimizationConfig(
diff --git a/packages/vite/src/node/utils.ts b/packages/vite/src/node/utils.ts
index 1d647e366a3be2..331f9ba0ceb667 100644
--- a/packages/vite/src/node/utils.ts
+++ b/packages/vite/src/node/utils.ts
@@ -1130,8 +1130,6 @@ export function stripBomTag(content: string): string {
   return content
 }
 
-export const isTS = (filename: string): boolean => /\.[cm]?ts$/.test(filename)
-
 const windowsDrivePathPrefixRE = /^[A-Za-z]:[/\\]/
 
 /**
diff --git a/playground/ssr-vue/vite.config.js b/playground/ssr-vue/vite.config.js
index 6d8073ad6755d4..c2c90bbc32c4bf 100644
--- a/playground/ssr-vue/vite.config.js
+++ b/playground/ssr-vue/vite.config.js
@@ -10,6 +10,11 @@ const nestedVirtualId = '\0' + nestedVirtualFile
 
 const base = '/test/'
 
+// preserve this to test loading __filename & __dirname in ESM as Vite polyfills them.
+// if Vite incorrectly load this file, node.js would error out.
+globalThis.__vite_test_filename = __filename
+globalThis.__vite_test_dirname = __dirname
+
 export default defineConfig(({ command, ssrBuild }) => ({
   base,
   plugins: [