wxt 0.1.2 → 0.1.4

package/dist/index.d.ts

@@ -245,7 +245,7 @@ interface ExtensionRunnerConfig {
 
 type EntrypointGroup = Entrypoint | Entrypoint[];
 
-var version = "0.1.2";
+var version = "0.1.4";
 
 declare function defineConfig(config: UserConfig): UserConfig;
 

package/dist/index.js

@@ -1,10 +1,7 @@
 // src/core/utils/getInternalConfig.ts
 import path2, { resolve as resolve6 } from "node:path";
-import * as vite2 from "vite";
-import { consola } from "consola";
-
-// src/core/vite-plugins/devHtmlPrerender.ts
 import * as vite from "vite";
+import { consola } from "consola";
 
 // src/core/utils/entrypoints.ts
 import path, { relative, resolve } from "node:path";
@@ -27,20 +24,17 @@ function devHtmlPrerender(config) {
   return {
     apply: "build",
     name: "wxt:dev-html-prerender",
-    config(userConfig) {
-      return vite.mergeConfig(
-        {
-          resolve: {
-            alias: {
-              "@wxt/reload-html": resolve2(
-                config.root,
-                "node_modules/wxt/dist/virtual-modules/reload-html.js"
-              )
-            }
+    config() {
+      return {
+        resolve: {
+          alias: {
+            "@wxt/reload-html": resolve2(
+              config.root,
+              "node_modules/wxt/dist/virtual-modules/reload-html.js"
+            )
           }
-        },
-        userConfig
-      );
+        }
+      };
     },
     async transform(html, id) {
       const server = config.server;
@@ -88,17 +82,18 @@ function devHtmlPrerender(config) {
 function devServerGlobals(internalConfig) {
   return {
     name: "wxt:dev-server-globals",
-    config(config) {
+    config() {
       if (internalConfig.server == null || internalConfig.command == "build")
         return;
-      config.define ??= {};
-      config.define.__DEV_SERVER_PROTOCOL__ = JSON.stringify("ws:");
-      config.define.__DEV_SERVER_HOSTNAME__ = JSON.stringify(
-        internalConfig.server.hostname
-      );
-      config.define.__DEV_SERVER_PORT__ = JSON.stringify(
-        internalConfig.server.port
-      );
+      return {
+        define: {
+          __DEV_SERVER_PROTOCOL__: JSON.stringify("ws:"),
+          __DEV_SERVER_HOSTNAME__: JSON.stringify(
+            internalConfig.server.hostname
+          ),
+          __DEV_SERVER_PORT__: JSON.stringify(internalConfig.server.port)
+        }
+      };
     }
   };
 }
@@ -218,7 +213,7 @@ function multipageMove(entrypoints, config) {
 import { createUnimport } from "unimport";
 
 // src/core/utils/auto-imports.ts
-import { mergeConfig as mergeConfig2 } from "vite";
+import { mergeConfig } from "vite";
 function getUnimportOptions(config) {
   const defaultOptions = {
     debugLog: config.logger.debug,
@@ -230,7 +225,7 @@ function getUnimportOptions(config) {
     warn: config.logger.warn,
     dirs: ["components", "composables", "hooks", "utils"]
   };
-  return mergeConfig2(
+  return mergeConfig(
     defaultOptions,
     config.imports
   );
@@ -371,12 +366,6 @@ async function getInternalConfig(config, command) {
   const outBaseDir = path2.resolve(root, ".output");
   const outDir = path2.resolve(outBaseDir, `${browser}-mv${manifestVersion}`);
   const logger = config.logger ?? consola;
-  const manifest = await (typeof config.manifest === "function" ? config.manifest({
-    browser,
-    command,
-    manifestVersion,
-    mode
-  }) : config.manifest ?? {});
   const baseConfig = {
     root,
     outDir,
@@ -388,7 +377,6 @@ async function getInternalConfig(config, command) {
     command,
     logger,
     vite: config.vite ?? {},
-    manifest,
     imports: config.imports ?? {},
     runnerConfig: await loadConfig({
       name: "web-ext",
@@ -409,7 +397,7 @@ async function getInternalConfig(config, command) {
     });
     userConfig = loaded.config ?? {};
   }
-  const merged = vite2.mergeConfig(
+  const merged = vite.mergeConfig(
     baseConfig,
     userConfig
   );
@@ -421,6 +409,10 @@ async function getInternalConfig(config, command) {
   const publicDir = resolve6(srcDir, userConfig.publicDir ?? "public");
   const wxtDir = resolve6(srcDir, ".wxt");
   const typesDir = resolve6(wxtDir, "types");
+  const env = { mode, browser, manifestVersion, command };
+  const userManifest = await resolveManifestConfig(env, userConfig.manifest);
+  const inlineManifest = await resolveManifestConfig(env, config.manifest);
+  const manifest = vite.mergeConfig(userManifest, inlineManifest);
   const finalConfig = {
     ...merged,
     srcDir,
@@ -428,7 +420,8 @@ async function getInternalConfig(config, command) {
     publicDir,
     wxtDir,
     typesDir,
-    fsCache: createFsCache(wxtDir)
+    fsCache: createFsCache(wxtDir),
+    manifest
   };
   finalConfig.vite.root = root;
   finalConfig.vite.configFile = false;
@@ -453,10 +446,13 @@ async function getInternalConfig(config, command) {
   });
   return finalConfig;
 }
+async function resolveManifestConfig(env, manifest) {
+  return await (typeof manifest === "function" ? manifest(env) : manifest ?? {});
+}
 
 // src/index.ts
 import pc3 from "picocolors";
-import * as vite6 from "vite";
+import * as vite5 from "vite";
 
 // src/core/utils/arrays.ts
 function every(array, predicate) {
@@ -555,7 +551,7 @@ import { consola as consola2 } from "consola";
 import { relative as relative6 } from "node:path";
 
 // src/core/build/buildEntrypoints.ts
-import * as vite3 from "vite";
+import * as vite2 from "vite";
 
 // src/core/utils/removeEmptyDirs.ts
 import fs4 from "fs-extra";
@@ -617,11 +613,11 @@ async function buildSingleEntrypoint(entrypoint, config) {
       }
     }
   };
-  const entryConfig = vite3.mergeConfig(
+  const entryConfig = vite2.mergeConfig(
     libMode,
     config.vite
   );
-  const result = await vite3.build(entryConfig);
+  const result = await vite2.build(entryConfig);
   return {
     entrypoints: entrypoint,
     chunks: getBuildOutputChunks(result)
@@ -647,11 +643,11 @@ async function buildMultipleEntrypoints(entrypoints, config) {
       }
     }
   };
-  const entryConfig = vite3.mergeConfig(
+  const entryConfig = vite2.mergeConfig(
     multiPage,
     config.vite
   );
-  const result = await vite3.build(entryConfig);
+  const result = await vite2.build(entryConfig);
   return {
     entrypoints,
     chunks: getBuildOutputChunks(result)
@@ -1015,7 +1011,20 @@ async function writeTsConfigFile(mainReference, config) {
     "strict": true,
 
     /* Completeness */
-    "skipLibCheck": true
+    "skipLibCheck": true,
+
+    /* Aliases */
+    "baseUrl": "${relative4(dir, config.root)}",
+    "paths": {
+      "@@": ["."],
+      "@@/*": ["./*"],
+      "~~": ["."],
+      "~~/*": ["./*"],
+      "@": ["${relative4(config.root, config.srcDir)}"],
+      "@/*": ["${relative4(config.root, config.srcDir)}/*"],
+      "~": ["${relative4(config.root, config.srcDir)}"],
+      "~/*": ["${relative4(config.root, config.srcDir)}/*"]
+    }
   },
   "include": [
     "${relative4(dir, config.root)}/**/*",
@@ -1354,7 +1363,7 @@ function addHostPermission(manifest, hostPermission) {
 
 // src/core/build.ts
 import pc2 from "picocolors";
-import * as vite4 from "vite";
+import * as vite3 from "vite";
 import fs11 from "fs-extra";
 
 // src/core/utils/groupEntrypoints.ts
@@ -1403,7 +1412,7 @@ function formatDuration(duration) {
 }
 
 // src/core/log/printBuildSummary.ts
-import path4, { extname as extname3, relative as relative5, resolve as resolve12 } from "path";
+import path4, { relative as relative5, resolve as resolve12 } from "path";
 
 // src/core/log/printTable.ts
 function printTable(log, rows, gap = 2) {
@@ -1440,8 +1449,8 @@ async function printBuildSummary(output, config) {
     ...output.steps.flatMap((step) => step.chunks),
     ...output.publicAssets
   ].sort((l, r) => {
-    const lWeight = CHUNK_SORT_WEIGHTS[l.fileName] ?? CHUNK_SORT_WEIGHTS[extname3(l.fileName)] ?? DEFAULT_SORT_WEIGHT;
-    const rWeight = CHUNK_SORT_WEIGHTS[r.fileName] ?? CHUNK_SORT_WEIGHTS[extname3(r.fileName)] ?? DEFAULT_SORT_WEIGHT;
+    const lWeight = getChunkSortWeight(l.fileName);
+    const rWeight = getChunkSortWeight(r.fileName);
     const diff = lWeight - rWeight;
     if (diff !== 0)
       return diff;
@@ -1454,9 +1463,8 @@ async function printBuildSummary(output, config) {
         relative5(process.cwd(), config.outDir) + path4.sep,
         chunk.fileName
       ];
-      const ext = extname3(chunk.fileName);
       const prefix = i === chunks.length - 1 ? "  \u2514\u2500" : "  \u251C\u2500";
-      const color = CHUNK_COLORS[ext] ?? DEFAULT_COLOR;
+      const color = getChunkColor(chunk.fileName);
       const stats = await fs10.lstat(resolve12(config.outDir, chunk.fileName));
       totalSize += stats.size;
       const size = String(filesize(stats.size));
@@ -1475,15 +1483,25 @@ var DEFAULT_SORT_WEIGHT = 100;
 var CHUNK_SORT_WEIGHTS = {
   "manifest.json": 0,
   ".html": 1,
+  ".js.map": 2,
   ".js": 2,
   ".css": 3
 };
+function getChunkSortWeight(filename) {
+  return Object.entries(CHUNK_SORT_WEIGHTS).find(
+    ([key]) => filename.endsWith(key)
+  )?.[1] ?? DEFAULT_SORT_WEIGHT;
+}
 var DEFAULT_COLOR = pc.blue;
 var CHUNK_COLORS = {
+  ".js.map": pc.gray,
   ".html": pc.green,
   ".css": pc.magenta,
   ".js": pc.cyan
 };
+function getChunkColor(filename) {
+  return Object.entries(CHUNK_COLORS).find(([key]) => filename.endsWith(key))?.[1] ?? DEFAULT_COLOR;
+}
 
 // src/core/build.ts
 async function buildInternal(config) {
@@ -1491,7 +1509,7 @@ async function buildInternal(config) {
   const target = `${config.browser}-mv${config.manifestVersion}`;
   config.logger.info(
     `${verb} ${pc2.cyan(target)} for ${pc2.cyan(config.mode)} with ${pc2.green(
-      `Vite ${vite4.version}`
+      `Vite ${vite3.version}`
     )}`
   );
   const startTime = Date.now();
@@ -1541,7 +1559,7 @@ async function rebuild(config, entrypointGroups, existingOutput = {
 }
 
 // src/core/server.ts
-import * as vite5 from "vite";
+import * as vite4 from "vite";
 
 // src/core/utils/findOpenPort.ts
 import net from "node:net";
@@ -1642,8 +1660,8 @@ async function getServerInfo() {
 }
 async function setupServer(serverInfo, config) {
   const runner = createWebExtRunner();
-  const viteServer = await vite5.createServer(
-    vite5.mergeConfig(serverInfo, config.vite)
+  const viteServer = await vite4.createServer(
+    vite4.mergeConfig(serverInfo, config.vite)
   );
   const start = async () => {
     await viteServer.listen(server.port);
@@ -1709,7 +1727,7 @@ function reloadHtmlPages(groups, server, config) {
 }
 
 // package.json
-var version2 = "0.1.2";
+var version2 = "0.1.4";
 
 // src/core/utils/defineConfig.ts
 function defineConfig(config) {
@@ -1729,7 +1747,7 @@ async function build2(config) {
 async function createServer2(config) {
   const serverInfo = await getServerInfo();
   const getLatestInternalConfig = () => {
-    const viteConfig = vite6.mergeConfig(
+    const viteConfig = vite5.mergeConfig(
       serverInfo.viteServerConfig,
       config?.vite ?? {}
     );