opennextjs-azure 0.1.4 → 0.2.0

package/README.md

@@ -188,7 +188,8 @@ opennextjs-azure deploy \
   [--resource-group <name>] \
   [--location <region>] \
   [--environment dev|staging|prod] \
-  [--skip-infrastructure]
+  [--skip-infrastructure] \
+  [--skip-resource-checks]
 
 # View live logs in Azure Portal
 opennextjs-azure tail \

package/dist/adapters/converters/azure-http.d.mts

@@ -1,5 +1,6 @@
 import { HttpRequest } from '@azure/functions';
 import { InternalEvent, InternalResult } from '@opennextjs/aws/types/open-next.js';
+import { Buffer } from 'node:buffer';
 
 /**
  * Converts Azure HTTP requests to OpenNext InternalEvent format
@@ -11,7 +12,8 @@ declare function convertFromAzureHttp(request: HttpRequest): Promise<InternalEve
 declare function convertToAzureHttp(result: InternalResult): Promise<{
     status: number;
     headers: Record<string, string>;
-    body?: string;
+    cookies: string[];
+    body?: Buffer;
 }>;
 declare const _default: {
     convertFrom: typeof convertFromAzureHttp;

package/dist/adapters/converters/azure-http.d.ts

@@ -1,5 +1,6 @@
 import { HttpRequest } from '@azure/functions';
 import { InternalEvent, InternalResult } from '@opennextjs/aws/types/open-next.js';
+import { Buffer } from 'node:buffer';
 
 /**
  * Converts Azure HTTP requests to OpenNext InternalEvent format
@@ -11,7 +12,8 @@ declare function convertFromAzureHttp(request: HttpRequest): Promise<InternalEve
 declare function convertToAzureHttp(result: InternalResult): Promise<{
     status: number;
     headers: Record<string, string>;
-    body?: string;
+    cookies: string[];
+    body?: Buffer;
 }>;
 declare const _default: {
     convertFrom: typeof convertFromAzureHttp;

package/dist/adapters/converters/azure-http.js

@@ -14,7 +14,8 @@ async function convertFromAzureHttp(request) {
     }
   });
   const headers = {};
-  for (const [key, value] of Object.entries(request.headers)) {
+  const headerEntries = typeof request.headers?.entries === "function" ? request.headers.entries() : Object.entries(request.headers);
+  for (const [key, value] of headerEntries) {
     if (value) {
       headers[key.toLowerCase()] = value;
     }
@@ -29,7 +30,8 @@ async function convertFromAzureHttp(request) {
       }
     });
   }
-  const body = request.method !== "GET" && request.method !== "HEAD" ? Buffer.from(await request.arrayBuffer()) : void 0;
+  const body = request.method !== "GET" && request.method !== "HEAD" ? await readRequestBody(request) : void 0;
+  const remoteAddress = (headers["x-forwarded-for"] || headers["x-real-ip"] || "::1").split(",")[0].trim();
   return {
     type: "core",
     method: request.method,
@@ -39,9 +41,22 @@ async function convertFromAzureHttp(request) {
     headers,
     query,
     cookies,
-    remoteAddress: headers["x-forwarded-for"] || headers["x-real-ip"] || "::1"
+    remoteAddress
   };
 }
+async function readRequestBody(request) {
+  const req = request;
+  if (typeof req.arrayBuffer === "function") {
+    return Buffer.from(await req.arrayBuffer());
+  }
+  if (req.bufferBody != null) {
+    return Buffer.isBuffer(req.bufferBody) ? req.bufferBody : Buffer.from(req.bufferBody);
+  }
+  if (req.rawBody != null) {
+    return Buffer.isBuffer(req.rawBody) ? req.rawBody : Buffer.from(String(req.rawBody));
+  }
+  return void 0;
+}
 function normalizePath(pathname) {
   if (!pathname || pathname === "/" || pathname === "") {
     return "/";
@@ -53,11 +68,14 @@ function normalizePath(pathname) {
 }
 async function convertToAzureHttp(result) {
   const headers = {};
+  const cookies = [];
   for (const [key, value] of Object.entries(result.headers)) {
     if (value === null || value === void 0) {
       continue;
     }
-    if (Array.isArray(value)) {
+    if (key.toLowerCase() === "set-cookie") {
+      cookies.push(...Array.isArray(value) ? value.map(String) : [String(value)]);
+    } else if (Array.isArray(value)) {
       headers[key] = value.join(", ");
     } else {
       headers[key] = String(value);
@@ -79,12 +97,12 @@ async function convertToAzureHttp(result) {
     } finally {
       reader.releaseLock();
     }
-    const buffer = Buffer.concat(chunks);
-    body = result.isBase64Encoded ? buffer.toString("base64") : buffer.toString("utf8");
+    body = Buffer.concat(chunks);
   }
   return {
     status: result.statusCode,
     headers,
+    cookies,
     body
   };
 }

package/dist/adapters/converters/azure-queue-revalidate.d.mts

@@ -0,0 +1,26 @@
+interface RevalidateRecord {
+    host: string;
+    url: string;
+    id: string;
+}
+interface RevalidateEvent {
+    type: "revalidate";
+    records: RevalidateRecord[];
+}
+/**
+ * Converts an Azure Storage Queue message into OpenNext's revalidate event.
+ *
+ * The producer (overrides/queue/azure-queue.ts) sends base64-encoded JSON
+ * {host, url, lastModified, eTag, deduplicationId, groupId}. The queue
+ * trigger decodes the base64 and the worker parses the JSON, so the item
+ * usually arrives as an object. Strings are handled too.
+ */
+declare function convertFromQueueMessage(queueItem: unknown): Promise<RevalidateEvent>;
+declare function convertToQueueResult(revalidateEvent: RevalidateEvent): Promise<RevalidateEvent>;
+declare const _default: {
+    convertFrom: typeof convertFromQueueMessage;
+    convertTo: typeof convertToQueueResult;
+    name: string;
+};
+
+export { _default as default };

