wxt 0.1.1-alpha2 → 0.1.1-alpha4

package/dist/index.cjs

@@ -41,44 +41,7 @@ module.exports = __toCommonJS(src_exports);
 // src/core/utils/getInternalConfig.ts
 var import_node_path3 = __toESM(require("path"), 1);
 var vite2 = __toESM(require("vite"), 1);
-var import_consola2 = require("consola");
-
-// src/core/utils/importTsFile.ts
 var import_consola = require("consola");
-var import_jiti = __toESM(require("jiti"), 1);
-var import_babel = __toESM(require("jiti/dist/babel"), 1);
-var import_path = require("path");
-var import_unimport = require("unimport");
-var import_fs_extra = __toESM(require("fs-extra"), 1);
-async function importTsFile(root, path5) {
-  const unimport2 = (0, import_unimport.createUnimport)({});
-  await unimport2.scanImportsFromFile(
-    (0, import_path.resolve)(root, "node_modules/wxt/dist/client.js")
-  );
-  const text = await import_fs_extra.default.readFile(path5, "utf-8");
-  const res = await unimport2.injectImports(text, path5);
-  const transformedText = res.code;
-  const jiti = (0, import_jiti.default)(__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 (0, import_babel.default)(opts);
-    }
-  });
-  try {
-    return await jiti(path5);
-  } catch (err) {
-    import_consola.consola.error(`Failed to import file: ${path5}`);
-    throw err;
-  }
-}
 
 // src/core/vite-plugins/devHtmlPrerender.ts
 var vite = __toESM(require("vite"), 1);
