fix(core): fixed using fallbacks with files in the public directory

[bump]
DuCanhGH · Feb 3, 2024 · e6ce949 · e6ce949
1 parent db2e02c
commit e6ce949
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 27 deletions.
diff --git a/.changeset/eighty-snails-doubt.md b/.changeset/eighty-snails-doubt.md
@@ -0,0 +1,7 @@
+---
+"@ducanh2912/next-pwa": patch
+---
+
+fix(core): fixed using fallbacks with files in the public directory
+
+- Silly mistakes... Sorry for the inconvenience.
diff --git a/packages/next-pwa/src/context.ts b/packages/next-pwa/src/context.ts
@@ -71,30 +71,29 @@ export const parseOptions = (
  const publicDir = path.resolve(webpackContext.dir, "public");
 
  if (!additionalManifestEntries) {
- additionalManifestEntries = fg
- .sync(
- [
- "**/*",
- "!workbox-*.js",
- "!workbox-*.js.map",
- "!worker-*.js",
- "!worker-*.js.map",
- "!fallback-*.js",
- "!fallback-*.js.map",
- "!swe-worker-*.js",
- "!swe-worker-*.js.map",
- `!${sw.replace(/^\/+/, "")}`,
- `!${sw.replace(/^\/+/, "")}.map`,
- ...publicExcludes,
- ],
- {
- cwd: publicDir,
- },
- )
- .map((f) => ({
- url: path.posix.join(nextConfig.basePath, f),
- revision: getFileHash(path.resolve(publicDir, f)),
- }));
+ const publicDirScan = fg.sync(
+ [
+ "**/*",
+ "!workbox-*.js",
+ "!workbox-*.js.map",
+ "!worker-*.js",
+ "!worker-*.js.map",
+ "!fallback-*.js",
+ "!fallback-*.js.map",
+ "!swe-worker-*.js",
+ "!swe-worker-*.js.map",
+ `!${sw.replace(/^\/+/, "")}`,
+ `!${sw.replace(/^\/+/, "")}.map`,
+ ...publicExcludes,
+ ],
+ {
+ cwd: publicDir,
+ },
+ );
+ additionalManifestEntries = publicDirScan.map((f) => ({
+ url: path.posix.join(nextConfig.basePath, f),
+ revision: getFileHash(path.resolve(publicDir, f)),
+ }));
  }
 
  if (cacheStartUrl) {
@@ -183,7 +182,9 @@ export const parseOptions = (
  const asset = (compilation as any).assetsInfo.get(key);
  m.revision = asset ? asset.contenthash || webpackContext.buildId : webpackContext.buildId;
  }
+
  m.url = m.url.replace(/\[/g, "%5B").replace(/\]/g, "%5D");
+
  return m;
  });
  return { manifest, warnings: [] };

diff --git a/packages/next-pwa/src/webpack/builders/build-workers.ts b/packages/next-pwa/src/webpack/builders/build-workers.ts
@@ -1,12 +1,10 @@
 import type { Configuration } from "webpack";
-import type { ManifestEntry } from "workbox-build";
 
 import { NextPwaContext } from "../../context.js";
 import { buildCustomWorker } from "./build-custom-worker.js";
 import { buildFallbackWorker } from "./build-fallback-worker.js";
 
 export const buildWorkers = (ctx: NextPwaContext) => {
- const additionalManifestEntries: ManifestEntry[] = [];
  const childCompilationInstances: NonNullable<Configuration["plugins"]> = [];
 
  const customWorker = buildCustomWorker(ctx);
@@ -36,7 +34,7 @@ export const buildWorkers = (ctx: NextPwaContext) => {
  if (
  route &&
  typeof route !== "boolean" &&
- !additionalManifestEntries.find((entry) => typeof entry !== "string" && entry.url.startsWith(route))
+ !ctx.options.workboxOptions.additionalManifestEntries.find((entry) => typeof entry === "object" && entry.url.startsWith(route))
  ) {
  ctx.options.workboxOptions.additionalManifestEntries.push({
  url: route,