package/dist/adapters/converters/azure-queue-revalidate.d.ts

@@ -0,0 +1,26 @@
+interface RevalidateRecord {
+    host: string;
+    url: string;
+    id: string;
+}
+interface RevalidateEvent {
+    type: "revalidate";
+    records: RevalidateRecord[];
+}
+/**
+ * Converts an Azure Storage Queue message into OpenNext's revalidate event.
+ *
+ * The producer (overrides/queue/azure-queue.ts) sends base64-encoded JSON
+ * {host, url, lastModified, eTag, deduplicationId, groupId}. The queue
+ * trigger decodes the base64 and the worker parses the JSON, so the item
+ * usually arrives as an object. Strings are handled too.
+ */
+declare function convertFromQueueMessage(queueItem: unknown): Promise<RevalidateEvent>;
+declare function convertToQueueResult(revalidateEvent: RevalidateEvent): Promise<RevalidateEvent>;
+declare const _default: {
+    convertFrom: typeof convertFromQueueMessage;
+    convertTo: typeof convertToQueueResult;
+    name: string;
+};
+
+export { _default as default };

package/dist/adapters/converters/azure-queue-revalidate.js

@@ -0,0 +1,30 @@
+async function convertFromQueueMessage(queueItem) {
+  let message = queueItem;
+  if (typeof message === "string") {
+    try {
+      message = JSON.parse(message);
+    } catch {
+      message = JSON.parse(Buffer.from(message, "base64").toString("utf8"));
+    }
+  }
+  return {
+    type: "revalidate",
+    records: [
+      {
+        host: message.host,
+        url: message.url,
+        id: message.deduplicationId || `${message.host}${message.url}`
+      }
+    ]
+  };
+}
+async function convertToQueueResult(revalidateEvent) {
+  return revalidateEvent;
+}
+const azureQueueRevalidate = {
+  convertFrom: convertFromQueueMessage,
+  convertTo: convertToQueueResult,
+  name: "azure-queue-revalidate"
+};
+
+export { azureQueueRevalidate as default };

package/dist/adapters/wrappers/azure-functions.d.mts

@@ -1,10 +1,17 @@
 import { InternalEvent, InternalResult } from '@opennextjs/aws/types/open-next.js';
 import { WrapperHandler } from '@opennextjs/aws/types/overrides.js';
 
