npm - @crxjs/vite-plugin - Versions diffs - 1.0.0 → 1.0.3 - Mend

@crxjs/vite-plugin 1.0.0 → 1.0.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (4) hide show

package/CHANGELOG.md ADDED Viewed

@@ -0,0 +1,20 @@
+# @crxjs/vite-plugin
+## 1.0.3
+### Patch Changes
+- 8b2e587: check service worker on interval from extension page
+## 1.0.2
+### Patch Changes
+- be8a1de: Remove unused code that throws when web accessible resources contains
+  an HTML file.
+## 1.0.1
+### Patch Changes
+- d2b4f9e: feat: allow hash in manifest html urls

package/dist/index.cjs CHANGED Viewed

@@ -42,6 +42,7 @@ function _interopNamespace(e) {
 var debug__default = /*#__PURE__*/_interopDefaultLegacy(debug$5);
 var fg__default = /*#__PURE__*/_interopDefaultLegacy(fg);
 var v8__default = /*#__PURE__*/_interopDefaultLegacy(v8);
+var fsExtra__default = /*#__PURE__*/_interopDefaultLegacy(fsExtra);
 var MagicString__default = /*#__PURE__*/_interopDefaultLegacy(MagicString);
 var colors__default = /*#__PURE__*/_interopDefaultLegacy(colors);
 var jsesc__default = /*#__PURE__*/_interopDefaultLegacy(jsesc);
@@ -101,7 +102,7 @@ function htmlFiles(manifest) {
     manifest.options_page,
     manifest.options_ui?.page,
     manifest.sandbox?.pages
-  ].flat().filter(isString).sort();
+  ].flat().filter(isString).map((s) => s.split("#")[0]).sort();
   return [...new Set(files)];
 }
 function decodeManifest(code) {
@@ -1981,6 +1982,7 @@ function withLatestFrom() {
     });
 }
