wxt 0.1.1 → 0.1.3

package/dist/index.cjs

@@ -277,6 +277,15 @@ function getUnimportOptions(config) {
 }
 
 // src/core/vite-plugins/unimport.ts
+var import_path2 = require("path");
+var ENABLED_EXTENSIONS = {
+  ".js": true,
+  ".jsx": true,
+  ".ts": true,
+  ".tsx": true,
+  ".vue": true,
+  ".svelte": true
+};
 function unimport(config) {
   const options = getUnimportOptions(config);
   const unimport2 = (0, import_unimport.createUnimport)(options);
@@ -286,14 +295,16 @@ function unimport(config) {
       await unimport2.scanImportsFromDir(void 0, { cwd: config.srcDir });
     },
     async transform(code, id) {
-      return unimport2.injectImports(code, id);
+      const ext = (0, import_path2.extname)(id);
+      if (ENABLED_EXTENSIONS[ext])
+        return unimport2.injectImports(code, id);
     }
   };
 }
 
 // src/core/vite-plugins/virtualEntrypoint.ts
 var import_fs_extra2 = __toESM(require("fs-extra"), 1);
-var import_path2 = require("path");
+var import_path3 = require("path");
 function virtualEntrypoin(type, config) {
   const virtualId = `virtual:wxt-${type}?`;
   const resolvedVirtualId = `\0${virtualId}`;
@@ -311,7 +322,7 @@ function virtualEntrypoin(type, config) {
         return;
       const inputPath = id.replace(resolvedVirtualId, "");
       const template = await import_fs_extra2.default.readFile(
-        (0, import_path2.resolve)(
+        (0, import_path3.resolve)(
           config.root,
           `node_modules/wxt/dist/virtual-modules/${type}-entrypoint.js`
         ),
@@ -324,13 +335,13 @@ function virtualEntrypoin(type, config) {
 
 // src/core/utils/createFsCache.ts
 var import_fs_extra3 = __toESM(require("fs-extra"), 1);
-var import_path3 = require("path");
+var import_path4 = require("path");
 function createFsCache(wxtDir) {
-  const getPath = (key) => (0, import_path3.resolve)(wxtDir, "cache", encodeURIComponent(key));
+  const getPath = (key) => (0, import_path4.resolve)(wxtDir, "cache", encodeURIComponent(key));
   return {
     async set(key, value) {
       const path5 = getPath(key);
-      await (0, import_fs_extra3.ensureDir)((0, import_path3.dirname)(path5));
+      await (0, import_fs_extra3.ensureDir)((0, import_path4.dirname)(path5));
       await import_fs_extra3.default.writeFile(path5, value, "utf-8");
     },
     async get(key) {
@@ -411,7 +422,6 @@ async function getInternalConfig(config, command) {
     command,
     logger,
     vite: config.vite ?? {},
-    manifest: config.manifest ?? {},
     imports: config.imports ?? {},
     runnerConfig: await (0, import_c12.loadConfig)({
       name: "web-ext",
@@ -444,6 +454,10 @@ async function getInternalConfig(config, command) {
   const publicDir = (0, import_node_path3.resolve)(srcDir, userConfig.publicDir ?? "public");
   const wxtDir = (0, import_node_path3.resolve)(srcDir, ".wxt");
   const typesDir = (0, import_node_path3.resolve)(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,
@@ -451,7 +465,8 @@ async function getInternalConfig(config, command) {
     publicDir,
     wxtDir,
     typesDir,
-    fsCache: createFsCache(wxtDir)
+    fsCache: createFsCache(wxtDir),
+    manifest
   };
   finalConfig.vite.root = root;
   finalConfig.vite.configFile = false;
@@ -476,6 +491,9 @@ async function getInternalConfig(config, command) {
   });
   return finalConfig;
 }
+async function resolveManifestConfig(env, manifest) {
+  return await (typeof manifest === "function" ? manifest(env) : manifest ?? {});
+}
 
 // src/index.ts
 var import_picocolors3 = __toESM(require("picocolors"), 1);
@@ -582,11 +600,11 @@ var vite3 = __toESM(require("vite"), 1);
 
 // src/core/utils/removeEmptyDirs.ts
 var import_fs_extra4 = __toESM(require("fs-extra"), 1);
-var import_path4 = __toESM(require("path"), 1);
+var import_path5 = __toESM(require("path"), 1);
 async function removeEmptyDirs(dir) {
   const files = await import_fs_extra4.default.readdir(dir);
   for (const file of files) {
-    const filePath = import_path4.default.join(dir, file);
+    const filePath = import_path5.default.join(dir, file);
     const stats = await import_fs_extra4.default.stat(filePath);
     if (stats.isDirectory()) {
       await removeEmptyDirs(filePath);
@@ -601,7 +619,7 @@ async function removeEmptyDirs(dir) {
 // src/core/build/buildEntrypoints.ts
 var import_fast_glob = __toESM(require("fast-glob"), 1);
 var import_fs_extra5 = __toESM(require("fs-extra"), 1);
-var import_path5 = require("path");
+var import_path6 = require("path");
 async function buildEntrypoints(groups, config) {
   const steps = [];
   for (const group of groups) {
@@ -693,9 +711,9 @@ async function copyPublicDirectory(config) {
     return publicAssets;
   const files = await (0, import_fast_glob.default)("**/*", { cwd: config.publicDir });
   for (const file of files) {
-    const srcPath = (0, import_path5.resolve)(config.publicDir, file);
-    const outPath = (0, import_path5.resolve)(config.outDir, file);
-    await import_fs_extra5.default.ensureDir((0, import_path5.dirname)(outPath));
+    const srcPath = (0, import_path6.resolve)(config.publicDir, file);
+    const outPath = (0, import_path6.resolve)(config.outDir, file);
+    await import_fs_extra5.default.ensureDir((0, import_path6.dirname)(outPath));
     await import_fs_extra5.default.copyFile(srcPath, outPath);
     publicAssets.push({
       type: "asset",
@@ -709,7 +727,7 @@ async function copyPublicDirectory(config) {
 }
 
 // src/core/build/findEntrypoints.ts
-var import_path7 = require("path");
+var import_path8 = require("path");
 var import_fs_extra7 = __toESM(require("fs-extra"), 1);
 var import_picomatch = __toESM(require("picomatch"), 1);
 var import_linkedom2 = require("linkedom");
@@ -719,7 +737,7 @@ var import_json5 = __toESM(require("json5"), 1);
 var import_jiti = __toESM(require("jiti"), 1);
 var import_unimport2 = require("unimport");
 var import_fs_extra6 = __toESM(require("fs-extra"), 1);
-var import_path6 = require("path");
+var import_path7 = require("path");
 var import_babel = __toESM(require("jiti/dist/babel"), 1);
 async function importTsFile(path5, config) {
   config.logger.debug("Loading file metadata:", path5);
@@ -741,7 +759,7 @@ async function importTsFile(path5, config) {
     esmResolve: true,
     interopDefault: true,
     alias: {
-      "webextension-polyfill": (0, import_path6.resolve)(
+      "webextension-polyfill": (0, import_path7.resolve)(
         config.root,
         "node_modules/wxt/dist/virtual-modules/fake-browser.js"
       )
@@ -773,7 +791,7 @@ async function findEntrypoints(config) {
   const entrypoints = [];
   await Promise.all(
     relativePaths.map(async (relativePath) => {
-      const path5 = (0, import_path7.resolve)(config.entrypointsDir, relativePath);
+      const path5 = (0, import_path8.resolve)(config.entrypointsDir, relativePath);
       const matchingGlob = pathGlobs.find(
         (glob3) => import_picomatch.default.isMatch(relativePath, glob3)
       );
@@ -820,8 +838,8 @@ ${JSON.stringify(
       if (withSameName) {
         throw Error(
           `Multiple entrypoints with the name "${entrypoint.name}" detected, but only one is allowed: ${[
-            (0, import_path7.relative)(config.root, withSameName.inputPath),
-            (0, import_path7.relative)(config.root, entrypoint.inputPath)
+            (0, import_path8.relative)(config.root, withSameName.inputPath),
+            (0, import_path8.relative)(config.root, entrypoint.inputPath)
           ].join(", ")}`
         );
       }
@@ -910,7 +928,7 @@ async function getContentScriptEntrypoint(config, name, path5) {
     type: "content-script",
     name: getEntrypointName(config.entrypointsDir, path5),
     inputPath: path5,
-    outputDir: (0, import_path7.resolve)(config.outDir, "content-scripts"),
+    outputDir: (0, import_path8.resolve)(config.outDir, "content-scripts"),
     options
   };
 }
@@ -948,7 +966,7 @@ var PATH_GLOB_TO_TYPE_MAP = {
 // src/core/build/generateTypesDir.ts
 var import_unimport3 = require("unimport");
 var import_fs_extra8 = __toESM(require("fs-extra"), 1);
-var import_path8 = require("path");
+var import_path9 = require("path");
 async function generateTypesDir(entrypoints, config) {
   await import_fs_extra8.default.ensureDir(config.typesDir);
   const references = [];
@@ -959,7 +977,7 @@ async function generateTypesDir(entrypoints, config) {
   await writeTsConfigFile(mainReference, config);
 }
 async function writeImportsDeclarationFile(config) {
-  const filePath = (0, import_path8.resolve)(config.typesDir, "imports.d.ts");
+  const filePath = (0, import_path9.resolve)(config.typesDir, "imports.d.ts");
   const unimport2 = (0, import_unimport3.createUnimport)(getUnimportOptions(config));
   await unimport2.scanImportsFromDir(void 0, { cwd: config.srcDir });
   await import_fs_extra8.default.writeFile(
@@ -971,26 +989,27 @@ async function writeImportsDeclarationFile(config) {
   return filePath;
 }
 async function writePathsDeclarationFile(entrypoints, config) {
-  const filePath = (0, import_path8.resolve)(config.typesDir, "paths.d.ts");
+  const filePath = (0, import_path9.resolve)(config.typesDir, "paths.d.ts");
+  const unions = entrypoints.map((entry) => {
+    const path5 = getEntrypointBundlePath(
+      entry,
+      config.outDir,
+      entry.inputPath.endsWith(".html") ? ".html" : ".js"
+    );
+    return `  | "/${path5}"`;
+  }).sort();
   await import_fs_extra8.default.writeFile(
     filePath,
     [
       "// Generated by wxt",
       "type EntrypointPath =",
-      ...entrypoints.map((entry) => {
-        const path5 = getEntrypointBundlePath(
-          entry,
-          config.outDir,
-          entry.inputPath.endsWith(".html") ? ".html" : ".js"
-        );
-        return `  | "/${path5}"`;
-      }).sort()
+      ...unions.length === 0 ? ["  never"] : unions
     ].join("\n") + "\n"
   );
   return filePath;
 }
 async function writeGlobalsDeclarationFile(config) {
-  const filePath = (0, import_path8.resolve)(config.typesDir, "globals.d.ts");
+  const filePath = (0, import_path9.resolve)(config.typesDir, "globals.d.ts");
   const globals = getGlobals(config);
   await import_fs_extra8.default.writeFile(
     filePath,
@@ -1007,13 +1026,13 @@ async function writeGlobalsDeclarationFile(config) {
 }
 async function writeMainDeclarationFile(references, config) {
   const dir = config.wxtDir;
-  const filePath = (0, import_path8.resolve)(dir, "wxt.d.ts");
+  const filePath = (0, import_path9.resolve)(dir, "wxt.d.ts");
   await import_fs_extra8.default.writeFile(
     filePath,
     [
       "// Generated by wxt",
       ...references.map(
-        (ref) => `/// <reference types="./${(0, import_path8.relative)(dir, ref)}" />`
+        (ref) => `/// <reference types="./${(0, import_path9.relative)(dir, ref)}" />`
       )
     ].join("\n") + "\n"
   );
@@ -1022,7 +1041,7 @@ async function writeMainDeclarationFile(references, config) {
 async function writeTsConfigFile(mainReference, config) {
   const dir = config.wxtDir;
   await import_fs_extra8.default.writeFile(
-    (0, import_path8.resolve)(dir, "tsconfig.json"),
+    (0, import_path9.resolve)(dir, "tsconfig.json"),
     `{
   "compilerOptions": {
     "target": "ESNext",
@@ -1037,20 +1056,33 @@ async function writeTsConfigFile(mainReference, config) {
     "strict": true,
 
     /* Completeness */
-    "skipLibCheck": true
+    "skipLibCheck": true,
+
+    /* Aliases */
+    "baseUrl": "${(0, import_path9.relative)(dir, config.root)}",
+    "paths": {
+      "@@": ["."],
+      "@@/*": ["./*"],
+      "~~": ["."],
+      "~~/*": ["./*"],
+      "@": ["${(0, import_path9.relative)(config.root, config.srcDir)}"],
+      "@/*": ["${(0, import_path9.relative)(config.root, config.srcDir)}/*"],
+      "~": ["${(0, import_path9.relative)(config.root, config.srcDir)}"],
+      "~/*": ["${(0, import_path9.relative)(config.root, config.srcDir)}/*"]
+    }
   },
   "include": [
-    "${(0, import_path8.relative)(dir, config.root)}/**/*",
-    "./${(0, import_path8.relative)(dir, mainReference)}"
+    "${(0, import_path9.relative)(dir, config.root)}/**/*",
+    "./${(0, import_path9.relative)(dir, mainReference)}"
   ],
-  "exclude": ["${(0, import_path8.relative)(dir, config.outBaseDir)}"]
+  "exclude": ["${(0, import_path9.relative)(dir, config.outBaseDir)}"]
 }`
   );
 }
 
 // src/core/utils/manifest.ts
 var import_fs_extra9 = __toESM(require("fs-extra"), 1);
-var import_path9 = require("path");
+var import_path10 = require("path");
 
 // src/core/utils/ContentSecurityPolicy.ts
 var ContentSecurityPolicy = class _ContentSecurityPolicy {
@@ -1099,7 +1131,7 @@ var ContentSecurityPolicy = class _ContentSecurityPolicy {
 async function writeManifest(manifest, output, config) {
   const str = config.mode === "production" ? JSON.stringify(manifest) : JSON.stringify(manifest, null, 2);
   await import_fs_extra9.default.ensureDir(config.outDir);
-  await import_fs_extra9.default.writeFile((0, import_path9.resolve)(config.outDir, "manifest.json"), str, "utf-8");
+  await import_fs_extra9.default.writeFile((0, import_path10.resolve)(config.outDir, "manifest.json"), str, "utf-8");
   output.publicAssets.unshift({
     type: "asset",
     fileName: "manifest.json",
@@ -1132,7 +1164,7 @@ async function generateMainfest(entrypoints, buildOutput, config) {
   return manifest;
 }
 async function getPackageJson(config) {
-  return await import_fs_extra9.default.readJson((0, import_path9.resolve)(config.root, "package.json"));
+  return await import_fs_extra9.default.readJson((0, import_path10.resolve)(config.root, "package.json"));
 }
 function simplifyVersion(versionName) {
   const version3 = /^((0|[1-9][0-9]{0,8})([.](0|[1-9][0-9]{0,8})){0,3}).*$/.exec(
@@ -1425,7 +1457,7 @@ function formatDuration(duration) {
 }
 
 // src/core/log/printBuildSummary.ts
-var import_path10 = __toESM(require("path"), 1);
+var import_path11 = __toESM(require("path"), 1);
 
 // src/core/log/printTable.ts
 function printTable(log, rows, gap = 2) {
@@ -1462,8 +1494,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[(0, import_path10.extname)(l.fileName)] ?? DEFAULT_SORT_WEIGHT;
-    const rWeight = CHUNK_SORT_WEIGHTS[r.fileName] ?? CHUNK_SORT_WEIGHTS[(0, import_path10.extname)(r.fileName)] ?? DEFAULT_SORT_WEIGHT;
+    const lWeight = getChunkSortWeight(l.fileName);
+    const rWeight = getChunkSortWeight(r.fileName);
     const diff = lWeight - rWeight;
     if (diff !== 0)
       return diff;
@@ -1473,13 +1505,12 @@ async function printBuildSummary(output, config) {
   const chunkRows = await Promise.all(
     chunks.map(async (chunk, i) => {
       const file = [
-        (0, import_path10.relative)(process.cwd(), config.outDir) + import_path10.default.sep,
+        (0, import_path11.relative)(process.cwd(), config.outDir) + import_path11.default.sep,
         chunk.fileName
       ];
-      const ext = (0, import_path10.extname)(chunk.fileName);
       const prefix = i === chunks.length - 1 ? "  \u2514\u2500" : "  \u251C\u2500";
-      const color = CHUNK_COLORS[ext] ?? DEFAULT_COLOR;
-      const stats = await import_fs_extra10.default.lstat((0, import_path10.resolve)(config.outDir, chunk.fileName));
+      const color = getChunkColor(chunk.fileName);
+      const stats = await import_fs_extra10.default.lstat((0, import_path11.resolve)(config.outDir, chunk.fileName));
       totalSize += stats.size;
       const size = String((0, import_filesize.filesize)(stats.size));
       return [
@@ -1497,15 +1528,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 = import_picocolors.default.blue;
 var CHUNK_COLORS = {
+  ".js.map": import_picocolors.default.gray,
   ".html": import_picocolors.default.green,
   ".css": import_picocolors.default.magenta,
   ".js": import_picocolors.default.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) {
@@ -1731,7 +1776,7 @@ function reloadHtmlPages(groups, server, config) {
 }
 
 // package.json
-var version2 = "0.1.1";
+var version2 = "0.1.3";
 
 // src/core/utils/defineConfig.ts
 function defineConfig(config) {