+/**
+ * Parses a Set-Cookie header string into the structured Cookie object the
+ * Azure Functions v3 http output binding expects (`context.res.cookies`).
+ * The v3 model has no other way to emit multiple Set-Cookie headers, and
+ * comma-joining them corrupts cookies (RFC 6265).
+ */
+declare function parseSetCookie(setCookie: string): Record<string, unknown> | null;
 declare const _default: {
     wrapper: WrapperHandler<InternalEvent, InternalResult>;
     name: string;
     supportStreaming: true;
 };
 
-export { _default as default };
+export { _default as default, parseSetCookie };

package/dist/adapters/wrappers/azure-functions.d.ts

@@ -1,10 +1,17 @@
 import { InternalEvent, InternalResult } from '@opennextjs/aws/types/open-next.js';
 import { WrapperHandler } from '@opennextjs/aws/types/overrides.js';
 
+/**
+ * Parses a Set-Cookie header string into the structured Cookie object the
+ * Azure Functions v3 http output binding expects (`context.res.cookies`).
+ * The v3 model has no other way to emit multiple Set-Cookie headers, and
+ * comma-joining them corrupts cookies (RFC 6265).
+ */
+declare function parseSetCookie(setCookie: string): Record<string, unknown> | null;
 declare const _default: {
     wrapper: WrapperHandler<InternalEvent, InternalResult>;
     name: string;
     supportStreaming: true;
 };
 
-export { _default as default };
+export { _default as default, parseSetCookie };

package/dist/adapters/wrappers/azure-functions.js

@@ -1,20 +1,87 @@
 import { Writable } from 'node:stream';
+import { readFileSync } from 'node:fs';
 
 const NULL_BODY_STATUSES = /* @__PURE__ */ new Set([101, 204, 205, 304]);
 const STATIC_ASSET_PATTERNS = [
-  /^\/_next\/static\//,
   /^\/favicon\.ico$/,
   /^\/robots\.txt$/,
   /^\/sitemap\.xml$/,
-  /^\/[^\/]+\.(svg|png|jpg|jpeg|gif|webp|ico|woff|woff2|ttf|eot)$/
+  /^\/[^/]+\.(svg|png|jpg|jpeg|gif|webp|ico|woff|woff2|ttf|eot)$/
 ];
+const METADATA_ROUTE_PATTERN = /^\/(opengraph-image|twitter-image|icon\d*|apple-icon\d*|manifest)\.[a-z0-9]+$/;
+let uploadedRootAssets = null;
+try {
+  const manifest = JSON.parse(readFileSync("static-assets.json", "utf8"));
+  if (Array.isArray(manifest)) {
+    uploadedRootAssets = new Set(manifest);
+  }
+} catch {
+}
 function isStaticAssetRequest(pathname) {
+  if (pathname.startsWith("/_next/static/")) {
+    return true;
+  }
+  if (uploadedRootAssets) {
+    const isRootLevel = pathname.startsWith("/") && !pathname.slice(1).includes("/");
+    return isRootLevel && uploadedRootAssets.has(pathname.slice(1));
+  }
+  if (METADATA_ROUTE_PATTERN.test(pathname)) {
+    return false;
+  }
   return STATIC_ASSET_PATTERNS.some((pattern) => pattern.test(pathname));
 }
