wxt 0.18.8 → 0.18.9

package/dist/{chunk-Z3C7S5VV.js → chunk-UA35R5HN.js}

@@ -12,7 +12,7 @@ import {
 } from "./chunk-QGM4M3NI.js";
 
 // package.json
-var version = "0.18.7";
+var version = "0.18.8";
 
 // src/core/utils/paths.ts
 import systemPath from "node:path";
@@ -901,114 +901,23 @@ function findEffectedSteps(changedFile, currentOutput) {
 }
 
 // src/core/utils/building/find-entrypoints.ts
-import { relative as relative4, resolve as resolve8 } from "path";
-import fs6 from "fs-extra";
+import { relative as relative3, resolve as resolve7 } from "path";
+import fs5 from "fs-extra";
 import { minimatch } from "minimatch";
 import { parseHTML as parseHTML3 } from "linkedom";
 import JSON5 from "json5";
 import glob2 from "fast-glob";
 import pc2 from "picocolors";
-
-// src/core/utils/building/import-entrypoint.ts
-import createJITI from "jiti";
-import { createUnimport as createUnimport2 } from "unimport";
-import fs5 from "fs-extra";
-import { relative as relative3, resolve as resolve7 } from "node:path";
-import { transformSync } from "esbuild";
-import { fileURLToPath } from "node:url";
-async function importEntrypointFile(path8) {
-  wxt.logger.debug("Loading file metadata:", path8);
-  const normalPath = normalizePath(path8);
-  const unimport2 = createUnimport2({
-    ...wxt.config.imports,
-    // Only allow specific imports, not all from the project
-    dirs: []
-  });
-  await unimport2.init();
-  const text = await fs5.readFile(path8, "utf-8");
-  const textNoImports = removeProjectImportStatements(text);
-  const { code } = await unimport2.injectImports(textNoImports);
-  wxt.logger.debug(
-    ["Text:", text, "No imports:", textNoImports, "Code:", code].join("\n")
-  );
-  const jiti = createJITI(
-    typeof __filename !== "undefined" ? __filename : fileURLToPath(import.meta.url),
-    {
-      cache: false,
-      debug: wxt.config.debug,
-      esmResolve: true,
-      alias: {
-        "webextension-polyfill": resolve7(
-          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 transformSync(
-          // Use modified source code for entrypoints
-          isEntrypoint ? code : opts.source,
-          getEsbuildOptions(opts)
-        );
-      }
-    }
-  );
-  try {
-    const res = await jiti(path8);
-    return res.default;
-  } catch (err) {
-    const filePath = relative3(wxt.config.root, path8);
-    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 fs6.mkdir(wxt.config.wxtDir, { recursive: true });
-  await fs6.writeJson(resolve8(wxt.config.wxtDir, "tsconfig.json"), {});
+  await fs5.mkdir(wxt.config.wxtDir, { recursive: true });
+  await fs5.writeJson(resolve7(wxt.config.wxtDir, "tsconfig.json"), {});
   const relativePaths = await glob2(Object.keys(PATH_GLOB_TO_TYPE_MAP), {
     cwd: wxt.config.entrypointsDir
   });
   relativePaths.sort();
   const pathGlobs = Object.keys(PATH_GLOB_TO_TYPE_MAP);
   const entrypointInfos = relativePaths.reduce((results, relativePath) => {
-    const inputPath = resolve8(wxt.config.entrypointsDir, relativePath);
+    const inputPath = resolve7(wxt.config.entrypointsDir, relativePath);
     const name = getEntrypointName(wxt.config.entrypointsDir, inputPath);
     const matchingGlob = pathGlobs.find(
       (glob5) => minimatch(relativePath, glob5)
@@ -1050,7 +959,7 @@ async function findEntrypoints() {
           return {
             ...info,
             type,
-            outputDir: resolve8(wxt.config.outDir, CONTENT_SCRIPT_OUT_DIR),
+            outputDir: resolve7(wxt.config.outDir, CONTENT_SCRIPT_OUT_DIR),
             options: {
               include: void 0,
               exclude: void 0
@@ -1124,7 +1033,7 @@ function preventDuplicateEntrypointNames(files) {
       if (absolutePaths.length > 1) {
         lines.push(`- ${name}`);
         absolutePaths.forEach((absolutePath) => {
-          lines.push(`  - ${relative4(wxt.config.root, absolutePath)}`);
+          lines.push(`  - ${relative3(wxt.config.root, absolutePath)}`);
         });
       }
       return lines;
@@ -1212,7 +1121,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(...)"?`
@@ -1235,7 +1144,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(...)"?`
@@ -1261,7 +1170,13 @@ async function getContentScriptEntrypoint({
   name,
   skipped
 }) {
-  const { main: _, ...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: _, ...options } = defaultExport;
   if (options == null) {
     throw Error(
       `${name}: Default export not found, did you forget to call "export default defineContentScript(...)"?`
@@ -1271,7 +1186,7 @@ async function getContentScriptEntrypoint({
     type: "content-script",
     name,
     inputPath,
-    outputDir: resolve8(wxt.config.outDir, CONTENT_SCRIPT_OUT_DIR),
+    outputDir: resolve7(wxt.config.outDir, CONTENT_SCRIPT_OUT_DIR),
     options: resolvePerBrowserOptions(options, wxt.config.browser),
     skipped
   };
@@ -1304,7 +1219,7 @@ async function getSidepanelEntrypoint(info) {
   };
 }
 async function getHtmlEntrypointOptions(info, keyMap, queries, parsers) {
-  const content = await fs6.readFile(info.inputPath, "utf-8");
+  const content = await fs5.readFile(info.inputPath, "utf-8");
   const { document } = parseHTML3(content);
   const options = {};
   const defaultQuery = (manifestKey) => document.querySelector(`meta[name='manifest.${manifestKey}']`)?.getAttribute("content");
@@ -1364,14 +1279,11 @@ var PATH_GLOB_TO_TYPE_MAP = {
   [`*/index.${CSS_EXTENSIONS_PATTERN}`]: "unlisted-style"
 };
 var CONTENT_SCRIPT_OUT_DIR = "content-scripts";
-function importEntrypoint(path8) {
-  return wxt.config.experimental.viteRuntime ? wxt.builder.importEntrypoint(path8) : importEntrypointFile(path8);
-}
 
 // src/core/utils/building/generate-wxt-dir.ts
-import { createUnimport as createUnimport3 } from "unimport";
-import fs7 from "fs-extra";
-import { relative as relative5, resolve as resolve9 } from "path";
+import { createUnimport as createUnimport2 } from "unimport";
+import fs6 from "fs-extra";
+import { relative as relative4, resolve as resolve8 } from "path";
 import path4 from "node:path";
 
 // src/core/utils/i18n.ts
@@ -1413,10 +1325,10 @@ function parseI18nMessages(messagesJson) {
 
 // src/core/utils/building/generate-wxt-dir.ts
 async function generateTypesDir(entrypoints) {
-  await fs7.ensureDir(wxt.config.typesDir);
+  await fs6.ensureDir(wxt.config.typesDir);
   const references = [];
   if (wxt.config.imports !== false) {
-    const unimport2 = createUnimport3(wxt.config.imports);
+    const unimport2 = createUnimport2(wxt.config.imports);
     references.push(await writeImportsDeclarationFile(unimport2));
     if (wxt.config.imports.eslintrc.enabled) {
       await writeImportsEslintFile(unimport2, wxt.config.imports);
@@ -1429,7 +1341,7 @@ async function generateTypesDir(entrypoints) {
   await writeTsConfigFile(mainReference);
 }
 async function writeImportsDeclarationFile(unimport2) {
-  const filePath = resolve9(wxt.config.typesDir, "imports.d.ts");
+  const filePath = resolve8(wxt.config.typesDir, "imports.d.ts");
   await unimport2.scanImportsFromDir(void 0, { cwd: wxt.config.srcDir });
   await writeFileIfDifferent(
     filePath,
@@ -1445,10 +1357,10 @@ async function writeImportsEslintFile(unimport2, options) {
   (await unimport2.getImports()).map((i) => i.as ?? i.name).filter(Boolean).sort().forEach((name) => {
     eslintrc.globals[name] = options.eslintrc.globalsPropValue;
   });
-  await fs7.writeJson(options.eslintrc.filePath, eslintrc, { spaces: 2 });
+  await fs6.writeJson(options.eslintrc.filePath, eslintrc, { spaces: 2 });
 }
 async function writePathsDeclarationFile(entrypoints) {
-  const filePath = resolve9(wxt.config.typesDir, "paths.d.ts");
+  const filePath = resolve8(wxt.config.typesDir, "paths.d.ts");
   const unions = entrypoints.map(
     (entry) => getEntrypointBundlePath(
       entry,
@@ -1476,7 +1388,7 @@ declare module "wxt/browser" {
   return filePath;
 }
 async function writeI18nDeclarationFile() {
-  const filePath = resolve9(wxt.config.typesDir, "i18n.d.ts");
+  const filePath = resolve8(wxt.config.typesDir, "i18n.d.ts");
   const defaultLocale = wxt.config.manifest.default_locale;
   const template = `// Generated by wxt
 import "wxt/browser";
@@ -1505,7 +1417,7 @@ declare module "wxt/browser" {
       defaultLocale,
       "messages.json"
     );
-    const content = JSON.parse(await fs7.readFile(defaultLocalePath, "utf-8"));
+    const content = JSON.parse(await fs6.readFile(defaultLocalePath, "utf-8"));
     messages = parseI18nMessages(content);
   } else {
     messages = parseI18nMessages({});
@@ -1529,7 +1441,7 @@ declare module "wxt/browser" {
   return filePath;
 }
 async function writeGlobalsDeclarationFile() {
-  const filePath = resolve9(wxt.config.typesDir, "globals.d.ts");
+  const filePath = resolve8(wxt.config.typesDir, "globals.d.ts");
   const globals2 = [...getGlobals(wxt.config), ...getEntrypointGlobals("")];
   await writeFileIfDifferent(
     filePath,
@@ -1548,14 +1460,14 @@ async function writeGlobalsDeclarationFile() {
 }
 async function writeMainDeclarationFile(references) {
   const dir = wxt.config.wxtDir;
-  const filePath = resolve9(dir, "wxt.d.ts");
+  const filePath = resolve8(dir, "wxt.d.ts");
   await writeFileIfDifferent(
     filePath,
     [
       "// Generated by wxt",
       `/// <reference types="wxt/vite-builder-env" />`,
       ...references.map(
-        (ref) => `/// <reference types="./${normalizePath(relative5(dir, ref))}" />`
+        (ref) => `/// <reference types="./${normalizePath(relative4(dir, ref))}" />`
       ),
       // Add references to modules installed from NPM to the TS project so
       // their type augmentation can update InlineConfig correctly. Local
@@ -1570,7 +1482,7 @@ async function writeMainDeclarationFile(references) {
 }
 async function writeTsConfigFile(mainReference) {
   const dir = wxt.config.wxtDir;
-  const getTsconfigPath = (path8) => normalizePath(relative5(dir, path8));
+  const getTsconfigPath = (path8) => normalizePath(relative4(dir, path8));
   const paths = Object.entries(wxt.config.alias).flatMap(([alias, absolutePath]) => {
     const aliasPath = getTsconfigPath(absolutePath);
     return [
@@ -1579,7 +1491,7 @@ async function writeTsConfigFile(mainReference) {
     ];
   }).join(",\n");
   await writeFileIfDifferent(
-    resolve9(dir, "tsconfig.json"),
+    resolve8(dir, "tsconfig.json"),
     `{
   "compilerOptions": {
     "target": "ESNext",
@@ -1609,10 +1521,10 @@ import { loadConfig } from "c12";
 import path5 from "node:path";
 
 // src/core/utils/cache.ts
-import fs8, { ensureDir as ensureDir2 } from "fs-extra";
-import { dirname as dirname4, resolve as resolve10 } from "path";
+import fs7, { ensureDir as ensureDir2 } from "fs-extra";
+import { dirname as dirname4, resolve as resolve9 } from "path";
 function createFsCache(wxtDir) {
-  const getPath = (key) => resolve10(wxtDir, "cache", encodeURIComponent(key));
+  const getPath = (key) => resolve9(wxtDir, "cache", encodeURIComponent(key));
   return {
     async set(key, value) {
       const path8 = getPath(key);
@@ -1622,7 +1534,7 @@ function createFsCache(wxtDir) {
     async get(key) {
       const path8 = getPath(key);
       try {
-        return await fs8.readFile(path8, "utf-8");
+        return await fs7.readFile(path8, "utf-8");
       } catch {
         return void 0;
       }
@@ -1634,12 +1546,12 @@ function createFsCache(wxtDir) {
 import defu from "defu";
 
 // src/core/utils/package.ts
-import { resolve as resolve11 } from "node:path";
-import fs9 from "fs-extra";
+import { resolve as resolve10 } from "node:path";
+import fs8 from "fs-extra";
 async function getPackageJson() {
-  const file = resolve11(wxt.config.root, "package.json");
+  const file = resolve10(wxt.config.root, "package.json");
   try {
-    return await fs9.readJson(file);
+    return await fs8.readJson(file);
   } catch (err) {
     wxt.logger.debug(
       `Failed to read package.json at: ${file}. Returning undefined.`
@@ -1655,7 +1567,7 @@ function isModuleInstalled(name) {
 }
 
 // src/core/utils/building/resolve-config.ts
-import fs10 from "fs-extra";
+import fs9 from "fs-extra";
 import glob3 from "fast-glob";
 async function resolveConfig(inlineConfig, command) {
   let userConfig = {};
@@ -1771,7 +1683,7 @@ async function resolveConfig(inlineConfig, command) {
     alias,
     experimental: defu(mergedConfig.experimental, {
       includeBrowserPolyfill: true,
-      viteRuntime: false
+      entrypointImporter: "jiti"
     }),
     dev: {
       server: devServerConfig,
@@ -1893,7 +1805,7 @@ async function resolveWxtModuleDir() {
   return path5.resolve(requireResolve("wxt"), "../..");
 }
 async function isDirMissing(dir) {
-  return !await fs10.exists(dir);
+  return !await fs9.exists(dir);
 }
 function logMissingDir(logger, name, expected) {
   logger.warn(
@@ -2005,6 +1917,95 @@ var ENTRY_TYPE_TO_GROUP_MAP = {
   "content-script-style": "individual"
 };
 
+// src/core/utils/building/import-entrypoint.ts
+import createJITI from "jiti";
+import { createUnimport as createUnimport3 } from "unimport";
+import fs10 from "fs-extra";
+import { relative as relative5, resolve as resolve11 } from "node:path";
+import { transformSync } from "esbuild";
+import { fileURLToPath } from "node:url";
+async function importEntrypointFile(path8) {
+  wxt.logger.debug("Loading file metadata:", path8);
+  const normalPath = normalizePath(path8);
+  const unimport2 = createUnimport3({
+    ...wxt.config.imports,
+    // Only allow specific imports, not all from the project
+    dirs: []
+  });
+  await unimport2.init();
+  const text = await fs10.readFile(path8, "utf-8");
+  const textNoImports = removeProjectImportStatements(text);
+  const { code } = await unimport2.injectImports(textNoImports);
+  wxt.logger.debug(
+    ["Text:", text, "No imports:", textNoImports, "Code:", code].join("\n")
+  );
+  const jiti = createJITI(
+    typeof __filename !== "undefined" ? __filename : fileURLToPath(import.meta.url),
+    {
+      cache: false,
+      debug: wxt.config.debug,
+      esmResolve: true,
+      alias: {
+        "webextension-polyfill": resolve11(
+          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 transformSync(
+          // Use modified source code for entrypoints
+          isEntrypoint ? code : opts.source,
+          getEsbuildOptions(opts)
+        );
+      }
+    }
+  );
+  try {
+    const res = await jiti(path8);
+    return res.default;
+  } catch (err) {
+    const filePath = relative5(wxt.config.root, path8);
+    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
 import pc5 from "picocolors";
 import fs13 from "fs-extra";
@@ -3125,6 +3126,9 @@ var packageManagers = {
 };
 
 // src/core/builders/vite/index.ts
+import { ViteNodeServer } from "vite-node/server";
+import { ViteNodeRunner } from "vite-node/client";
+import { installSourcemapsSupport } from "vite-node/source-map";
 async function createViteBuilder(wxtConfig, hooks, server) {
   const vite = await import("vite");
   const getBaseConfig = async () => {
@@ -3272,21 +3276,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 module = await runtime.executeUrl(url);
-      await server2.close();
-      return module.default;
+    async importEntrypoint(path8) {
+      switch (wxtConfig.experimental.entrypointImporter) {
+        default:
+        case "jiti": {
+          return await importEntrypointFile(path8);
+        }
+        case "vite-runtime": {
+          const baseConfig = await getBaseConfig();
+          const envConfig = {
+            plugins: [
+              webextensionPolyfillMock(wxtConfig),
+              removeEntrypointMainFunction(wxtConfig, path8)
+            ]
+          };
+          const config = vite.mergeConfig(baseConfig, envConfig);
+          const server2 = await vite.createServer(config);
+          await server2.listen();
+          const runtime = await vite.createViteRuntime(server2, { hmr: false });
+          const module = await runtime.executeUrl(path8);
+          await server2.close();
+          return module.default;
+        }
+        case "vite-node": {
+          const baseConfig = await getBaseConfig();
+          baseConfig.optimizeDeps ??= {};
+          baseConfig.optimizeDeps.noDiscovery = true;
+          baseConfig.optimizeDeps.include = [];
+          const envConfig = {
+            plugins: [
+              webextensionPolyfillMock(wxtConfig),
+              removeEntrypointMainFunction(wxtConfig, path8)
+            ]
+          };
+          const config = vite.mergeConfig(baseConfig, envConfig);
+          const server2 = await vite.createServer(config);
+          await server2.pluginContainer.buildStart({});
+          const node = new ViteNodeServer(server2);
+          installSourcemapsSupport({
+            getSourceMap: (source) => node.getSourceMap(source)
+          });
+          const runner = new 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(path8);
+          await server2.close();
+          return res.default;
+        }
+      }
     },
     async build(group) {
       let entryConfig;