@@ -99,7 +62,7 @@ function getEntrypointBundlePath(entrypoint, outDir, ext) {
 
 // src/core/vite-plugins/devHtmlPrerender.ts
 var import_linkedom = require("linkedom");
-var import_path2 = require("path");
+var import_path = require("path");
 function devHtmlPrerender(config) {
   return {
     apply: "build",
@@ -109,7 +72,7 @@ function devHtmlPrerender(config) {
         {
           resolve: {
             alias: {
-              "@wxt/reload-html": (0, import_path2.resolve)(
+              "@wxt/reload-html": (0, import_path.resolve)(
                 config.root,
                 "node_modules/wxt/dist/virtual-modules/reload-html.js"
               )
@@ -137,11 +100,11 @@ function devHtmlPrerender(config) {
           const src = element.getAttribute(attr);
           if (!src)
             return;
-          if ((0, import_path2.isAbsolute)(src)) {
+          if ((0, import_path.isAbsolute)(src)) {
             element.setAttribute(attr, server.origin + src);
           } else if (src.startsWith(".")) {
-            const abs = (0, import_path2.resolve)((0, import_path2.dirname)(id), src);
-            const pathname = (0, import_path2.relative)(config.root, abs);
+            const abs = (0, import_path.resolve)((0, import_path.dirname)(id), src);
+            const pathname = (0, import_path.relative)(config.root, abs);
             element.setAttribute(attr, `${server.origin}/${pathname}`);
           }
         });
@@ -251,7 +214,7 @@ function download(config) {
 
 // src/core/vite-plugins/multipageMove.ts
 var import_node_path2 = require("path");
-var import_fs_extra2 = __toESM(require("fs-extra"), 1);
+var import_fs_extra = __toESM(require("fs-extra"), 1);
 function multipageMove(entrypoints, config) {
   return {
     name: "wxt:multipage-move",
@@ -278,8 +241,8 @@ function multipageMove(entrypoints, config) {
         }
         const oldAbsPath = (0, import_node_path2.resolve)(config.outDir, oldBundlePath);
         const newAbsPath = (0, import_node_path2.resolve)(config.outDir, newBundlePath);
-        await (0, import_fs_extra2.ensureDir)((0, import_node_path2.dirname)(newAbsPath));
-        await import_fs_extra2.default.move(oldAbsPath, newAbsPath, { overwrite: true });
+        await (0, import_fs_extra.ensureDir)((0, import_node_path2.dirname)(newAbsPath));
+        await import_fs_extra.default.move(oldAbsPath, newAbsPath, { overwrite: true });
         const renamedChunk = {
           ...bundle[oldBundlePath],
           fileName: newBundlePath
@@ -292,7 +255,7 @@ function multipageMove(entrypoints, config) {
 }
 
 // src/core/vite-plugins/unimport.ts
-var import_unimport2 = require("unimport");
+var import_unimport = require("unimport");
 
 // src/core/utils/auto-imports.ts
 var import_vite = require("vite");
@@ -316,7 +279,7 @@ function getUnimportOptions(config) {
 // src/core/vite-plugins/unimport.ts
 function unimport(config) {
   const options = getUnimportOptions(config);
-  const unimport2 = (0, import_unimport2.createUnimport)(options);
+  const unimport2 = (0, import_unimport.createUnimport)(options);
   return {
     name: "wxt:unimport",
     async config() {
@@ -329,8 +292,8 @@ function unimport(config) {
 }
 
 // src/core/vite-plugins/virtualEntrypoint.ts
-var import_fs_extra3 = __toESM(require("fs-extra"), 1);
-var import_path3 = require("path");
+var import_fs_extra2 = __toESM(require("fs-extra"), 1);
+var import_path2 = require("path");
 function virtualEntrypoin(type, config) {
   const virtualId = `virtual:wxt-${type}?`;
   const resolvedVirtualId = `\0${virtualId}`;
@@ -347,8 +310,8 @@ function virtualEntrypoin(type, config) {
       if (!id.startsWith(resolvedVirtualId))
         return;
       const inputPath = id.replace(resolvedVirtualId, "");
-      const template = await import_fs_extra3.default.readFile(
-        (0, import_path3.resolve)(
+      const template = await import_fs_extra2.default.readFile(
+        (0, import_path2.resolve)(
           config.root,
           `node_modules/wxt/dist/virtual-modules/${type}-entrypoint.js`
         ),
@@ -360,20 +323,20 @@ function virtualEntrypoin(type, config) {
 }
 
 // src/core/utils/createFsCache.ts
-var import_fs_extra4 = __toESM(require("fs-extra"), 1);
-var import_path4 = require("path");
+var import_fs_extra3 = __toESM(require("fs-extra"), 1);
+var import_path3 = require("path");
 function createFsCache(wxtDir) {
-  const getPath = (key) => (0, import_path4.resolve)(wxtDir, "cache", encodeURIComponent(key));
+  const getPath = (key) => (0, import_path3.resolve)(wxtDir, "cache", encodeURIComponent(key));
   return {
     async set(key, value) {
       const path5 = getPath(key);
-      await (0, import_fs_extra4.ensureDir)((0, import_path4.dirname)(path5));
-      await import_fs_extra4.default.writeFile(path5, value, "utf-8");
+      await (0, import_fs_extra3.ensureDir)((0, import_path3.dirname)(path5));
+      await import_fs_extra3.default.writeFile(path5, value, "utf-8");
     },
     async get(key) {
       const path5 = getPath(key);
       try {
-        return await import_fs_extra4.default.readFile(path5, "utf-8");
+        return await import_fs_extra3.default.readFile(path5, "utf-8");
       } catch {
         return void 0;
       }
@@ -436,7 +399,7 @@ async function getInternalConfig(config, command) {
   const manifestVersion = config.manifestVersion ?? (browser == "firefox" ? 2 : 3);
   const outBaseDir = import_node_path3.default.resolve(root, ".output");
   const outDir = import_node_path3.default.resolve(outBaseDir, `${browser}-mv${manifestVersion}`);
-  const logger = config.logger ?? import_consola2.consola;
+  const logger = config.logger ?? import_consola.consola;
   const baseConfig = {
     root,
     outDir,
@@ -462,10 +425,12 @@ async function getInternalConfig(config, command) {
     mode
   };
   if (config.configFile !== false) {
-    userConfig = await importTsFile(
-      root,
-      import_node_path3.default.resolve(root, config.configFile ?? "wxt.config.ts")
-    );
+    const loaded = await (0, import_c12.loadConfig)({
+      name: "wxt",
+      cwd: root,
+      rcFile: false
+    });
+    userConfig = loaded.config ?? {};
   }
   const merged = vite2.mergeConfig(
     baseConfig,
@@ -609,34 +574,34 @@ function findEffectedSteps(changedFile, currentOutput) {
 
 // src/index.ts
 var import_async_mutex = require("async-mutex");
-var import_consola3 = require("consola");
+var import_consola2 = require("consola");
 var import_node_path4 = require("path");
 
 // src/core/build/buildEntrypoints.ts
 var vite3 = __toESM(require("vite"), 1);
 
 // src/core/utils/removeEmptyDirs.ts
-var import_fs_extra5 = __toESM(require("fs-extra"), 1);
-var import_path5 = __toESM(require("path"), 1);
+var import_fs_extra4 = __toESM(require("fs-extra"), 1);
+var import_path4 = __toESM(require("path"), 1);
 async function removeEmptyDirs(dir) {
-  const files = await import_fs_extra5.default.readdir(dir);
+  const files = await import_fs_extra4.default.readdir(dir);
   for (const file of files) {
-    const filePath = import_path5.default.join(dir, file);
-    const stats = await import_fs_extra5.default.stat(filePath);
+    const filePath = import_path4.default.join(dir, file);
+    const stats = await import_fs_extra4.default.stat(filePath);
     if (stats.isDirectory()) {
       await removeEmptyDirs(filePath);
     }
   }
   try {
-    await import_fs_extra5.default.rmdir(dir);
+    await import_fs_extra4.default.rmdir(dir);
   } catch {
   }
 }
 
 // src/core/build/buildEntrypoints.ts
 var import_fast_glob = __toESM(require("fast-glob"), 1);
-var import_fs_extra6 = __toESM(require("fs-extra"), 1);
-var import_path6 = require("path");
+var import_fs_extra5 = __toESM(require("fs-extra"), 1);
+var import_path5 = require("path");
 async function buildEntrypoints(groups, config) {
   const steps = [];
   for (const group of groups) {
@@ -724,20 +689,20 @@ function getBuildOutputChunks(result) {
 }
 async function copyPublicDirectory(config) {
   const publicAssets = [];
-  if (!await import_fs_extra6.default.exists(config.publicDir))
+  if (!await import_fs_extra5.default.exists(config.publicDir))
     return publicAssets;
   const files = await (0, import_fast_glob.default)("**/*", { cwd: config.publicDir });
   for (const file of files) {
-    const srcPath = (0, import_path6.resolve)(config.publicDir, file);
-    const outPath = (0, import_path6.resolve)(config.outDir, file);
-    await import_fs_extra6.default.ensureDir((0, import_path6.dirname)(outPath));
-    await import_fs_extra6.default.copyFile(srcPath, outPath);
+    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));
+    await import_fs_extra5.default.copyFile(srcPath, outPath);
     publicAssets.push({
       type: "asset",
       fileName: file,
       name: file,
       needsCodeReference: false,
-      source: await import_fs_extra6.default.readFile(srcPath)
+      source: await import_fs_extra5.default.readFile(srcPath)
     });
   }
   return publicAssets;
@@ -749,6 +714,54 @@ var import_fs_extra7 = __toESM(require("fs-extra"), 1);
 var import_picomatch = __toESM(require("picomatch"), 1);
 var import_linkedom2 = require("linkedom");
 var import_json5 = __toESM(require("json5"), 1);
+
+// src/core/utils/importTsFile.ts
+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_babel = __toESM(require("jiti/dist/babel"), 1);
+async function importTsFile(path5, config) {
+  config.logger.log("Loading file metadata:", path5);
+  const unimport2 = (0, import_unimport2.createUnimport)({
+    ...getUnimportOptions(config),
+    // Only allow specific imports, not all from the project
+    imports: [{ name: "*", as: "browser", from: "webextension-polyfill" }],
+    dirs: []
+  });
+  await unimport2.init();
+  const text = await import_fs_extra6.default.readFile(path5, "utf-8");
+  const textNoImports = text.replace(/import.*[\n;]/gm, "");
+  const { code } = await unimport2.injectImports(textNoImports);
+  config.logger.log(
+    ["Text:", text, "No imports:", textNoImports, "Code:", code].join("\n")
+  );
+  const jiti = (0, import_jiti.default)(__filename, {
+    cache: false,
+    esmResolve: true,
+    interopDefault: true,
+    alias: {
+      "webextension-polyfill": (0, import_path6.resolve)(
+        config.root,
+        "node_modules/wxt/dist/virtual-modules/fake-browser.js"
+      )
+    },
+    transform(opts) {
+      if (opts.filename === path5)
+        return (0, import_babel.default)({ ...opts, source: code });
+      else
+        return (0, import_babel.default)(opts);
+    }
+  });
+  try {
+    return await jiti(path5);
+  } catch (err) {
+    config.logger.error(err);
+    throw err;
+  }
+}
+
+// src/core/build/findEntrypoints.ts
 var import_fast_glob2 = __toESM(require("fast-glob"), 1);
 async function findEntrypoints(config) {
   const relativePaths = await (0, import_fast_glob2.default)("**/*", {
@@ -873,7 +886,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");
   }
@@ -887,8 +900,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`);
@@ -1718,7 +1731,7 @@ function reloadHtmlPages(groups, server, config) {
 }
 
 // package.json
-var version2 = "0.1.1-alpha2";
+var version2 = "0.1.1-alpha4";
 
 // src/core/utils/defineConfig.ts
 function defineConfig(config) {
@@ -1761,7 +1774,7 @@ async function createServer2(config) {
       const changes = detectDevChanges(fileChanges, server.currentOutput);
       if (changes.type === "no-change")
         return;
-      import_consola3.consola.info(
+      import_consola2.consola.info(
         `Changed: ${Array.from(new Set(fileChanges.map((change) => change[1]))).map((file) => import_picocolors3.default.dim((0, import_node_path4.relative)(internalConfig.root, file))).join(", ")}`
       );
       const rebuiltNames = changes.rebuildGroups.flat().map((entry) => {
@@ -1789,7 +1802,7 @@ async function createServer2(config) {
           reloadContentScripts(changes.changedSteps, internalConfig, server);
           break;
       }
-      import_consola3.consola.success(`Reloaded: ${rebuiltNames}`);
+      import_consola2.consola.success(`Reloaded: ${rebuiltNames}`);
     });
   });
   return server;