@netlify/plugin-nextjs 5.0.0-rc.3 → 5.0.0-rc.5

package/dist/run/headers.js

@@ -10,7 +10,7 @@ import {
   setCacheStatusHeader,
   setCacheTagsHeaders,
   setVaryHeaders
-} from "../esm-chunks/chunk-UTCWWUFW.js";
+} from "../esm-chunks/chunk-637Y3P2U.js";
 import "../esm-chunks/chunk-TYCYFZ22.js";
 import "../esm-chunks/chunk-5JVNISGM.js";
 export {

package/dist/run/next.cjs

@@ -586,42 +586,33 @@ module.exports = __toCommonJS(next_exports);
 var import_promises = __toESM(require("fs/promises"));
 var import_path = require("path");
 
-// node_modules/@netlify/blobs/dist/main.js
-var import_buffer = require("buffer");
-var import_process = require("process");
-var import_buffer2 = require("buffer");
-var import_buffer3 = require("buffer");
-var import_stream = __toESM(require("stream"), 1);
-var import_util = require("util");
-var BlobsConsistencyError = class extends Error {
-  constructor() {
-    super(
-      `Netlify Blobs has failed to perform a read using strong consistency because the environment has not been configured with a 'uncachedEdgeURL' property`
-    );
-    this.name = "BlobsConsistencyError";
+// node_modules/@netlify/blobs/dist/chunk-6TGYNZGH.js
+var BlobsInternalError = class extends Error {
+  constructor(statusCode) {
+    super(`Netlify Blobs has generated an internal error: ${statusCode} response`);
+    this.name = "BlobsInternalError";
   }
 };
-var getEnvironmentContext = () => {
-  const context = globalThis.netlifyBlobsContext || import_process.env.NETLIFY_BLOBS_CONTEXT;
-  if (typeof context !== "string" || !context) {
-    return {};
+var collectIterator = async (iterator) => {
+  const result = [];
+  for await (const item of iterator) {
+    result.push(item);
   }
-  const data = import_buffer.Buffer.from(context, "base64").toString();
-  try {
-    return JSON.parse(data);
-  } catch {
+  return result;
+};
+var base64Decode = (input) => {
+  const { Buffer: Buffer3 } = globalThis;
+  if (Buffer3) {
+    return Buffer3.from(input, "base64").toString();
   }
-  return {};
+  return atob(input);
 };
-var MissingBlobsEnvironmentError = class extends Error {
-  constructor(requiredProperties) {
-    super(
-      `The environment has not been configured to use Netlify Blobs. To use it manually, supply the following properties when creating a store: ${requiredProperties.join(
-        ", "
-      )}`
-    );
-    this.name = "MissingBlobsEnvironmentError";
+var base64Encode = (input) => {
+  const { Buffer: Buffer3 } = globalThis;
+  if (Buffer3) {
+    return Buffer3.from(input).toString("base64");
   }
+  return btoa(input);
 };
 var BASE64_PREFIX = "b64;";
 var METADATA_HEADER_INTERNAL = "x-amz-meta-user";
@@ -631,7 +622,7 @@ var encodeMetadata = (metadata) => {
   if (!metadata) {
     return null;
   }
-  const encodedObject = import_buffer2.Buffer.from(JSON.stringify(metadata)).toString("base64");
+  const encodedObject = base64Encode(JSON.stringify(metadata));
   const payload = `b64;${encodedObject}`;
   if (METADATA_HEADER_EXTERNAL.length + payload.length > METADATA_MAX_SIZE) {
     throw new Error("Metadata object exceeds the maximum size");
@@ -643,7 +634,7 @@ var decodeMetadata = (header) => {
     return {};
   }
   const encodedData = header.slice(BASE64_PREFIX.length);
-  const decodedData = import_buffer2.Buffer.from(encodedData, "base64").toString();
+  const decodedData = base64Decode(encodedData);
   const metadata = JSON.parse(decodedData);
   return metadata;
 };
@@ -660,7 +651,51 @@ var getMetadataFromResponse = (response) => {
     );
   }
 };
-var DEFAULT_RETRY_DELAY = 5e3;
+var BlobsConsistencyError = class extends Error {
+  constructor() {
+    super(
+      `Netlify Blobs has failed to perform a read using strong consistency because the environment has not been configured with a 'uncachedEdgeURL' property`
+    );
+    this.name = "BlobsConsistencyError";
+  }
+};
+var getEnvironment = () => {
+  const { Deno, Netlify, process: process2 } = globalThis;
+  return Netlify?.env ?? Deno?.env ?? {
+    delete: (key) => delete process2?.env[key],
+    get: (key) => process2?.env[key],
+    has: (key) => Boolean(process2?.env[key]),
+    set: (key, value) => {
+      if (process2?.env) {
+        process2.env[key] = value;
+      }
+    },
+    toObject: () => process2?.env ?? {}
+  };
+};
+var getEnvironmentContext = () => {
+  const context = globalThis.netlifyBlobsContext || getEnvironment().get("NETLIFY_BLOBS_CONTEXT");
+  if (typeof context !== "string" || !context) {
+    return {};
+  }
+  const data = base64Decode(context);
+  try {
+    return JSON.parse(data);
+  } catch {
+  }
+  return {};
+};
+var MissingBlobsEnvironmentError = class extends Error {
+  constructor(requiredProperties) {
+    super(
+      `The environment has not been configured to use Netlify Blobs. To use it manually, supply the following properties when creating a store: ${requiredProperties.join(
+        ", "
+      )}`
+    );
+    this.name = "MissingBlobsEnvironmentError";
+  }
+};
+var DEFAULT_RETRY_DELAY = getEnvironment().get("NODE_ENV") === "test" ? 1 : 5e3;
 var MIN_RETRY_DELAY = 1e3;
 var MAX_RETRY = 5;
 var RATE_LIMIT_HEADER = "X-RateLimit-Reset";
@@ -691,6 +726,7 @@ var getDelay = (rateLimitReset) => {
 var sleep = (ms) => new Promise((resolve2) => {
   setTimeout(resolve2, ms);
 });
+var SIGNED_URL_ACCEPT_HEADER = "application/json;type=signed-url";
 var Client = class {
   constructor({ apiURL, consistency, edgeURL, fetch, siteID, token, uncachedEdgeURL }) {
     this.apiURL = apiURL;
@@ -716,6 +752,13 @@ var Client = class {
   }) {
     const encodedMetadata = encodeMetadata(metadata);
     const consistency = opConsistency ?? this.consistency;
+    let urlPath = `/${this.siteID}`;
+    if (storeName) {
+      urlPath += `/${storeName}`;
+    }
+    if (key) {
+      urlPath += `/${key}`;
+    }
     if (this.edgeURL) {
       if (consistency === "strong" && !this.uncachedEdgeURL) {
         throw new BlobsConsistencyError();
@@ -726,8 +769,7 @@ var Client = class {
       if (encodedMetadata) {
         headers[METADATA_HEADER_INTERNAL] = encodedMetadata;
       }
-      const path = key ? `/${this.siteID}/${storeName}/${key}` : `/${this.siteID}/${storeName}`;
-      const url2 = new URL(path, consistency === "strong" ? this.uncachedEdgeURL : this.edgeURL);
+      const url2 = new URL(urlPath, consistency === "strong" ? this.uncachedEdgeURL : this.edgeURL);
       for (const key2 in parameters) {
         url2.searchParams.set(key2, parameters[key2]);
       }
@@ -737,28 +779,29 @@ var Client = class {
       };
     }
     const apiHeaders = { authorization: `Bearer ${this.token}` };
-    const url = new URL(`/api/v1/sites/${this.siteID}/blobs`, this.apiURL ?? "https://api.netlify.com");
+    const url = new URL(`/api/v1/blobs${urlPath}`, this.apiURL ?? "https://api.netlify.com");
     for (const key2 in parameters) {
       url.searchParams.set(key2, parameters[key2]);
     }
-    url.searchParams.set("context", storeName);
-    if (key === void 0) {
+    if (storeName === void 0 || key === void 0) {
       return {
         headers: apiHeaders,
         url: url.toString()
       };
     }
-    url.pathname += `/${key}`;
     if (encodedMetadata) {
       apiHeaders[METADATA_HEADER_EXTERNAL] = encodedMetadata;
     }
-    if (method === "head") {
+    if (method === "head" || method === "delete") {
       return {
         headers: apiHeaders,
         url: url.toString()
       };
     }
-    const res = await this.fetch(url.toString(), { headers: apiHeaders, method });
+    const res = await this.fetch(url.toString(), {
+      headers: { ...apiHeaders, accept: SIGNED_URL_ACCEPT_HEADER },
+      method
+    });
     if (res.status !== 200) {
       throw new Error(`Netlify Blobs has generated an internal error: ${res.status} response`);
     }
@@ -823,29 +866,24 @@ var getClientOptions = (options, contextOverride) => {
   };
   return clientOptions;
 };
-var BlobsInternalError = class extends Error {
-  constructor(statusCode) {
-    super(`Netlify Blobs has generated an internal error: ${statusCode} response`);
-    this.name = "BlobsInternalError";
-  }
-};
-var collectIterator = async (iterator) => {
-  const result = [];
-  for await (const item of iterator) {
-    result.push(item);
-  }
-  return result;
-};
+
+// node_modules/@netlify/blobs/dist/main.js
+var DEPLOY_STORE_PREFIX = "deploy:";
+var LEGACY_STORE_INTERNAL_PREFIX = "netlify-internal/legacy-namespace/";
+var SITE_STORE_PREFIX = "site:";
 var Store = class _Store {
   constructor(options) {
     this.client = options.client;
-    this.consistency = options.consistency ?? "eventual";
     if ("deployID" in options) {
       _Store.validateDeployID(options.deployID);
-      this.name = `deploy:${options.deployID}`;
+      this.name = DEPLOY_STORE_PREFIX + options.deployID;
+    } else if (options.name.startsWith(LEGACY_STORE_INTERNAL_PREFIX)) {
+      const storeName = options.name.slice(LEGACY_STORE_INTERNAL_PREFIX.length);
+      _Store.validateStoreName(storeName);
+      this.name = storeName;
     } else {
       _Store.validateStoreName(options.name);
-      this.name = options.name;
+      this.name = SITE_STORE_PREFIX + options.name;
     }
   }
   async delete(key) {
@@ -1000,7 +1038,7 @@ var Store = class _Store {
     if (key.startsWith("/") || key.startsWith("%2F")) {
       throw new Error("Blob key must not start with forward slash (/).");
     }
-    if (import_buffer3.Buffer.byteLength(key, "utf8") > 600) {
+    if (new TextEncoder().encode(key).length > 600) {
       throw new Error(
         "Blob key must be a sequence of Unicode characters whose UTF-8 encoding is at most 600 bytes long."
       );
@@ -1012,13 +1050,10 @@ var Store = class _Store {
     }
   }
   static validateStoreName(name) {
-    if (name.startsWith("deploy:") || name.startsWith("deploy%3A1")) {
-      throw new Error("Store name must not start with the `deploy:` reserved keyword.");
-    }
     if (name.includes("/") || name.includes("%2F")) {
       throw new Error("Store name must not contain forward slashes (/).");
     }
-    if (import_buffer3.Buffer.byteLength(name, "utf8") > 64) {
+    if (new TextEncoder().encode(name).length > 64) {
       throw new Error(
         "Store name must be a sequence of Unicode characters whose UTF-8 encoding is at most 64 bytes long."
       );
@@ -1081,7 +1116,6 @@ var getDeployStore = (options = {}) => {
   const client = new Client(clientOptions);
   return new Store({ client, deployID });
 };
-var pipeline = (0, import_util.promisify)(import_stream.default.pipeline);
 
 // node_modules/@opentelemetry/api/build/esm/platform/node/globalThis.js
 var _globalThis = typeof globalThis === "object" ? globalThis : global;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/plugin-nextjs",
-  "version": "5.0.0-rc.3",
+  "version": "5.0.0-rc.5",
   "description": "Run Next.js seamlessly on Netlify",
   "main": "./dist/index.js",
   "type": "module",
@@ -26,13 +26,5 @@
   "bugs": {
     "url": "https://github.com/netlify/next-runtime-minimal/issues"
   },
-  "homepage": "https://github.com/netlify/next-runtime-minimal#readme",
-  "clean-package": {
-    "indent": 2,
-    "remove": [
-      "dependencies",
-      "devDependencies",
-      "scripts"
-    ]
-  }
+  "homepage": "https://github.com/netlify/next-runtime-minimal#readme"
 }