wxt 0.18.7 → 0.18.9

package/dist/index.cjs

@@ -8637,7 +8637,7 @@ var init_core2 = __esm({
 
 // ../../node_modules/.pnpm/consola@3.2.3/node_modules/consola/dist/shared/consola.06ad8a64.mjs
 function parseStack(stack) {
-  const cwd = process.cwd() + import_node_path15.sep;
+  const cwd = process.cwd() + import_node_path14.sep;
   const lines = stack.split("\n").splice(1).map((l2) => l2.trim().replace("file://", "").replace(cwd, ""));
   return lines;
 }
@@ -8645,12 +8645,12 @@ function writeStream(data, stream) {
   const write = stream.__write || stream.write;
   return write.call(stream, data);
 }
-var import_node_util11, import_node_path15, bracket, BasicReporter;
+var import_node_util11, import_node_path14, bracket, BasicReporter;
 var init_consola_06ad8a64 = __esm({
   "../../node_modules/.pnpm/consola@3.2.3/node_modules/consola/dist/shared/consola.06ad8a64.mjs"() {
     "use strict";
     import_node_util11 = require("util");
-    import_node_path15 = require("path");
+    import_node_path14 = require("path");
     bracket = (x) => x ? `[${x}]` : "";
     BasicReporter = class {
       formatStack(stack, opts) {
@@ -9053,7 +9053,7 @@ async function prompt(message, opts = {}) {
   }
   throw new Error(`Unknown prompt type: ${opts.type}`);
 }
-var import_node_process11, import_node_readline, import_node_tty3, import_tty, import_node_util12, import_node_path16, ESC, CSI, beep, cursor, scroll, erase, src, picocolors, tty4, isColorSupported2, formatter, replaceClose2, createColors2, picocolorsExports, l, m, G, K, Y, v, L, M, T, r, Z, H, q, p, J, b, W, Q, I, w, N, j, X, _, DD, uD, R, V, tD, h2, sD, iD, ED, oD, unicode, s, S_STEP_ACTIVE, S_STEP_CANCEL, S_STEP_ERROR, S_STEP_SUBMIT, S_BAR, S_BAR_END, S_RADIO_ACTIVE, S_RADIO_INACTIVE, S_CHECKBOX_ACTIVE, S_CHECKBOX_SELECTED, S_CHECKBOX_INACTIVE, symbol, text, confirm, select, multiselect;
+var import_node_process11, import_node_readline, import_node_tty3, import_tty, import_node_util12, import_node_path15, ESC, CSI, beep, cursor, scroll, erase, src, picocolors, tty4, isColorSupported2, formatter, replaceClose2, createColors2, picocolorsExports, l, m, G, K, Y, v, L, M, T, r, Z, H, q, p, J, b, W, Q, I, w, N, j, X, _, DD, uD, R, V, tD, h2, sD, iD, ED, oD, unicode, s, S_STEP_ACTIVE, S_STEP_CANCEL, S_STEP_ERROR, S_STEP_SUBMIT, S_BAR, S_BAR_END, S_RADIO_ACTIVE, S_RADIO_INACTIVE, S_CHECKBOX_ACTIVE, S_CHECKBOX_SELECTED, S_CHECKBOX_INACTIVE, symbol, text, confirm, select, multiselect;
 var init_prompt = __esm({
   "../../node_modules/.pnpm/consola@3.2.3/node_modules/consola/dist/chunks/prompt.mjs"() {
     "use strict";
@@ -9066,7 +9066,7 @@ var init_prompt = __esm({
     init_core2();
     init_consola_06ad8a64();
     import_node_util12 = require("util");
-    import_node_path16 = require("path");
+    import_node_path15 = require("path");
     ESC = "\x1B";
     CSI = `${ESC}[`;
     beep = "\x07";
@@ -10981,10 +10981,13 @@ try {
       // Use "pre" so the new script is added before vite bundles all the scripts
       order: "pre",
       handler(html, _ctx) {
+        const src2 = config.command === "serve" ? `http://${config.dev.server?.hostname}:${config.dev.server?.port}/@id/${virtualHtmlModuleId}` : virtualHtmlModuleId;
         const { document } = (0, import_linkedom2.parseHTML)(html);
+        const existing = document.querySelector(`script[src='${src2}']`);
+        if (existing) return;
         const script = document.createElement("script");
         script.type = "module";
-        script.src = config.command === "serve" ? `http://${config.dev.server?.hostname}:${config.dev.server?.port}/@id/${virtualHtmlModuleId}` : virtualHtmlModuleId;
+        script.src = src2;
         if (document.head == null) {
           const newHead = document.createElement("head");
           document.documentElement.prepend(newHead);
@@ -11032,6 +11035,9 @@ ${noImports}`;
 }
 
 // src/core/builders/vite/index.ts
+var import_server = require("vite-node/server");
+var import_client = require("vite-node/client");
+var import_source_map = require("vite-node/source-map");
 async function createViteBuilder(wxtConfig, hooks, server) {
   const vite = await import("vite");
   const getBaseConfig = async () => {
@@ -11179,21 +11185,64 @@ async function createViteBuilder(wxtConfig, hooks, server) {
   return {
     name: "Vite",
     version: vite.version,
-    async importEntrypoint(url) {
-      const baseConfig = await getBaseConfig();
-      const envConfig = {
-        plugins: [
-          webextensionPolyfillMock(wxtConfig),
-          removeEntrypointMainFunction(wxtConfig, url)
-        ]
-      };
-      const config = vite.mergeConfig(baseConfig, envConfig);
-      const server2 = await vite.createServer(config);
-      await server2.listen();
-      const runtime = await vite.createViteRuntime(server2, { hmr: false });
-      const module2 = await runtime.executeUrl(url);
-      await server2.close();
-      return module2.default;
+    async importEntrypoint(path12) {
+      switch (wxtConfig.experimental.entrypointImporter) {
+        default:
+        case "jiti": {
+          return await importEntrypointFile(path12);
+        }
+        case "vite-runtime": {
+          const baseConfig = await getBaseConfig();
+          const envConfig = {
+            plugins: [
+              webextensionPolyfillMock(wxtConfig),
+              removeEntrypointMainFunction(wxtConfig, path12)
+            ]
+          };
+          const config = vite.mergeConfig(baseConfig, envConfig);
+          const server2 = await vite.createServer(config);
+          await server2.listen();
+          const runtime = await vite.createViteRuntime(server2, { hmr: false });
+          const module2 = await runtime.executeUrl(path12);
+          await server2.close();
+          return module2.default;
+        }
+        case "vite-node": {
+          const baseConfig = await getBaseConfig();
+          baseConfig.optimizeDeps ??= {};
+          baseConfig.optimizeDeps.noDiscovery = true;
+          baseConfig.optimizeDeps.include = [];
+          const envConfig = {
+            plugins: [
+              webextensionPolyfillMock(wxtConfig),
+              removeEntrypointMainFunction(wxtConfig, path12)
+            ]
+          };
+          const config = vite.mergeConfig(baseConfig, envConfig);
+          const server2 = await vite.createServer(config);
+          await server2.pluginContainer.buildStart({});
+          const node = new import_server.ViteNodeServer(server2);
+          (0, import_source_map.installSourcemapsSupport)({
+            getSourceMap: (source) => node.getSourceMap(source)
+          });
+          const runner = new import_client.ViteNodeRunner({
+            root: server2.config.root,
+            base: server2.config.base,
+            // when having the server and runner in a different context,
+            // you will need to handle the communication between them
+            // and pass to this function
+            fetchModule(id) {
+              return node.fetchModule(id);
+            },
+            resolveId(id, importer) {
+              return node.resolveId(id, importer);
+            }
+          });
+          const res = await runner.executeFile(path12);
+          await server2.close();
+          return res.default;
+        }
+      }
     },
     async build(group) {
       let entryConfig;
@@ -11382,11 +11431,25 @@ function detectDevChanges(changedFiles, currentOutput) {
       (changedFile) => findEffectedSteps(changedFile, currentOutput)
     )
   );
-  if (changedSteps.size === 0) return { type: "no-change" };
+  if (changedSteps.size === 0) {
+    const hasPublicChange = some(
+      changedFiles,
+      (file) => file.startsWith(wxt.config.publicDir)
+    );
+    if (hasPublicChange) {
+      return {
+        type: "extension-reload",
+        rebuildGroups: [],
+        cachedOutput: currentOutput
+      };
+    } else {
+      return { type: "no-change" };
+    }
+  }
   const unchangedOutput = {
     manifest: currentOutput.manifest,
     steps: [],
-    publicAssets: []
+    publicAssets: [...currentOutput.publicAssets]
   };
   const changedOutput = {
     manifest: currentOutput.manifest,
@@ -11400,13 +11463,6 @@ function detectDevChanges(changedFiles, currentOutput) {
       unchangedOutput.steps.push(step);
     }
   }
-  for (const asset of currentOutput.publicAssets) {
-    if (changedSteps.has(asset)) {
-      changedOutput.publicAssets.push(asset);
-    } else {
-      unchangedOutput.publicAssets.push(asset);
-    }
-  }
   const isOnlyHtmlChanges = changedFiles.length > 0 && every(changedFiles, (file) => file.endsWith(".html"));
   if (isOnlyHtmlChanges) {
     return {
@@ -11447,116 +11503,20 @@ function findEffectedSteps(changedFile, currentOutput) {
     const effectedChunk = step.chunks.find((chunk) => isChunkEffected(chunk));
     if (effectedChunk) changes.push(step);
   }
-  const effectedAsset = currentOutput.publicAssets.find(
-    (chunk) => isChunkEffected(chunk)
-  );
-  if (effectedAsset) changes.push(effectedAsset);
   return changes;
 }
 
 // src/core/utils/building/find-entrypoints.ts
 var import_path4 = require("path");
-var import_fs_extra7 = __toESM(require("fs-extra"), 1);
+var import_fs_extra6 = __toESM(require("fs-extra"), 1);
 var import_minimatch = require("minimatch");
 var import_linkedom3 = require("linkedom");
 var import_json5 = __toESM(require("json5"), 1);
 var import_fast_glob2 = __toESM(require("fast-glob"), 1);
 var import_picocolors2 = __toESM(require("picocolors"), 1);
-
-// src/core/utils/building/import-entrypoint.ts
-var import_jiti = __toESM(require("jiti"), 1);
-var import_unimport2 = require("unimport");
-var import_fs_extra6 = __toESM(require("fs-extra"), 1);
-var import_node_path13 = require("path");
-var import_esbuild = require("esbuild");
-var import_node_url3 = require("url");
-var import_meta = {};
-async function importEntrypointFile(path12) {
-  wxt.logger.debug("Loading file metadata:", path12);
-  const normalPath = normalizePath(path12);
-  const unimport2 = (0, import_unimport2.createUnimport)({
-    ...wxt.config.imports,
-    // Only allow specific imports, not all from the project
-    dirs: []
-  });
-  await unimport2.init();
-  const text2 = await import_fs_extra6.default.readFile(path12, "utf-8");
-  const textNoImports = removeProjectImportStatements(text2);
-  const { code } = await unimport2.injectImports(textNoImports);
-  wxt.logger.debug(
-    ["Text:", text2, "No imports:", textNoImports, "Code:", code].join("\n")
-  );
-  const jiti = (0, import_jiti.default)(
-    typeof __filename !== "undefined" ? __filename : (0, import_node_url3.fileURLToPath)(import_meta.url),
-    {
-      cache: false,
-      debug: wxt.config.debug,
-      esmResolve: true,
-      alias: {
-        "webextension-polyfill": (0, import_node_path13.resolve)(
-          wxt.config.wxtModuleDir,
-          "dist/virtual/mock-browser.js"
-        )
-      },
-      // Continue using node to load TS files even if `bun run --bun` is detected. Jiti does not
-      // respect the custom transform function when using it's native bun option.
-      experimentalBun: false,
-      // List of extensions to transform with esbuild
-      extensions: [
-        ".ts",
-        ".cts",
-        ".mts",
-        ".tsx",
-        ".js",
-        ".cjs",
-        ".mjs",
-        ".jsx"
-      ],
-      transform(opts) {
-        const isEntrypoint = opts.filename === normalPath;
-        return (0, import_esbuild.transformSync)(
-          // Use modified source code for entrypoints
-          isEntrypoint ? code : opts.source,
-          getEsbuildOptions(opts)
-        );
-      }
-    }
-  );
-  try {
-    const res = await jiti(path12);
-    return res.default;
-  } catch (err) {
-    const filePath = (0, import_node_path13.relative)(wxt.config.root, path12);
-    if (err instanceof ReferenceError) {
-      const variableName = err.message.replace(" is not defined", "");
-      throw Error(
-        `${filePath}: Cannot use imported variable "${variableName}" outside the main function. See https://wxt.dev/guide/go-further/entrypoint-side-effects.html`,
-        { cause: err }
-      );
-    } else {
-      wxt.logger.error(err);
-      throw Error(`Failed to load entrypoint: ${filePath}`, { cause: err });
-    }
-  }
-}
-function getEsbuildOptions(opts) {
-  const isJsx = opts.filename?.endsWith("x");
-  return {
-    format: "cjs",
-    loader: isJsx ? "tsx" : "ts",
-    ...isJsx ? {
-      // `h` and `Fragment` are undefined, but that's OK because JSX is never evaluated while
-      // grabbing the entrypoint's options.
-      jsxFactory: "h",
-      jsxFragment: "Fragment"
-    } : void 0
-  };
-}
-
-// src/core/utils/building/find-entrypoints.ts
 async function findEntrypoints() {
-  await import_fs_extra7.default.mkdir(wxt.config.wxtDir, { recursive: true });
-  await import_fs_extra7.default.writeJson((0, import_path4.resolve)(wxt.config.wxtDir, "tsconfig.json"), {});
+  await import_fs_extra6.default.mkdir(wxt.config.wxtDir, { recursive: true });
+  await import_fs_extra6.default.writeJson((0, import_path4.resolve)(wxt.config.wxtDir, "tsconfig.json"), {});
   const relativePaths = await (0, import_fast_glob2.default)(Object.keys(PATH_GLOB_TO_TYPE_MAP), {
     cwd: wxt.config.entrypointsDir
   });
@@ -11767,7 +11727,7 @@ async function getUnlistedScriptEntrypoint({
   name,
   skipped
 }) {
-  const defaultExport = await importEntrypoint(inputPath);
+  const defaultExport = await wxt.builder.importEntrypoint(inputPath);
   if (defaultExport == null) {
     throw Error(
       `${name}: Default export not found, did you forget to call "export default defineUnlistedScript(...)"?`
@@ -11790,7 +11750,7 @@ async function getBackgroundEntrypoint({
 }) {
   let options = {};
   if (inputPath !== VIRTUAL_NOOP_BACKGROUND_MODULE_ID) {
-    const defaultExport = await importEntrypoint(inputPath);
+    const defaultExport = await wxt.builder.importEntrypoint(inputPath);
     if (defaultExport == null) {
       throw Error(
         `${name}: Default export not found, did you forget to call "export default defineBackground(...)"?`
@@ -11816,7 +11776,13 @@ async function getContentScriptEntrypoint({
   name,
   skipped
 }) {
-  const { main: _2, ...options } = await importEntrypoint(inputPath);
+  const defaultExport = await wxt.builder.importEntrypoint(inputPath);
+  if (defaultExport == null) {
+    throw Error(
+      `${name}: Default export not found, did you forget to call "export default defineContentScript(...)"?`
+    );
+  }
+  const { main: _2, ...options } = defaultExport;
   if (options == null) {
     throw Error(
       `${name}: Default export not found, did you forget to call "export default defineContentScript(...)"?`
@@ -11859,7 +11825,7 @@ async function getSidepanelEntrypoint(info) {
   };
 }
 async function getHtmlEntrypointOptions(info, keyMap, queries, parsers) {
-  const content = await import_fs_extra7.default.readFile(info.inputPath, "utf-8");
+  const content = await import_fs_extra6.default.readFile(info.inputPath, "utf-8");
   const { document } = (0, import_linkedom3.parseHTML)(content);
   const options = {};
   const defaultQuery = (manifestKey) => document.querySelector(`meta[name='manifest.${manifestKey}']`)?.getAttribute("content");
@@ -11919,15 +11885,12 @@ var PATH_GLOB_TO_TYPE_MAP = {
   [`*/index.${CSS_EXTENSIONS_PATTERN}`]: "unlisted-style"
 };
 var CONTENT_SCRIPT_OUT_DIR = "content-scripts";
-function importEntrypoint(path12) {
-  return wxt.config.experimental.viteRuntime ? wxt.builder.importEntrypoint(path12) : importEntrypointFile(path12);
-}
 
 // src/core/utils/building/generate-wxt-dir.ts
-var import_unimport3 = require("unimport");
-var import_fs_extra8 = __toESM(require("fs-extra"), 1);
+var import_unimport2 = require("unimport");
+var import_fs_extra7 = __toESM(require("fs-extra"), 1);
 var import_path5 = require("path");
-var import_node_path14 = __toESM(require("path"), 1);
+var import_node_path13 = __toESM(require("path"), 1);
 
 // src/core/utils/i18n.ts
 var predefinedMessages = {
@@ -11968,10 +11931,10 @@ function parseI18nMessages(messagesJson) {
 
 // src/core/utils/building/generate-wxt-dir.ts
 async function generateTypesDir(entrypoints) {
-  await import_fs_extra8.default.ensureDir(wxt.config.typesDir);
+  await import_fs_extra7.default.ensureDir(wxt.config.typesDir);
   const references = [];
   if (wxt.config.imports !== false) {
-    const unimport2 = (0, import_unimport3.createUnimport)(wxt.config.imports);
+    const unimport2 = (0, import_unimport2.createUnimport)(wxt.config.imports);
     references.push(await writeImportsDeclarationFile(unimport2));
     if (wxt.config.imports.eslintrc.enabled) {
       await writeImportsEslintFile(unimport2, wxt.config.imports);
@@ -12000,7 +11963,7 @@ async function writeImportsEslintFile(unimport2, options) {
   (await unimport2.getImports()).map((i2) => i2.as ?? i2.name).filter(Boolean).sort().forEach((name) => {
     eslintrc.globals[name] = options.eslintrc.globalsPropValue;
   });
-  await import_fs_extra8.default.writeJson(options.eslintrc.filePath, eslintrc, { spaces: 2 });
+  await import_fs_extra7.default.writeJson(options.eslintrc.filePath, eslintrc, { spaces: 2 });
 }
 async function writePathsDeclarationFile(entrypoints) {
   const filePath = (0, import_path5.resolve)(wxt.config.typesDir, "paths.d.ts");
@@ -12054,13 +12017,13 @@ declare module "wxt/browser" {
 `;
   let messages;
   if (defaultLocale) {
-    const defaultLocalePath = import_node_path14.default.resolve(
+    const defaultLocalePath = import_node_path13.default.resolve(
       wxt.config.publicDir,
       "_locales",
       defaultLocale,
       "messages.json"
     );
-    const content = JSON.parse(await import_fs_extra8.default.readFile(defaultLocalePath, "utf-8"));
+    const content = JSON.parse(await import_fs_extra7.default.readFile(defaultLocalePath, "utf-8"));
     messages = parseI18nMessages(content);
   } else {
     messages = parseI18nMessages({});
@@ -12161,23 +12124,23 @@ ${paths}
 
 // src/core/utils/building/resolve-config.ts
 var import_c12 = require("c12");
-var import_node_path19 = __toESM(require("path"), 1);
+var import_node_path18 = __toESM(require("path"), 1);
 
 // src/core/utils/cache.ts
-var import_fs_extra9 = __toESM(require("fs-extra"), 1);
+var import_fs_extra8 = __toESM(require("fs-extra"), 1);
 var import_path6 = require("path");
 function createFsCache(wxtDir) {
   const getPath = (key) => (0, import_path6.resolve)(wxtDir, "cache", encodeURIComponent(key));
   return {
     async set(key, value) {
       const path12 = getPath(key);
-      await (0, import_fs_extra9.ensureDir)((0, import_path6.dirname)(path12));
+      await (0, import_fs_extra8.ensureDir)((0, import_path6.dirname)(path12));
       await writeFileIfDifferent(path12, value);
     },
     async get(key) {
       const path12 = getPath(key);
       try {
-        return await import_fs_extra9.default.readFile(path12, "utf-8");
+        return await import_fs_extra8.default.readFile(path12, "utf-8");
       } catch {
         return void 0;
       }
@@ -12193,18 +12156,18 @@ var import_node_process13 = require("process");
 init_utils2();
 var import_node_tty4 = require("tty");
 var import_node_util13 = require("util");
-var import_node_path17 = require("path");
+var import_node_path16 = require("path");
 
 // src/core/utils/building/resolve-config.ts
 var import_defu = __toESM(require("defu"), 1);
 
 // src/core/utils/package.ts
-var import_node_path18 = require("path");
-var import_fs_extra10 = __toESM(require("fs-extra"), 1);
+var import_node_path17 = require("path");
+var import_fs_extra9 = __toESM(require("fs-extra"), 1);
 async function getPackageJson() {
-  const file = (0, import_node_path18.resolve)(wxt.config.root, "package.json");
+  const file = (0, import_node_path17.resolve)(wxt.config.root, "package.json");
   try {
-    return await import_fs_extra10.default.readJson(file);
+    return await import_fs_extra9.default.readJson(file);
   } catch (err) {
     wxt.logger.debug(
       `Failed to read package.json at: ${file}. Returning undefined.`
@@ -12220,9 +12183,9 @@ function isModuleInstalled(name) {
 }
 
 // src/core/utils/building/resolve-config.ts
-var import_fs_extra11 = __toESM(require("fs-extra"), 1);
+var import_fs_extra10 = __toESM(require("fs-extra"), 1);
 var import_fast_glob3 = __toESM(require("fast-glob"), 1);
-var import_meta2 = {};
+var import_meta = {};
 async function resolveConfig(inlineConfig, command) {
   let userConfig = {};
   let userConfigMetadata;
@@ -12247,28 +12210,28 @@ async function resolveConfig(inlineConfig, command) {
   const manifestVersion = mergedConfig.manifestVersion ?? (browser === "firefox" || browser === "safari" ? 2 : 3);
   const mode = mergedConfig.mode ?? COMMAND_MODES[command];
   const env2 = { browser, command, manifestVersion, mode };
-  const root = import_node_path19.default.resolve(
+  const root = import_node_path18.default.resolve(
     inlineConfig.root ?? userConfig.root ?? process.cwd()
   );
-  const wxtDir = import_node_path19.default.resolve(root, ".wxt");
+  const wxtDir = import_node_path18.default.resolve(root, ".wxt");
   const wxtModuleDir = await resolveWxtModuleDir();
-  const srcDir = import_node_path19.default.resolve(root, mergedConfig.srcDir ?? root);
-  const entrypointsDir = import_node_path19.default.resolve(
+  const srcDir = import_node_path18.default.resolve(root, mergedConfig.srcDir ?? root);
+  const entrypointsDir = import_node_path18.default.resolve(
     srcDir,
     mergedConfig.entrypointsDir ?? "entrypoints"
   );
-  const modulesDir = import_node_path19.default.resolve(srcDir, mergedConfig.modulesDir ?? "modules");
+  const modulesDir = import_node_path18.default.resolve(srcDir, mergedConfig.modulesDir ?? "modules");
   if (await isDirMissing(entrypointsDir)) {
     logMissingDir(logger, "Entrypoints", entrypointsDir);
   }
   const filterEntrypoints = !!mergedConfig.filterEntrypoints?.length ? new Set(mergedConfig.filterEntrypoints) : void 0;
-  const publicDir = import_node_path19.default.resolve(srcDir, mergedConfig.publicDir ?? "public");
+  const publicDir = import_node_path18.default.resolve(srcDir, mergedConfig.publicDir ?? "public");
   if (await isDirMissing(publicDir)) {
     logMissingDir(logger, "Public", publicDir);
   }
-  const typesDir = import_node_path19.default.resolve(wxtDir, "types");
-  const outBaseDir = import_node_path19.default.resolve(root, mergedConfig.outDir ?? ".output");
-  const outDir = import_node_path19.default.resolve(outBaseDir, `${browser}-mv${manifestVersion}`);
+  const typesDir = import_node_path18.default.resolve(wxtDir, "types");
+  const outBaseDir = import_node_path18.default.resolve(root, mergedConfig.outDir ?? ".output");
+  const outDir = import_node_path18.default.resolve(outBaseDir, `${browser}-mv${manifestVersion}`);
   const reloadCommand = mergedConfig.dev?.reloadCommand ?? "Alt+R";
   const runnerConfig = await (0, import_c12.loadConfig)({
     name: "web-ext",
@@ -12285,7 +12248,7 @@ async function resolveConfig(inlineConfig, command) {
       "~": srcDir,
       "@@": root,
       "~~": root
-    }).map(([key, value]) => [key, import_node_path19.default.resolve(root, value)])
+    }).map(([key, value]) => [key, import_node_path18.default.resolve(root, value)])
   );
   let devServerConfig;
   if (command === "serve") {
@@ -12337,7 +12300,7 @@ async function resolveConfig(inlineConfig, command) {
     alias,
     experimental: (0, import_defu.default)(mergedConfig.experimental, {
       includeBrowserPolyfill: true,
-      viteRuntime: false
+      entrypointImporter: "jiti"
     }),
     dev: {
       server: devServerConfig,
@@ -12375,7 +12338,7 @@ async function mergeInlineConfig(inlineConfig, userConfig) {
   };
 }
 function resolveZipConfig(root, mergedConfig) {
-  const downloadedPackagesDir = import_node_path19.default.resolve(root, ".wxt/local_modules");
+  const downloadedPackagesDir = import_node_path18.default.resolve(root, ".wxt/local_modules");
   return {
     name: void 0,
     sourcesTemplate: "{{name}}-{{version}}-sources.zip",
@@ -12401,12 +12364,12 @@ function resolveZipConfig(root, mergedConfig) {
   };
 }
 function resolveAnalysisConfig(root, mergedConfig) {
-  const analysisOutputFile = import_node_path19.default.resolve(
+  const analysisOutputFile = import_node_path18.default.resolve(
     root,
     mergedConfig.analysis?.outputFile ?? "stats.html"
   );
-  const analysisOutputDir = import_node_path19.default.dirname(analysisOutputFile);
-  const analysisOutputName = import_node_path19.default.parse(analysisOutputFile).name;
+  const analysisOutputDir = import_node_path18.default.dirname(analysisOutputFile);
+  const analysisOutputName = import_node_path18.default.parse(analysisOutputFile).name;
   return {
     enabled: mergedConfig.analysis?.enabled ?? false,
     open: mergedConfig.analysis?.open ?? false,
@@ -12445,7 +12408,7 @@ async function getUnimportOptions(wxtDir, logger, config) {
     dirs: ["components", "composables", "hooks", "utils"],
     eslintrc: {
       enabled,
-      filePath: import_node_path19.default.resolve(wxtDir, "eslintrc-auto-import.json"),
+      filePath: import_node_path18.default.resolve(wxtDir, "eslintrc-auto-import.json"),
       globalsPropValue: true
     }
   };
@@ -12455,16 +12418,16 @@ async function getUnimportOptions(wxtDir, logger, config) {
   );
 }
 async function resolveWxtModuleDir() {
-  const requireResolve = require?.resolve ?? (await import("module")).default.createRequire(import_meta2.url).resolve;
-  return import_node_path19.default.resolve(requireResolve("wxt"), "../..");
+  const requireResolve = require?.resolve ?? (await import("module")).default.createRequire(import_meta.url).resolve;
+  return import_node_path18.default.resolve(requireResolve("wxt"), "../..");
 }
 async function isDirMissing(dir) {
-  return !await import_fs_extra11.default.exists(dir);
+  return !await import_fs_extra10.default.exists(dir);
 }
 function logMissingDir(logger, name, expected) {
   logger.warn(
     `${name} directory not found: ./${normalizePath(
-      import_node_path19.default.relative(process.cwd(), expected)
+      import_node_path18.default.relative(process.cwd(), expected)
     )}`
   );
 }
@@ -12508,7 +12471,7 @@ async function resolveWxtModules(modulesDir, modules = []) {
   }).catch(() => []);
   const localModules = await Promise.all(
     localModulePaths.map(async (file) => {
-      const absolutePath = normalizePath(import_node_path19.default.resolve(modulesDir, file));
+      const absolutePath = normalizePath(import_node_path18.default.resolve(modulesDir, file));
       const { config } = await (0, import_c12.loadConfig)({
         configFile: absolutePath,
         globalRc: false,
@@ -12571,6 +12534,96 @@ var ENTRY_TYPE_TO_GROUP_MAP = {
   "content-script-style": "individual"
 };
 
+// src/core/utils/building/import-entrypoint.ts
+var import_jiti = __toESM(require("jiti"), 1);
+var import_unimport3 = require("unimport");
+var import_fs_extra11 = __toESM(require("fs-extra"), 1);
+var import_node_path19 = require("path");
+var import_esbuild = require("esbuild");
+var import_node_url3 = require("url");
+var import_meta2 = {};
+async function importEntrypointFile(path12) {
+  wxt.logger.debug("Loading file metadata:", path12);
+  const normalPath = normalizePath(path12);
+  const unimport2 = (0, import_unimport3.createUnimport)({
+    ...wxt.config.imports,
+    // Only allow specific imports, not all from the project
+    dirs: []
+  });
+  await unimport2.init();
+  const text2 = await import_fs_extra11.default.readFile(path12, "utf-8");
+  const textNoImports = removeProjectImportStatements(text2);
+  const { code } = await unimport2.injectImports(textNoImports);
+  wxt.logger.debug(
+    ["Text:", text2, "No imports:", textNoImports, "Code:", code].join("\n")
+  );
+  const jiti = (0, import_jiti.default)(
+    typeof __filename !== "undefined" ? __filename : (0, import_node_url3.fileURLToPath)(import_meta2.url),
+    {
+      cache: false,
+      debug: wxt.config.debug,
+      esmResolve: true,
+      alias: {
+        "webextension-polyfill": (0, import_node_path19.resolve)(
+          wxt.config.wxtModuleDir,
+          "dist/virtual/mock-browser.js"
+        )
+      },
+      // Continue using node to load TS files even if `bun run --bun` is detected. Jiti does not
+      // respect the custom transform function when using it's native bun option.
+      experimentalBun: false,
+      // List of extensions to transform with esbuild
+      extensions: [
+        ".ts",
+        ".cts",
+        ".mts",
+        ".tsx",
+        ".js",
+        ".cjs",
+        ".mjs",
+        ".jsx"
+      ],
+      transform(opts) {
+        const isEntrypoint = opts.filename === normalPath;
+        return (0, import_esbuild.transformSync)(
+          // Use modified source code for entrypoints
+          isEntrypoint ? code : opts.source,
+          getEsbuildOptions(opts)
+        );
+      }
+    }
+  );
+  try {
+    const res = await jiti(path12);
+    return res.default;
+  } catch (err) {
+    const filePath = (0, import_node_path19.relative)(wxt.config.root, path12);
+    if (err instanceof ReferenceError) {
+      const variableName = err.message.replace(" is not defined", "");
+      throw Error(
+        `${filePath}: Cannot use imported variable "${variableName}" outside the main function. See https://wxt.dev/guide/go-further/entrypoint-side-effects.html`,
+        { cause: err }
+      );
+    } else {
+      wxt.logger.error(err);
+      throw Error(`Failed to load entrypoint: ${filePath}`, { cause: err });
+    }
+  }
+}
+function getEsbuildOptions(opts) {
+  const isJsx = opts.filename?.endsWith("x");
+  return {
+    format: "cjs",
+    loader: isJsx ? "tsx" : "ts",
+    ...isJsx ? {
+      // `h` and `Fragment` are undefined, but that's OK because JSX is never evaluated while
+      // grabbing the entrypoint's options.
+      jsxFactory: "h",
+      jsxFragment: "Fragment"
+    } : void 0
+  };
+}
+
 // src/core/utils/building/internal-build.ts
 var import_picocolors5 = __toESM(require("picocolors"), 1);
 var import_fs_extra14 = __toESM(require("fs-extra"), 1);
@@ -12682,7 +12735,7 @@ function getChunkSortWeight(filename) {
 var import_picocolors4 = __toESM(require("picocolors"), 1);
 
 // package.json
-var version = "0.18.6";
+var version = "0.18.8";
 
 // src/core/utils/building/internal-build.ts
 var import_fast_glob4 = __toESM(require("fast-glob"), 1);
@@ -13767,6 +13820,7 @@ function createFileReloader(server) {
   return async (event, path12) => {
     await wxt.reloadConfig();
     if (path12.startsWith(wxt.config.outBaseDir)) return;
+    if (path12.startsWith(wxt.config.wxtDir)) return;
     changeQueue.push([event, path12]);
     await fileChangedMutex.runExclusive(async () => {
       if (server.currentOutput == null) return;