wxt 0.2.4 → 0.2.5

package/dist/index.cjs

@@ -263,7 +263,7 @@ function getUnimportOptions(config) {
     ],
     presets: [{ package: "wxt/client" }],
     warn: config.logger.warn,
-    dirs: ["components", "composables", "hooks", "utils"]
+    dirs: ["./components/*", "./composables/*", "./hooks/*", "./utils/*"]
   };
   return (0, import_vite.mergeConfig)(
     defaultOptions,
@@ -337,6 +337,26 @@ function tsconfigPaths(config) {
   });
 }
 
+// src/core/vite-plugins/noopBackground.ts
+function noopBackground() {
+  const virtualModuleId = VIRTUAL_NOOP_BACKGROUND_MODULE_ID;
+  const resolvedVirtualModuleId = "\0" + virtualModuleId;
+  return {
+    name: "wxt:noop-background",
+    resolveId(id) {
+      if (id === virtualModuleId)
+        return resolvedVirtualModuleId;
+    },
+    load(id) {
+      if (id === resolvedVirtualModuleId) {
+        return `import { defineBackground } from 'wxt/client';
+export default defineBackground(() => void 0)`;
+      }
+    }
+  };
+}
+var VIRTUAL_NOOP_BACKGROUND_MODULE_ID = "virtual:user-background";
+
 // src/core/utils/createFsCache.ts
 var import_fs_extra3 = __toESM(require("fs-extra"), 1);
 var import_path4 = require("path");
@@ -510,6 +530,7 @@ async function getInternalConfig(config, command) {
   );
   finalConfig.vite.plugins.push(devServerGlobals(finalConfig));
   finalConfig.vite.plugins.push(tsconfigPaths(finalConfig));
+  finalConfig.vite.plugins.push(noopBackground());
   finalConfig.vite.define ??= {};
   getGlobals(finalConfig).forEach((global) => {
     finalConfig.vite.define[global.name] = JSON.stringify(global.value);
@@ -764,6 +785,16 @@ var import_unimport2 = require("unimport");
 var import_fs_extra6 = __toESM(require("fs-extra"), 1);
 var import_path7 = require("path");
 var import_babel = __toESM(require("jiti/dist/babel"), 1);
+
+// src/core/utils/strings.ts
+function removeImportStatements(text) {
+  return text.replace(
+    /(import\s?[{\w][\s\S]*?from\s?["'][\s\S]*?["'];?|import\s?["'][\s\S]*?["'];?)/gm,
+    ""
+  );
+}
+
+// src/core/utils/importTsFile.ts
 async function importTsFile(path5, config) {
   config.logger.debug("Loading file metadata:", path5);
   const unimport2 = (0, import_unimport2.createUnimport)({
@@ -774,7 +805,7 @@ async function importTsFile(path5, config) {
   });
   await unimport2.init();
   const text = await import_fs_extra6.default.readFile(path5, "utf-8");
-  const textNoImports = text.replace(/import.*[\n;]/gm, "");
+  const textNoImports = removeImportStatements(text);
   const { code } = await unimport2.injectImports(textNoImports);
   config.logger.debug(
     ["Text:", text, "No imports:", textNoImports, "Code:", code].join("\n")
@@ -814,6 +845,7 @@ async function findEntrypoints(config) {
   const pathGlobs = Object.keys(PATH_GLOB_TO_TYPE_MAP);
   const existingNames = {};
   const entrypoints = [];
+  let hasBackground = false;
   await Promise.all(
     relativePaths.map(async (relativePath) => {
       const path5 = (0, import_path8.resolve)(config.entrypointsDir, relativePath);
@@ -843,6 +875,7 @@ ${JSON.stringify(
           break;
         case "background":
           entrypoint = await getBackgroundEntrypoint(config, path5);
+          hasBackground = true;
           break;
         case "content-script":
           entrypoint = await getContentScriptEntrypoint(
@@ -872,6 +905,11 @@ ${JSON.stringify(
       existingNames[entrypoint.name] = entrypoint;
     })
   );
+  if (config.command === "serve" && !hasBackground) {
+    entrypoints.push(
+      await getBackgroundEntrypoint(config, VIRTUAL_NOOP_BACKGROUND_MODULE_ID)
+    );
+  }
   return entrypoints;
 }
 async function getPopupEntrypoint(config, path5) {
@@ -929,9 +967,17 @@ async function getOptionsEntrypoint(config, path5) {
   };
 }
 async function getBackgroundEntrypoint(config, path5) {
-  const { main: _, ...options } = await importTsFile(path5, config);
-  if (options == null) {
-    throw Error("Background script does not have a default export");
+  let options = {};
+  if (path5 !== VIRTUAL_NOOP_BACKGROUND_MODULE_ID) {
+    const defaultExport = await importTsFile(
+      path5,
+      config
+    );
+    if (defaultExport == null) {
+      throw Error("Background script does not have a default export");
+    }
+    const { main: _, ...moduleOptions } = defaultExport;
+    options = moduleOptions;
   }
   return {
     type: "background",
@@ -975,6 +1021,7 @@ var PATH_GLOB_TO_TYPE_MAP = {
   "devtools.html": "devtools",
   "devtools/index.html": "devtools",
   "background.ts": "background",
+  [VIRTUAL_NOOP_BACKGROUND_MODULE_ID]: "background",
   "content.ts?(x)": "content-script",
   "content/index.ts?(x)": "content-script",
   "*.content.ts?(x)": "content-script",
@@ -1655,7 +1702,7 @@ async function buildInternal(config) {
   await import_fs_extra12.default.ensureDir(config.outDir);
   const entrypoints = await findEntrypoints(config);
   const groups = groupEntrypoints(entrypoints);
-  const { output } = await rebuild(config, groups);
+  const { output } = await rebuild(config, groups, void 0);
   config.logger.success(
     `Built extension in ${formatDuration(Date.now() - startTime)}`
   );
@@ -1667,7 +1714,11 @@ async function rebuild(config, entrypointGroups, existingOutput = {
   publicAssets: []
 }) {
   const allEntrypoints = await findEntrypoints(config);
-  await generateTypesDir(allEntrypoints, config);
+  await generateTypesDir(allEntrypoints, config).catch((err) => {
+    config.logger.warn("Failed to update .wxt directory:", err);
+    if (config.command === "build")
+      throw err;
+  });
   const newOutput = await buildEntrypoints(entrypointGroups, config);
   const mergedOutput = {
     steps: [...existingOutput.steps, ...newOutput.steps],
@@ -1843,7 +1894,7 @@ function reloadHtmlPages(groups, server, config) {
 }
 
 // package.json
-var version2 = "0.2.4";
+var version2 = "0.2.5";
 
 // src/core/utils/defineConfig.ts
 function defineConfig(config) {
@@ -1883,6 +1934,8 @@ async function createServer2(config) {
     changeQueue.push([event, path5]);
     await fileChangedMutex.runExclusive(async () => {
       const fileChanges = changeQueue.splice(0, changeQueue.length);
+      if (fileChanges.length === 0)
+        return;
       const changes = detectDevChanges(fileChanges, server.currentOutput);
       if (changes.type === "no-change")
         return;