fix: ensure compatibility with vite v6.0.7 (#63)

* fix: ensure compatibility with vite v6.0.7

* remove unrelated update

* set default target

* format

---------

Co-authored-by: Menci <[email protected]>

Author: ocavue

package.json

@@ -32,13 +32,13 @@
     "@types/jest": "^29.5.12",
     "@types/uuid": "^10.0.0",
     "cz-conventional-changelog": "^3.3.0",
-    "esbuild": "^0.23.0",
+    "esbuild": "^0.24.0",
     "jest": "^29.7.0",
     "jest-extended": "^4.0.2",
     "prettier": "^3.3.3",
     "ts-jest": "^29.2.3",
     "typescript": "^5.5.3",
-    "vite": "^5.3.4"
+    "vite": "^6.0.7"
   },
   "dependencies": {
     "@rollup/plugin-virtual": "^3.0.2",

src/index.ts

@@ -13,6 +13,10 @@ export type { Options } from "./options";
 
 type ViteTarget = ResolvedConfig["build"]["target"];
 
+// Use the same default target as Vite.
+// https://github.com/vitejs/vite/blob/v6.0.7/packages/vite/src/node/constants.ts#L70-L76
+const DEFAULT_VITE_TARGET: ViteTarget = ["es2020", "edge88", "firefox78", "chrome87", "safari14"];
+
 export default function topLevelAwait(options?: Options): Plugin {
   const resolvedOptions: Options = {
     ...DEFAULT_OPTIONS,
@@ -47,24 +51,26 @@ export default function topLevelAwait(options?: Options): Plugin {
         isWorkerIifeRequested = true;
       }
     },
-    configResolved(config) {
-      if (config.command === "build") {
-        if (config.isWorker) {
+    config(config, env) {
+      if (env.command === "build") {
+        if (config.worker) {
           isWorker = true;
         }
 
         // By default Vite transforms code with esbuild with target for a browser list with ES modules support
         // This cause esbuild to throw an exception when there're top-level awaits in code
-        // Let's backup the original target and override the esbuild target with "esnext", which allows TLAs
-        buildTarget = config.build.target;
+        // Let's backup the original target and override the esbuild target with "esnext", which allows TLAs.
+        // If the user doesn't specify a target explicitly, `config.build.target` will be undefined and we'll
+        // use the default Vite target.
+        buildTarget = config.build.target ?? DEFAULT_VITE_TARGET;
         config.build.target = "esnext";
 
         minify = !!config.build.minify;
 
         assetsDir = config.build.assetsDir;
       }
 
-      if (config.command === "serve") {
+      if (env.command === "serve") {
         // Fix errors in NPM packages which are getting pre-processed in development build
         if (config.optimizeDeps?.esbuildOptions) {
           config.optimizeDeps.esbuildOptions.target = "esnext";

src/transform.ts

@@ -192,18 +192,22 @@ export function transformModule(
     imports.flatMap(importStmt => importStmt.specifiers.map(specifier => specifier.local.value))
   );
   const exportFromedNames = new Set(
-    exportFroms.flatMap(exportStmt => exportStmt.specifiers.map(specifier => {
-      if (specifier.type === "ExportNamespaceSpecifier") {
-        return specifier.name.value;
-      } else if (specifier.type === "ExportDefaultSpecifier") {
-        // When will this happen?
-        return specifier.exported.value;
-      } else {
-        return (specifier.exported || specifier.orig).value;
-      }
-    }))
+    exportFroms.flatMap(exportStmt =>
+      exportStmt.specifiers.map(specifier => {
+        if (specifier.type === "ExportNamespaceSpecifier") {
+          return specifier.name.value;
+        } else if (specifier.type === "ExportDefaultSpecifier") {
+          // When will this happen?
+          return specifier.exported.value;
+        } else {
+          return (specifier.exported || specifier.orig).value;
+        }
+      })
+    )
+  );
+  const exportedNamesDeclaration = makeVariablesDeclaration(
+    exportedNames.filter(name => !importedNames.has(name) && !exportFromedNames.has(name))
   );
-  const exportedNamesDeclaration = makeVariablesDeclaration(exportedNames.filter(name => !importedNames.has(name) && !exportFromedNames.has(name)));
 
   const warppedStatements = topLevelStatements.flatMap<SWC.Statement>(stmt => {
     if (stmt.type === "VariableDeclaration") {
@@ -368,7 +372,12 @@ export function transformModule(
    * export { ..., __tla };
    */
 
-  const newTopLevel: SWC.ModuleItem[] = [...imports, ...newImportsByExportFroms, ...exportFroms, exportedNamesDeclaration];
+  const newTopLevel: SWC.ModuleItem[] = [
+    ...imports,
+    ...newImportsByExportFroms,
+    ...exportFroms,
+    exportedNamesDeclaration
+  ];
 
   if (exportedNames.length > 0 || bundleInfo[moduleName]?.importedBy?.length > 0) {
     // If the chunk is being imported, append export of the TLA promise to export list