From f9fafe4cd5945ba27843fd92634efd861ec7f934 Mon Sep 17 00:00:00 2001
From: Haoqun Jiang <haoqunjiang@gmail.com>
Date: Fri, 2 Jul 2021 17:04:08 +0800
Subject: [PATCH] fix: use `.mjs` extension for injected client modules (#4061)

---
 packages/vite/rollup.config.js      | 4 ++--
 packages/vite/src/node/constants.ts | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/vite/rollup.config.js b/packages/vite/rollup.config.js
index db55f4e518a12f..34ea08f1692732 100644
--- a/packages/vite/rollup.config.js
+++ b/packages/vite/rollup.config.js
@@ -26,7 +26,7 @@ const envConfig = {
     })
   ],
   output: {
-    dir: path.resolve(__dirname, 'dist/client'),
+    file: path.resolve(__dirname, 'dist/client', 'env.mjs'),
     sourcemap: true
   }
 }
@@ -48,7 +48,7 @@ const clientConfig = {
     })
   ],
   output: {
-    dir: path.resolve(__dirname, 'dist/client'),
+    file: path.resolve(__dirname, 'dist/client', 'client.mjs'),
     sourcemap: true
   }
 }
diff --git a/packages/vite/src/node/constants.ts b/packages/vite/src/node/constants.ts
index 4352869419d897..8910344936f3ce 100644
--- a/packages/vite/src/node/constants.ts
+++ b/packages/vite/src/node/constants.ts
@@ -41,9 +41,9 @@ export const NULL_BYTE_PLACEHOLDER = `__x00__`
 export const CLIENT_PUBLIC_PATH = `/@vite/client`
 export const ENV_PUBLIC_PATH = `/@vite/env`
 // eslint-disable-next-line node/no-missing-require
-export const CLIENT_ENTRY = require.resolve('vite/dist/client/client.js')
+export const CLIENT_ENTRY = require.resolve('vite/dist/client/client.mjs')
 // eslint-disable-next-line node/no-missing-require
-export const ENV_ENTRY = require.resolve('vite/dist/client/env.js')
+export const ENV_ENTRY = require.resolve('vite/dist/client/env.mjs')
 export const CLIENT_DIR = path.dirname(CLIENT_ENTRY)
 
 export const KNOWN_ASSET_TYPES = [