@serwist/turbopack 10.0.0-preview.12 → 10.0.0-preview.14

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAI9C,OAAO,KAAK,EAAE,qBAAqB,EAAiC,MAAM,YAAY,CAAC;AAuCvF;;;GAGG;AACH,eAAO,MAAM,kBAAkB,GAAI,SAAS,qBAAqB;;;;;;;aAgFzC,OAAO,cAAc;QAAE,MAAM,EAAE,OAAO,CAAC;YAAE,IAAI,EAAE,MAAM,CAAA;SAAE,CAAC,CAAA;KAAE;CAajF,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAI9C,OAAO,KAAK,EAAE,qBAAqB,EAAiC,MAAM,YAAY,CAAC;AAuCvF;;;GAGG;AACH,eAAO,MAAM,kBAAkB,GAAI,SAAS,qBAAqB;;;;;;;aAoFzC,OAAO,cAAc;QAAE,MAAM,EAAE,OAAO,CAAC;YAAE,IAAI,EAAE,MAAM,CAAA;SAAE,CAAC,CAAA;KAAE;CAajF,CAAC"}

package/dist/index.js

@@ -104,8 +104,12 @@ const createSerwistRoute = (options)=>{
                 ...config.manifestTransforms ?? [],
                 (manifestEntries)=>{
                     const manifest = manifestEntries.map((m)=>{
-                        if (m.url.startsWith(".next/")) m.url = `/_next/${m.url.slice(6)}`;
-                        if (m.url.startsWith("public/")) m.url = path.posix.join(config.basePath, m.url.slice(7));
+                        if (m.url.startsWith(config.nextConfig.distDir)) {
+                            m.url = `${config.nextConfig.assetPrefix ?? ""}/_next/${m.url.slice(config.nextConfig.distDir.length)}`;
+                        }
+                        if (m.url.startsWith("public/")) {
+                            m.url = path.posix.join(config.nextConfig.basePath, m.url.slice(7));
+                        }
                         return m;
                     });
                     return {
@@ -120,7 +124,7 @@ const createSerwistRoute = (options)=>{
     const loadMap = async (filePath)=>{
         const config = await validation;
         const { count, size, manifestEntries, warnings } = await getFileManifestEntries(config);
-        const injectionPoint = config.injectionPoint ? config.injectionPoint : "";
+        const injectionPoint = config.injectionPoint || "";
         const manifestString = manifestEntries === undefined ? "undefined" : JSON.stringify(manifestEntries, null, 2);
         logSerwistResult(filePath, {
             count,

package/dist/index.schema.d.ts

@@ -1,13 +1,21 @@
 import z from "zod";
 export declare const turboPartial: z.ZodObject<{
     cwd: z.ZodPrefault<z.ZodString>;
-    basePath: z.ZodString;
+    nextConfig: z.ZodObject<{
+        assetPrefix: z.ZodOptional<z.ZodString>;
+        basePath: z.ZodPrefault<z.ZodString>;
+        distDir: z.ZodPrefault<z.ZodString>;
+    }, z.z.core.$strict>;
     esbuildOptions: z.ZodPrefault<z.ZodRecord<z.ZodLiteral<"bundle" | "splitting" | "preserveSymlinks" | "external" | "packages" | "alias" | "loader" | "resolveExtensions" | "mainFields" | "conditions" | "allowOverwrite" | "tsconfig" | "outExtension" | "publicPath" | "inject" | "banner" | "footer" | "plugins" | "sourcemap" | "legalComments" | "sourceRoot" | "sourcesContent" | "format" | "globalName" | "target" | "supported" | "mangleProps" | "reserveProps" | "mangleQuoted" | "mangleCache" | "drop" | "dropLabels" | "minify" | "minifyWhitespace" | "minifyIdentifiers" | "minifySyntax" | "lineLimit" | "charset" | "treeShaking" | "ignoreAnnotations" | "jsx" | "jsxFactory" | "jsxFragment" | "jsxImportSource" | "jsxDev" | "jsxSideEffects" | "define" | "pure" | "keepNames" | "absPaths" | "color" | "logLevel" | "logLimit" | "logOverride" | "tsconfigRaw"> & z.z.core.$partial, z.ZodAny>>;
 }, z.z.core.$strict>;
 export declare const injectManifestOptions: z.ZodPipe<z.ZodObject<{
     cwd: z.ZodPrefault<z.ZodString>;
     esbuildOptions: z.ZodPrefault<z.ZodRecord<z.ZodLiteral<"bundle" | "splitting" | "preserveSymlinks" | "external" | "packages" | "alias" | "loader" | "resolveExtensions" | "mainFields" | "conditions" | "allowOverwrite" | "tsconfig" | "outExtension" | "publicPath" | "inject" | "banner" | "footer" | "plugins" | "sourcemap" | "legalComments" | "sourceRoot" | "sourcesContent" | "format" | "globalName" | "target" | "supported" | "mangleProps" | "reserveProps" | "mangleQuoted" | "mangleCache" | "drop" | "dropLabels" | "minify" | "minifyWhitespace" | "minifyIdentifiers" | "minifySyntax" | "lineLimit" | "charset" | "treeShaking" | "ignoreAnnotations" | "jsx" | "jsxFactory" | "jsxFragment" | "jsxImportSource" | "jsxDev" | "jsxSideEffects" | "define" | "pure" | "keepNames" | "absPaths" | "color" | "logLevel" | "logLimit" | "logOverride" | "tsconfigRaw"> & z.z.core.$partial, z.ZodAny>>;
-    basePath: z.ZodString;
+    nextConfig: z.ZodObject<{
+        assetPrefix: z.ZodOptional<z.ZodString>;
+        basePath: z.ZodPrefault<z.ZodString>;
+        distDir: z.ZodPrefault<z.ZodString>;
+    }, z.z.core.$strict>;
     additionalPrecacheEntries: z.ZodOptional<z.ZodArray<z.ZodUnion<readonly [z.ZodString, z.ZodType<import("@serwist/build").ManifestEntry, import("@serwist/build").ManifestEntry, z.z.core.$ZodTypeInternals<import("@serwist/build").ManifestEntry, import("@serwist/build").ManifestEntry>>]>>>;
     dontCacheBustURLsMatching: z.ZodOptional<z.ZodCustom<RegExp, RegExp>>;
     manifestTransforms: z.ZodOptional<z.ZodArray<z.ZodType<import("@serwist/build").ManifestTransform, import("@serwist/build").ManifestTransform, z.z.core.$ZodTypeInternals<import("@serwist/build").ManifestTransform, import("@serwist/build").ManifestTransform>>>>;
@@ -15,7 +23,7 @@ export declare const injectManifestOptions: z.ZodPipe<z.ZodObject<{
     modifyURLPrefix: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
     globFollow: z.ZodDefault<z.ZodBoolean>;
     globIgnores: z.ZodDefault<z.ZodArray<z.ZodString>>;
-    globPatterns: z.ZodPrefault<z.ZodArray<z.ZodString>>;
+    globPatterns: z.ZodOptional<z.ZodArray<z.ZodString>>;
     globStrict: z.ZodDefault<z.ZodBoolean>;
     templatedURLs: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodUnion<readonly [z.ZodString, z.ZodArray<z.ZodString>]>>>;
     injectionPoint: z.ZodPrefault<z.ZodString>;
@@ -23,29 +31,36 @@ export declare const injectManifestOptions: z.ZodPipe<z.ZodObject<{
     globDirectory: z.ZodOptional<z.ZodString>;
 }, z.z.core.$strict>, z.ZodTransform<{
     swSrc: string;
+    globPatterns: string[];
     globDirectory: string;
+    dontCacheBustURLsMatching: RegExp;
+    nextConfig: {
+        distDir: string;
+        basePath: string;
+        assetPrefix?: string | undefined;
+    };
     cwd: string;
     esbuildOptions: Partial<Record<"bundle" | "splitting" | "preserveSymlinks" | "external" | "packages" | "alias" | "loader" | "resolveExtensions" | "mainFields" | "conditions" | "allowOverwrite" | "tsconfig" | "outExtension" | "publicPath" | "inject" | "banner" | "footer" | "plugins" | "sourcemap" | "legalComments" | "sourceRoot" | "sourcesContent" | "format" | "globalName" | "target" | "supported" | "mangleProps" | "reserveProps" | "mangleQuoted" | "mangleCache" | "drop" | "dropLabels" | "minify" | "minifyWhitespace" | "minifyIdentifiers" | "minifySyntax" | "lineLimit" | "charset" | "treeShaking" | "ignoreAnnotations" | "jsx" | "jsxFactory" | "jsxFragment" | "jsxImportSource" | "jsxDev" | "jsxSideEffects" | "define" | "pure" | "keepNames" | "absPaths" | "color" | "logLevel" | "logLimit" | "logOverride" | "tsconfigRaw", any>>;
-    basePath: string;
     maximumFileSizeToCacheInBytes: number;
     globFollow: boolean;
     globIgnores: string[];
-    globPatterns: string[];
     globStrict: boolean;
     injectionPoint: string;
     additionalPrecacheEntries?: (string | import("@serwist/build").ManifestEntry)[] | undefined;
-    dontCacheBustURLsMatching?: RegExp | undefined;
     manifestTransforms?: import("@serwist/build").ManifestTransform[] | undefined;
     modifyURLPrefix?: Record<string, string> | undefined;
     templatedURLs?: Record<string, string | string[]> | undefined;
 }, {
     cwd: string;
     esbuildOptions: Partial<Record<"bundle" | "splitting" | "preserveSymlinks" | "external" | "packages" | "alias" | "loader" | "resolveExtensions" | "mainFields" | "conditions" | "allowOverwrite" | "tsconfig" | "outExtension" | "publicPath" | "inject" | "banner" | "footer" | "plugins" | "sourcemap" | "legalComments" | "sourceRoot" | "sourcesContent" | "format" | "globalName" | "target" | "supported" | "mangleProps" | "reserveProps" | "mangleQuoted" | "mangleCache" | "drop" | "dropLabels" | "minify" | "minifyWhitespace" | "minifyIdentifiers" | "minifySyntax" | "lineLimit" | "charset" | "treeShaking" | "ignoreAnnotations" | "jsx" | "jsxFactory" | "jsxFragment" | "jsxImportSource" | "jsxDev" | "jsxSideEffects" | "define" | "pure" | "keepNames" | "absPaths" | "color" | "logLevel" | "logLimit" | "logOverride" | "tsconfigRaw", any>>;
-    basePath: string;
+    nextConfig: {
+        basePath: string;
+        distDir: string;
+        assetPrefix?: string | undefined;
+    };
     maximumFileSizeToCacheInBytes: number;
     globFollow: boolean;
     globIgnores: string[];
-    globPatterns: string[];
     globStrict: boolean;
     injectionPoint: string;
     swSrc: string;
@@ -53,6 +68,7 @@ export declare const injectManifestOptions: z.ZodPipe<z.ZodObject<{
     dontCacheBustURLsMatching?: RegExp | undefined;
     manifestTransforms?: import("@serwist/build").ManifestTransform[] | undefined;
     modifyURLPrefix?: Record<string, string> | undefined;
+    globPatterns?: string[] | undefined;
     templatedURLs?: Record<string, string | string[]> | undefined;
     globDirectory?: string | undefined;
 }>>;

package/dist/index.schema.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.schema.d.ts","sourceRoot":"","sources":["../src/index.schema.ts"],"names":[],"mappings":"AAEA,OAAO,CAAC,MAAM,KAAK,CAAC;AAIpB,eAAO,MAAM,YAAY;;;;oBAIvB,CAAC;AAEH,eAAO,MAAM,qBAAqB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgB9B,CAAC"}
+{"version":3,"file":"index.schema.d.ts","sourceRoot":"","sources":["../src/index.schema.ts"],"names":[],"mappings":"AAEA,OAAO,CAAC,MAAM,KAAK,CAAC;AAKpB,eAAO,MAAM,YAAY;;;;;;;;oBAQvB,CAAC;AAEH,eAAO,MAAM,qBAAqB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAyB9B,CAAC"}

package/dist/index.schema.js

@@ -2,10 +2,6 @@ import path from 'node:path';
 import { injectPartial, globPartial, basePartial, assertType } from '@serwist/build/schema';
 import z from 'zod';
 
-const DEFAULT_GLOB_PATTERNS = [
-    ".next/static/**/*.{js,css,html,ico,apng,png,avif,jpg,jpeg,jfif,pjpeg,pjp,gif,svg,webp,json,webmanifest}",
-    "public/**/*"
-];
 const SUPPORTED_ESBUILD_OPTIONS = [
     "sourcemap",
     "legalComments",
@@ -64,9 +60,18 @@ const SUPPORTED_ESBUILD_OPTIONS = [
     "plugins"
 ];
 
+const generateGlobPatterns = (distDir)=>[
+        `${distDir}static/**/*.{js,css,html,ico,apng,png,avif,jpg,jpeg,jfif,pjpeg,pjp,gif,svg,webp,json,webmanifest}`,
+        "public/**/*"
+    ];
+
 const turboPartial = z.strictObject({
     cwd: z.string().prefault(process.cwd()),
-    basePath: z.string(),
+    nextConfig: z.strictObject({
+        assetPrefix: z.string().optional(),
+        basePath: z.string().prefault("/"),
+        distDir: z.string().prefault(".next")
+    }),
     esbuildOptions: z.partialRecord(z.literal(SUPPORTED_ESBUILD_OPTIONS), z.any()).prefault({})
 });
 const injectManifestOptions = z.strictObject({
@@ -74,15 +79,24 @@ const injectManifestOptions = z.strictObject({
     ...globPartial.shape,
     ...injectPartial.shape,
     ...turboPartial.shape,
-    globPatterns: z.array(z.string()).prefault(DEFAULT_GLOB_PATTERNS),
+    globPatterns: z.array(z.string()).optional(),
     globDirectory: z.string().optional()
 }).omit({
     disablePrecacheManifest: true
 }).transform((input)=>{
+    let distDir = input.nextConfig.distDir;
+    if (distDir[0] === "/") distDir = distDir.slice(1);
+    if (distDir[distDir.length - 1] !== "/") distDir += "/";
     return {
         ...input,
         swSrc: path.isAbsolute(input.swSrc) ? input.swSrc : path.join(input.cwd, input.swSrc),
-        globDirectory: input.globDirectory ?? input.cwd
+        globPatterns: input.globPatterns ?? generateGlobPatterns(distDir),
+        globDirectory: input.globDirectory ?? input.cwd,
+        dontCacheBustURLsMatching: input.dontCacheBustURLsMatching ?? new RegExp(`^${distDir}static/`),
+        nextConfig: {
+            ...input.nextConfig,
+            distDir
+        }
     };
 });
 assertType();

package/dist/index.worker.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.worker.d.ts","sourceRoot":"","sources":["../src/index.worker.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAG9C,eAAO,MAAM,gBAAgB;;;;CAInB,CAAC;AAEX;;;;;GAKG;AACH,eAAO,MAAM,YAAY,EAAE,cAAc,EAsQlC,CAAC"}
+{"version":3,"file":"index.worker.d.ts","sourceRoot":"","sources":["../src/index.worker.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAG9C,eAAO,MAAM,gBAAgB;;;;CAInB,CAAC;AAEX;;;;;GAKG;AACH,eAAO,MAAM,YAAY,EAAE,cAAc,EAkQlC,CAAC"}

package/dist/index.worker.js

@@ -170,15 +170,13 @@ const defaultCache = process.env.NODE_ENV !== "production" ? [
         })
     },
     {
-        matcher: ({ sameOrigin, url: { pathname } })=>{
-            if (!sameOrigin || pathname.startsWith("/api/auth/callback")) {
-                return false;
-            }
-            if (pathname.startsWith("/api/")) {
-                return true;
-            }
-            return false;
-        },
+        matcher: /\/api\/auth\/.*/,
+        handler: new NetworkOnly({
+            networkTimeoutSeconds: 10
+        })
+    },
+    {
+        matcher: ({ sameOrigin, url: { pathname } })=>sameOrigin && pathname.startsWith("/api/"),
         method: "GET",
         handler: new NetworkFirst({
             cacheName: "apis",
@@ -252,6 +250,11 @@ const defaultCache = process.env.NODE_ENV !== "production" ? [
             ],
             networkTimeoutSeconds: 10
         })
+    },
+    {
+        matcher: /.*/i,
+        method: "GET",
+        handler: new NetworkOnly()
     }
 ];
 

package/dist/lib/constants.d.ts

@@ -1,3 +1,2 @@
-export declare const DEFAULT_GLOB_PATTERNS: string[];
 export declare const SUPPORTED_ESBUILD_OPTIONS: readonly ["sourcemap", "legalComments", "sourceRoot", "sourcesContent", "format", "globalName", "target", "supported", "define", "treeShaking", "minify", "mangleProps", "reserveProps", "mangleQuoted", "mangleCache", "drop", "dropLabels", "minifyWhitespace", "minifyIdentifiers", "minifySyntax", "lineLimit", "charset", "ignoreAnnotations", "jsx", "jsxFactory", "jsxFragment", "jsxImportSource", "jsxDev", "jsxSideEffects", "pure", "keepNames", "absPaths", "color", "logLevel", "logLimit", "logOverride", "tsconfigRaw", "bundle", "splitting", "preserveSymlinks", "external", "packages", "alias", "loader", "resolveExtensions", "mainFields", "conditions", "allowOverwrite", "tsconfig", "outExtension", "publicPath", "inject", "banner", "footer", "plugins"];
 //# sourceMappingURL=constants.d.ts.map

package/dist/lib/constants.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../src/lib/constants.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,qBAAqB,UAGjC,CAAC;AAEF,eAAO,MAAM,yBAAyB,ovBA0Dc,CAAC"}
+{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../src/lib/constants.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,yBAAyB,ovBA0Dc,CAAC"}

package/dist/lib/utils.d.ts

@@ -0,0 +1,2 @@
+export declare const generateGlobPatterns: (distDir: string) => string[];
+//# sourceMappingURL=utils.d.ts.map

package/dist/lib/utils.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/lib/utils.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,oBAAoB,GAAI,SAAS,MAAM,aAGnD,CAAC"}

package/dist/types.d.ts

@@ -2,8 +2,31 @@ import type { BasePartial, BaseResolved, GlobPartial, GlobResolved, InjectPartia
 import type { Prettify, Require } from "@serwist/utils";
 import type { BuildOptions } from "esbuild-wasm";
 import type { SUPPORTED_ESBUILD_OPTIONS } from "./lib/constants.js";
+import type { NextConfig as CompleteNextConfig } from "next";
 export type EsbuildSupportedOptions = (typeof SUPPORTED_ESBUILD_OPTIONS)[number];
 export type EsbuildOptions = Pick<BuildOptions, EsbuildSupportedOptions>;
+export interface NextConfig extends Pick<CompleteNextConfig, "basePath" | "distDir"> {
+    /**
+     * The Next.js `assetPrefix` config option.
+     *
+     * @see https://nextjs.org/docs/app/api-reference/config/next-config-js/assetPrefix
+     */
+    assetPrefix?: string;
+    /**
+     * The Next.js `basePath` config option.
+     *
+     * @default "/"
+     * @see https://nextjs.org/docs/app/api-reference/config/next-config-js/basePath
+     */
+    basePath?: string;
+    /**
+     * The Next.js `distDir` config option.
+     *
+     * @default ".next"
+     * @see https://nextjs.org/docs/app/api-reference/config/next-config-js/distDir
+     */
+    distDir?: string;
+}
 export interface TurboPartial {
     /**
      * The path to your working directory.
@@ -12,13 +35,23 @@ export interface TurboPartial {
      */
     cwd?: string;
     /**
-     * The Next.js `basePath` config option. If this option
-     * is not configured, set to `/`.
+     * A copy of your Next.js configuration. You must check
+     * if any option you've configured is needed by Serwist
+     * to ensure expected behavior.
+     *
+     * The following options are currently needed: `assetPrefix`,
+     * `basePath`, `distDir`.
+     */
+    nextConfig: Prettify<NextConfig>;
+    /**
+     * Options to configure the esbuild instance used to bundle
+     * the service worker.
      */
-    basePath: string;
     esbuildOptions?: EsbuildOptions;
 }
-export type TurboResolved = Require<TurboPartial, "cwd" | "esbuildOptions">;
+export interface TurboResolved extends Require<TurboPartial, "cwd" | "esbuildOptions"> {
+    nextConfig: Require<NextConfig, "basePath" | "distDir">;
+}
 export type InjectManifestOptions = Prettify<Omit<BasePartial & GlobPartial & InjectPartial & OptionalGlobDirectoryPartial & TurboPartial, "disablePrecacheManifest">>;
-export type InjectManifestOptionsComplete = Prettify<Omit<BaseResolved & GlobResolved & InjectResolved & RequiredGlobDirectoryResolved & TurboResolved, "disablePrecacheManifest">>;
+export type InjectManifestOptionsComplete = Prettify<Omit<Require<BaseResolved, "dontCacheBustURLsMatching"> & GlobResolved & InjectResolved & RequiredGlobDirectoryResolved & TurboResolved, "disablePrecacheManifest">>;
 //# sourceMappingURL=types.d.ts.map

package/dist/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,WAAW,EACX,YAAY,EACZ,WAAW,EACX,YAAY,EACZ,aAAa,EACb,cAAc,EACd,4BAA4B,EAC5B,6BAA6B,EAC9B,MAAM,gBAAgB,CAAC;AACxB,OAAO,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AACxD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AACjD,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,oBAAoB,CAAC;AAEpE,MAAM,MAAM,uBAAuB,GAAG,CAAC,OAAO,yBAAyB,CAAC,CAAC,MAAM,CAAC,CAAC;AAEjF,MAAM,MAAM,cAAc,GAAG,IAAI,CAAC,YAAY,EAAE,uBAAuB,CAAC,CAAC;AAEzE,MAAM,WAAW,YAAY;IAC3B;;;;OAIG;IACH,GAAG,CAAC,EAAE,MAAM,CAAC;IACb;;;OAGG;IACH,QAAQ,EAAE,MAAM,CAAC;IACjB,cAAc,CAAC,EAAE,cAAc,CAAC;CACjC;AAED,MAAM,MAAM,aAAa,GAAG,OAAO,CAAC,YAAY,EAAE,KAAK,GAAG,gBAAgB,CAAC,CAAC;AAE5E,MAAM,MAAM,qBAAqB,GAAG,QAAQ,CAC1C,IAAI,CAAC,WAAW,GAAG,WAAW,GAAG,aAAa,GAAG,4BAA4B,GAAG,YAAY,EAAE,yBAAyB,CAAC,CACzH,CAAC;AAEF,MAAM,MAAM,6BAA6B,GAAG,QAAQ,CAClD,IAAI,CAAC,YAAY,GAAG,YAAY,GAAG,cAAc,GAAG,6BAA6B,GAAG,aAAa,EAAE,yBAAyB,CAAC,CAC9H,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,WAAW,EACX,YAAY,EACZ,WAAW,EACX,YAAY,EACZ,aAAa,EACb,cAAc,EACd,4BAA4B,EAC5B,6BAA6B,EAC9B,MAAM,gBAAgB,CAAC;AACxB,OAAO,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AACxD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AACjD,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,oBAAoB,CAAC;AACpE,OAAO,KAAK,EAAE,UAAU,IAAI,kBAAkB,EAAE,MAAM,MAAM,CAAC;AAE7D,MAAM,MAAM,uBAAuB,GAAG,CAAC,OAAO,yBAAyB,CAAC,CAAC,MAAM,CAAC,CAAC;AAEjF,MAAM,MAAM,cAAc,GAAG,IAAI,CAAC,YAAY,EAAE,uBAAuB,CAAC,CAAC;AAEzE,MAAM,WAAW,UAAW,SAAQ,IAAI,CAAC,kBAAkB,EAAE,UAAU,GAAG,SAAS,CAAC;IAClF;;;;OAIG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB;;;;;OAKG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB;;;;;OAKG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,YAAY;IAC3B;;;;OAIG;IACH,GAAG,CAAC,EAAE,MAAM,CAAC;IACb;;;;;;;OAOG;IACH,UAAU,EAAE,QAAQ,CAAC,UAAU,CAAC,CAAC;IACjC;;;OAGG;IACH,cAAc,CAAC,EAAE,cAAc,CAAC;CACjC;AAED,MAAM,WAAW,aAAc,SAAQ,OAAO,CAAC,YAAY,EAAE,KAAK,GAAG,gBAAgB,CAAC;IACpF,UAAU,EAAE,OAAO,CAAC,UAAU,EAAE,UAAU,GAAG,SAAS,CAAC,CAAC;CACzD;AAED,MAAM,MAAM,qBAAqB,GAAG,QAAQ,CAC1C,IAAI,CAAC,WAAW,GAAG,WAAW,GAAG,aAAa,GAAG,4BAA4B,GAAG,YAAY,EAAE,yBAAyB,CAAC,CACzH,CAAC;AAEF,MAAM,MAAM,6BAA6B,GAAG,QAAQ,CAClD,IAAI,CACF,OAAO,CAAC,YAAY,EAAE,2BAA2B,CAAC,GAAG,YAAY,GAAG,cAAc,GAAG,6BAA6B,GAAG,aAAa,EAClI,yBAAyB,CAC1B,CACF,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@serwist/turbopack",
-  "version": "10.0.0-preview.12",
+  "version": "10.0.0-preview.14",
   "type": "module",
   "sideEffects": false,
   "description": "A module that integrates Serwist into your Next.js / Turbopack application.",
@@ -63,30 +63,31 @@
     "./package.json": "./package.json"
   },
   "dependencies": {
-    "@swc/core": "1.12.14",
-    "esbuild-wasm": "0.25.8",
+    "@swc/core": "1.13.5",
     "kolorist": "1.8.0",
-    "zod": "4.0.5",
-    "@serwist/build": "10.0.0-preview.12",
-    "@serwist/window": "10.0.0-preview.12",
-    "serwist": "10.0.0-preview.12"
+    "zod": "4.1.5",
+    "@serwist/build": "10.0.0-preview.14",
+    "@serwist/window": "10.0.0-preview.14",
+    "serwist": "10.0.0-preview.14"
   },
   "devDependencies": {
-    "@types/node": "24.0.14",
-    "@types/react": "19.1.8",
-    "next": "15.4.1",
-    "react": "19.1.0",
-    "react-dom": "19.1.0",
-    "rollup": "4.45.1",
+    "@types/node": "24.3.0",
+    "@types/react": "19.1.12",
+    "esbuild-wasm": "0.25.9",
+    "next": "15.5.2",
+    "react": "19.1.1",
+    "react-dom": "19.1.1",
+    "rollup": "4.49.0",
     "type-fest": "4.41.0",
-    "typescript": "5.8.3",
-    "@serwist/configs": "10.0.0-preview.12",
-    "@serwist/utils": "10.0.0-preview.12"
+    "typescript": "5.9.2",
+    "@serwist/configs": "10.0.0-preview.14",
+    "@serwist/utils": "10.0.0-preview.14"
   },
   "peerDependencies": {
     "next": ">=14.0.0",
     "react": ">=18.0.0",
-    "typescript": ">=5.0.0"
+    "typescript": ">=5.0.0",
+    "esbuild-wasm": "^0.25.0"
   },
   "peerDependenciesMeta": {
     "typescript": {

package/src/index.schema.ts

@@ -1,12 +1,17 @@
 import path from "node:path";
 import { assertType, type Equals, basePartial, globPartial, injectPartial } from "@serwist/build/schema";
 import z from "zod";
-import { DEFAULT_GLOB_PATTERNS, SUPPORTED_ESBUILD_OPTIONS } from "./lib/constants.js";
+import { SUPPORTED_ESBUILD_OPTIONS } from "./lib/constants.js";
+import { generateGlobPatterns } from "./lib/utils.js";
 import type { InjectManifestOptions, InjectManifestOptionsComplete, TurboPartial, TurboResolved } from "./types.js";
 
 export const turboPartial = z.strictObject({
   cwd: z.string().prefault(process.cwd()),
-  basePath: z.string(),
+  nextConfig: z.strictObject({
+    assetPrefix: z.string().optional(),
+    basePath: z.string().prefault("/"),
+    distDir: z.string().prefault(".next"),
+  }),
   esbuildOptions: z.partialRecord(z.literal(SUPPORTED_ESBUILD_OPTIONS), z.any()).prefault({}),
 });
 
@@ -16,15 +21,24 @@ export const injectManifestOptions = z
     ...globPartial.shape,
     ...injectPartial.shape,
     ...turboPartial.shape,
-    globPatterns: z.array(z.string()).prefault(DEFAULT_GLOB_PATTERNS),
+    globPatterns: z.array(z.string()).optional(),
     globDirectory: z.string().optional(),
   })
   .omit({ disablePrecacheManifest: true })
   .transform((input) => {
+    let distDir = input.nextConfig.distDir;
+    if (distDir[0] === "/") distDir = distDir.slice(1);
+    if (distDir[distDir.length - 1] !== "/") distDir += "/";
     return {
       ...input,
       swSrc: path.isAbsolute(input.swSrc) ? input.swSrc : path.join(input.cwd, input.swSrc),
+      globPatterns: input.globPatterns ?? generateGlobPatterns(distDir),
       globDirectory: input.globDirectory ?? input.cwd,
+      dontCacheBustURLsMatching: input.dontCacheBustURLsMatching ?? new RegExp(`^${distDir}static/`),
+      nextConfig: {
+        ...input.nextConfig,
+        distDir,
+      },
     };
   });
 

package/src/index.ts

@@ -73,10 +73,14 @@ export const createSerwistRoute = (options: InjectManifestOptions) => {
         ...(config.manifestTransforms ?? []),
         (manifestEntries) => {
           const manifest = manifestEntries.map((m) => {
-            // Replace all references to .next/ with "/_next/".
-            if (m.url.startsWith(".next/")) m.url = `/_next/${m.url.slice(6)}`;
+            // Replace all references to "$(distDir)" with "$(assetPrefix)/_next/".
+            if (m.url.startsWith(config.nextConfig.distDir)) {
+              m.url = `${config.nextConfig.assetPrefix ?? ""}/_next/${m.url.slice(config.nextConfig.distDir.length)}`;
+            }
             // Replace all references to public/ with "$(basePath)/".
-            if (m.url.startsWith("public/")) m.url = path.posix.join(config.basePath, m.url.slice(7));
+            if (m.url.startsWith("public/")) {
+              m.url = path.posix.join(config.nextConfig.basePath, m.url.slice(7));
+            }
             return m;
           });
           return { manifest, warnings: [] };
@@ -92,7 +96,7 @@ export const createSerwistRoute = (options: InjectManifestOptions) => {
     const config = await validation;
     const { count, size, manifestEntries, warnings } = await getFileManifestEntries(config);
     // See https://github.com/GoogleChrome/workbox/issues/2230
-    const injectionPoint = config.injectionPoint ? config.injectionPoint : "";
+    const injectionPoint = config.injectionPoint || "";
     const manifestString = manifestEntries === undefined ? "undefined" : JSON.stringify(manifestEntries, null, 2);
     logSerwistResult(filePath, { count, size, warnings });
     const result = await (await esbuild).build({

package/src/index.worker.ts

@@ -181,24 +181,15 @@ export const defaultCache: RuntimeCaching[] =
           }),
         },
         {
-          matcher: ({ sameOrigin, url: { pathname } }) => {
-            // Exclude /api/auth/callback/* to fix OAuth workflow in Safari without having
-            // an impact on other environments
-            // The above route is the default for next-auth, you may need to change it if
-            // your OAuth workflow has a different callback route.
-            // Issue: https://github.com/shadowwalker/next-pwa/issues/131#issuecomment-821894809
-            // TODO(ducanhgh): Investigate Auth.js's "/api/auth/*" failing when we allow them
-            // to be cached (the current behaviour).
-            if (!sameOrigin || pathname.startsWith("/api/auth/callback")) {
-              return false;
-            }
-
-            if (pathname.startsWith("/api/")) {
-              return true;
-            }
-
-            return false;
-          },
+          // Exclude /api/auth/* to fix auth callback
+          // https://github.com/serwist/serwist/discussions/28
+          matcher: /\/api\/auth\/.*/,
+          handler: new NetworkOnly({
+            networkTimeoutSeconds: 10, // fallback to cache if API does not response within 10 seconds
+          }),
+        },
+        {
+          matcher: ({ sameOrigin, url: { pathname } }) => sameOrigin && pathname.startsWith("/api/"),
           method: "GET",
           handler: new NetworkFirst({
             cacheName: "apis",
@@ -275,4 +266,9 @@ export const defaultCache: RuntimeCaching[] =
             networkTimeoutSeconds: 10,
           }),
         },
+        {
+          matcher: /.*/i,
+          method: "GET",
+          handler: new NetworkOnly(),
+        },
       ];

package/src/lib/constants.ts

@@ -1,10 +1,5 @@
 import type { BuildOptions } from "esbuild-wasm";
 
-export const DEFAULT_GLOB_PATTERNS = [
-  ".next/static/**/*.{js,css,html,ico,apng,png,avif,jpg,jpeg,jfif,pjpeg,pjp,gif,svg,webp,json,webmanifest}",
-  "public/**/*",
-];
-
 export const SUPPORTED_ESBUILD_OPTIONS = [
   // CommonOptions
   "sourcemap",

package/src/lib/utils.ts

@@ -0,0 +1,4 @@
+export const generateGlobPatterns = (distDir: string) => [
+  `${distDir}static/**/*.{js,css,html,ico,apng,png,avif,jpg,jpeg,jfif,pjpeg,pjp,gif,svg,webp,json,webmanifest}`,
+  "public/**/*",
+];

package/src/types.ts

@@ -11,11 +11,35 @@ import type {
 import type { Prettify, Require } from "@serwist/utils";
 import type { BuildOptions } from "esbuild-wasm";
 import type { SUPPORTED_ESBUILD_OPTIONS } from "./lib/constants.js";
+import type { NextConfig as CompleteNextConfig } from "next";
 
 export type EsbuildSupportedOptions = (typeof SUPPORTED_ESBUILD_OPTIONS)[number];
 
 export type EsbuildOptions = Pick<BuildOptions, EsbuildSupportedOptions>;
 
+export interface NextConfig extends Pick<CompleteNextConfig, "basePath" | "distDir"> {
+  /**
+   * The Next.js `assetPrefix` config option.
+   *
+   * @see https://nextjs.org/docs/app/api-reference/config/next-config-js/assetPrefix
+   */
+  assetPrefix?: string;
+  /**
+   * The Next.js `basePath` config option.
+   *
+   * @default "/"
+   * @see https://nextjs.org/docs/app/api-reference/config/next-config-js/basePath
+   */
+  basePath?: string;
+  /**
+   * The Next.js `distDir` config option.
+   *
+   * @default ".next"
+   * @see https://nextjs.org/docs/app/api-reference/config/next-config-js/distDir
+   */
+  distDir?: string;
+}
+
 export interface TurboPartial {
   /**
    * The path to your working directory.
@@ -24,19 +48,32 @@ export interface TurboPartial {
    */
   cwd?: string;
   /**
-   * The Next.js `basePath` config option. If this option
-   * is not configured, set to `/`.
+   * A copy of your Next.js configuration. You must check
+   * if any option you've configured is needed by Serwist
+   * to ensure expected behavior.
+   *
+   * The following options are currently needed: `assetPrefix`,
+   * `basePath`, `distDir`.
+   */
+  nextConfig: Prettify<NextConfig>;
+  /**
+   * Options to configure the esbuild instance used to bundle
+   * the service worker.
    */
-  basePath: string;
   esbuildOptions?: EsbuildOptions;
 }
 
-export type TurboResolved = Require<TurboPartial, "cwd" | "esbuildOptions">;
+export interface TurboResolved extends Require<TurboPartial, "cwd" | "esbuildOptions"> {
+  nextConfig: Require<NextConfig, "basePath" | "distDir">;
+}
 
 export type InjectManifestOptions = Prettify<
   Omit<BasePartial & GlobPartial & InjectPartial & OptionalGlobDirectoryPartial & TurboPartial, "disablePrecacheManifest">
 >;
 
 export type InjectManifestOptionsComplete = Prettify<
-  Omit<BaseResolved & GlobResolved & InjectResolved & RequiredGlobDirectoryResolved & TurboResolved, "disablePrecacheManifest">
+  Omit<
+    Require<BaseResolved, "dontCacheBustURLsMatching"> & GlobResolved & InjectResolved & RequiredGlobDirectoryResolved & TurboResolved,
+    "disablePrecacheManifest"
+  >
 >;