wxt 0.1.0 → 0.1.1-alpha2

package/dist/index.d.ts

@@ -232,7 +232,7 @@ interface ExtensionRunnerConfig {
 
 type EntrypointGroup = Entrypoint | Entrypoint[];
 
-var version = "0.1.0";
+var version = "0.1.1-alpha2";
 
 declare function defineConfig(config: UserConfig): UserConfig;
 

package/dist/index.js

@@ -8,25 +8,27 @@ import { consola } from "consola";
 import createJITI from "jiti";
 import transform from "jiti/dist/babel";
 import { resolve } from "path";
-import { scanExports } from "unimport";
+import { createUnimport } from "unimport";
+import fs from "fs-extra";
 async function importTsFile(root, path5) {
-  const clientImports = await scanExports(
+  const unimport2 = createUnimport({});
+  await unimport2.scanImportsFromFile(
     resolve(root, "node_modules/wxt/dist/client.js")
   );
+  const text = await fs.readFile(path5, "utf-8");
+  const res = await unimport2.injectImports(text, path5);
+  const transformedText = res.code;
   const jiti = createJITI(__filename, {
     cache: false,
     esmResolve: true,
     interopDefault: true,
+    alias: {
+      "webextension-polyfill": "@webext-core/fake-browser"
+    },
     transform(opts) {
+      if (opts.filename === path5)
+        opts.source = transformedText;
       opts.source = opts.source.replace(/^import ['"].*\.css['"];?$/gm, "");
-      opts.source = opts.source.replace(
-        /^import\s+.*\s+from ['"]webextension-polyfill['"];?$/gm,
-        ""
-      );
-      if (opts.filename === path5) {
-        const imports = clientImports.map((i) => `import { ${i.name} } from "${i.from}";`).join("\n") + "\n";
-        opts.source = imports + opts.source;
-      }
       return transform(opts);
     }
   });
@@ -209,7 +211,7 @@ function download(config) {
 
 // src/core/vite-plugins/multipageMove.ts
 import { dirname as dirname2, extname, resolve as resolve4 } from "node:path";
-import fs, { ensureDir } from "fs-extra";
+import fs2, { ensureDir } from "fs-extra";
 function multipageMove(entrypoints, config) {
   return {
     name: "wxt:multipage-move",
@@ -237,7 +239,7 @@ function multipageMove(entrypoints, config) {
         const oldAbsPath = resolve4(config.outDir, oldBundlePath);
         const newAbsPath = resolve4(config.outDir, newBundlePath);
         await ensureDir(dirname2(newAbsPath));
-        await fs.move(oldAbsPath, newAbsPath, { overwrite: true });
+        await fs2.move(oldAbsPath, newAbsPath, { overwrite: true });
         const renamedChunk = {
           ...bundle[oldBundlePath],
           fileName: newBundlePath
@@ -250,7 +252,7 @@ function multipageMove(entrypoints, config) {
 }
 
 // src/core/vite-plugins/unimport.ts
-import { createUnimport } from "unimport";
+import { createUnimport as createUnimport2 } from "unimport";
 
 // src/core/utils/auto-imports.ts
 import { mergeConfig as mergeConfig2 } from "vite";
@@ -274,7 +276,7 @@ function getUnimportOptions(config) {
 // src/core/vite-plugins/unimport.ts
 function unimport(config) {
   const options = getUnimportOptions(config);
-  const unimport2 = createUnimport(options);
+  const unimport2 = createUnimport2(options);
   return {
     name: "wxt:unimport",
     async config() {
@@ -287,7 +289,7 @@ function unimport(config) {
 }
 
 // src/core/vite-plugins/virtualEntrypoint.ts
-import fs2 from "fs-extra";
+import fs3 from "fs-extra";
 import { resolve as resolve5 } from "path";
 function virtualEntrypoin(type, config) {
   const virtualId = `virtual:wxt-${type}?`;
@@ -305,7 +307,7 @@ function virtualEntrypoin(type, config) {
       if (!id.startsWith(resolvedVirtualId))
         return;
       const inputPath = id.replace(resolvedVirtualId, "");
-      const template = await fs2.readFile(
+      const template = await fs3.readFile(
         resolve5(
           config.root,
           `node_modules/wxt/dist/virtual-modules/${type}-entrypoint.js`
@@ -318,7 +320,7 @@ function virtualEntrypoin(type, config) {
 }
 
 // src/core/utils/createFsCache.ts
-import fs3, { ensureDir as ensureDir2 } from "fs-extra";
+import fs4, { ensureDir as ensureDir2 } from "fs-extra";
 import { dirname as dirname3, resolve as resolve6 } from "path";
 function createFsCache(wxtDir) {
   const getPath = (key) => resolve6(wxtDir, "cache", encodeURIComponent(key));
@@ -326,12 +328,12 @@ function createFsCache(wxtDir) {
     async set(key, value) {
       const path5 = getPath(key);
       await ensureDir2(dirname3(path5));
-      await fs3.writeFile(path5, value, "utf-8");
+      await fs4.writeFile(path5, value, "utf-8");
     },
     async get(key) {
       const path5 = getPath(key);
       try {
-        return await fs3.readFile(path5, "utf-8");
+        return await fs4.readFile(path5, "utf-8");
       } catch {
         return void 0;
       }
@@ -574,26 +576,26 @@ import { relative as relative6 } from "node:path";
 import * as vite3 from "vite";
 
 // src/core/utils/removeEmptyDirs.ts
-import fs4 from "fs-extra";
+import fs5 from "fs-extra";
 import path3 from "path";
 async function removeEmptyDirs(dir) {
-  const files = await fs4.readdir(dir);
+  const files = await fs5.readdir(dir);
   for (const file of files) {
     const filePath = path3.join(dir, file);
-    const stats = await fs4.stat(filePath);
+    const stats = await fs5.stat(filePath);
     if (stats.isDirectory()) {
       await removeEmptyDirs(filePath);
     }
   }
   try {
-    await fs4.rmdir(dir);
+    await fs5.rmdir(dir);
   } catch {
   }
 }
 
 // src/core/build/buildEntrypoints.ts
 import glob from "fast-glob";
-import fs5 from "fs-extra";
+import fs6 from "fs-extra";
 import { dirname as dirname4, resolve as resolve8 } from "path";
 async function buildEntrypoints(groups, config) {
   const steps = [];
@@ -682,20 +684,20 @@ function getBuildOutputChunks(result) {
 }
 async function copyPublicDirectory(config) {
   const publicAssets = [];
-  if (!await fs5.exists(config.publicDir))
+  if (!await fs6.exists(config.publicDir))
     return publicAssets;
   const files = await glob("**/*", { cwd: config.publicDir });
   for (const file of files) {
     const srcPath = resolve8(config.publicDir, file);
     const outPath = resolve8(config.outDir, file);
-    await fs5.ensureDir(dirname4(outPath));
-    await fs5.copyFile(srcPath, outPath);
+    await fs6.ensureDir(dirname4(outPath));
+    await fs6.copyFile(srcPath, outPath);
     publicAssets.push({
       type: "asset",
       fileName: file,
       name: file,
       needsCodeReference: false,
-      source: await fs5.readFile(srcPath)
+      source: await fs6.readFile(srcPath)
     });
   }
   return publicAssets;
@@ -703,7 +705,7 @@ async function copyPublicDirectory(config) {
 
 // src/core/build/findEntrypoints.ts
 import { relative as relative3, resolve as resolve9 } from "path";
-import fs6 from "fs-extra";
+import fs7 from "fs-extra";
 import picomatch from "picomatch";
 import { parseHTML as parseHTML2 } from "linkedom";
 import JSON5 from "json5";
@@ -778,7 +780,7 @@ ${JSON.stringify(
 }
 async function getPopupEntrypoint(config, path5) {
   const options = {};
-  const content = await fs6.readFile(path5, "utf-8");
+  const content = await fs7.readFile(path5, "utf-8");
   const { document } = parseHTML2(content);
   const title = document.querySelector("title");
   if (title != null)
@@ -808,7 +810,7 @@ async function getPopupEntrypoint(config, path5) {
 }
 async function getOptionsEntrypoint(config, path5) {
   const options = {};
-  const content = await fs6.readFile(path5, "utf-8");
+  const content = await fs7.readFile(path5, "utf-8");
   const { document } = parseHTML2(content);
   const openInTabContent = document.querySelector("meta[name='manifest.open_in_tab']")?.getAttribute("content");
   if (openInTabContent) {
@@ -891,11 +893,11 @@ var PATH_GLOB_TO_TYPE_MAP = {
 };
 
 // src/core/build/generateTypesDir.ts
-import { createUnimport as createUnimport2 } from "unimport";
-import fs7 from "fs-extra";
+import { createUnimport as createUnimport3 } from "unimport";
+import fs8 from "fs-extra";
 import { relative as relative4, resolve as resolve10 } from "path";
 async function generateTypesDir(entrypoints, config) {
-  await fs7.ensureDir(config.typesDir);
+  await fs8.ensureDir(config.typesDir);
   const references = [];
   references.push(await writeImportsDeclarationFile(config));
   references.push(await writePathsDeclarationFile(entrypoints, config));
@@ -905,9 +907,9 @@ async function generateTypesDir(entrypoints, config) {
 }
 async function writeImportsDeclarationFile(config) {
   const filePath = resolve10(config.typesDir, "imports.d.ts");
-  const unimport2 = createUnimport2(getUnimportOptions(config));
+  const unimport2 = createUnimport3(getUnimportOptions(config));
   await unimport2.scanImportsFromDir(void 0, { cwd: config.srcDir });
-  await fs7.writeFile(
+  await fs8.writeFile(
     filePath,
     ["// Generated by wxt", await unimport2.generateTypeDeclarations()].join(
       "\n"
@@ -917,7 +919,7 @@ async function writeImportsDeclarationFile(config) {
 }
 async function writePathsDeclarationFile(entrypoints, config) {
   const filePath = resolve10(config.typesDir, "paths.d.ts");
-  await fs7.writeFile(
+  await fs8.writeFile(
     filePath,
     [
       "// Generated by wxt",
@@ -937,7 +939,7 @@ async function writePathsDeclarationFile(entrypoints, config) {
 async function writeGlobalsDeclarationFile(config) {
   const filePath = resolve10(config.typesDir, "globals.d.ts");
   const globals = getGlobals(config);
-  await fs7.writeFile(
+  await fs8.writeFile(
     filePath,
     [
       "// Generated by wxt",
@@ -953,7 +955,7 @@ async function writeGlobalsDeclarationFile(config) {
 async function writeMainDeclarationFile(references, config) {
   const dir = config.wxtDir;
   const filePath = resolve10(dir, "wxt.d.ts");
-  await fs7.writeFile(
+  await fs8.writeFile(
     filePath,
     [
       "// Generated by wxt",
@@ -966,7 +968,7 @@ async function writeMainDeclarationFile(references, config) {
 }
 async function writeTsConfigFile(mainReference, config) {
   const dir = config.wxtDir;
-  await fs7.writeFile(
+  await fs8.writeFile(
     resolve10(dir, "tsconfig.json"),
     `{
   "compilerOptions": {
@@ -994,7 +996,7 @@ async function writeTsConfigFile(mainReference, config) {
 }
 
 // src/core/utils/manifest.ts
-import fs8 from "fs-extra";
+import fs9 from "fs-extra";
 import { resolve as resolve11 } from "path";
 
 // src/core/utils/ContentSecurityPolicy.ts
@@ -1043,8 +1045,8 @@ var ContentSecurityPolicy = class _ContentSecurityPolicy {
 // src/core/utils/manifest.ts
 async function writeManifest(manifest, output, config) {
   const str = config.mode === "production" ? JSON.stringify(manifest) : JSON.stringify(manifest, null, 2);
-  await fs8.ensureDir(config.outDir);
-  await fs8.writeFile(resolve11(config.outDir, "manifest.json"), str, "utf-8");
+  await fs9.ensureDir(config.outDir);
+  await fs9.writeFile(resolve11(config.outDir, "manifest.json"), str, "utf-8");
   output.publicAssets.unshift({
     type: "asset",
     fileName: "manifest.json",
@@ -1077,7 +1079,7 @@ async function generateMainfest(entrypoints, buildOutput, config) {
   return manifest;
 }
 async function getPackageJson(config) {
-  return await fs8.readJson(resolve11(config.root, "package.json"));
+  return await fs9.readJson(resolve11(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(
@@ -1322,7 +1324,7 @@ function addHostPermission(manifest, hostPermission) {
 // src/core/build.ts
 import pc2 from "picocolors";
 import * as vite4 from "vite";
-import fs10 from "fs-extra";
+import fs11 from "fs-extra";
 
 // src/core/utils/groupEntrypoints.ts
 function groupEntrypoints(entrypoints) {
@@ -1400,7 +1402,7 @@ function printTable(log, rows, gap = 2) {
 
 // src/core/log/printBuildSummary.ts
 import pc from "picocolors";
-import fs9 from "fs-extra";
+import fs10 from "fs-extra";
 import { filesize } from "filesize";
 async function printBuildSummary(output, config) {
   const chunks = [
@@ -1424,7 +1426,7 @@ async function printBuildSummary(output, config) {
       const ext = extname2(chunk.fileName);
       const prefix = i === chunks.length - 1 ? "  \u2514\u2500" : "  \u251C\u2500";
       const color = CHUNK_COLORS[ext] ?? DEFAULT_COLOR;
-      const stats = await fs9.lstat(resolve12(config.outDir, chunk.fileName));
+      const stats = await fs10.lstat(resolve12(config.outDir, chunk.fileName));
       totalSize += stats.size;
       const size = String(filesize(stats.size));
       return [
@@ -1462,8 +1464,8 @@ async function buildInternal(config) {
     )}`
   );
   const startTime = Date.now();
-  await fs10.rm(config.outDir, { recursive: true, force: true });
-  await fs10.ensureDir(config.outDir);
+  await fs11.rm(config.outDir, { recursive: true, force: true });
+  await fs11.ensureDir(config.outDir);
   const entrypoints = await findEntrypoints(config);
   const groups = groupEntrypoints(entrypoints);
   const { output } = await rebuild(config, groups);
@@ -1676,7 +1678,7 @@ function reloadHtmlPages(groups, server, config) {
 }
 
 // package.json
-var version2 = "0.1.0";
+var version2 = "0.1.1-alpha2";
 
 // src/core/utils/defineConfig.ts
 function defineConfig(config) {