wxt 0.5.6 → 0.6.0-alpha1

package/dist/index.d.cts

@@ -134,11 +134,13 @@ interface InlineConfig {
      */
     logger?: Logger;
     /**
-     * Custom Vite options, see <https://vitejs.dev/config/shared-options.html>.
+     * Return custom Vite options from a function. See
+     * <https://vitejs.dev/config/shared-options.html>.
      *
-     * [`root`](#root), [`configFile`](#configfile), and [`mode`](#mode) should be set in WXT's config.
+     * [`root`](#root), [`configFile`](#configfile), and [`mode`](#mode) should be set in WXT's config
+     * instead of Vite's.
      */
-    vite?: WxtViteConfig | ((env: ConfigEnv) => WxtViteConfig | Promise<WxtViteConfig>);
+    vite?: (env: ConfigEnv) => WxtViteConfig | Promise<WxtViteConfig>;
     /**
      * Customize the `manifest.json` output. Can be an object, promise, or function that returns an
      * object or promise.
@@ -478,7 +480,7 @@ type EntrypointGroup = Entrypoint | Entrypoint[];
  */
 declare function clean(root?: string): Promise<void>;
 
-var version = "0.5.6";
+var version = "0.6.0-alpha1";
 
 declare function defineConfig(config: UserConfig): UserConfig;
 

package/dist/index.d.ts

@@ -134,11 +134,13 @@ interface InlineConfig {
      */
     logger?: Logger;
     /**
-     * Custom Vite options, see <https://vitejs.dev/config/shared-options.html>.
+     * Return custom Vite options from a function. See
+     * <https://vitejs.dev/config/shared-options.html>.
      *
-     * [`root`](#root), [`configFile`](#configfile), and [`mode`](#mode) should be set in WXT's config.
+     * [`root`](#root), [`configFile`](#configfile), and [`mode`](#mode) should be set in WXT's config
+     * instead of Vite's.
      */
-    vite?: WxtViteConfig | ((env: ConfigEnv) => WxtViteConfig | Promise<WxtViteConfig>);
+    vite?: (env: ConfigEnv) => WxtViteConfig | Promise<WxtViteConfig>;
     /**
      * Customize the `manifest.json` output. Can be an object, promise, or function that returns an
      * object or promise.
@@ -478,7 +480,7 @@ type EntrypointGroup = Entrypoint | Entrypoint[];
  */
 declare function clean(root?: string): Promise<void>;
 
-var version = "0.5.6";
+var version = "0.6.0-alpha1";
 
 declare function defineConfig(config: UserConfig): UserConfig;
 

package/dist/index.js

@@ -506,6 +506,7 @@ async function getInternalConfig(inlineConfig, command) {
     command,
     debug,
     entrypointsDir,
+    env,
     fsCache: createFsCache(wxtDir),
     imports: mergedConfig.imports ?? {},
     logger,
@@ -519,16 +520,12 @@ async function getInternalConfig(inlineConfig, command) {
     runnerConfig,
     srcDir,
     typesDir,
-    vite: {},
+    vite: () => ({}),
     // Real value added after this object is initialized.
     wxtDir,
     zip: resolveInternalZipConfig(root, mergedConfig)
   };
-  finalConfig.vite = await resolveInternalViteConfig(
-    env,
-    mergedConfig,
-    finalConfig
-  );
+  finalConfig.vite = (env2) => resolveInternalViteConfig(env2, mergedConfig, finalConfig);
   return finalConfig;
 }
 async function resolveManifestConfig(env, manifest) {
@@ -552,9 +549,9 @@ function mergeInlineConfig(inlineConfig, userConfig) {
     return vite2.mergeConfig(user, inline);
   };
   const viteConfig = async (env) => {
-    const user = await resolveViteConfig(env, userConfig.vite);
-    const inline = await resolveViteConfig(env, inlineConfig.vite);
-    return vite2.mergeConfig(user, inline);
+    const user = await userConfig.vite?.(env);
+    const inline = await inlineConfig.vite?.(env);
+    return vite2.mergeConfig(user ?? {}, inline ?? {});
   };
   const runner = vite2.mergeConfig(
     userConfig.runner ?? {},
@@ -582,9 +579,6 @@ function mergeInlineConfig(inlineConfig, userConfig) {
     zip
   };
 }
-async function resolveViteConfig(env, vite6) {
-  return await (typeof vite6 === "function" ? vite6(env) : vite6 ?? {});
-}
 function resolveInternalZipConfig(root, mergedConfig) {
   return {
     sourcesTemplate: "{{name}}-{{version}}-sources.zip",
@@ -606,10 +600,7 @@ function resolveInternalZipConfig(root, mergedConfig) {
   };
 }
 async function resolveInternalViteConfig(env, mergedConfig, finalConfig) {
-  const internalVite = await resolveViteConfig(
-    env,
-    mergedConfig.vite
-  );
+  const internalVite = await mergedConfig.vite?.(env) ?? {};
   internalVite.root = finalConfig.root;
   internalVite.configFile = false;
   internalVite.logLevel = "warn";
@@ -824,7 +815,7 @@ async function buildSingleEntrypoint(entrypoint, config) {
   }
   const entryConfig = vite3.mergeConfig(
     libMode,
-    config.vite
+    await config.vite(config.env)
   );
   const result = await vite3.build(entryConfig);
   return {
@@ -858,7 +849,7 @@ async function buildMultipleEntrypoints(entrypoints, config) {
   }
   const entryConfig = vite3.mergeConfig(
     multiPage,
-    config.vite
+    await config.vite(config.env)
   );
   const result = await vite3.build(entryConfig);
   return {
@@ -2161,7 +2152,7 @@ async function getServerInfo() {
 async function setupServer(serverInfo, config) {
   const runner = createWebExtRunner();
   const viteServer = await vite5.createServer(
-    vite5.mergeConfig(serverInfo, config.vite)
+    vite5.mergeConfig(serverInfo, await config.vite(config.env))
   );
   const start = async () => {
     await viteServer.listen(server.port);
@@ -2262,7 +2253,7 @@ async function clean(root = process.cwd()) {
 }
 
 // package.json
-var version2 = "0.5.6";
+var version2 = "0.6.0-alpha1";
 
 // src/core/utils/defineConfig.ts
 function defineConfig(config) {
@@ -2285,7 +2276,7 @@ async function createServer2(config) {
     return getInternalConfig(
       {
         ...config,
-        vite: serverInfo.viteServerConfig
+        vite: () => serverInfo.viteServerConfig
       },
       "serve"
     );