@netlify/cache 1.11.1 → 2.0.0

package/dist/bootstrap/main.cjs

@@ -68,8 +68,10 @@ var UserAgent = "user-agent";
 // src/bootstrap/cache.ts
 var allowedProtocols = /* @__PURE__ */ new Set(["http:", "https:"]);
 var discardedHeaders = /* @__PURE__ */ new Set(["cookie", "content-encoding", "content-length"]);
+var forbiddenHeaderPrefixes = ["netlify-programmable-", "x-nf-"];
 var getInternalHeaders = Symbol("getInternalHeaders");
-var serializeResourceHeaders = Symbol("serializeResourceHeaders");
+var serializeRequestHeaders = Symbol("serializeRequestHeaders");
+var serializeResponseHeaders = Symbol("serializeResponseHeaders");
 var _getContext, _name, _userAgent;
 var NetlifyCache = class {
   constructor({ getContext, name, userAgent }) {
@@ -94,7 +96,20 @@ var NetlifyCache = class {
     }
     return headers;
   }
-  [serializeResourceHeaders](headers) {
+  [serializeRequestHeaders](headers) {
+    const headersMap = {};
+    headers.forEach((value, key) => {
+      const normalizedKey = key.toLowerCase();
+      for (const prefix of forbiddenHeaderPrefixes) {
+        if (normalizedKey.startsWith(prefix)) {
+          return;
+        }
+      }
+      headersMap[normalizedKey] = value;
+    });
+    return headersMap;
+  }
+  [serializeResponseHeaders](headers) {
     const headersMap = {};
     headers.forEach((value, key) => {
       if (discardedHeaders.has(key)) {
@@ -140,7 +155,10 @@ var NetlifyCache = class {
       const resourceURL = extractAndValidateURL(request);
       const cacheURL = `${context.url}/${toCacheKey(resourceURL)}`;
       const response = await fetch(cacheURL, {
-        headers: this[getInternalHeaders](context),
+        headers: {
+          ...request instanceof Request ? this[serializeRequestHeaders](request.headers) : {},
+          ...this[getInternalHeaders](context)
+        },
         method: "GET"
       });
       if (!response.ok) {
@@ -180,7 +198,7 @@ var NetlifyCache = class {
       body: response.body,
       headers: {
         ...this[getInternalHeaders](context),
-        [ResourceHeaders]: this[serializeResourceHeaders](response.headers),
+        [ResourceHeaders]: this[serializeResponseHeaders](response.headers),
         [ResourceStatus]: response.status.toString()
       },
       // @ts-expect-error https://github.com/whatwg/fetch/pull/1457

package/dist/bootstrap/main.d.cts

@@ -1,5 +1,5 @@
-import { E as EnvironmentOptions } from '../cache-Boq7iRAh.cjs';
-export { N as NetlifyCache, O as Operation, R as RequestContextFactory } from '../cache-Boq7iRAh.cjs';
+import { E as EnvironmentOptions } from '../cache-B9TsVKLp.cjs';
+export { N as NetlifyCache, O as Operation, R as RequestContextFactory } from '../cache-B9TsVKLp.cjs';
 
 declare class NetlifyCacheStorage {
     #private;

package/dist/bootstrap/main.d.ts

@@ -1,5 +1,5 @@
-import { E as EnvironmentOptions } from '../cache-Boq7iRAh.js';
-export { N as NetlifyCache, O as Operation, R as RequestContextFactory } from '../cache-Boq7iRAh.js';
+import { E as EnvironmentOptions } from '../cache-B9TsVKLp.js';
+export { N as NetlifyCache, O as Operation, R as RequestContextFactory } from '../cache-B9TsVKLp.js';
 
 declare class NetlifyCacheStorage {
     #private;

package/dist/bootstrap/main.js

@@ -41,8 +41,10 @@ var UserAgent = "user-agent";
 // src/bootstrap/cache.ts
 var allowedProtocols = /* @__PURE__ */ new Set(["http:", "https:"]);
 var discardedHeaders = /* @__PURE__ */ new Set(["cookie", "content-encoding", "content-length"]);
+var forbiddenHeaderPrefixes = ["netlify-programmable-", "x-nf-"];
 var getInternalHeaders = Symbol("getInternalHeaders");
-var serializeResourceHeaders = Symbol("serializeResourceHeaders");
+var serializeRequestHeaders = Symbol("serializeRequestHeaders");
+var serializeResponseHeaders = Symbol("serializeResponseHeaders");
 var _getContext, _name, _userAgent;
 var NetlifyCache = class {
   constructor({ getContext, name, userAgent }) {
@@ -67,7 +69,20 @@ var NetlifyCache = class {
     }
     return headers;
   }
-  [serializeResourceHeaders](headers) {
+  [serializeRequestHeaders](headers) {
+    const headersMap = {};
+    headers.forEach((value, key) => {
+      const normalizedKey = key.toLowerCase();
+      for (const prefix of forbiddenHeaderPrefixes) {
+        if (normalizedKey.startsWith(prefix)) {
+          return;
+        }
+      }
+      headersMap[normalizedKey] = value;
+    });
+    return headersMap;
+  }
+  [serializeResponseHeaders](headers) {
     const headersMap = {};
     headers.forEach((value, key) => {
       if (discardedHeaders.has(key)) {
@@ -113,7 +128,10 @@ var NetlifyCache = class {
       const resourceURL = extractAndValidateURL(request);
       const cacheURL = `${context.url}/${toCacheKey(resourceURL)}`;
       const response = await fetch(cacheURL, {
-        headers: this[getInternalHeaders](context),
+        headers: {
+          ...request instanceof Request ? this[serializeRequestHeaders](request.headers) : {},
+          ...this[getInternalHeaders](context)
+        },
         method: "GET"
       });
       if (!response.ok) {
@@ -153,7 +171,7 @@ var NetlifyCache = class {
       body: response.body,
       headers: {
         ...this[getInternalHeaders](context),
-        [ResourceHeaders]: this[serializeResourceHeaders](response.headers),
+        [ResourceHeaders]: this[serializeResponseHeaders](response.headers),
         [ResourceStatus]: response.status.toString()
       },
       // @ts-expect-error https://github.com/whatwg/fetch/pull/1457

package/dist/{cache-Boq7iRAh.d.cts → cache-B9TsVKLp.d.cts}

@@ -22,12 +22,14 @@ type NetlifyCacheOptions = EnvironmentOptions & {
     name: string;
 };
 declare const getInternalHeaders: unique symbol;
-declare const serializeResourceHeaders: unique symbol;
+declare const serializeRequestHeaders: unique symbol;
+declare const serializeResponseHeaders: unique symbol;
 declare class NetlifyCache implements Cache {
     #private;
     constructor({ getContext, name, userAgent }: NetlifyCacheOptions);
     private [getInternalHeaders];
-    private [serializeResourceHeaders];
+    private [serializeRequestHeaders];
+    private [serializeResponseHeaders];
     add(request: RequestInfo | URL): Promise<void>;
     addAll(requests: RequestInfo[]): Promise<void>;
     delete(request: RequestInfo | URL): Promise<boolean>;

package/dist/{cache-Boq7iRAh.d.ts → cache-B9TsVKLp.d.ts}

@@ -22,12 +22,14 @@ type NetlifyCacheOptions = EnvironmentOptions & {
     name: string;
 };
 declare const getInternalHeaders: unique symbol;
-declare const serializeResourceHeaders: unique symbol;
+declare const serializeRequestHeaders: unique symbol;
+declare const serializeResponseHeaders: unique symbol;
 declare class NetlifyCache implements Cache {
     #private;
     constructor({ getContext, name, userAgent }: NetlifyCacheOptions);
     private [getInternalHeaders];
-    private [serializeResourceHeaders];
+    private [serializeRequestHeaders];
+    private [serializeResponseHeaders];
     add(request: RequestInfo | URL): Promise<void>;
     addAll(requests: RequestInfo[]): Promise<void>;
     delete(request: RequestInfo | URL): Promise<boolean>;

package/dist/main.cjs

@@ -210,13 +210,16 @@ var parseCacheStatusValue = (value) => {
   const parts = value.split(";").map((part) => part.trim());
   const [namePart, ...attributeParts] = parts;
   const name = (namePart ?? "").replace(/"/g, "").toLowerCase();
-  const attributes = attributeParts.reduce((acc, part) => {
-    const [key, value2 = ""] = part.split("=");
-    return {
-      ...acc,
-      [key]: value2
-    };
-  }, {});
+  const attributes = attributeParts.reduce(
+    (acc, part) => {
+      const [key, value2 = ""] = part.split("=");
+      return {
+        ...acc,
+        [key]: value2
+      };
+    },
+    {}
+  );
   return {
     attributes,
     name
@@ -303,7 +306,7 @@ var isRequestInit = (input) => {
   }
   return false;
 };
-var fetchWithCache = async (request, optionsOrCacheSettings, cacheOptionsParam) => {
+var fetchWithCache = async (requestOrURL, optionsOrCacheSettings, cacheOptionsParam) => {
   let cacheOptions;
   let requestInit;
   if (isRequestInit(optionsOrCacheSettings)) {
@@ -313,13 +316,8 @@ var fetchWithCache = async (request, optionsOrCacheSettings, cacheOptionsParam)
     cacheOptions = optionsOrCacheSettings || {};
     requestInit = {};
   }
-  let method;
-  if (request instanceof Request) {
-    method = request.method;
-  } else {
-    method = requestInit?.method;
-  }
-  if (method && method?.toLowerCase() !== "get") {
+  const request = new Request(requestOrURL, requestInit);
+  if (request.method.toLowerCase() !== "get") {
     throw new TypeError("`fetchWithCache` only supports GET requests.");
   }
   let cache;
@@ -339,7 +337,7 @@ var fetchWithCache = async (request, optionsOrCacheSettings, cacheOptionsParam)
   if (cached) {
     return cached;
   }
-  const fresh = await fetch(request, requestInit);
+  const fresh = await fetch(request);
   if (!fresh.body) {
     return fresh;
   }

package/dist/main.d.cts

@@ -1,4 +1,4 @@
-import { N as NetlifyCache } from './cache-Boq7iRAh.cjs';
+import { N as NetlifyCache } from './cache-B9TsVKLp.cjs';
 
 /**
  * Polyfill for local development environments where `globalThis.caches` is not

package/dist/main.d.ts

@@ -1,4 +1,4 @@
-import { N as NetlifyCache } from './cache-Boq7iRAh.js';
+import { N as NetlifyCache } from './cache-B9TsVKLp.js';
 
 /**
  * Polyfill for local development environments where `globalThis.caches` is not

package/dist/main.js

@@ -176,13 +176,16 @@ var parseCacheStatusValue = (value) => {
   const parts = value.split(";").map((part) => part.trim());
   const [namePart, ...attributeParts] = parts;
   const name = (namePart ?? "").replace(/"/g, "").toLowerCase();
-  const attributes = attributeParts.reduce((acc, part) => {
-    const [key, value2 = ""] = part.split("=");
-    return {
-      ...acc,
-      [key]: value2
-    };
-  }, {});
+  const attributes = attributeParts.reduce(
+    (acc, part) => {
+      const [key, value2 = ""] = part.split("=");
+      return {
+        ...acc,
+        [key]: value2
+      };
+    },
+    {}
+  );
   return {
     attributes,
     name
@@ -269,7 +272,7 @@ var isRequestInit = (input) => {
   }
   return false;
 };
-var fetchWithCache = async (request, optionsOrCacheSettings, cacheOptionsParam) => {
+var fetchWithCache = async (requestOrURL, optionsOrCacheSettings, cacheOptionsParam) => {
   let cacheOptions;
   let requestInit;
   if (isRequestInit(optionsOrCacheSettings)) {
@@ -279,13 +282,8 @@ var fetchWithCache = async (request, optionsOrCacheSettings, cacheOptionsParam)
     cacheOptions = optionsOrCacheSettings || {};
     requestInit = {};
   }
-  let method;
-  if (request instanceof Request) {
-    method = request.method;
-  } else {
-    method = requestInit?.method;
-  }
-  if (method && method?.toLowerCase() !== "get") {
+  const request = new Request(requestOrURL, requestInit);
+  if (request.method.toLowerCase() !== "get") {
     throw new TypeError("`fetchWithCache` only supports GET requests.");
   }
   let cache;
@@ -305,7 +303,7 @@ var fetchWithCache = async (request, optionsOrCacheSettings, cacheOptionsParam)
   if (cached) {
     return cached;
   }
-  const fresh = await fetch(request, requestInit);
+  const fresh = await fetch(request);
   if (!fresh.body) {
     return fresh;
   }

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@netlify/cache",
-  "version": "1.11.1",
+  "version": "2.0.0",
   "description": "TypeScript utilities for interacting with the Netlify cache",
   "type": "module",
   "engines": {
-    "node": "^14.16.0 || >=16.0.0"
+    "node": "^18.14.0 || >=20"
   },
   "main": "./dist/main.cjs",
   "module": "./dist/main.js",
@@ -47,10 +47,10 @@
     "build": "tsup-node",
     "dev": "tsup-node --watch",
     "prepack": "npm run build",
-    "test": "run-s build test:dev",
+    "test": "run-s build test:ci",
     "test:dev": "run-s build test:dev:*",
     "test:ci": "run-s build test:ci:*",
-    "test:dev:vitest": "vitest run",
+    "test:dev:vitest": "vitest",
     "test:dev:vitest:watch": "vitest watch",
     "test:ci:vitest": "vitest run",
     "publint": "npx -y publint --strict"
@@ -68,15 +68,13 @@
   },
   "author": "Netlify Inc.",
   "devDependencies": {
-    "@netlify/dev-utils": "2.1.1",
-    "@netlify/types": "1.1.1",
+    "@netlify/dev-utils": "3.0.0",
+    "@netlify/types": "2.0.0",
     "npm-run-all2": "^7.0.2",
-    "semver": "^7.5.3",
-    "tmp-promise": "^3.0.3",
     "tsup": "^8.0.0",
     "vitest": "^3.0.0"
   },
   "dependencies": {
-    "@netlify/runtime-utils": "1.3.1"
+    "@netlify/runtime-utils": "2.0.0"
   }
 }