serwist 9.1.1 → 10.0.0-preview.10

package/src/lib/strategies/NetworkFirst.ts

@@ -6,13 +6,13 @@
   https://opensource.org/licenses/MIT.
 */
 
-import { SerwistError } from "../../utils/SerwistError.js";
-import { assert } from "../../utils/assert.js";
-import { logger } from "../../utils/logger.js";
+import { assert } from "#utils/assert.js";
+import { logger } from "#utils/logger.js";
+import { SerwistError } from "#utils/SerwistError.js";
+import { cacheOkAndOpaquePlugin } from "./plugins/cacheOkAndOpaquePlugin.js";
 import type { StrategyOptions } from "./Strategy.js";
 import { Strategy } from "./Strategy.js";
 import type { StrategyHandler } from "./StrategyHandler.js";
-import { cacheOkAndOpaquePlugin } from "./plugins/cacheOkAndOpaquePlugin.js";
 import { messages } from "./utils/messages.js";
 
 export interface NetworkFirstOptions extends StrategyOptions {

package/src/lib/strategies/NetworkOnly.ts

@@ -6,10 +6,10 @@
   https://opensource.org/licenses/MIT.
 */
 
-import { SerwistError } from "../../utils/SerwistError.js";
-import { assert } from "../../utils/assert.js";
-import { logger } from "../../utils/logger.js";
-import { timeout } from "../../utils/timeout.js";
+import { assert } from "#utils/assert.js";
+import { logger } from "#utils/logger.js";
+import { SerwistError } from "#utils/SerwistError.js";
+import { timeout } from "#utils/timeout.js";
 import type { StrategyOptions } from "./Strategy.js";
 import { Strategy } from "./Strategy.js";
 import type { StrategyHandler } from "./StrategyHandler.js";

package/src/lib/strategies/StaleWhileRevalidate.ts

@@ -6,13 +6,13 @@
   https://opensource.org/licenses/MIT.
 */
 
-import { SerwistError } from "../../utils/SerwistError.js";
-import { assert } from "../../utils/assert.js";
-import { logger } from "../../utils/logger.js";
+import { assert } from "#utils/assert.js";
+import { logger } from "#utils/logger.js";
+import { SerwistError } from "#utils/SerwistError.js";
+import { cacheOkAndOpaquePlugin } from "./plugins/cacheOkAndOpaquePlugin.js";
 import type { StrategyOptions } from "./Strategy.js";
 import { Strategy } from "./Strategy.js";
 import type { StrategyHandler } from "./StrategyHandler.js";
-import { cacheOkAndOpaquePlugin } from "./plugins/cacheOkAndOpaquePlugin.js";
 import { messages } from "./utils/messages.js";
 
 /**

package/src/lib/strategies/Strategy.ts

@@ -6,11 +6,11 @@
   https://opensource.org/licenses/MIT.
 */
 
-import type { HandlerCallbackOptions, RouteHandlerObject, SerwistPlugin } from "../../types.js";
-import { SerwistError } from "../../utils/SerwistError.js";
-import { cacheNames as privateCacheNames } from "../../utils/cacheNames.js";
-import { getFriendlyURL } from "../../utils/getFriendlyURL.js";
-import { logger } from "../../utils/logger.js";
+import type { HandlerCallbackOptions, RouteHandlerObject, StrategyPlugin } from "#lib/types.js";
+import { cacheNames as privateCacheNames } from "#utils/cacheNames.js";
+import { getFriendlyURL } from "#utils/getFriendlyURL.js";
+import { logger } from "#utils/logger.js";
+import { SerwistError } from "#utils/SerwistError.js";
 import { StrategyHandler } from "./StrategyHandler.js";
 
 export interface StrategyOptions {
@@ -21,7 +21,7 @@ export interface StrategyOptions {
   /**
    * [Plugins](https://serwist.pages.dev/docs/serwist/runtime-caching/plugins) to use in conjunction with this caching strategy.
    */
-  plugins?: SerwistPlugin[];
+  plugins?: StrategyPlugin[];
   /**
    * Options passed to [non-navigation](https://github.com/GoogleChrome/workbox/issues/1796) `fetch()` calls made by
    * this strategy.
@@ -42,7 +42,7 @@ export interface StrategyOptions {
  */
 export abstract class Strategy implements RouteHandlerObject {
   cacheName: string;
-  plugins: SerwistPlugin[];
+  plugins: StrategyPlugin[];
   fetchOptions?: RequestInit;
   matchOptions?: CacheQueryOptions;
 

package/src/lib/strategies/StrategyHandler.ts

@@ -6,17 +6,17 @@
   https://opensource.org/licenses/MIT.
 */
 
-import type { HandlerCallbackOptions, MapLikeObject, SerwistPlugin, SerwistPluginCallbackParam } from "../../types.js";
-import { Deferred } from "../../utils/Deferred.js";
-import { SerwistError } from "../../utils/SerwistError.js";
-import { assert } from "../../utils/assert.js";
-import { cacheMatchIgnoreParams } from "../../utils/cacheMatchIgnoreParams.js";
-import { executeQuotaErrorCallbacks } from "../../utils/executeQuotaErrorCallbacks.js";
-import { getFriendlyURL } from "../../utils/getFriendlyURL.js";
-import { logger } from "../../utils/logger.js";
-import { timeout } from "../../utils/timeout.js";
+import type { Route } from "#lib/route.js";
+import type { HandlerCallbackOptions, MapLikeObject, StrategyPlugin, StrategyPluginCallbackParam } from "#lib/types.js";
+import { assert } from "#utils/assert.js";
+import { cacheMatchIgnoreParams } from "#utils/cacheMatchIgnoreParams.js";
+import { Deferred } from "#utils/Deferred.js";
+import { executeQuotaErrorCallbacks } from "#utils/executeQuotaErrorCallbacks.js";
+import { getFriendlyURL } from "#utils/getFriendlyURL.js";
+import { logger } from "#utils/logger.js";
+import { SerwistError } from "#utils/SerwistError.js";
+import { timeout } from "#utils/timeout.js";
 import type { Strategy } from "./Strategy.js";
-import type { Route } from "../../Route.js";
 
 function toRequest(input: RequestInfo) {
   return typeof input === "string" ? new Request(input) : input;
@@ -59,8 +59,8 @@ export class StrategyHandler {
   private readonly _strategy: Strategy;
   private readonly _handlerDeferred: Deferred<any>;
   private readonly _extendLifetimePromises: Promise<any>[];
-  private readonly _plugins: SerwistPlugin[];
-  private readonly _pluginStateMap: Map<SerwistPlugin, MapLikeObject>;
+  private readonly _plugins: StrategyPlugin[];
+  private readonly _pluginStateMap: Map<StrategyPlugin, MapLikeObject>;
 
   /**
    * Creates a new instance associated with the passed strategy and event
@@ -405,7 +405,7 @@ export class StrategyHandler {
    * @param name The name of the callback to check for.
    * @returns
    */
-  hasCallback<C extends keyof SerwistPlugin>(name: C): boolean {
+  hasCallback<C extends keyof StrategyPlugin>(name: C): boolean {
     for (const plugin of this._strategy.plugins) {
       if (name in plugin) {
         return true;
@@ -426,10 +426,10 @@ export class StrategyHandler {
    * @param param The object to pass as the first (and only) param when executing each callback. This object will be merged with the
    * current plugin state prior to callback execution.
    */
-  async runCallbacks<C extends keyof NonNullable<SerwistPlugin>>(name: C, param: Omit<SerwistPluginCallbackParam[C], "state">): Promise<void> {
+  async runCallbacks<C extends keyof NonNullable<StrategyPlugin>>(name: C, param: Omit<StrategyPluginCallbackParam[C], "state">): Promise<void> {
     for (const callback of this.iterateCallbacks(name)) {
       // TODO(philipwalton): not sure why `any` is needed. It seems like
-      // this should work with `as SerwistPluginCallbackParam[C]`.
+      // this should work with `as StrategyPluginCallbackParam[C]`.
       await callback(param as any);
     }
   }
@@ -440,18 +440,18 @@ export class StrategyHandler {
    * @param name The name fo the callback to run
    * @returns
    */
-  *iterateCallbacks<C extends keyof SerwistPlugin>(name: C): Generator<NonNullable<SerwistPlugin[C]>> {
+  *iterateCallbacks<C extends keyof StrategyPlugin>(name: C): Generator<NonNullable<StrategyPlugin[C]>> {
     for (const plugin of this._strategy.plugins) {
       if (typeof plugin[name] === "function") {
         const state = this._pluginStateMap.get(plugin);
-        const statefulCallback = (param: Omit<SerwistPluginCallbackParam[C], "state">) => {
+        const statefulCallback = (param: Omit<StrategyPluginCallbackParam[C], "state">) => {
           const statefulParam = { ...param, state };
 
           // TODO(philipwalton): not sure why `any` is needed. It seems like
           // this should work with `as WorkboxPluginCallbackParam[C]`.
           return plugin[name]!(statefulParam as any);
         };
-        yield statefulCallback as NonNullable<SerwistPlugin[C]>;
+        yield statefulCallback as NonNullable<StrategyPlugin[C]>;
       }
     }
   }

package/src/lib/strategies/index.ts

@@ -0,0 +1,10 @@
+export { CacheFirst } from "./CacheFirst.js";
+export { CacheOnly } from "./CacheOnly.js";
+export type { NetworkFirstOptions } from "./NetworkFirst.js";
+export { NetworkFirst } from "./NetworkFirst.js";
+export type { NetworkOnlyOptions } from "./NetworkOnly.js";
+export { NetworkOnly } from "./NetworkOnly.js";
+export { StaleWhileRevalidate } from "./StaleWhileRevalidate.js";
+export type { StrategyOptions } from "./Strategy.js";
+export { Strategy } from "./Strategy.js";
+export { StrategyHandler } from "./StrategyHandler.js";

package/src/lib/strategies/plugins/cacheOkAndOpaquePlugin.ts

@@ -6,9 +6,9 @@
   https://opensource.org/licenses/MIT.
 */
 
-import type { SerwistPlugin } from "../../../types.js";
+import type { StrategyPlugin } from "#lib/types.js";
 
-export const cacheOkAndOpaquePlugin: SerwistPlugin = {
+export const cacheOkAndOpaquePlugin: StrategyPlugin = {
   /**
    * Returns a valid response (to allow caching) if the status is 200 (OK) or
    * 0 (opaque).

package/src/lib/strategies/utils/messages.ts

@@ -6,8 +6,8 @@
   https://opensource.org/licenses/MIT.
 */
 
-import { getFriendlyURL } from "../../../utils/getFriendlyURL.js";
-import { logger } from "../../../utils/logger.js";
+import { getFriendlyURL } from "#utils/getFriendlyURL.js";
+import { logger } from "#utils/logger.js";
 
 export const messages = {
   strategyStart: (strategyName: string, request: Request): string => `Using ${strategyName} to respond to '${getFriendlyURL(request.url)}'`,

package/src/{types.ts → lib/types.ts}

@@ -1,8 +1,8 @@
-import type { MaybePromise } from "@serwist/utils";
+import type { MaybePromise, Prettify } from "@serwist/utils";
+import type { PrecacheEntry, PrecacheExtensionOptions, PrecacheOptions, PrecacheRouteOptions } from "#lib/extensions/index.js";
 import type { HTTPMethod } from "./constants.js";
-import type { PrecacheStrategyOptions } from "./lib/strategies/PrecacheStrategy.js";
-import type { Route } from "./Route.js";
-import type { Serwist } from "./Serwist.js";
+import type { Route } from "./route.js";
+import type { Serwist } from "./serwist.js";
 
 export type { MaybePromise as PromiseOrNot };
 
@@ -75,7 +75,7 @@ export interface ManualHandlerCallbackOptions {
   params?: never;
 }
 
-export type HandlerCallbackOptions = RouteHandlerCallbackOptions | ManualHandlerCallbackOptions;
+export type HandlerCallbackOptions = Prettify<RouteHandlerCallbackOptions | ManualHandlerCallbackOptions>;
 
 /**
  * The "handler" callback is invoked whenever a request is matched to a
@@ -111,7 +111,7 @@ export interface RouteHandlerObject {
  * Either a {@linkcode RouteHandlerCallback} or a {@linkcode RouteHandlerObject}.
  * Most APIs that accept route handlers take either.
  */
-export type RouteHandler = RouteHandlerCallback | RouteHandlerObject;
+export type RouteHandler = RouteHandlerCallback | Prettify<RouteHandlerObject>;
 
 export interface HandlerWillStartCallbackParam {
   request: Request;
@@ -257,7 +257,7 @@ export type HandlerDidCompleteCallback = (param: HandlerDidCompleteCallbackParam
  * An object with optional lifecycle callback properties for the fetch and
  * cache operations.
  */
-export declare interface SerwistPlugin {
+export interface StrategyPlugin {
   cacheDidUpdate?: CacheDidUpdateCallback;
   cachedResponseWillBeUsed?: CachedResponseWillBeUsedCallback;
   cacheKeyWillBeUsed?: CacheKeyWillBeUsedCallback;
@@ -272,7 +272,7 @@ export declare interface SerwistPlugin {
   requestWillFetch?: RequestWillFetchCallback;
 }
 
-export interface SerwistPluginCallbackParam {
+export interface StrategyPluginCallbackParam {
   cacheDidUpdate: CacheDidUpdateCallbackParam;
   cachedResponseWillBeUsed: CachedResponseWillBeUsedCallbackParam;
   cacheKeyWillBeUsed: CacheKeyWillBeUsedCallbackParam;
@@ -332,66 +332,13 @@ export interface CleanupResult {
   deletedCacheRequests: string[];
 }
 
-export declare interface PrecacheEntry {
-  integrity?: string;
-  url: string;
-  revision?: string | null;
-}
-
-export interface PrecacheRouteOptions {
-  /**
-   * Tells Serwist to check the precache for an entry whose URL is the request URL appended
-   * with the specified value. Only applies if the request URL ends with "/".
-   *
-   * @default "index.html"
-   */
-  directoryIndex?: string | null;
-  /**
-   * An array of `RegExp` objects matching search params that should be removed when looking
-   * for a precache match.
-   */
-  ignoreURLParametersMatching?: RegExp[];
-  /**
-   * Tells Serwist to check the precache for an entry whose URL is the request URL appended
-   * with ".html".
-   *
-   * @default true
-   */
-  cleanURLs?: boolean;
-  /**
-   * A function that should take a URL and return an array of alternative URLs that should
-   * be checked for precache matches.
-   */
-  urlManipulation?: UrlManipulation;
-}
-
-export interface PrecacheOptions extends PrecacheStrategyOptions, PrecacheRouteOptions {
-  /**
-   * Whether outdated caches should be removed.
-   *
-   * @default false
-   */
-  cleanupOutdatedCaches?: boolean;
-  /**
-   * The number of precache requests that should be made concurrently.
-   *
-   * @default 10
-   */
-  concurrency?: number;
-  /**
-   * An URL that should point to a HTML file with which navigation requests for URLs that aren't
-   * precached will be fulfilled.
-   */
-  navigateFallback?: string;
-  /**
-   * URLs that should be allowed to use the `navigateFallback` handler.
-   */
-  navigateFallbackAllowlist?: RegExp[];
-  /**
-   * URLs that should not be allowed to use the `navigateFallback` handler. This takes precedence
-   * over `navigateFallbackAllowlist`.
-   */
-  navigateFallbackDenylist?: RegExp[];
-}
-
 export type UrlManipulation = ({ url }: { url: URL }) => URL[];
+
+export type {
+  StrategyPlugin as SerwistPlugin,
+  StrategyPluginCallbackParam as SerwistPluginCallbackParam,
+  PrecacheEntry,
+  PrecacheRouteOptions,
+  PrecacheExtensionOptions,
+  PrecacheOptions,
+};

package/src/lib/utils.ts

@@ -0,0 +1,137 @@
+/*
+  Copyright 2019 Google LLC
+
+  Use of this source code is governed by an MIT-style
+  license that can be found in the LICENSE file or at
+  https://opensource.org/licenses/MIT.
+*/
+import { assert } from "#utils/assert.js";
+import type { PartialCacheNameDetails } from "#utils/cacheNames.js";
+import { cacheNames } from "#utils/cacheNames.js";
+import { canConstructResponseFromBodyStream } from "#utils/canConstructResponseFromBodyStream.js";
+import { logger } from "#utils/logger.js";
+import { SerwistError } from "#utils/SerwistError.js";
+import { quotaErrorCallbacks } from "../models/quotaErrorCallbacks.js";
+
+declare const self: ServiceWorkerGlobalScope;
+
+/**
+ * Disables Serwist's logging in development mode.
+ *
+ * @see https://serwist.pages.dev/docs/serwist/core/disable-dev-logs
+ */
+export const disableDevLogs = (): void => {
+  self.__WB_DISABLE_DEV_LOGS = true;
+};
+
+/**
+ * Modifies the default cache names used by Serwist packages.
+ * Cache names are generated as `<prefix>-<Cache Name>-<suffix>`.
+ *
+ * @param details
+ */
+export const setCacheNameDetails = (details: PartialCacheNameDetails): void => {
+  if (process.env.NODE_ENV !== "production") {
+    for (const key of Object.keys(details)) {
+      assert!.isType(details[key], "string", {
+        moduleName: "@serwist/core",
+        funcName: "setCacheNameDetails",
+        paramName: `details.${key}`,
+      });
+    }
+
+    if (details.precache?.length === 0) {
+      throw new SerwistError("invalid-cache-name", {
+        cacheNameId: "precache",
+        value: details.precache,
+      });
+    }
+
+    if (details.runtime?.length === 0) {
+      throw new SerwistError("invalid-cache-name", {
+        cacheNameId: "runtime",
+        value: details.runtime,
+      });
+    }
+
+    if (details.googleAnalytics?.length === 0) {
+      throw new SerwistError("invalid-cache-name", {
+        cacheNameId: "googleAnalytics",
+        value: details.googleAnalytics,
+      });
+    }
+  }
+
+  cacheNames.updateDetails(details);
+};
+
+/**
+ * Adds a function to the set of quotaErrorCallbacks that will be executed if
+ * there's a quota error.
+ *
+ * @param callback
+ */
+// biome-ignore lint/complexity/noBannedTypes: Can't change Function type
+export const registerQuotaErrorCallback = (callback: Function): void => {
+  if (process.env.NODE_ENV !== "production") {
+    assert!.isType(callback, "function", {
+      moduleName: "@serwist/core",
+      funcName: "register",
+      paramName: "callback",
+    });
+  }
+
+  quotaErrorCallbacks.add(callback);
+
+  if (process.env.NODE_ENV !== "production") {
+    logger.log("Registered a callback to respond to quota errors.", callback);
+  }
+};
+
+/**
+ * Allows developers to copy a response and modify its `headers`, `status`,
+ * or `statusText` values (the [valid options](https://developer.mozilla.org/en-US/docs/Web/API/Response/Response#options)
+ * when constructing a `Response` object).
+ * To modify these values, pass a function as the second argument. That
+ * function will be invoked with the options of the initial `Response` object.
+ * The return value of this function will be used as the options for the new `Response` object.
+ * To change the values either modify the passed parameter(s) and return it or return a totally
+ * new object.
+ *
+ * This method is intentionally limited to same-origin responses, regardless of
+ * whether CORS was used or not.
+ *
+ * @param response The initial response.
+ * @param modifier The function used to modify the options of the `Response` object.
+ */
+export const copyResponse = async (response: Response, modifier?: (responseInit: ResponseInit) => ResponseInit): Promise<Response> => {
+  let origin = null;
+  // If response.url isn't set, assume it's cross-origin and keep origin null.
+  if (response.url) {
+    const responseURL = new URL(response.url);
+    origin = responseURL.origin;
+  }
+
+  if (origin !== self.location.origin) {
+    throw new SerwistError("cross-origin-copy-response", { origin });
+  }
+
+  const clonedResponse = response.clone();
+
+  // Create a fresh `ResponseInit` object by cloning the headers.
+  const responseInit: ResponseInit = {
+    headers: new Headers(clonedResponse.headers),
+    status: clonedResponse.status,
+    statusText: clonedResponse.statusText,
+  };
+
+  // Apply any user modifications.
+  const modifiedResponseInit = modifier ? modifier(responseInit) : responseInit;
+
+  // Create the new response from the body stream and `ResponseInit`
+  // modifications. Note: not all browsers support the Response.body stream,
+  // so fall back to reading the entire body into memory as a blob.
+  const body = canConstructResponseFromBodyStream() ? clonedResponse.body : await clonedResponse.blob();
+
+  return new Response(body, modifiedResponseInit);
+};

package/src/models/messages/messageGenerator.ts

@@ -6,7 +6,7 @@
   https://opensource.org/licenses/MIT.
 */
 
-import type { MapLikeObject } from "../../types.js";
+import type { MapLikeObject } from "#lib/types.js";
 import { type MessageKey, messages } from "./messages.js";
 
 const fallback = (code: string, ...args: any[]) => {

package/src/models/messages/messages.ts

@@ -64,7 +64,7 @@ export const messages = {
   },
 
   "add-to-cache-list-unexpected-type": ({ entry }) => {
-    return `An unexpected entry was passed to 'serwist.Serwist.addToPrecacheList()' The entry '${JSON.stringify(
+    return `An unexpected entry was passed to 'serwist.Serwist.precache.addToCacheList()' The entry '${JSON.stringify(
       entry,
     )}' isn't supported. You must supply an array of strings with one or more characters, objects with a url property or Request objects.`;
   },
@@ -74,7 +74,7 @@ export const messages = {
       throw new Error("Unexpected input to " + `'add-to-cache-list-duplicate-entries' error.`);
     }
 
-    return `Two of the entries passed to 'serwist.Serwist.addToPrecacheList()' had the URL ${firstEntry} but different revision details. Serwist is unable to cache and version the asset correctly. Please remove one of the entries.`;
+    return `Two of the entries passed to 'serwist.Serwist.precache.addToCacheList()' had the URL ${firstEntry} but different revision details. Serwist is unable to cache and version the asset correctly. Please remove one of the entries.`;
   },
 
   "plugin-error-request-will-fetch": ({ thrownErrorMessage }) => {
@@ -210,7 +210,7 @@ export const messages = {
   },
 
   "add-to-cache-list-conflicting-integrities": ({ url }) => {
-    return `Two of the entries passed to 'serwist.Serwist.addToPrecacheList()' had the URL ${url} with different integrity values. Please remove one of them.`;
+    return `Two of the entries passed to 'serwist.Serwist.precache.addToCacheList()' had the URL ${url} with different integrity values. Please remove one of them.`;
   },
 
   "missing-precache-entry": ({ cacheName, url }) => {

package/src/utils/SerwistError.ts

@@ -6,9 +6,9 @@
   https://opensource.org/licenses/MIT.
 */
 
-import { messageGenerator } from "../models/messages/messageGenerator.js";
-import type { MessageKey } from "../models/messages/messages.js";
-import type { MapLikeObject } from "../types.js";
+import type { MapLikeObject } from "#lib/types.js";
+import { messageGenerator } from "#models/messages/messageGenerator.js";
+import type { MessageKey } from "#models/messages/messages.js";
 
 /**
  * Serwist errors should be thrown with this class.

package/src/utils/assert.ts

@@ -6,7 +6,7 @@
   https://opensource.org/licenses/MIT.
 */
 
-import type { MapLikeObject } from "../types.js";
+import type { MapLikeObject } from "#lib/types.js";
 import { SerwistError } from "./SerwistError.js";
 
 /*

package/src/utils/createCacheKey.ts

@@ -6,10 +6,9 @@
   https://opensource.org/licenses/MIT.
 */
 
+import type { PrecacheEntry } from "#lib/types.js";
 import { SerwistError } from "./SerwistError.js";
 
-import type { PrecacheEntry } from "../types.js";
-
 interface CacheKey {
   cacheKey: string;
   url: string;

package/src/utils/executeQuotaErrorCallbacks.ts

@@ -6,7 +6,7 @@
   https://opensource.org/licenses/MIT.
 */
 
-import { quotaErrorCallbacks } from "../models/quotaErrorCallbacks.js";
+import { quotaErrorCallbacks } from "#models/quotaErrorCallbacks.js";
 import { logger } from "./logger.js";
 
 /**

package/src/utils/generateURLVariations.ts

@@ -6,7 +6,7 @@
   https://opensource.org/licenses/MIT.
 */
 
-import type { PrecacheRouteOptions } from "../types.js";
+import type { PrecacheRouteOptions } from "#lib/types.js";
 import { removeIgnoredSearchParams } from "./removeIgnoredSearchParams.js";
 
 /**

package/src/utils/logger.ts

@@ -24,7 +24,7 @@ declare global {
  * before using it.
  */
 export const logger =
-  process.env.NODE_ENV === "production" || typeof self === "undefined"
+  process.env.NODE_ENV === "production" || typeof self === "undefined" || (import.meta as any).env?.SSR /** Check for SSR */
     ? null!
     : (() => {
         // Don't overwrite this value if it's already set.

package/src/utils/normalizeHandler.ts

@@ -6,7 +6,7 @@
   https://opensource.org/licenses/MIT.
 */
 
-import type { RouteHandler, RouteHandlerObject } from "../types.js";
+import type { RouteHandler, RouteHandlerObject } from "#lib/types.js";
 import { assert } from "./assert.js";
 
 /**

package/src/utils/parseRoute.ts

@@ -1,9 +1,8 @@
-import { RegExpRoute } from "../RegExpRoute.js";
-import { Route } from "../Route.js";
-import type { HTTPMethod } from "../constants.js";
-import type { RouteHandler, RouteMatchCallback } from "../types.js";
-import { SerwistError } from "./SerwistError.js";
+import type { HTTPMethod } from "#lib/constants.js";
+import { RegExpRoute, Route } from "#lib/route.js";
+import type { RouteHandler, RouteMatchCallback } from "#lib/types.js";
 import { logger } from "./logger.js";
+import { SerwistError } from "./SerwistError.js";
 
 /**
  * Parses a `RegExp`, string, or function with a caching strategy into a {@linkcode Route}. This is for

package/src/utils/pluginUtils.ts

@@ -6,10 +6,10 @@
   https://opensource.org/licenses/MIT.
 */
 
-import type { SerwistPlugin } from "../types.js";
+import type { StrategyPlugin } from "#lib/types.js";
 
 export const pluginUtils = {
-  filter: (plugins: SerwistPlugin[], callbackName: string): SerwistPlugin[] => {
+  filter: (plugins: StrategyPlugin[], callbackName: string): StrategyPlugin[] => {
     return plugins.filter((plugin) => callbackName in plugin);
   },
 };