+const { pathExistsSync, outputFile, statSync } = fsExtra__default["default"];
 const debug$3 = _debug("file-writer").extend("events");
 const writerEvent$ = new BehaviorSubject({
   type: "init"
@@ -2002,7 +2004,7 @@ const filesReady$ = writerEvent$.pipe(filter((x) => {
   return x.type === "writeBundle";
 }), switchMap((event) => interval(100).pipe(mapTo(event), first(({ bundle, options, timestamp }) => {
   const result = Object.keys(bundle).every((p) => {
-    const stats = fsExtra.statSync(join(options.dir, p));
+    const stats = statSync(join(options.dir, p));
     return stats.mtimeMs > timestamp;
   });
   return result;
@@ -2014,7 +2016,7 @@ const rebuildFiles = async () => {
   debug$3("rebuildFiles start");
   await filesReady();
   await Promise.all([
-    fsExtra.outputFile(await triggerName, Date.now().toString()),
+    outputFile(await triggerName, Date.now().toString()),
     filesStart()
   ]);
   await filesReady();
@@ -2063,8 +2065,8 @@ const pluginFileWriterEvents = () => {
     async buildStart(options) {
       start = perf_hooks.performance.now();
       const filename = await triggerName;
-      if (!fsExtra.existsSync(filename)) {
-        await fsExtra.outputFile(filename, Date.now().toString());
+      if (!pathExistsSync(filename)) {
+        await outputFile(filename, Date.now().toString());
       }
       this.addWatchFile(filename);
       writerEvent$.next({ type: "buildStart", options });
@@ -2091,7 +2093,7 @@ const pluginFileWriterEvents = () => {
   };
 };
-var preControllerScript = "setTimeout(() => location.reload(), 100);\n";
+var preControllerScript = "const id = setInterval(() => location.reload(), 100);\nsetTimeout(() => clearInterval(id), 5e3);\n";
 var preControllerHtml = "<!DOCTYPE html>\n<html lang=\"en\">\n  <head>\n    <title>Waiting for the extension service worker...</title>\n    <script src=\"%PATH%\"></script>\n  </head>\n  <body>\n    <h1>Waiting for service worker</h1>\n\n    <p>\n      If you see this message, it means the service worker has not loaded fully.\n    </p>\n\n    <p>\n      During development, the service worker reroutes HTML requests to the dev\n      server, so this file isn't used unless the extension service worker opens\n      a page immediately after a full extension reload, and before the service\n      worker takes control of fetch (e.g., in the onInstalled event). In that\n      case, this page will continuously reload until the service worker is\n      ready, always less than 100 ms.\n    </p>\n\n    <p>This page is never added in production.</p>\n  </body>\n</html>\n";
@@ -2543,6 +2545,216 @@ const pluginHtmlAuditor = () => {
   };
 };
+const pluginManifest = (_manifest) => () => {
+  let manifest;
+  let plugins;
+  let refId;
+  let config;
+  return [
+    {
+      name: "crx:manifest-init",
+      enforce: "pre",
+      async config(config2, env) {
+        manifest = await (typeof _manifest === "function" ? _manifest(env) : _manifest);
+        if (manifest.manifest_version !== 3)
+          throw new Error(`Manifest v${manifest.manifest_version} is currently unsupported, please use manifest v3`);
+        if (env.command === "serve") {
+          const {
+            contentScripts: js,
+            background: sw,
+            html
+          } = await manifestFiles(manifest);
+          let { entries = [] } = config2.optimizeDeps ?? {};
+          entries = [entries].flat();
+          const set = new Set(entries);
+          for (const x of [...js, ...sw, ...html])
+            set.add(x);
+          return {
+            ...config2,
+            optimizeDeps: {
+              ...config2.optimizeDeps,
+              entries: [...set]
+            }
+          };
+        }
+      },
+      buildStart(options) {
+        if (options.plugins)
+          plugins = options.plugins;
+      }
+    },
+    {
+      name: "crx:manifest-loader",
+      apply: "build",
+      enforce: "pre",
+      buildStart() {
+        refId = this.emitFile({
+          type: "chunk",
+          id: manifestId,
+          name: "crx-manifest.js",
+          preserveSignature: "strict"
+        });
+      },
+      resolveId(source) {
+        if (source === manifestId)
+          return manifestId;
+        return null;
+      },
+      load(id) {
+        if (id === manifestId)
+          return encodeManifest(manifest);
+        return null;
+      }
+    },
+    {
+      name: "crx:stub-input",
+      apply: "build",
+      enforce: "pre",
+      options({ input, ...options }) {
+        return {
+          input: isString(input) && input.endsWith("index.html") ? stubId : input,
+          ...options
+        };
+      },
+      resolveId(source) {
+        if (source === stubId)
+          return stubId;
+        return null;
+      },
+      load(id) {
+        if (id === stubId)
+          return `console.log('stub')`;
+        return null;
+      },
+      generateBundle(options, bundle) {
+        for (const [key, chunk] of Object.entries(bundle)) {
+          if (chunk.type === "chunk" && chunk.facadeModuleId === stubId) {
+            delete bundle[key];
+            break;
+          }
+        }
+      }
+    },
+    {
+      name: "crx:manifest-post",
+      apply: "build",
+      enforce: "post",
+      configResolved(_config) {
+        config = _config;
+        const plugins2 = config.plugins;
+        const crx = plugins2.findIndex(({ name }) => name === "crx:manifest-post");
+        const [plugin] = plugins2.splice(crx, 1);
+        plugins2.push(plugin);
+      },
+      async transform(code, id) {
+        if (id !== manifestId)
+          return;
+        let manifest2 = decodeManifest.call(this, code);
+        for (const plugin of plugins) {
+          try {
+            const m = structuredClone(manifest2);
+            const result = await plugin.transformCrxManifest?.call(this, m);
+            manifest2 = result ?? manifest2;
+          } catch (error) {
+            if (error instanceof Error)
+              error.message = `[${plugin.name}] ${error.message}`;
+            throw error;
+          }
+        }
+        if (manifest2.content_scripts?.length) {
+          manifest2.content_scripts = manifest2.content_scripts.map(({ js = [], ...rest }) => {
+            const refJS = js.map((file) => this.emitFile({
+              type: "chunk",
+              id: file,
+              name: basename(file)
+            }));
+            return { js: refJS, ...rest };
+          });
+        }
+        if (!this.meta.watchMode) {
+          if (manifest2.background?.service_worker) {
+            const file = manifest2.background.service_worker;
+            const refId2 = this.emitFile({
+              type: "chunk",
+              id: file,
+              name: basename(file)
+            });
+            manifest2.background.service_worker = refId2;
+          }
+          for (const file of htmlFiles(manifest2)) {
+            this.emitFile({
+              type: "chunk",
+              id: file,
+              name: basename(file)
+            });
+          }
+        }
+        const encoded = encodeManifest(manifest2);
+        return encoded;
+      },
+      async generateBundle(options, bundle) {
+        const manifestName = this.getFileName(refId);
+        const manifestJs = bundle[manifestName];
+        let manifest2 = decodeManifest.call(this, manifestJs.code);
+        if (manifest2.background?.service_worker && !this.meta.watchMode) {
+          const ref = manifest2.background.service_worker;
+          const name = this.getFileName(ref);
+          manifest2.background.service_worker = name;
+        }
+        manifest2.content_scripts = manifest2.content_scripts?.map(({ js = [], ...rest }) => {
+          const refJS = js.map((ref) => this.getFileName(ref));
+          return { js: refJS, ...rest };
+        });
+        for (const plugin of plugins) {
+          try {
+            const m = structuredClone(manifest2);
+            const result = await plugin.renderCrxManifest?.call(this, m, bundle);
+            manifest2 = result ?? manifest2;
+          } catch (error) {
+            const name = `[${plugin.name}]`;
+            let message = error;
+            if (error instanceof Error) {
+              message = colors__default["default"].red(`${name} ${error.stack ? error.stack : error.message}`);
+            } else if (typeof error === "string") {
+              message = colors__default["default"].red(`${name} ${error}`);
+            }
+            console.log(message);
+            throw new Error(`Error in ${plugin.name}.renderCrxManifest`);
+          }
+        }
+        const assetTypes = [
+          "icons",
+          "locales",
+          "rulesets",
+          "webAccessibleResources"
+        ];
+        const files = await manifestFiles(manifest2);
+        await Promise.all(assetTypes.map((k) => files[k]).flat().map(async (f) => {
+          if (typeof bundle[f] === "undefined") {
+            const filename = join(config.root, f);
+            this.emitFile({
+              type: "asset",
+              fileName: f,
+              source: await fsExtra.readFile(filename)
+            });
+          }
+        }));
+        const manifestJson = bundle["manifest.json"];
+        if (typeof manifestJson === "undefined") {
+          this.emitFile({
+            type: "asset",
+            fileName: "manifest.json",
+            source: JSON.stringify(manifest2, null, 2)
+          });
+        } else {
+          manifestJson.source = JSON.stringify(manifest2, null, 2);
+        }
+        delete bundle[manifestName];
+      }
+    }
+  ];
+};
 var contentHmrPort = "function isCrxHMRPayload(x) {\n  return x.type === \"custom\" && x.event.startsWith(\"crx:\");\n}\nclass HMRPort {\n  port;\n  callbacks = /* @__PURE__ */ new Map();\n  constructor() {\n    setInterval(() => {\n      try {\n        this.port?.postMessage({ data: \"ping\" });\n      } catch (error) {\n        if (error instanceof Error && error.message.includes(\"Extension context invalidated.\")) {\n          location.reload();\n        } else\n          throw error;\n      }\n    }, __CRX_HMR_TIMEOUT__);\n    setInterval(this.initPort, 5 * 60 * 1e3);\n    this.initPort();\n  }\n  initPort = () => {\n    this.port?.disconnect();\n    this.port = chrome.runtime.connect({ name: \"@crx/client\" });\n    this.port.onDisconnect.addListener(this.handleDisconnect.bind(this));\n    this.port.onMessage.addListener(this.handleMessage.bind(this));\n    this.port.postMessage({ type: \"connected\" });\n  };\n  handleDisconnect = () => {\n    if (this.callbacks.has(\"close\"))\n      for (const cb of this.callbacks.get(\"close\")) {\n        cb({ wasClean: true });\n      }\n  };\n  handleMessage = (message) => {\n    const forward = (data) => {\n      if (this.callbacks.has(\"message\"))\n        for (const cb of this.callbacks.get(\"message\")) {\n          cb({ data });\n        }\n    };\n    const payload = JSON.parse(message.data);\n    if (isCrxHMRPayload(payload)) {\n      if (payload.event === \"crx:runtime-reload\") {\n        console.log(\"[crx] runtime reload\");\n        setTimeout(() => location.reload(), 500);\n      } else {\n        forward(JSON.stringify(payload.data));\n      }\n    } else {\n      forward(message.data);\n    }\n  };\n  addEventListener = (event, callback) => {\n    const cbs = this.callbacks.get(event) ?? /* @__PURE__ */ new Set();\n    cbs.add(callback);\n    this.callbacks.set(event, cbs);\n  };\n  send = (data) => {\n    if (this.port)\n      this.port.postMessage({ data });\n    else\n      throw new Error(\"HMRPort is not initialized\");\n  };\n}\n\nexport { HMRPort };\n";
 var contentDevLoader = "(function () {\n  'use strict';\n\n  (async () => {\n    if (__PREAMBLE__)\n      await import(\n        /* @vite-ignore */\n        chrome.runtime.getURL(__PREAMBLE__)\n      );\n    await import(\n      /* @vite-ignore */\n      chrome.runtime.getURL(__CLIENT__)\n    );\n    await import(\n      /* @vite-ignore */\n      chrome.runtime.getURL(__SCRIPT__)\n    );\n  })().catch(console.error);\n\n})();\n";
@@ -2981,220 +3193,6 @@ const pluginResources = ({ contentScripts = {} }) => {
   ];
 };
-const pluginManifest = (_manifest) => () => {
-  let manifest;
-  let plugins;
-  let refId;
-  let config;
-  return [
-    {
-      name: "crx:manifest-init",
-      enforce: "pre",
-      async config(config2, env) {
-        manifest = await (typeof _manifest === "function" ? _manifest(env) : _manifest);
-        if (manifest.manifest_version !== 3)
-          throw new Error(`Manifest v${manifest.manifest_version} is currently unsupported, please use manifest v3`);
-        if (env.command === "serve") {
-          const {
-            contentScripts: js,
-            background: sw,
-            html
-          } = await manifestFiles(manifest);
-          let { entries = [] } = config2.optimizeDeps ?? {};
-          entries = [entries].flat();
-          const set = new Set(entries);
-          for (const x of [...js, ...sw, ...html])
-            set.add(x);
-          return {
-            ...config2,
-            optimizeDeps: {
-              ...config2.optimizeDeps,
-              entries: [...set]
-            }
-          };
-        }
-      },
-      buildStart(options) {
-        if (options.plugins)
-          plugins = options.plugins;
-      }
-    },
-    {
-      name: "crx:manifest-loader",
-      apply: "build",
-      enforce: "pre",
-      buildStart() {
-        refId = this.emitFile({
-          type: "chunk",
-          id: manifestId,
-          name: "crx-manifest.js",
-          preserveSignature: "strict"
-        });
-      },
-      resolveId(source) {
-        if (source === manifestId)
-          return manifestId;
-        return null;
-      },
-      load(id) {
-        if (id === manifestId)
-          return encodeManifest(manifest);
-        return null;
-      }
-    },
-    {
-      name: "crx:stub-input",
-      apply: "build",
-      enforce: "pre",
-      options({ input, ...options }) {
-        return {
-          input: isString(input) && input.endsWith("index.html") ? stubId : input,
-          ...options
-        };
-      },
-      resolveId(source) {
-        if (source === stubId)
-          return stubId;
-        return null;
-      },
-      load(id) {
-        if (id === stubId)
-          return `console.log('stub')`;
-        return null;
-      },
-      generateBundle(options, bundle) {
-        for (const [key, chunk] of Object.entries(bundle)) {
-          if (chunk.type === "chunk" && chunk.facadeModuleId === stubId) {
-            delete bundle[key];
-            break;
-          }
-        }
-      }
-    },
-    {
-      name: "crx:manifest-post",
-      apply: "build",
-      enforce: "post",
-      configResolved(_config) {
-        config = _config;
-        const plugins2 = config.plugins;
-        const crx = plugins2.findIndex(({ name }) => name === "crx:manifest-post");
-        const [plugin] = plugins2.splice(crx, 1);
-        plugins2.push(plugin);
-      },
-      async transform(code, id) {
-        if (id !== manifestId)
-          return;
-        let manifest2 = decodeManifest.call(this, code);
-        for (const plugin of plugins) {
-          try {
-            const m = structuredClone(manifest2);
-            const result = await plugin.transformCrxManifest?.call(this, m);
-            manifest2 = result ?? manifest2;
-          } catch (error) {
-            if (error instanceof Error)
-              error.message = `[${plugin.name}] ${error.message}`;
-            throw error;
-          }
-        }
-        if (manifest2.content_scripts?.length) {
-          manifest2.content_scripts = manifest2.content_scripts.map(({ js = [], ...rest }) => {
-            const refJS = js.map((file) => this.emitFile({
-              type: "chunk",
-              id: file,
-              name: basename(file)
-            }));
-            return { js: refJS, ...rest };
-          });
-        }
-        if (!this.meta.watchMode) {
-          if (manifest2.background?.service_worker) {
-            const file = manifest2.background.service_worker;
-            const refId2 = this.emitFile({
-              type: "chunk",
-              id: file,
-              name: basename(file)
-            });
-            manifest2.background.service_worker = refId2;
-          }
-          for (const file of htmlFiles(manifest2)) {
-            this.emitFile({
-              type: "chunk",
-              id: file,
-              name: basename(file)
-            });
-          }
-        }
-        const encoded = encodeManifest(manifest2);
-        return encoded;
-      },
-      async generateBundle(options, bundle) {
-        const manifestName = this.getFileName(refId);
-        const manifestJs = bundle[manifestName];
-        let manifest2 = decodeManifest.call(this, manifestJs.code);
-        if (manifest2.background?.service_worker && !this.meta.watchMode) {
-          const ref = manifest2.background.service_worker;
-          const name = this.getFileName(ref);
-          manifest2.background.service_worker = name;
-        }
-        manifest2.content_scripts = manifest2.content_scripts?.map(({ js = [], ...rest }) => {
-          const refJS = js.map((ref) => this.getFileName(ref));
-          return { js: refJS, ...rest };
-        });
-        manifest2.web_accessible_resources = manifest2.web_accessible_resources?.map(({ resources, ...rest }) => ({
-          resources: resources.map((r) => fg__default["default"].isDynamicPattern(r) || r === dynamicResourcesName ? r : this.getFileName(r)),
-          ...rest
-        }));
-        for (const plugin of plugins) {
-          try {
-            const m = structuredClone(manifest2);
-            const result = await plugin.renderCrxManifest?.call(this, m, bundle);
-            manifest2 = result ?? manifest2;
-          } catch (error) {
-            const name = `[${plugin.name}]`;
-            let message = error;
-            if (error instanceof Error) {
-              message = colors__default["default"].red(`${name} ${error.stack ? error.stack : error.message}`);
-            } else if (typeof error === "string") {
-              message = colors__default["default"].red(`${name} ${error}`);
-            }
-            console.log(message);
-            throw new Error(`Error in ${plugin.name}.renderCrxManifest`);
-          }
-        }
-        const assetTypes = [
-          "icons",
-          "locales",
-          "rulesets",
-          "webAccessibleResources"
-        ];
-        const files = await manifestFiles(manifest2);
-        await Promise.all(assetTypes.map((k) => files[k]).flat().map(async (f) => {
-          if (typeof bundle[f] === "undefined") {
-            const filename = join(config.root, f);
-            this.emitFile({
-              type: "asset",
-              fileName: f,
-              source: await fsExtra.readFile(filename)
-            });
-          }
-        }));
-        const manifestJson = bundle["manifest.json"];
-        if (typeof manifestJson === "undefined") {
-          this.emitFile({
-            type: "asset",
-            fileName: "manifest.json",
-            source: JSON.stringify(manifest2, null, 2)
-          });
-        } else {
-          manifestJson.source = JSON.stringify(manifest2, null, 2);
-        }
-        delete bundle[manifestName];
-      }
-    }
-  ];
-};
 var workerHmrClient = "const ownOrigin = new URL(chrome.runtime.getURL(\"/\")).origin;\nself.addEventListener(\"fetch\", (fetchEvent) => {\n  const url = new URL(fetchEvent.request.url);\n  if (url.origin === ownOrigin) {\n    fetchEvent.respondWith(sendToServer(url));\n  }\n});\nasync function sendToServer(url) {\n  url.protocol = \"http:\";\n  url.host = \"localhost\";\n  url.port = __SERVER_PORT__;\n  url.searchParams.set(\"t\", Date.now().toString());\n  const response = await fetch(url.href.replace(/=$|=(?=&)/g, \"\"));\n  return new Response(response.body, {\n    headers: {\n      \"Content-Type\": response.headers.get(\"Content-Type\") ?? \"text/javascript\"\n    }\n  });\n}\nconst ports = /* @__PURE__ */ new Set();\nchrome.runtime.onConnect.addListener((port) => {\n  if (port.name === \"@crx/client\") {\n    ports.add(port);\n    port.onDisconnect.addListener((port2) => ports.delete(port2));\n    port.onMessage.addListener((message) => {\n    });\n    port.postMessage({ data: JSON.stringify({ type: \"connected\" }) });\n  }\n});\nfunction notifyContentScripts(payload) {\n  const data = JSON.stringify(payload);\n  for (const port of ports)\n    port.postMessage({ data });\n}\nconsole.log(\"[vite] connecting...\");\nconst socketProtocol = __HMR_PROTOCOL__ || (location.protocol === \"https:\" ? \"wss\" : \"ws\");\nconst socketHost = `${__HMR_HOSTNAME__ || location.hostname}:${__HMR_PORT__}`;\nconst socket = new WebSocket(`${socketProtocol}://${socketHost}`, \"vite-hmr\");\nconst base = __BASE__ || \"/\";\nsocket.addEventListener(\"message\", async ({ data }) => {\n  handleSocketMessage(JSON.parse(data));\n});\nfunction isCrxHmrPayload(x) {\n  return x.type === \"custom\" && x.event.startsWith(\"crx:\");\n}\nfunction handleSocketMessage(payload) {\n  if (isCrxHmrPayload(payload)) {\n    handleCrxHmrPayload(payload);\n  } else if (payload.type === \"connected\") {\n    console.log(`[vite] connected.`);\n    const interval = setInterval(() => socket.send(\"ping\"), __HMR_TIMEOUT__);\n    socket.addEventListener(\"close\", () => clearInterval(interval));\n  }\n}\nfunction handleCrxHmrPayload(payload) {\n  notifyContentScripts(payload);\n  switch (payload.event) {\n    case \"crx:runtime-reload\":\n      console.log(\"[crx] runtime reload\");\n      chrome.runtime.reload();\n      break;\n  }\n}\nasync function waitForSuccessfulPing(ms = 1e3) {\n  while (true) {\n    try {\n      await fetch(`${base}__vite_ping`);\n      break;\n    } catch (e) {\n      await new Promise((resolve) => setTimeout(resolve, ms));\n    }\n  }\n}\nsocket.addEventListener(\"close\", async ({ wasClean }) => {\n  if (wasClean)\n    return;\n  console.log(`[vite] server connection lost. polling for restart...`);\n  await waitForSuccessfulPing();\n  chrome.runtime.reload();\n});\n";
 function defineClientValues(code, config) {

package/dist/index.mjs CHANGED Viewed

@@ -4,7 +4,7 @@ import { createHash as createHash$1 } from 'crypto';
 import debug$5 from 'debug';
 import fg from 'fast-glob';
 import v8 from 'v8';
-import { readFile, outputFile, existsSync, statSync, readFileSync } from 'fs-extra';
+import fsExtra, { readFile, readFileSync } from 'fs-extra';
 import MagicString from 'magic-string';
 import { posix } from 'path';
 import { performance } from 'perf_hooks';
@@ -69,7 +69,7 @@ function htmlFiles(manifest) {
     manifest.options_page,
     manifest.options_ui?.page,
     manifest.sandbox?.pages
-  ].flat().filter(isString).sort();
+  ].flat().filter(isString).map((s) => s.split("#")[0]).sort();
   return [...new Set(files)];
 }
 function decodeManifest(code) {
@@ -1949,6 +1949,7 @@ function withLatestFrom() {
     });
 }
+const { pathExistsSync, outputFile, statSync } = fsExtra;
 const debug$3 = _debug("file-writer").extend("events");
 const writerEvent$ = new BehaviorSubject({
   type: "init"
@@ -2031,7 +2032,7 @@ const pluginFileWriterEvents = () => {
     async buildStart(options) {
       start = performance.now();
       const filename = await triggerName;
-      if (!existsSync(filename)) {
+      if (!pathExistsSync(filename)) {
         await outputFile(filename, Date.now().toString());
       }
       this.addWatchFile(filename);
@@ -2059,7 +2060,7 @@ const pluginFileWriterEvents = () => {
   };
 };
-var preControllerScript = "setTimeout(() => location.reload(), 100);\n";
+var preControllerScript = "const id = setInterval(() => location.reload(), 100);\nsetTimeout(() => clearInterval(id), 5e3);\n";
 var preControllerHtml = "<!DOCTYPE html>\n<html lang=\"en\">\n  <head>\n    <title>Waiting for the extension service worker...</title>\n    <script src=\"%PATH%\"></script>\n  </head>\n  <body>\n    <h1>Waiting for service worker</h1>\n\n    <p>\n      If you see this message, it means the service worker has not loaded fully.\n    </p>\n\n    <p>\n      During development, the service worker reroutes HTML requests to the dev\n      server, so this file isn't used unless the extension service worker opens\n      a page immediately after a full extension reload, and before the service\n      worker takes control of fetch (e.g., in the onInstalled event). In that\n      case, this page will continuously reload until the service worker is\n      ready, always less than 100 ms.\n    </p>\n\n    <p>This page is never added in production.</p>\n  </body>\n</html>\n";
@@ -2511,6 +2512,216 @@ const pluginHtmlAuditor = () => {
   };
 };
+const pluginManifest = (_manifest) => () => {
+  let manifest;
+  let plugins;
+  let refId;
+  let config;
+  return [
+    {
+      name: "crx:manifest-init",
+      enforce: "pre",
+      async config(config2, env) {
+        manifest = await (typeof _manifest === "function" ? _manifest(env) : _manifest);
+        if (manifest.manifest_version !== 3)
+          throw new Error(`Manifest v${manifest.manifest_version} is currently unsupported, please use manifest v3`);
+        if (env.command === "serve") {
+          const {
+            contentScripts: js,
+            background: sw,
+            html
+          } = await manifestFiles(manifest);
+          let { entries = [] } = config2.optimizeDeps ?? {};
+          entries = [entries].flat();
+          const set = new Set(entries);
+          for (const x of [...js, ...sw, ...html])
+            set.add(x);
+          return {
+            ...config2,
+            optimizeDeps: {
+              ...config2.optimizeDeps,
+              entries: [...set]
+            }
+          };
+        }
+      },
+      buildStart(options) {
+        if (options.plugins)
+          plugins = options.plugins;
+      }
+    },
+    {
+      name: "crx:manifest-loader",
+      apply: "build",
+      enforce: "pre",
+      buildStart() {
+        refId = this.emitFile({
+          type: "chunk",
+          id: manifestId,
+          name: "crx-manifest.js",
+          preserveSignature: "strict"
+        });
+      },
+      resolveId(source) {
+        if (source === manifestId)
+          return manifestId;
+        return null;
+      },
+      load(id) {
+        if (id === manifestId)
+          return encodeManifest(manifest);
+        return null;
+      }
+    },
+    {
+      name: "crx:stub-input",
+      apply: "build",
+      enforce: "pre",
+      options({ input, ...options }) {
+        return {
+          input: isString(input) && input.endsWith("index.html") ? stubId : input,
+          ...options
+        };
+      },
+      resolveId(source) {
+        if (source === stubId)
+          return stubId;
+        return null;
+      },
+      load(id) {
+        if (id === stubId)
+          return `console.log('stub')`;
+        return null;
+      },
+      generateBundle(options, bundle) {
+        for (const [key, chunk] of Object.entries(bundle)) {
+          if (chunk.type === "chunk" && chunk.facadeModuleId === stubId) {
+            delete bundle[key];
+            break;
+          }
+        }
+      }
+    },
+    {
+      name: "crx:manifest-post",
+      apply: "build",
+      enforce: "post",
+      configResolved(_config) {
+        config = _config;
+        const plugins2 = config.plugins;
+        const crx = plugins2.findIndex(({ name }) => name === "crx:manifest-post");
+        const [plugin] = plugins2.splice(crx, 1);
+        plugins2.push(plugin);
+      },
+      async transform(code, id) {
+        if (id !== manifestId)
+          return;
+        let manifest2 = decodeManifest.call(this, code);
+        for (const plugin of plugins) {
+          try {
+            const m = structuredClone(manifest2);
+            const result = await plugin.transformCrxManifest?.call(this, m);
+            manifest2 = result ?? manifest2;
+          } catch (error) {
+            if (error instanceof Error)
+              error.message = `[${plugin.name}] ${error.message}`;
+            throw error;
+          }
+        }
+        if (manifest2.content_scripts?.length) {
+          manifest2.content_scripts = manifest2.content_scripts.map(({ js = [], ...rest }) => {
+            const refJS = js.map((file) => this.emitFile({
+              type: "chunk",
+              id: file,
+              name: basename(file)
+            }));
+            return { js: refJS, ...rest };
+          });
+        }
+        if (!this.meta.watchMode) {
+          if (manifest2.background?.service_worker) {
+            const file = manifest2.background.service_worker;
+            const refId2 = this.emitFile({
+              type: "chunk",
+              id: file,
+              name: basename(file)
+            });
+            manifest2.background.service_worker = refId2;
+          }
+          for (const file of htmlFiles(manifest2)) {
+            this.emitFile({
+              type: "chunk",
+              id: file,
+              name: basename(file)
+            });
+          }
+        }
+        const encoded = encodeManifest(manifest2);
+        return encoded;
+      },
+      async generateBundle(options, bundle) {
+        const manifestName = this.getFileName(refId);
+        const manifestJs = bundle[manifestName];
+        let manifest2 = decodeManifest.call(this, manifestJs.code);
+        if (manifest2.background?.service_worker && !this.meta.watchMode) {
+          const ref = manifest2.background.service_worker;
+          const name = this.getFileName(ref);
+          manifest2.background.service_worker = name;
+        }
+        manifest2.content_scripts = manifest2.content_scripts?.map(({ js = [], ...rest }) => {
+          const refJS = js.map((ref) => this.getFileName(ref));
+          return { js: refJS, ...rest };
+        });
+        for (const plugin of plugins) {
+          try {
+            const m = structuredClone(manifest2);
+            const result = await plugin.renderCrxManifest?.call(this, m, bundle);
+            manifest2 = result ?? manifest2;
+          } catch (error) {
+            const name = `[${plugin.name}]`;
+            let message = error;
+            if (error instanceof Error) {
+              message = colors.red(`${name} ${error.stack ? error.stack : error.message}`);
+            } else if (typeof error === "string") {
+              message = colors.red(`${name} ${error}`);
+            }
+            console.log(message);
+            throw new Error(`Error in ${plugin.name}.renderCrxManifest`);
+          }
+        }
+        const assetTypes = [
+          "icons",
+          "locales",
+          "rulesets",
+          "webAccessibleResources"
+        ];
+        const files = await manifestFiles(manifest2);
+        await Promise.all(assetTypes.map((k) => files[k]).flat().map(async (f) => {
+          if (typeof bundle[f] === "undefined") {
+            const filename = join(config.root, f);
+            this.emitFile({
+              type: "asset",
+              fileName: f,
+              source: await readFile(filename)
+            });
+          }
+        }));
+        const manifestJson = bundle["manifest.json"];
+        if (typeof manifestJson === "undefined") {
+          this.emitFile({
+            type: "asset",
+            fileName: "manifest.json",
+            source: JSON.stringify(manifest2, null, 2)
+          });
+        } else {
+          manifestJson.source = JSON.stringify(manifest2, null, 2);
+        }
+        delete bundle[manifestName];
+      }
+    }
+  ];
+};
 var contentHmrPort = "function isCrxHMRPayload(x) {\n  return x.type === \"custom\" && x.event.startsWith(\"crx:\");\n}\nclass HMRPort {\n  port;\n  callbacks = /* @__PURE__ */ new Map();\n  constructor() {\n    setInterval(() => {\n      try {\n        this.port?.postMessage({ data: \"ping\" });\n      } catch (error) {\n        if (error instanceof Error && error.message.includes(\"Extension context invalidated.\")) {\n          location.reload();\n        } else\n          throw error;\n      }\n    }, __CRX_HMR_TIMEOUT__);\n    setInterval(this.initPort, 5 * 60 * 1e3);\n    this.initPort();\n  }\n  initPort = () => {\n    this.port?.disconnect();\n    this.port = chrome.runtime.connect({ name: \"@crx/client\" });\n    this.port.onDisconnect.addListener(this.handleDisconnect.bind(this));\n    this.port.onMessage.addListener(this.handleMessage.bind(this));\n    this.port.postMessage({ type: \"connected\" });\n  };\n  handleDisconnect = () => {\n    if (this.callbacks.has(\"close\"))\n      for (const cb of this.callbacks.get(\"close\")) {\n        cb({ wasClean: true });\n      }\n  };\n  handleMessage = (message) => {\n    const forward = (data) => {\n      if (this.callbacks.has(\"message\"))\n        for (const cb of this.callbacks.get(\"message\")) {\n          cb({ data });\n        }\n    };\n    const payload = JSON.parse(message.data);\n    if (isCrxHMRPayload(payload)) {\n      if (payload.event === \"crx:runtime-reload\") {\n        console.log(\"[crx] runtime reload\");\n        setTimeout(() => location.reload(), 500);\n      } else {\n        forward(JSON.stringify(payload.data));\n      }\n    } else {\n      forward(message.data);\n    }\n  };\n  addEventListener = (event, callback) => {\n    const cbs = this.callbacks.get(event) ?? /* @__PURE__ */ new Set();\n    cbs.add(callback);\n    this.callbacks.set(event, cbs);\n  };\n  send = (data) => {\n    if (this.port)\n      this.port.postMessage({ data });\n    else\n      throw new Error(\"HMRPort is not initialized\");\n  };\n}\n\nexport { HMRPort };\n";
 var contentDevLoader = "(function () {\n  'use strict';\n\n  (async () => {\n    if (__PREAMBLE__)\n      await import(\n        /* @vite-ignore */\n        chrome.runtime.getURL(__PREAMBLE__)\n      );\n    await import(\n      /* @vite-ignore */\n      chrome.runtime.getURL(__CLIENT__)\n    );\n    await import(\n      /* @vite-ignore */\n      chrome.runtime.getURL(__SCRIPT__)\n    );\n  })().catch(console.error);\n\n})();\n";
@@ -2949,220 +3160,6 @@ const pluginResources = ({ contentScripts = {} }) => {
   ];
 };
-const pluginManifest = (_manifest) => () => {
-  let manifest;
-  let plugins;
-  let refId;
-  let config;
-  return [
-    {
-      name: "crx:manifest-init",
-      enforce: "pre",
-      async config(config2, env) {
-        manifest = await (typeof _manifest === "function" ? _manifest(env) : _manifest);
-        if (manifest.manifest_version !== 3)
-          throw new Error(`Manifest v${manifest.manifest_version} is currently unsupported, please use manifest v3`);
-        if (env.command === "serve") {
-          const {
-            contentScripts: js,
-            background: sw,
-            html
-          } = await manifestFiles(manifest);
-          let { entries = [] } = config2.optimizeDeps ?? {};
-          entries = [entries].flat();
-          const set = new Set(entries);
-          for (const x of [...js, ...sw, ...html])
-            set.add(x);
-          return {
-            ...config2,
-            optimizeDeps: {
-              ...config2.optimizeDeps,
-              entries: [...set]
-            }
-          };
-        }
-      },
-      buildStart(options) {
-        if (options.plugins)
-          plugins = options.plugins;
-      }
-    },
-    {
-      name: "crx:manifest-loader",
-      apply: "build",
-      enforce: "pre",
-      buildStart() {
-        refId = this.emitFile({
-          type: "chunk",
-          id: manifestId,
-          name: "crx-manifest.js",
-          preserveSignature: "strict"
-        });
-      },
-      resolveId(source) {
-        if (source === manifestId)
-          return manifestId;
-        return null;
-      },
-      load(id) {
-        if (id === manifestId)
-          return encodeManifest(manifest);
-        return null;
-      }
-    },
-    {
-      name: "crx:stub-input",
-      apply: "build",
-      enforce: "pre",
-      options({ input, ...options }) {
-        return {
-          input: isString(input) && input.endsWith("index.html") ? stubId : input,
-          ...options
-        };
-      },
-      resolveId(source) {
-        if (source === stubId)
-          return stubId;
-        return null;
-      },
-      load(id) {
-        if (id === stubId)
-          return `console.log('stub')`;
-        return null;
-      },
-      generateBundle(options, bundle) {
-        for (const [key, chunk] of Object.entries(bundle)) {
-          if (chunk.type === "chunk" && chunk.facadeModuleId === stubId) {
-            delete bundle[key];
-            break;
-          }
-        }
-      }
-    },
-    {
-      name: "crx:manifest-post",
-      apply: "build",
-      enforce: "post",
-      configResolved(_config) {
-        config = _config;
-        const plugins2 = config.plugins;
-        const crx = plugins2.findIndex(({ name }) => name === "crx:manifest-post");
-        const [plugin] = plugins2.splice(crx, 1);
-        plugins2.push(plugin);
-      },
-      async transform(code, id) {
-        if (id !== manifestId)
-          return;
-        let manifest2 = decodeManifest.call(this, code);
-        for (const plugin of plugins) {
-          try {
-            const m = structuredClone(manifest2);
-            const result = await plugin.transformCrxManifest?.call(this, m);
-            manifest2 = result ?? manifest2;
-          } catch (error) {
-            if (error instanceof Error)
-              error.message = `[${plugin.name}] ${error.message}`;
-            throw error;
-          }
-        }
-        if (manifest2.content_scripts?.length) {
-          manifest2.content_scripts = manifest2.content_scripts.map(({ js = [], ...rest }) => {
-            const refJS = js.map((file) => this.emitFile({
-              type: "chunk",
-              id: file,
-              name: basename(file)
-            }));
-            return { js: refJS, ...rest };
-          });
-        }
-        if (!this.meta.watchMode) {
-          if (manifest2.background?.service_worker) {
-            const file = manifest2.background.service_worker;
-            const refId2 = this.emitFile({
-              type: "chunk",
-              id: file,
-              name: basename(file)
-            });
-            manifest2.background.service_worker = refId2;
-          }
-          for (const file of htmlFiles(manifest2)) {
-            this.emitFile({
-              type: "chunk",
-              id: file,
-              name: basename(file)
-            });
-          }
-        }
-        const encoded = encodeManifest(manifest2);
-        return encoded;
-      },
-      async generateBundle(options, bundle) {
-        const manifestName = this.getFileName(refId);
-        const manifestJs = bundle[manifestName];
-        let manifest2 = decodeManifest.call(this, manifestJs.code);
-        if (manifest2.background?.service_worker && !this.meta.watchMode) {
-          const ref = manifest2.background.service_worker;
-          const name = this.getFileName(ref);
-          manifest2.background.service_worker = name;
-        }
-        manifest2.content_scripts = manifest2.content_scripts?.map(({ js = [], ...rest }) => {
-          const refJS = js.map((ref) => this.getFileName(ref));
-          return { js: refJS, ...rest };
-        });
-        manifest2.web_accessible_resources = manifest2.web_accessible_resources?.map(({ resources, ...rest }) => ({
-          resources: resources.map((r) => fg.isDynamicPattern(r) || r === dynamicResourcesName ? r : this.getFileName(r)),
-          ...rest
-        }));
-        for (const plugin of plugins) {
-          try {
-            const m = structuredClone(manifest2);
-            const result = await plugin.renderCrxManifest?.call(this, m, bundle);
-            manifest2 = result ?? manifest2;
-          } catch (error) {
-            const name = `[${plugin.name}]`;
-            let message = error;
-            if (error instanceof Error) {
-              message = colors.red(`${name} ${error.stack ? error.stack : error.message}`);
-            } else if (typeof error === "string") {
-              message = colors.red(`${name} ${error}`);
-            }
-            console.log(message);
-            throw new Error(`Error in ${plugin.name}.renderCrxManifest`);
-          }
-        }
-        const assetTypes = [
-          "icons",
-          "locales",
-          "rulesets",
-          "webAccessibleResources"
-        ];
-        const files = await manifestFiles(manifest2);
-        await Promise.all(assetTypes.map((k) => files[k]).flat().map(async (f) => {
-          if (typeof bundle[f] === "undefined") {
-            const filename = join(config.root, f);
-            this.emitFile({
-              type: "asset",
-              fileName: f,
-              source: await readFile(filename)
-            });
-          }
-        }));
-        const manifestJson = bundle["manifest.json"];
-        if (typeof manifestJson === "undefined") {
-          this.emitFile({
-            type: "asset",
-            fileName: "manifest.json",
-            source: JSON.stringify(manifest2, null, 2)
-          });
-        } else {
-          manifestJson.source = JSON.stringify(manifest2, null, 2);
-        }
-        delete bundle[manifestName];
-      }
-    }
-  ];
-};
 var workerHmrClient = "const ownOrigin = new URL(chrome.runtime.getURL(\"/\")).origin;\nself.addEventListener(\"fetch\", (fetchEvent) => {\n  const url = new URL(fetchEvent.request.url);\n  if (url.origin === ownOrigin) {\n    fetchEvent.respondWith(sendToServer(url));\n  }\n});\nasync function sendToServer(url) {\n  url.protocol = \"http:\";\n  url.host = \"localhost\";\n  url.port = __SERVER_PORT__;\n  url.searchParams.set(\"t\", Date.now().toString());\n  const response = await fetch(url.href.replace(/=$|=(?=&)/g, \"\"));\n  return new Response(response.body, {\n    headers: {\n      \"Content-Type\": response.headers.get(\"Content-Type\") ?? \"text/javascript\"\n    }\n  });\n}\nconst ports = /* @__PURE__ */ new Set();\nchrome.runtime.onConnect.addListener((port) => {\n  if (port.name === \"@crx/client\") {\n    ports.add(port);\n    port.onDisconnect.addListener((port2) => ports.delete(port2));\n    port.onMessage.addListener((message) => {\n    });\n    port.postMessage({ data: JSON.stringify({ type: \"connected\" }) });\n  }\n});\nfunction notifyContentScripts(payload) {\n  const data = JSON.stringify(payload);\n  for (const port of ports)\n    port.postMessage({ data });\n}\nconsole.log(\"[vite] connecting...\");\nconst socketProtocol = __HMR_PROTOCOL__ || (location.protocol === \"https:\" ? \"wss\" : \"ws\");\nconst socketHost = `${__HMR_HOSTNAME__ || location.hostname}:${__HMR_PORT__}`;\nconst socket = new WebSocket(`${socketProtocol}://${socketHost}`, \"vite-hmr\");\nconst base = __BASE__ || \"/\";\nsocket.addEventListener(\"message\", async ({ data }) => {\n  handleSocketMessage(JSON.parse(data));\n});\nfunction isCrxHmrPayload(x) {\n  return x.type === \"custom\" && x.event.startsWith(\"crx:\");\n}\nfunction handleSocketMessage(payload) {\n  if (isCrxHmrPayload(payload)) {\n    handleCrxHmrPayload(payload);\n  } else if (payload.type === \"connected\") {\n    console.log(`[vite] connected.`);\n    const interval = setInterval(() => socket.send(\"ping\"), __HMR_TIMEOUT__);\n    socket.addEventListener(\"close\", () => clearInterval(interval));\n  }\n}\nfunction handleCrxHmrPayload(payload) {\n  notifyContentScripts(payload);\n  switch (payload.event) {\n    case \"crx:runtime-reload\":\n      console.log(\"[crx] runtime reload\");\n      chrome.runtime.reload();\n      break;\n  }\n}\nasync function waitForSuccessfulPing(ms = 1e3) {\n  while (true) {\n    try {\n      await fetch(`${base}__vite_ping`);\n      break;\n    } catch (e) {\n      await new Promise((resolve) => setTimeout(resolve, ms));\n    }\n  }\n}\nsocket.addEventListener(\"close\", async ({ wasClean }) => {\n  if (wasClean)\n    return;\n  console.log(`[vite] server connection lost. polling for restart...`);\n  await waitForSuccessfulPing();\n  chrome.runtime.reload();\n});\n";
 function defineClientValues(code, config) {

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@crxjs/vite-plugin",
-  "version": "1.0.0",
+  "version": "1.0.3",
   "description": "Build Chrome Extensions with this Vite plugin.",
   "keywords": [
     "rollup-plugin",
@@ -72,17 +72,17 @@
     "jsesc": "^3.0.2",
     "magic-string": "^0.26.0",
     "picocolors": "^1.0.0",
-    "react-refresh": "^0.12.0",
+    "react-refresh": "^0.13.0",
     "rollup": "^2.70.2"
   },
   "devDependencies": {
     "@extend-chrome/messages": "1.2.2",
     "@extend-chrome/storage": "1.5.0",
     "@rollup/plugin-alias": "3.1.9",
-    "@rollup/plugin-commonjs": "21.0.3",
+    "@rollup/plugin-commonjs": "21.1.0",
     "@rollup/plugin-node-resolve": "13.2.0",
     "@types/acorn": "4.0.6",
-    "@types/chrome": "0.0.181",
+    "@types/chrome": "0.0.183",
     "@types/debug": "4.1.7",
     "@types/fs-extra": "9.0.13",
     "@types/jest": "27.4.1",
@@ -90,28 +90,25 @@
     "@types/jsesc": "3.0.1",
     "@types/node": "17.0.18",
     "@types/react": "17.0.44",
-    "@types/react-dom": "17.0.11",
-    "@typescript-eslint/eslint-plugin": "5.19.0",
-    "@typescript-eslint/parser": "5.19.0",
+    "@types/react-dom": "17.0.16",
+    "@typescript-eslint/eslint-plugin": "5.21.0",
+    "@typescript-eslint/parser": "5.21.0",
     "@vitejs/plugin-react": "1.3.1",
     "@vitejs/plugin-vue": "2.3.1",
-    "@vue/compiler-sfc": "3.2.33",
-    "@vueuse/core": "7.6.2",
-    "@vueuse/router": "8.2.6",
-    "esbuild": "0.14.23",
+    "esbuild": "0.14.38",
     "esbuild-runner": "2.2.1",
+    "eslint": "^8.14.0",
     "jest": "27.5.1",
     "jest-image-snapshot": "4.5.1",
-    "playwright-chromium": "1.21.0",
+    "playwright-chromium": "1.21.1",
     "react": "17.0.2",
     "react-dom": "17.0.2",
     "rimraf": "3.0.2",
     "rollup-plugin-dts": "^4.2.0",
     "rollup-plugin-esbuild": "4.9.1",
     "rxjs": "7.5.5",
-    "typescript": "4.6.3",
     "vite": "^2.9.5",
-    "vite-plugin-inspect": "0.4.3",
+    "vite-plugin-inspect": "0.5.0",
     "vue": "3.2.33"
   },
   "peerDependencies": {