@crxjs/vite-plugin 2.6.0 → 2.6.1

package/dist/index.mjs

@@ -2,7 +2,7 @@ import { simple } from 'acorn-walk';
 import { createHash } from 'crypto';
 import debug$5 from 'debug';
 import { join, normalize, dirname, basename, isAbsolute, relative, resolve, parse as parse$1 } from 'pathe';
-import { Subject, filter, ReplaySubject, switchMap, of, startWith, map, BehaviorSubject, mergeMap, firstValueFrom, takeUntil, first, toArray, retry, concatWith, Subscription, buffer } from 'rxjs';
+import { Subject, filter, ReplaySubject, switchMap, of, startWith, tap, debounceTime, map, share, 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';
@@ -515,12 +515,39 @@ fileWriterEvent$.pipe(
   filter((e) => e.type === "build_start"),
   switchMap((e) => of(e))
 );
-const allFilesReady$ = buildEnd$.pipe(
-  switchMap(() => outputFiles.change$.pipe(startWith({ type: "start" }))),
-  map(() => [...outputFiles.values()]),
+const allFilesReadyDebounceMs = 100;
+let currentAllFilesReadyGeneration = 0;
+let completedAllFilesReadyGeneration = 0;
+let lastAllFilesReadyResults;
+const allFilesReadyState$ = buildEnd$.pipe(
   switchMap(
-    (files) => Promise.allSettled(files.map((file) => waitForOutputFile(file)))
-  )
+    () => outputFiles.change$.pipe(
+      startWith({ type: "start" }),
+      tap(() => {
+        currentAllFilesReadyGeneration += 1;
+      }),
+      debounceTime(allFilesReadyDebounceMs)
+    )
+  ),
+  map(() => ({
+    generation: currentAllFilesReadyGeneration,
+    files: [...outputFiles.values()]
+  })),
+  switchMap(async ({ generation, files }) => {
+    const seen = /* @__PURE__ */ new Set();
+    const results = await Promise.allSettled(
+      files.map((file) => waitForOutputFile(file, seen))
+    );
+    return { generation, results };
+  }),
+  tap(({ generation, results }) => {
+    completedAllFilesReadyGeneration = generation;
+    lastAllFilesReadyResults = results;
+  }),
+  share()
+);
+const allFilesReady$ = allFilesReadyState$.pipe(
+  map(({ results }) => results)
 );
 async function waitForOutputFile(file, seen = /* @__PURE__ */ new Set()) {
   if (seen.has(file))
@@ -529,6 +556,18 @@ async function waitForOutputFile(file, seen = /* @__PURE__ */ new Set()) {
   const { deps } = await file.file;
   await Promise.all(deps.map((dep) => waitForOutputFile(dep, seen)));
 }
+async function waitForAllFilesReadyResults() {
+  const targetGeneration = currentAllFilesReadyGeneration;
+  if (lastAllFilesReadyResults && completedAllFilesReadyGeneration >= targetGeneration) {
+    return lastAllFilesReadyResults;
+  }
+  const { results } = await firstValueFrom(
+    allFilesReadyState$.pipe(
+      filter(({ generation }) => generation >= targetGeneration)
+    )
+  );
+  return results;
+}
 const timestamp$ = new BehaviorSubject(Date.now());
 allFilesReady$.subscribe(() => {
   timestamp$.next(Date.now());
@@ -731,7 +770,7 @@ function prepIifeScript(fileName, script) {
   );
 }
 async function allFilesReady() {
-  await firstValueFrom(allFilesReady$);
+  await waitForAllFilesReadyResults();
 }
 
 const { outputFile } = fsx;
@@ -1735,7 +1774,7 @@ async function prepareVitePayloadForCrx(p) {
       return update(id).map((file) => file.file);
     });
     await Promise.all(pendingFiles);
-    await firstValueFrom(allFilesReady$);
+    await allFilesReady();
   }
   return mapVitePayloadForCrx(p);
 }

package/package.json

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