@crxjs/vite-plugin 2.0.0-beta.13 → 2.0.0-beta.15

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';
@@ -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}`));
         }
@@ -477,7 +477,7 @@ async function allFilesReady() {
   await firstValueFrom(allFilesReady$);
 }
 
-const { outputFile, remove } = fsx;
+const { outputFile } = fsx;
 _debug("file-writer");
 async function start({
   server
@@ -498,8 +498,6 @@ async function start({
     dir: outDir,
     format: "es"
   };
-  if (server.config.build.emptyOutDir)
-    await remove(server.config.build.outDir);
   fileWriterEvent$.next({ type: "build_start" });
   const build = await rollup(inputOptions);
   await build.write(outputOptions);
@@ -868,29 +866,42 @@ const pluginDynamicContentScripts = () => {
   ];
 };
 
+const { remove } = fsx;
 const logger = createLogger("error", { prefix: "crxjs" });
 const pluginFileWriter = () => {
   fileWriterError$.subscribe((error) => {
     logger.error(error.err.message, { error: error.err });
   });
-  return {
-    name: "crx:file-writer",
-    apply: "serve",
-    configureServer(server) {
-      server.httpServer?.on("listening", async () => {
-        try {
-          await start({ server });
-        } catch (error) {
-          console.error(error);
-          server.close();
+  return [
+    {
+      name: "crx:file-writer-empty-out-dir",
+      apply: "serve",
+      enforce: "pre",
+      async configResolved(config) {
+        if (config.build.emptyOutDir) {
+          await remove(config.build.outDir);
         }
-      });
-      server.httpServer?.on("close", () => close());
+      }
     },
-    closeBundle() {
-      outputFiles.clear();
+    {
+      name: "crx:file-writer",
+      apply: "serve",
+      configureServer(server) {
+        server.httpServer?.on("listening", async () => {
+          try {
+            await start({ server });
+          } catch (error) {
+            console.error(error);
+            server.close();
+          }
+        });
+        server.httpServer?.on("close", () => close());
+      },
+      closeBundle() {
+        outputFiles.clear();
+      }
     }
-  };
+  ];
 };
 
 const _require = typeof require === "undefined" ? createRequire(import.meta.url) : require;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@crxjs/vite-plugin",
-  "version": "2.0.0-beta.13",
+  "version": "2.0.0-beta.15",
   "description": "Build Chrome Extensions with this Vite plugin.",
   "keywords": [
     "rollup-plugin",