wxt 0.1.1-alpha2 → 0.1.1-alpha3

package/dist/index.d.ts

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

package/dist/index.js

@@ -1,57 +1,20 @@
 // src/core/utils/getInternalConfig.ts
-import path2, { resolve as resolve7 } from "node:path";
+import path2, { resolve as resolve6 } from "node:path";
 import * as vite2 from "vite";
-import { consola as consola2 } from "consola";
-
-// src/core/utils/importTsFile.ts
 import { consola } from "consola";
-import createJITI from "jiti";
-import transform from "jiti/dist/babel";
-import { resolve } from "path";
-import { createUnimport } from "unimport";
-import fs from "fs-extra";
-async function importTsFile(root, path5) {
-  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, "");
-      return transform(opts);
-    }
-  });
-  try {
-    return await jiti(path5);
-  } catch (err) {
-    consola.error(`Failed to import file: ${path5}`);
-    throw err;
-  }
-}
 
 // src/core/vite-plugins/devHtmlPrerender.ts
 import * as vite from "vite";
 
 // src/core/utils/entrypoints.ts
-import path, { relative, resolve as resolve2 } from "node:path";
+import path, { relative, resolve } from "node:path";
 function getEntrypointName(entrypointsDir, inputPath) {
   const relativePath = path.relative(entrypointsDir, inputPath);
   const name = relativePath.split(/[\.\/]/, 2)[0];
   return name;
 }
 function getEntrypointOutputFile(entrypoint, ext) {
-  return resolve2(entrypoint.outputDir, `${entrypoint.name}${ext}`);
+  return resolve(entrypoint.outputDir, `${entrypoint.name}${ext}`);
 }
 function getEntrypointBundlePath(entrypoint, outDir, ext) {
   return relative(outDir, getEntrypointOutputFile(entrypoint, ext));
@@ -59,7 +22,7 @@ function getEntrypointBundlePath(entrypoint, outDir, ext) {
 
 // src/core/vite-plugins/devHtmlPrerender.ts
 import { parseHTML } from "linkedom";
-import { dirname, isAbsolute, relative as relative2, resolve as resolve3 } from "path";
+import { dirname, isAbsolute, relative as relative2, resolve as resolve2 } from "path";
 function devHtmlPrerender(config) {
   return {
     apply: "build",
@@ -69,7 +32,7 @@ function devHtmlPrerender(config) {
         {
           resolve: {
             alias: {
-              "@wxt/reload-html": resolve3(
+              "@wxt/reload-html": resolve2(
                 config.root,
                 "node_modules/wxt/dist/virtual-modules/reload-html.js"
               )
@@ -100,7 +63,7 @@ function devHtmlPrerender(config) {
           if (isAbsolute(src)) {
             element.setAttribute(attr, server.origin + src);
           } else if (src.startsWith(".")) {
-            const abs = resolve3(dirname(id), src);
+            const abs = resolve2(dirname(id), src);
             const pathname = relative2(config.root, abs);
             element.setAttribute(attr, `${server.origin}/${pathname}`);
           }
@@ -210,8 +173,8 @@ function download(config) {
 }
 
 // src/core/vite-plugins/multipageMove.ts
-import { dirname as dirname2, extname, resolve as resolve4 } from "node:path";
-import fs2, { ensureDir } from "fs-extra";
+import { dirname as dirname2, extname, resolve as resolve3 } from "node:path";
+import fs, { ensureDir } from "fs-extra";
 function multipageMove(entrypoints, config) {
   return {
     name: "wxt:multipage-move",
@@ -236,10 +199,10 @@ function multipageMove(entrypoints, config) {
           );
           continue;
         }
-        const oldAbsPath = resolve4(config.outDir, oldBundlePath);
-        const newAbsPath = resolve4(config.outDir, newBundlePath);
+        const oldAbsPath = resolve3(config.outDir, oldBundlePath);
+        const newAbsPath = resolve3(config.outDir, newBundlePath);
         await ensureDir(dirname2(newAbsPath));
-        await fs2.move(oldAbsPath, newAbsPath, { overwrite: true });
+        await fs.move(oldAbsPath, newAbsPath, { overwrite: true });
         const renamedChunk = {
           ...bundle[oldBundlePath],
           fileName: newBundlePath
@@ -252,7 +215,7 @@ function multipageMove(entrypoints, config) {
 }
 
 // src/core/vite-plugins/unimport.ts
-import { createUnimport as createUnimport2 } from "unimport";
+import { createUnimport } from "unimport";
 
 // src/core/utils/auto-imports.ts
 import { mergeConfig as mergeConfig2 } from "vite";
@@ -276,7 +239,7 @@ function getUnimportOptions(config) {
 // src/core/vite-plugins/unimport.ts
 function unimport(config) {
   const options = getUnimportOptions(config);
-  const unimport2 = createUnimport2(options);
+  const unimport2 = createUnimport(options);
   return {
     name: "wxt:unimport",
     async config() {
@@ -289,8 +252,8 @@ function unimport(config) {
 }
 
 // src/core/vite-plugins/virtualEntrypoint.ts
-import fs3 from "fs-extra";
-import { resolve as resolve5 } from "path";
+import fs2 from "fs-extra";
+import { resolve as resolve4 } from "path";
 function virtualEntrypoin(type, config) {
   const virtualId = `virtual:wxt-${type}?`;
   const resolvedVirtualId = `\0${virtualId}`;
@@ -307,8 +270,8 @@ function virtualEntrypoin(type, config) {
       if (!id.startsWith(resolvedVirtualId))
         return;
       const inputPath = id.replace(resolvedVirtualId, "");
-      const template = await fs3.readFile(
-        resolve5(
+      const template = await fs2.readFile(
+        resolve4(
           config.root,
           `node_modules/wxt/dist/virtual-modules/${type}-entrypoint.js`
         ),
@@ -320,20 +283,20 @@ function virtualEntrypoin(type, config) {
 }
 
 // src/core/utils/createFsCache.ts
-import fs4, { ensureDir as ensureDir2 } from "fs-extra";
-import { dirname as dirname3, resolve as resolve6 } from "path";
+import fs3, { ensureDir as ensureDir2 } from "fs-extra";
+import { dirname as dirname3, resolve as resolve5 } from "path";
 function createFsCache(wxtDir) {
-  const getPath = (key) => resolve6(wxtDir, "cache", encodeURIComponent(key));
+  const getPath = (key) => resolve5(wxtDir, "cache", encodeURIComponent(key));
   return {
     async set(key, value) {
       const path5 = getPath(key);
       await ensureDir2(dirname3(path5));
-      await fs4.writeFile(path5, value, "utf-8");
+      await fs3.writeFile(path5, value, "utf-8");
     },
     async get(key) {
       const path5 = getPath(key);
       try {
-        return await fs4.readFile(path5, "utf-8");
+        return await fs3.readFile(path5, "utf-8");
       } catch {
         return void 0;
       }
@@ -396,7 +359,7 @@ async function getInternalConfig(config, command) {
   const manifestVersion = config.manifestVersion ?? (browser == "firefox" ? 2 : 3);
   const outBaseDir = path2.resolve(root, ".output");
   const outDir = path2.resolve(outBaseDir, `${browser}-mv${manifestVersion}`);
-  const logger = config.logger ?? consola2;
+  const logger = config.logger ?? consola;
   const baseConfig = {
     root,
     outDir,
@@ -422,23 +385,25 @@ async function getInternalConfig(config, command) {
     mode
   };
   if (config.configFile !== false) {
-    userConfig = await importTsFile(
-      root,
-      path2.resolve(root, config.configFile ?? "wxt.config.ts")
-    );
+    const loaded = await loadConfig({
+      name: "wxt",
+      cwd: root,
+      rcFile: false
+    });
+    userConfig = loaded.config ?? {};
   }
   const merged = vite2.mergeConfig(
     baseConfig,
     userConfig
   );
-  const srcDir = userConfig.srcDir ? resolve7(root, userConfig.srcDir) : root;
-  const entrypointsDir = resolve7(
+  const srcDir = userConfig.srcDir ? resolve6(root, userConfig.srcDir) : root;
+  const entrypointsDir = resolve6(
     srcDir,
     userConfig.entrypointsDir ?? "entrypoints"
   );
-  const publicDir = resolve7(srcDir, userConfig.publicDir ?? "public");
-  const wxtDir = resolve7(srcDir, ".wxt");
-  const typesDir = resolve7(wxtDir, "types");
+  const publicDir = resolve6(srcDir, userConfig.publicDir ?? "public");
+  const wxtDir = resolve6(srcDir, ".wxt");
+  const typesDir = resolve6(wxtDir, "types");
   const finalConfig = {
     ...merged,
     srcDir,
@@ -576,27 +541,27 @@ import { relative as relative6 } from "node:path";
 import * as vite3 from "vite";
 
 // src/core/utils/removeEmptyDirs.ts
-import fs5 from "fs-extra";
+import fs4 from "fs-extra";
 import path3 from "path";
 async function removeEmptyDirs(dir) {
-  const files = await fs5.readdir(dir);
+  const files = await fs4.readdir(dir);
   for (const file of files) {
     const filePath = path3.join(dir, file);
-    const stats = await fs5.stat(filePath);
+    const stats = await fs4.stat(filePath);
     if (stats.isDirectory()) {
       await removeEmptyDirs(filePath);
     }
   }
   try {
-    await fs5.rmdir(dir);
+    await fs4.rmdir(dir);
   } catch {
   }
 }
 
 // src/core/build/buildEntrypoints.ts
 import glob from "fast-glob";
-import fs6 from "fs-extra";
-import { dirname as dirname4, resolve as resolve8 } from "path";
+import fs5 from "fs-extra";
+import { dirname as dirname4, resolve as resolve7 } from "path";
 async function buildEntrypoints(groups, config) {
   const steps = [];
   for (const group of groups) {
@@ -684,20 +649,20 @@ function getBuildOutputChunks(result) {
 }
 async function copyPublicDirectory(config) {
   const publicAssets = [];
-  if (!await fs6.exists(config.publicDir))
+  if (!await fs5.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 fs6.ensureDir(dirname4(outPath));
-    await fs6.copyFile(srcPath, outPath);
+    const srcPath = resolve7(config.publicDir, file);
+    const outPath = resolve7(config.outDir, file);
+    await fs5.ensureDir(dirname4(outPath));
+    await fs5.copyFile(srcPath, outPath);
     publicAssets.push({
       type: "asset",
       fileName: file,
       name: file,
       needsCodeReference: false,
-      source: await fs6.readFile(srcPath)
+      source: await fs5.readFile(srcPath)
     });
   }
   return publicAssets;
@@ -709,6 +674,54 @@ import fs7 from "fs-extra";
 import picomatch from "picomatch";
 import { parseHTML as parseHTML2 } from "linkedom";
 import JSON5 from "json5";
+
+// src/core/utils/importTsFile.ts
+import { consola as consola2 } from "consola";
+import transform from "jiti/dist/babel";
+import { createUnimport as createUnimport2 } from "unimport";
+import fs6 from "fs-extra";
+import { loadConfig as loadConfig2 } from "c12";
+import { resolve as resolve8 } from "path";
+async function importTsFile(path5, config) {
+  const options = getUnimportOptions(config);
+  const unimport2 = createUnimport2(options);
+  await unimport2.scanImportsFromDir(void 0, { cwd: config.srcDir });
+  const text = await fs6.readFile(path5, "utf-8");
+  const res = await unimport2.injectImports(text, path5);
+  const transformedText = res.code;
+  try {
+    const loaded = await loadConfig2({
+      configFile: path5,
+      rcFile: false,
+      jitiOptions: {
+        cache: false,
+        // esmResolve: true,
+        // interopDefault: true,
+        alias: {
+          "webextension-polyfill": resolve8(
+            config.root,
+            "node_modules/wxt/dist/virtual-modules/fake-browser.js"
+          )
+        },
+        transform(opts) {
+          if (opts.filename === path5)
+            opts.source = transformedText;
+          opts.source = opts.source.replace(
+            /^import.*['"].*\.css['"];?$/gm,
+            ""
+          );
+          return transform(opts);
+        }
+      }
+    });
+    return loaded.config;
+  } catch (err) {
+    consola2.error(`Failed to import file: ${path5}`);
+    throw err;
+  }
+}
+
+// src/core/build/findEntrypoints.ts
 import glob2 from "fast-glob";
 async function findEntrypoints(config) {
   const relativePaths = await glob2("**/*", {
@@ -833,7 +846,7 @@ async function getOptionsEntrypoint(config, path5) {
   };
 }
 async function getBackgroundEntrypoint(config, path5) {
-  const { main: _, ...options } = await importTsFile(config.root, path5);
+  const { main: _, ...options } = await importTsFile(path5, config);
   if (options == null) {
     throw Error("Background script does not have a default export");
   }
@@ -847,8 +860,8 @@ async function getBackgroundEntrypoint(config, path5) {
 }
 async function getContentScriptEntrypoint(config, name, path5) {
   const { main: _, ...options } = await importTsFile(
-    config.root,
-    path5
+    path5,
+    config
   );
   if (options == null) {
     throw Error(`Content script ${name} does not have a default export`);
@@ -1678,7 +1691,7 @@ function reloadHtmlPages(groups, server, config) {
 }
 
 // package.json
-var version2 = "0.1.1-alpha2";
+var version2 = "0.1.1-alpha3";
 
 // src/core/utils/defineConfig.ts
 function defineConfig(config) {