@crxjs/vite-plugin 2.0.0-beta.14 → 2.0.0-beta.16

package/client.d.ts

@@ -57,3 +57,18 @@ declare module '*?script&module' {
   const fileName: string
   export default fileName
 }
+
+declare namespace ContentScriptAPI {
+  export interface ExecuteFnOptions {
+    perf: {
+      injectTime: number
+      loadTime: number
+    }
+  }
+  export interface ExecuteFn {
+    (options: ExecuteFnOptions): void
+  }
+  export interface ModuleExports {
+    onExecute?: ExecuteFn
+  }
+}

package/dist/index.mjs

@@ -3,7 +3,7 @@ import { createHash } from 'crypto';
 import debug$3 from 'debug';
 import v8 from 'v8';
 import { posix } from 'path';
-import { Subject, filter, ReplaySubject, switchMap, of, startWith, map, mergeMap, firstValueFrom, takeUntil, first, toArray, retry, concatWith, Subscription, buffer } from 'rxjs';
+import { Subject, filter, ReplaySubject, switchMap, of, startWith, map, BehaviorSubject, mergeMap, firstValueFrom, takeUntil, first, toArray, retry, concatWith, Subscription, buffer } from 'rxjs';
 import fsx from 'fs-extra';
 import { performance } from 'perf_hooks';
 import { rollup } from 'rollup';
@@ -337,9 +337,9 @@ const pluginBackground = () => {
 
 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";
+var contentDevLoader = "(function () {\n  'use strict';\n\n  const injectTime = performance.now();\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    const { onExecute } = await import(\n      /* @vite-ignore */\n      chrome.runtime.getURL(__SCRIPT__)\n    );\n    onExecute?.({ perf: { injectTime, loadTime: performance.now() - injectTime } });\n  })().catch(console.error);\n\n})();\n";
 
-var contentProLoader = "(function () {\n  'use strict';\n\n  (async () => {\n    await import(\n      /* @vite-ignore */\n      chrome.runtime.getURL(__SCRIPT__)\n    );\n  })().catch(console.error);\n\n})();\n";
+var contentProLoader = "(function () {\n  'use strict';\n\n  const injectTime = performance.now();\n  (async () => {\n    const { onExecute } = await import(\n      /* @vite-ignore */\n      chrome.runtime.getURL(__SCRIPT__)\n    );\n    onExecute?.({ perf: { injectTime, loadTime: performance.now() - injectTime } });\n  })().catch(console.error);\n\n})();\n";
 
 const contentScripts = new RxMap();
 contentScripts.change$.pipe(filter(RxMap.isChangeType.set)).subscribe(({ map, value }) => {
@@ -397,6 +397,10 @@ const allFilesReady$ = buildEnd$.pipe(
   map(() => [...outputFiles.values()]),
   switchMap((files) => Promise.allSettled(files.map(({ file }) => file)))
 );
+const timestamp$ = new BehaviorSubject(Date.now());
+allFilesReady$.subscribe(() => {
+  timestamp$.next(Date.now());
+});
 const isRejected = (x) => x?.status === "rejected";
 const fileWriterError$ = allFilesReady$.pipe(
   mergeMap((results) => results.filter(isRejected)),
@@ -458,14 +462,10 @@ function prepScript(fileName, script) {
       const [imports] = lexer.parse(code, fileName);
       const depSet = new Set(deps);
       const magic = new MagicString(code);
-      const now = Date.now();
       for (const i of imports)
         if (i.n) {
           depSet.add(i.n);
-          let fileName2 = getFileName({ type: "module", id: i.n });
-          if (!fileName2.startsWith("vendor")) {
-            fileName2 = `${fileName2}?t=${now}`;
-          }
+          const fileName2 = getFileName({ type: "module", id: i.n });
           const fullImport = code.substring(i.s, i.e);
           magic.overwrite(i.s, i.e, fullImport.replace(i.n, `/${fileName2}`));
         }
@@ -649,6 +649,19 @@ const pluginContentScripts = () => {
       name: "crx:content-scripts",
       apply: "build",
       enforce: "pre",
+      config(config) {
+        return {
+          ...config,
+          build: {
+            ...config.build,
+            rollupOptions: {
+              ...config.build?.rollupOptions,
+              // keep exports for content script module api
+              preserveEntrySignatures: config.build?.rollupOptions?.preserveEntrySignatures ?? "exports-only"
+            }
+          }
+        };
+      },
       generateBundle() {
         for (const [key, script] of contentScripts)
           if (key === script.refId) {
@@ -1662,10 +1675,10 @@ Public dir: "${config.publicDir}"`
           this.emitFile({
             type: "asset",
             fileName: "manifest.json",
-            source: JSON.stringify(manifest2, null, 2)
+            source: JSON.stringify(manifest2, null, 2) + "\n"
           });
         } else {
-          manifestJson.source = JSON.stringify(manifest2, null, 2);
+          manifestJson.source = JSON.stringify(manifest2, null, 2) + "\n";
         }
         delete bundle[manifestName];
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@crxjs/vite-plugin",
-  "version": "2.0.0-beta.14",
+  "version": "2.0.0-beta.16",
   "description": "Build Chrome Extensions with this Vite plugin.",
   "keywords": [
     "rollup-plugin",
@@ -101,13 +101,13 @@
     "@vitejs/plugin-react": "^2.1.0",
     "@vitejs/plugin-vue": "3.2.0",
     "chokidar": "^3.5.3",
-    "esbuild": "0.17.4",
+    "esbuild": "0.17.14",
     "esbuild-runner": "2.2.2",
     "eslint": "8.26.0",
     "eslint-plugin-react": "^7.29.4",
     "jest-image-snapshot": "^5.2.0",
     "npm-run-all": "^4.1.5",
-    "playwright-chromium": "1.27.1",
+    "playwright-chromium": "1.31.2",
     "react": "17.0.2",
     "react-dom": "17.0.2",
     "rimraf": "3.0.2",