wxt 0.1.2 → 0.1.3

package/dist/index.d.ts

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

package/dist/index.js

@@ -371,12 +371,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 +382,6 @@ async function getInternalConfig(config, command) {
     command,
     logger,
     vite: config.vite ?? {},
-    manifest,
     imports: config.imports ?? {},
     runnerConfig: await loadConfig({
       name: "web-ext",
@@ -421,6 +414,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 = vite2.mergeConfig(userManifest, inlineManifest);
   const finalConfig = {
     ...merged,
     srcDir,
@@ -428,7 +425,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,6 +451,9 @@ 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";
@@ -1015,7 +1016,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)}/**/*",
@@ -1403,7 +1417,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 +1454,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 +1468,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 +1488,29 @@ 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, value]) => {
+    if (filename.endsWith(key))
+      return value;
+  })?.[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, value]) => {
+    if (filename.endsWith(key))
+      return value;
+  })?.[1] ?? DEFAULT_COLOR;
+}
 
 // src/core/build.ts
 async function buildInternal(config) {
@@ -1709,7 +1736,7 @@ function reloadHtmlPages(groups, server, config) {
 }
 
 // package.json
-var version2 = "0.1.2";
+var version2 = "0.1.3";
 
 // src/core/utils/defineConfig.ts
 function defineConfig(config) {