+function parseSetCookie(setCookie) {
+  const parts = setCookie.split(";");
+  const [nameValue, ...attrs] = parts;
+  const eq = nameValue.indexOf("=");
+  if (eq === -1)
+    return null;
+  const cookie = {
+    name: nameValue.slice(0, eq).trim(),
+    value: nameValue.slice(eq + 1).trim()
+  };
+  for (const attr of attrs) {
+    const [rawKey, ...rawVal] = attr.split("=");
+    const key = rawKey.trim().toLowerCase();
+    const value = rawVal.join("=").trim();
+    switch (key) {
+      case "expires": {
+        const expires = new Date(value);
+        if (!Number.isNaN(expires.getTime())) {
+          cookie.expires = expires;
+        }
+        break;
+      }
+      case "max-age": {
+        const maxAge = Number(value);
+        if (!Number.isNaN(maxAge)) {
+          cookie.maxAge = maxAge;
+        }
+        break;
+      }
+      case "domain":
+        cookie.domain = value;
+        break;
+      case "path":
+        cookie.path = value;
+        break;
+      case "samesite":
+        cookie.sameSite = value;
+        break;
+      case "secure":
+        cookie.secure = true;
+        break;
+      case "httponly":
+        cookie.httpOnly = true;
+        break;
+    }
+  }
+  return cookie;
+}
 const handler = async (handler2, converter) => async (context, request) => {
   try {
     const internalEvent = await converter.convertFrom(request);
-    if (isStaticAssetRequest(internalEvent.rawPath)) {
+    if (isStaticAssetRequest(internalEvent.rawPath) && process.env.AZURE_STORAGE_ACCOUNT_NAME) {
       const blobUrl = `https://${process.env.AZURE_STORAGE_ACCOUNT_NAME}.blob.core.windows.net/assets${internalEvent.rawPath}`;
       const cacheControl = internalEvent.rawPath.startsWith("/_next/static/") ? "public, max-age=31536000, immutable" : "public, max-age=0, must-revalidate";
       context.res = {
@@ -32,13 +99,12 @@ const handler = async (handler2, converter) => async (context, request) => {
       writeHeaders(prelude) {
         const { statusCode, cookies, headers } = prelude;
         const responseHeaders = { ...headers };
-        if (cookies.length > 0) {
-          responseHeaders["set-cookie"] = cookies.join(", ");
-        }
+        const responseCookies = cookies.map(parseSetCookie).filter(Boolean);
         if (NULL_BODY_STATUSES.has(statusCode)) {
           context.res = {
             status: statusCode,
-            headers: responseHeaders
+            headers: responseHeaders,
+            ...responseCookies.length > 0 ? { cookies: responseCookies } : {}
           };
           return new Writable({
             write(chunk, encoding, callback) {
@@ -56,19 +122,23 @@ const handler = async (handler2, converter) => async (context, request) => {
             callback();
           },
           final(callback) {
-            const body = Buffer.concat(chunks);
-            const bodyString = body.toString("utf8");
             context.res = {
               status: statusCode,
               headers: responseHeaders,
-              body: bodyString
+              ...responseCookies.length > 0 ? { cookies: responseCookies } : {},
+              body: Buffer.concat(chunks),
+              isRaw: true
             };
             callback();
             resolveStream?.();
+          },
+          destroy(error, callback) {
+            resolveStream?.();
+            callback(error);
           }
         });
       },
-      retainChunks: true
+      retainChunks: false
     };
     await handler2(internalEvent, { streamCreator });
     if (streamFinished) {
@@ -102,4 +172,4 @@ const azureFunctions = {
   supportStreaming: true
 };
 
-export { azureFunctions as default };
+export { azureFunctions as default, parseSetCookie };

package/dist/adapters/wrappers/azure-image-optimization.js

@@ -1,17 +1,36 @@
 import { Writable } from 'node:stream';
 import { createHash } from 'node:crypto';
 import { BlobServiceClient } from '@azure/storage-blob';
+import { parseSetCookie } from './azure-functions.js';
+import { BLOB_RETRY_OPTIONS } from '../../overrides/incrementalCache/azure-blob.js';
+import 'node:fs';
+import '../../config/index.js';
 
 const NULL_BODY_STATUSES = /* @__PURE__ */ new Set([101, 204, 205, 304]);
 const { AZURE_STORAGE_CONNECTION_STRING, AZURE_STORAGE_ACCOUNT_NAME } = process.env;
 const CACHE_CONTAINER = "optimized-images";
+let cachedContainerClient = null;
 function getBlobClient(key) {
-  if (!AZURE_STORAGE_CONNECTION_STRING && !AZURE_STORAGE_ACCOUNT_NAME) {
-    throw new Error("Azure Storage connection string or account name must be defined");
+  if (!cachedContainerClient) {
+    if (!AZURE_STORAGE_CONNECTION_STRING && !AZURE_STORAGE_ACCOUNT_NAME) {
+      throw new Error("Azure Storage connection string or account name must be defined");
+    }
+    const blobServiceClient = AZURE_STORAGE_CONNECTION_STRING ? BlobServiceClient.fromConnectionString(AZURE_STORAGE_CONNECTION_STRING, BLOB_RETRY_OPTIONS) : new BlobServiceClient(
+      `https://${AZURE_STORAGE_ACCOUNT_NAME}.blob.core.windows.net`,
+      void 0,
+      BLOB_RETRY_OPTIONS
+    );
+    cachedContainerClient = blobServiceClient.getContainerClient(CACHE_CONTAINER);
   }
-  const blobServiceClient = AZURE_STORAGE_CONNECTION_STRING ? BlobServiceClient.fromConnectionString(AZURE_STORAGE_CONNECTION_STRING) : new BlobServiceClient(`https://${AZURE_STORAGE_ACCOUNT_NAME}.blob.core.windows.net`);
-  const containerClient = blobServiceClient.getContainerClient(CACHE_CONTAINER);
-  return containerClient.getBlockBlobClient(key);
+  return cachedContainerClient.getBlockBlobClient(key);
+}
+function acceptFormat(event) {
+  const accept = event.headers?.accept || "";
+  if (accept.includes("image/avif"))
+    return "avif";
+  if (accept.includes("image/webp"))
+    return "webp";
+  return "orig";
 }
 function computeCacheKey(event) {
   const { query } = event;
@@ -19,15 +38,11 @@ function computeCacheKey(event) {
   const width = Array.isArray(query?.w) ? query.w[0] : query?.w || "0";
   const quality = Array.isArray(query?.q) ? query.q[0] : query?.q || "75";
   const hash = createHash("sha256").update(url).digest("hex").substring(0, 16);
-  return `${hash}/w${width}_q${quality}.cache`;
+  return `${hash}/w${width}_q${quality}_${acceptFormat(event)}.cache`;
 }
 async function getCachedImage(cacheKey) {
   try {
     const blobClient = getBlobClient(cacheKey);
-    const exists = await blobClient.exists();
-    if (!exists) {
-      return null;
-    }
     const downloadResponse = await blobClient.download();
     if (!downloadResponse.readableStreamBody) {
       return null;
@@ -36,7 +51,11 @@ async function getCachedImage(cacheKey) {
     for await (const chunk of downloadResponse.readableStreamBody) {
       chunks.push(Buffer.from(chunk));
     }
-    return Buffer.concat(chunks);
+    return {
+      buffer: Buffer.concat(chunks),
+      contentType: downloadResponse.contentType,
+      cacheControl: downloadResponse.cacheControl
+    };
   } catch (error) {
     return null;
   }
@@ -61,17 +80,19 @@ const handler = async (handler2, converter) => async (context, request) => {
   try {
     const internalEvent = await converter.convertFrom(request);
     const cacheKey = computeCacheKey(internalEvent);
-    const cachedBuffer = await getCachedImage(cacheKey);
-    if (cachedBuffer) {
-      process.stderr.write(`[ImageCache] \u2713 Cache HIT
-`);
+    const cached = await getCachedImage(cacheKey);
+    if (cached) {
       context.res = {
         status: 200,
         headers: {
-          "Content-Type": "image/webp",
-          "Cache-Control": "public,max-age=31536000,immutable"
+          // Serve the stored type; hardcoding webp mislabels
+          // avif/gif/svg passthroughs.
+          "Content-Type": cached.contentType || "image/webp",
+          "Cache-Control": cached.cacheControl || "public,max-age=31536000,immutable",
+          Vary: "Accept"
         },
-        body: cachedBuffer
+        body: cached.buffer,
+        isRaw: true
       };
       return;
     }
@@ -86,13 +107,12 @@ const handler = async (handler2, converter) => async (context, request) => {
         const { statusCode, cookies, headers } = prelude;
         responseContentType = headers["Content-Type"] || headers["content-type"] || "image/webp";
         const responseHeaders = { ...headers };
-        if (cookies.length > 0) {
-          responseHeaders["set-cookie"] = cookies.join(", ");
-        }
+        const responseCookies = cookies.map(parseSetCookie).filter(Boolean);
         if (NULL_BODY_STATUSES.has(statusCode)) {
           context.res = {
             status: statusCode,
-            headers: responseHeaders
+            headers: responseHeaders,
+            ...responseCookies.length > 0 ? { cookies: responseCookies } : {}
           };
           return new Writable({
             write(_chunk, _encoding, callback) {
@@ -111,14 +131,23 @@ const handler = async (handler2, converter) => async (context, request) => {
           },
           final(callback) {
             const body = Buffer.concat(chunks);
-            processedBuffer = body;
+            if (statusCode === 200) {
+              processedBuffer = body;
+            }
+            responseHeaders["Vary"] = "Accept";
             context.res = {
               status: statusCode,
               headers: responseHeaders,
-              body
+              ...responseCookies.length > 0 ? { cookies: responseCookies } : {},
+              body,
+              isRaw: true
             };
             callback();
             resolveStream?.();
+          },
+          destroy(error, callback) {
+            resolveStream?.();
+            callback(error);
           }
         });
         return writable;

package/dist/adapters/wrappers/azure-queue-revalidate.d.mts

@@ -0,0 +1,9 @@
+import { WrapperHandler } from '@opennextjs/aws/types/overrides.js';
+
+declare const _default: {
+    wrapper: WrapperHandler<any, any>;
+    name: string;
+    supportStreaming: boolean;
+};
+
+export { _default as default };

package/dist/adapters/wrappers/azure-queue-revalidate.d.ts

@@ -0,0 +1,9 @@
+import { WrapperHandler } from '@opennextjs/aws/types/overrides.js';
+
+declare const _default: {
+    wrapper: WrapperHandler<any, any>;
+    name: string;
+    supportStreaming: boolean;
+};
+
+export { _default as default };

package/dist/adapters/wrappers/azure-queue-revalidate.js

@@ -0,0 +1,17 @@
+const handler = async (handler2, converter) => async (context, queueItem) => {
+  const event = await converter.convertFrom(queueItem);
+  const result = await handler2(event);
+  const failed = result?.records ?? [];
+  if (failed.length > 0) {
+    const urls = failed.map((r) => r.url).join(", ");
+    throw new Error(`Revalidation failed for: ${urls}`);
+  }
+  context.log?.(`Revalidated ${event.records.length} page(s)`);
+};
+const azureQueueRevalidate = {
+  wrapper: handler,
+  name: "azure-queue-revalidate",
+  supportStreaming: false
+};
+
+export { azureQueueRevalidate as default };

package/dist/cli/index.js

@@ -1,6 +1,7 @@
 #!/usr/bin/env node
-import { Command } from 'commander';
-import { r as redX, g as greenCheck, p as promptForInput, i as init, b as build, d as deploy } from '../deploy.js';
+import { createRequire } from 'node:module';
+import { Command, Option } from 'commander';
+import { v as validateAzureNames, r as redX, g as greenCheck, p as promptForInput, i as init, b as build, d as deploy } from '../deploy.js';
 import { exec } from 'node:child_process';
 import { promisify } from 'node:util';
 import fs from 'node:fs/promises';
@@ -8,6 +9,10 @@ import path from 'node:path';
 import 'node:url';
 import '@opennextjs/aws/build.js';
 import 'node:fs';
+import '@azure/storage-blob';
+import '@azure/data-tables';
+import '../overrides/tagCache/azure-table.js';
+import '../config/index.js';
 import 'node:readline';
 
 const execAsync$2 = promisify(exec);
@@ -25,6 +30,7 @@ async function tail(options) {
   const appName = options?.appName || config.appName;
   const resourceGroup = options?.resourceGroup || config.resourceGroup;
   const environment = config.environment || "dev";
+  validateAzureNames({ appName, resourceGroup, environment });
   if (!appName || !resourceGroup) {
     console.error("\u274C Missing required information!");
     console.error("   Provide --app-name and --resource-group or run from a project with azure.config.json\n");
@@ -73,6 +79,7 @@ async function health(options) {
   const appName = options?.appName || config.appName;
   const resourceGroup = options?.resourceGroup || config.resourceGroup;
   const environment = config.environment || "dev";
+  validateAzureNames({ appName, resourceGroup, environment });
   if (!appName || !resourceGroup) {
     console.error(`${redX()} Missing required information!`);
     console.error("  Provide --app-name and --resource-group or run from a project with azure.config.json\n");
@@ -462,6 +469,7 @@ async function deleteResourceGroup(options) {
     console.error("  Provide --resource-group\n");
     process.exit(1);
   }
+  validateAzureNames({ resourceGroup });
   try {
     const { stdout } = await execAsync(
       `az group show --name ${resourceGroup} --query '{Location:location, State:properties.provisioningState}' -o json`
@@ -493,7 +501,7 @@ ${redX()} Deletion cancelled. Resource group name did not match.
   }
   console.log(`
 Deleting resource group "${resourceGroup}"...`);
-  if (options.noWait) {
+  if (options.wait === false) {
     console.log("Initiating deletion in the background...\n");
     try {
       await execAsync(`az group delete --name ${resourceGroup} --yes --no-wait`);
@@ -525,15 +533,17 @@ ${colors.yellow}Note:${colors.reset} Deletion typically takes 3-5 minutes to com
   }
 }
 
+const require = createRequire(import.meta.url);
+const { version } = require("../../package.json");
 const program = new Command();
-program.name("opennextjs-azure").description("CLI tool for building and deploying Next.js apps to Azure").version("0.1.2");
+program.name("opennextjs-azure").description("CLI tool for building and deploying Next.js apps to Azure").version(version);
 program.command("init").description("Initialize Azure infrastructure in your project").option("--scaffold", "Scaffold a new Next.js project if in empty directory").option("--no-typescript", "Disable TypeScript (default: enabled)").option("--no-tailwind", "Disable Tailwind CSS (default: enabled with v3)").option("--no-eslint", "Disable ESLint (default: enabled)").option("--no-src-dir", "Disable src/ directory (default: enabled)").option("--no-app-router", "Use Pages Router instead of App Router").option("--import-alias <alias>", "Import alias (default: @/*)").option("--package-manager <pm>", "Package manager: npm, yarn, pnpm, bun (default: pnpm)").action(async (options) => {
   await init(options);
 });
 program.command("build").description("Build Next.js app for Azure deployment").option("-c, --config <path>", "Path to open-next.config.ts file").action(async (options) => {
   await build(options.config);
 });
-program.command("deploy").description("Deploy Next.js app to Azure (provisions infrastructure + deploys)").option("-n, --app-name <name>", "Application name (overrides azure.config.json)").option("-g, --resource-group <name>", "Azure resource group name").option("-l, --location <location>", "Azure region").option("-e, --environment <env>", "Environment: dev, staging, or prod").option("--skip-infrastructure", "Skip infrastructure provisioning").option("--skip-resource-checks", "Skip Azure resource validation checks (permissions, quota, providers)").action(async (options) => {
+program.command("deploy").description("Deploy Next.js app to Azure (provisions infrastructure + deploys)").option("-n, --app-name <name>", "Application name (overrides azure.config.json)").option("-g, --resource-group <name>", "Azure resource group name").option("-l, --location <location>", "Azure region").addOption(new Option("-e, --environment <env>", "Deployment environment").choices(["dev", "staging", "prod"])).option("--skip-infrastructure", "Skip infrastructure provisioning").option("--skip-resource-checks", "Skip Azure resource validation checks (permissions, quota, providers)").action(async (options) => {
   await deploy(options);
 });
 program.command("tail").description("Open Azure Portal Log Stream in browser (live logs)").option("-n, --app-name <name>", "Application name").option("-g, --resource-group <name>", "Azure resource group name").action(async (options) => {

package/dist/config/index.js

@@ -17,6 +17,15 @@ function defineAzureConfig(config = {}) {
     imageOptimization: {
       loader: resolveImageLoader(config.imageLoader)
     },
+    // Upstream's declared revalidate converter type says {host, url} but
+    // its runtime handler reads event.records[]. These match the runtime,
+    // hence the casts.
+    revalidate: {
+      override: {
+        wrapper: () => import('../adapters/wrappers/azure-queue-revalidate.js').then((m) => m.default),
+        converter: () => import('../adapters/converters/azure-queue-revalidate.js').then((m) => m.default)
+      }
+    },
     dangerous: config.dangerous,
     buildCommand: config.buildCommand,
     buildOutputPath: config.buildOutputPath || ".",