From e996c53afe83911cac4d2f10b23ce44e31346037 Mon Sep 17 00:00:00 2001 From: Victor Berchet Date: Mon, 14 Apr 2025 11:15:30 +0200 Subject: [PATCH 1/5] Add support for basePath --- .changeset/blue-beds-crash.md | 5 + examples/bugs/gh-219/package.json | 1 - packages/cloudflare/package.json | 2 +- .../incremental-cache/kv-incremental-cache.ts | 3 +- .../static-assets-incremental-cache.ts | 3 +- packages/cloudflare/src/cli/build/build.ts | 2 +- .../src/cli/build/open-next/compile-init.ts | 7 +- packages/cloudflare/src/cli/templates/init.ts | 11 +- .../cloudflare/src/cli/templates/worker.ts | 4 +- pnpm-lock.yaml | 223 ++++++++---------- 10 files changed, 119 insertions(+), 142 deletions(-) create mode 100644 .changeset/blue-beds-crash.md diff --git a/.changeset/blue-beds-crash.md b/.changeset/blue-beds-crash.md new file mode 100644 index 000000000..2b7785c15 --- /dev/null +++ b/.changeset/blue-beds-crash.md @@ -0,0 +1,5 @@ +--- +"@opennextjs/cloudflare": patch +--- + +Add support for basePath diff --git a/examples/bugs/gh-219/package.json b/examples/bugs/gh-219/package.json index abaacd4b5..bb64a55fa 100644 --- a/examples/bugs/gh-219/package.json +++ b/examples/bugs/gh-219/package.json @@ -16,7 +16,6 @@ "dependencies": { "@hookform/resolvers": "^3.9.1", "@libsql/client": "^0.14.0", - "@opennextjs/aws": "^3.3.1", "@t3-oss/env-nextjs": "^0.11.1", "@tanstack/react-table": "^8.20.6", "better-sqlite3": "^11.7.0", diff --git a/packages/cloudflare/package.json b/packages/cloudflare/package.json index 97b103cb7..6d2300ef1 100644 --- a/packages/cloudflare/package.json +++ b/packages/cloudflare/package.json @@ -53,7 +53,7 @@ "homepage": "https://github.com/opennextjs/opennextjs-cloudflare", "dependencies": { "@dotenvx/dotenvx": "catalog:", - "@opennextjs/aws": "3.5.6", + "@opennextjs/aws": "https://pkg.pr.new/@opennextjs/aws@821", "enquirer": "^2.4.1", "glob": "catalog:", "ts-tqdm": "^0.8.6" diff --git a/packages/cloudflare/src/api/overrides/incremental-cache/kv-incremental-cache.ts b/packages/cloudflare/src/api/overrides/incremental-cache/kv-incremental-cache.ts index 7a2e40f1f..4a3ed935c 100644 --- a/packages/cloudflare/src/api/overrides/incremental-cache/kv-incremental-cache.ts +++ b/packages/cloudflare/src/api/overrides/incremental-cache/kv-incremental-cache.ts @@ -56,8 +56,7 @@ class KVIncrementalCache implements IncrementalCache { // if there is no lastModified property, the file was stored during build-time cache population. return { value: entry, - // __BUILD_TIMESTAMP_MS__ is injected by ESBuild. - lastModified: (globalThis as { __BUILD_TIMESTAMP_MS__?: number }).__BUILD_TIMESTAMP_MS__, + lastModified: globalThis.__BUILD_TIMESTAMP_MS__, }; } catch (e) { error("Failed to get from cache", e); diff --git a/packages/cloudflare/src/api/overrides/incremental-cache/static-assets-incremental-cache.ts b/packages/cloudflare/src/api/overrides/incremental-cache/static-assets-incremental-cache.ts index 155b94730..125e766a5 100644 --- a/packages/cloudflare/src/api/overrides/incremental-cache/static-assets-incremental-cache.ts +++ b/packages/cloudflare/src/api/overrides/incremental-cache/static-assets-incremental-cache.ts @@ -33,8 +33,7 @@ class StaticAssetsIncrementalCache implements IncrementalCache { return { value: await response.json(), - // __BUILD_TIMESTAMP_MS__ is injected by ESBuild. - lastModified: (globalThis as { __BUILD_TIMESTAMP_MS__?: number }).__BUILD_TIMESTAMP_MS__, + lastModified: globalThis.__BUILD_TIMESTAMP_MS__, }; } catch (e) { error("Failed to get from cache", e); diff --git a/packages/cloudflare/src/cli/build/build.ts b/packages/cloudflare/src/cli/build/build.ts index 3c02b5e1b..250fecf9a 100644 --- a/packages/cloudflare/src/cli/build/build.ts +++ b/packages/cloudflare/src/cli/build/build.ts @@ -70,7 +70,7 @@ export async function build( // Compile middleware await createMiddleware(options, { forceOnlyBuildOnce: true }); - createStaticAssets(options); + createStaticAssets(options, { useBasePath: true }); if (config.dangerous?.disableIncrementalCache !== true) { const { useTagCache, metaFiles } = createCacheAssets(options); diff --git a/packages/cloudflare/src/cli/build/open-next/compile-init.ts b/packages/cloudflare/src/cli/build/open-next/compile-init.ts index e0a1a8291..ec81c1d04 100644 --- a/packages/cloudflare/src/cli/build/open-next/compile-init.ts +++ b/packages/cloudflare/src/cli/build/open-next/compile-init.ts @@ -1,7 +1,8 @@ import path from "node:path"; import { fileURLToPath } from "node:url"; -import type { BuildOptions } from "@opennextjs/aws/build/helper"; +import { loadConfig } from "@opennextjs/aws/adapters/config/util.js"; +import type { BuildOptions } from "@opennextjs/aws/build/helper.js"; import { build } from "esbuild"; /** @@ -12,6 +13,9 @@ export async function compileInit(options: BuildOptions) { const templatesDir = path.join(currentDir, "../../templates"); const initPath = path.join(templatesDir, "init.js"); + const nextConfig = loadConfig(path.join(options.appBuildOutputPath, ".next")); + const basePath = nextConfig.basePath ?? ""; + await build({ entryPoints: [initPath], outdir: path.join(options.outputDir, "cloudflare"), @@ -22,6 +26,7 @@ export async function compileInit(options: BuildOptions) { platform: "node", define: { __BUILD_TIMESTAMP_MS__: JSON.stringify(Date.now()), + __NEXT_BASE_PATH__: JSON.stringify(basePath), }, }); } diff --git a/packages/cloudflare/src/cli/templates/init.ts b/packages/cloudflare/src/cli/templates/init.ts index 00e84c07e..9d6278033 100644 --- a/packages/cloudflare/src/cli/templates/init.ts +++ b/packages/cloudflare/src/cli/templates/init.ts @@ -91,8 +91,8 @@ function initRuntime() { Object.assign(globalThis, { Request: CustomRequest, - //@ts-expect-error Inline at build time by ESBuild __BUILD_TIMESTAMP_MS__: __BUILD_TIMESTAMP_MS__, + __NEXT_BASE_PATH__: __NEXT_BASE_PATH__, }); } @@ -126,3 +126,12 @@ function populateProcessEnv(url: URL, env: CloudflareEnv) { }, }); } + +/* eslint-disable no-var */ +declare global { + // Build timestamp + var __BUILD_TIMESTAMP_MS__: number; + // Next basePath + var __NEXT_BASE_PATH__: string; +} +/* eslint-enable no-var */ diff --git a/packages/cloudflare/src/cli/templates/worker.ts b/packages/cloudflare/src/cli/templates/worker.ts index f265c2891..ee59a29e3 100644 --- a/packages/cloudflare/src/cli/templates/worker.ts +++ b/packages/cloudflare/src/cli/templates/worker.ts @@ -25,10 +25,10 @@ export default { } // Fallback for the Next default image loader. - if (url.pathname === "/_next/image") { + if (url.pathname === `${globalThis.__NEXT_BASE_PATH__}/_next/image`) { const imageUrl = url.searchParams.get("url") ?? ""; return imageUrl.startsWith("/") - ? env.ASSETS?.fetch(new URL(imageUrl, request.url)) + ? env.ASSETS?.fetch(`http://assets.local${imageUrl}`) : fetch(imageUrl, { cf: { cacheEverything: true } }); } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index ab480048f..5594f5c36 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -202,9 +202,6 @@ importers: '@libsql/client': specifier: ^0.14.0 version: 0.14.0 - '@opennextjs/aws': - specifier: ^3.3.1 - version: 3.5.3 '@t3-oss/env-nextjs': specifier: ^0.11.1 version: 0.11.1(typescript@5.7.3)(zod@3.24.1) @@ -964,8 +961,8 @@ importers: specifier: 'catalog:' version: 1.31.0 '@opennextjs/aws': - specifier: 3.5.6 - version: 3.5.6 + specifier: https://pkg.pr.new/@opennextjs/aws@821 + version: https://pkg.pr.new/@opennextjs/aws@821 enquirer: specifier: ^2.4.1 version: 2.4.1 @@ -1137,20 +1134,20 @@ packages: resolution: {integrity: sha512-kISKhqN1k48TaMPbLgq9jj7mO2jvbJdhirvfu4JW3jhFhENnkY0oCwTPvR4Q6Ne2as6GFAMo2XZDZq4rxC7YDw==} engines: {node: '>=14.0.0'} - '@aws-sdk/client-dynamodb@3.777.0': - resolution: {integrity: sha512-LgFgdyGh8ZuBnbY1QNc+7ahNy5HFKK9OA6knEKr7UpWYZ0ct41EdPkGrsH9Ea/TMSu/C9p3W4rawwdUkfLepUQ==} + '@aws-sdk/client-dynamodb@3.788.0': + resolution: {integrity: sha512-agm2+5p47uDbAcWRJjRqsIIpbjig5P0AMB/1lQjkQKTnGOfdgzIrFLtQ3tO0kWWbTb7gH6Pg5EviuTC8j6axLQ==} engines: {node: '>=18.0.0'} - '@aws-sdk/client-lambda@3.777.0': - resolution: {integrity: sha512-UXwqwS5U+kYFnqqrDSWwXddEiWPaX6sHHkiKZYslc+dM/bl1DyPmX17eTkde/8V+bsZvw9az2NuYlZy1N12DVQ==} + '@aws-sdk/client-lambda@3.787.0': + resolution: {integrity: sha512-aPSg7YL7IpEaijsunAYtws/3dZl+VjyQ1wbv6RxdIfzww/35x31GSc6vD6paq8KC6lcns8wlli/0qCOl8Z9wZg==} engines: {node: '>=18.0.0'} '@aws-sdk/client-s3@3.726.1': resolution: {integrity: sha512-UpOGcob87DiuS2d3fW6vDZg94g57mNiOSkzvR/6GOdvBSlUgk8LLwVzGASB71FdKMl1EGEr4MeD5uKH9JsG+dw==} engines: {node: '>=18.0.0'} - '@aws-sdk/client-sqs@3.777.0': - resolution: {integrity: sha512-q9oPr+KvyBNaQzYajwpYkylHa1fbHQ+sBhdJGQYBghFJgU7wdpSkeZUMuFQcYf76b9rVkv5rEqlZQNfWCUNxNw==} + '@aws-sdk/client-sqs@3.787.0': + resolution: {integrity: sha512-usTvGFd6q7/8rA79uhGuu7wAShE2ZEAgQSKAGYF6fTdGunZLYBArRzJT8FS79AvHAW5nddn5AON0kF+hOpAefA==} engines: {node: '>=18.0.0'} '@aws-sdk/client-sso-oidc@3.726.0': @@ -1167,8 +1164,8 @@ packages: resolution: {integrity: sha512-NM5pjv2qglEc4XN3nnDqtqGsSGv1k5YTmzDo3W3pObItHmpS8grSeNfX9zSH+aVl0Q8hE4ZIgvTPNZ+GzwVlqg==} engines: {node: '>=18.0.0'} - '@aws-sdk/client-sso@3.777.0': - resolution: {integrity: sha512-0+z6CiAYIQa7s6FJ+dpBYPi9zr9yY5jBg/4/FGcwYbmqWPXwL9Thdtr0FearYRZgKl7bhL3m3dILCCfWqr3teQ==} + '@aws-sdk/client-sso@3.787.0': + resolution: {integrity: sha512-L8R+Mh258G0DC73ktpSVrG4TT9i2vmDLecARTDR/4q5sRivdDQSL5bUp3LKcK80Bx+FRw3UETIlX6mYMLL9PJQ==} engines: {node: '>=18.0.0'} '@aws-sdk/client-sts@3.398.0': @@ -1221,8 +1218,8 @@ packages: peerDependencies: '@aws-sdk/client-sts': ^3.726.0 - '@aws-sdk/credential-provider-ini@3.777.0': - resolution: {integrity: sha512-1X9mCuM9JSQPmQ+D2TODt4THy6aJWCNiURkmKmTIPRdno7EIKgAqrr/LLN++K5mBf54DZVKpqcJutXU2jwo01A==} + '@aws-sdk/credential-provider-ini@3.787.0': + resolution: {integrity: sha512-hc2taRoDlXn2uuNuHWDJljVWYrp3r9JF1a/8XmOAZhVUNY+ImeeStylHXhXXKEA4JOjW+5PdJj0f1UDkVCHJiQ==} engines: {node: '>=18.0.0'} '@aws-sdk/credential-provider-node@3.398.0': @@ -1233,8 +1230,8 @@ packages: resolution: {integrity: sha512-jjsewBcw/uLi24x8JbnuDjJad4VA9ROCE94uVRbEnGmUEsds75FWOKp3fWZLQlmjLtzsIbJOZLALkZP86liPaw==} engines: {node: '>=18.0.0'} - '@aws-sdk/credential-provider-node@3.777.0': - resolution: {integrity: sha512-ZD66ywx1Q0KyUSuBXZIQzBe3Q7MzX8lNwsrCU43H3Fww+Y+HB3Ncws9grhSdNhKQNeGmZ+MgKybuZYaaeLwJEQ==} + '@aws-sdk/credential-provider-node@3.787.0': + resolution: {integrity: sha512-JioVi44B1vDMaK2CdzqimwvJD3uzvzbQhaEWXsGMBcMcNHajXAXf08EF50JG3ZhLrhhUsT1ObXpbTaPINOhh+g==} engines: {node: '>=18.0.0'} '@aws-sdk/credential-provider-process@3.398.0': @@ -1257,8 +1254,8 @@ packages: resolution: {integrity: sha512-WxkN76WeB08j2yw7jUH9yCMPxmT9eBFd9ZA/aACG7yzOIlsz7gvG3P2FQ0tVg25GHM0E4PdU3p/ByTOawzcOAg==} engines: {node: '>=18.0.0'} - '@aws-sdk/credential-provider-sso@3.777.0': - resolution: {integrity: sha512-9mPz7vk9uE4PBVprfINv4tlTkyq1OonNevx2DiXC1LY4mCUCNN3RdBwAY0BTLzj0uyc3k5KxFFNbn3/8ZDQP7w==} + '@aws-sdk/credential-provider-sso@3.787.0': + resolution: {integrity: sha512-fHc08bsvwm4+dEMEQKnQ7c1irEQmmxbgS+Fq41y09pPvPh31nAhoMcjBSTWAaPHvvsRbTYvmP4Mf12ZGr8/nfg==} engines: {node: '>=18.0.0'} '@aws-sdk/credential-provider-web-identity@3.398.0': @@ -1271,8 +1268,8 @@ packages: peerDependencies: '@aws-sdk/client-sts': ^3.723.0 - '@aws-sdk/credential-provider-web-identity@3.777.0': - resolution: {integrity: sha512-uGCqr47fnthkqwq5luNl2dksgcpHHjSXz2jUra7TXtFOpqvnhOW8qXjoa1ivlkq8qhqlaZwCzPdbcN0lXpmLzQ==} + '@aws-sdk/credential-provider-web-identity@3.787.0': + resolution: {integrity: sha512-SobmCwNbk6TfEsF283mZPQEI5vV2j6eY5tOCj8Er4Lzraxu9fBPADV+Bib2A8F6jlB1lMPJzOuDCbEasSt/RIw==} engines: {node: '>=18.0.0'} '@aws-sdk/endpoint-cache@3.723.0': @@ -1367,12 +1364,12 @@ packages: resolution: {integrity: sha512-hZvzuE5S0JmFie1r68K2wQvJbzyxJFdzltj9skgnnwdvLe8F/tz7MqLkm28uV0m4jeHk0LpiBo6eZaPkQiwsZQ==} engines: {node: '>=18.0.0'} - '@aws-sdk/middleware-user-agent@3.775.0': - resolution: {integrity: sha512-7Lffpr1ptOEDE1ZYH1T78pheEY1YmeXWBfFt/amZ6AGsKSLG+JPXvof3ltporTGR2bhH/eJPo7UHCglIuXfzYg==} + '@aws-sdk/middleware-user-agent@3.787.0': + resolution: {integrity: sha512-Lnfj8SmPLYtrDFthNIaNj66zZsBCam+E4XiUDr55DIHTGstH6qZ/q6vg0GfbukxwSmUcGMwSR4Qbn8rb8yd77g==} engines: {node: '>=18.0.0'} - '@aws-sdk/nested-clients@3.777.0': - resolution: {integrity: sha512-bmmVRsCjuYlStYPt06hr+f8iEyWg7+AklKCA8ZLDEJujXhXIowgUIqXmqpTkXwkVvDQ9tzU7hxaONjyaQCGybA==} + '@aws-sdk/nested-clients@3.787.0': + resolution: {integrity: sha512-xk03q1xpKNHgbuo+trEf1dFrI239kuMmjKKsqLEsHlAZbuFq4yRGMlHBrVMnKYOPBhVFDS/VineM991XI52fKg==} engines: {node: '>=18.0.0'} '@aws-sdk/region-config-resolver@3.723.0': @@ -1405,8 +1402,8 @@ packages: peerDependencies: '@aws-sdk/client-sso-oidc': ^3.723.0 - '@aws-sdk/token-providers@3.777.0': - resolution: {integrity: sha512-Yc2cDONsHOa4dTSGOev6Ng2QgTKQUEjaUnsyKd13pc/nLLz/WLqHiQ/o7PcnKERJxXGs1g1C6l3sNXiX+kbnFQ==} + '@aws-sdk/token-providers@3.787.0': + resolution: {integrity: sha512-d7/NIqxq308Zg0RPMNrmn0QvzniL4Hx8Qdwzr6YZWLYAbUSvZYS2ppLR3BFWSkV6SsTJUx8BuDaj3P8vttkrog==} engines: {node: '>=18.0.0'} '@aws-sdk/types@3.398.0': @@ -1437,8 +1434,8 @@ packages: resolution: {integrity: sha512-sLd30ASsPMoPn3XBK50oe/bkpJ4N8Bpb7SbhoxcY3Lk+fSASaWxbbXE81nbvCnkxrZCvkPOiDHzJCp1E2im71A==} engines: {node: '>=18.0.0'} - '@aws-sdk/util-endpoints@3.775.0': - resolution: {integrity: sha512-yjWmUgZC9tUxAo8Uaplqmq0eUh0zrbZJdwxGRKdYxfm4RG6fMw1tj52+KkatH7o+mNZvg1GDcVp/INktxonJLw==} + '@aws-sdk/util-endpoints@3.787.0': + resolution: {integrity: sha512-fd3zkiOkwnbdbN0Xp9TsP5SWrmv0SpT70YEdbb8wAj2DWQwiCmFszaSs+YCvhoCdmlR3Wl9Spu0pGpSAGKeYvQ==} engines: {node: '>=18.0.0'} '@aws-sdk/util-format-url@3.734.0': @@ -1476,8 +1473,8 @@ packages: aws-crt: optional: true - '@aws-sdk/util-user-agent-node@3.775.0': - resolution: {integrity: sha512-N9yhTevbizTOMo3drH7Eoy6OkJ3iVPxhV7dwb6CMAObbLneS36CSfA6xQXupmHWcRvZPTz8rd1JGG3HzFOau+g==} + '@aws-sdk/util-user-agent-node@3.787.0': + resolution: {integrity: sha512-mG7Lz8ydfG4SF9e8WSXiPQ/Lsn3n8A5B5jtPROidafi06I3ckV2WxyMLdwG14m919NoS6IOfWHyRGSqWIwbVKA==} engines: {node: '>=18.0.0'} peerDependencies: aws-crt: '>=1.0.0' @@ -3600,12 +3597,9 @@ packages: '@octokit/types@13.6.1': resolution: {integrity: sha512-PHZE9Z+kWXb23Ndik8MKPirBPziOc0D2/3KH1P+6jK5nGWe96kadZuE4jev2/Jq7FvIfTlT2Ltg8Fv2x1v0a5g==} - '@opennextjs/aws@3.5.3': - resolution: {integrity: sha512-fSb9T2S3q39T+XYoacEbtfzM+9aW9njXreByK7eZBvBEKWBNoE+DoJ0r4jaPunBPpr87SBxr1V8ZORlzXudIQg==} - hasBin: true - - '@opennextjs/aws@3.5.6': - resolution: {integrity: sha512-hYI3uYLVEK15zoxjlGKLSlzOrSf1GvnFWARCmS2gllL6aYaDspw2HIJ2OP+RS3wn+Npqs9iKVV2Dwiejdt5vxQ==} + '@opennextjs/aws@https://pkg.pr.new/@opennextjs/aws@821': + resolution: {tarball: https://pkg.pr.new/@opennextjs/aws@821} + version: 3.5.6 hasBin: true '@opentelemetry/api@1.9.0': @@ -9342,22 +9336,22 @@ snapshots: transitivePeerDependencies: - aws-crt - '@aws-sdk/client-dynamodb@3.777.0': + '@aws-sdk/client-dynamodb@3.788.0': dependencies: '@aws-crypto/sha256-browser': 5.2.0 '@aws-crypto/sha256-js': 5.2.0 '@aws-sdk/core': 3.775.0 - '@aws-sdk/credential-provider-node': 3.777.0 + '@aws-sdk/credential-provider-node': 3.787.0 '@aws-sdk/middleware-endpoint-discovery': 3.775.0 '@aws-sdk/middleware-host-header': 3.775.0 '@aws-sdk/middleware-logger': 3.775.0 '@aws-sdk/middleware-recursion-detection': 3.775.0 - '@aws-sdk/middleware-user-agent': 3.775.0 + '@aws-sdk/middleware-user-agent': 3.787.0 '@aws-sdk/region-config-resolver': 3.775.0 '@aws-sdk/types': 3.775.0 - '@aws-sdk/util-endpoints': 3.775.0 + '@aws-sdk/util-endpoints': 3.787.0 '@aws-sdk/util-user-agent-browser': 3.775.0 - '@aws-sdk/util-user-agent-node': 3.775.0 + '@aws-sdk/util-user-agent-node': 3.787.0 '@smithy/config-resolver': 4.1.0 '@smithy/core': 3.2.0 '@smithy/fetch-http-handler': 5.0.2 @@ -9390,21 +9384,21 @@ snapshots: transitivePeerDependencies: - aws-crt - '@aws-sdk/client-lambda@3.777.0': + '@aws-sdk/client-lambda@3.787.0': dependencies: '@aws-crypto/sha256-browser': 5.2.0 '@aws-crypto/sha256-js': 5.2.0 '@aws-sdk/core': 3.775.0 - '@aws-sdk/credential-provider-node': 3.777.0 + '@aws-sdk/credential-provider-node': 3.787.0 '@aws-sdk/middleware-host-header': 3.775.0 '@aws-sdk/middleware-logger': 3.775.0 '@aws-sdk/middleware-recursion-detection': 3.775.0 - '@aws-sdk/middleware-user-agent': 3.775.0 + '@aws-sdk/middleware-user-agent': 3.787.0 '@aws-sdk/region-config-resolver': 3.775.0 '@aws-sdk/types': 3.775.0 - '@aws-sdk/util-endpoints': 3.775.0 + '@aws-sdk/util-endpoints': 3.787.0 '@aws-sdk/util-user-agent-browser': 3.775.0 - '@aws-sdk/util-user-agent-node': 3.775.0 + '@aws-sdk/util-user-agent-node': 3.787.0 '@smithy/config-resolver': 4.1.0 '@smithy/core': 3.2.0 '@smithy/eventstream-serde-browser': 4.0.2 @@ -9502,22 +9496,22 @@ snapshots: transitivePeerDependencies: - aws-crt - '@aws-sdk/client-sqs@3.777.0': + '@aws-sdk/client-sqs@3.787.0': dependencies: '@aws-crypto/sha256-browser': 5.2.0 '@aws-crypto/sha256-js': 5.2.0 '@aws-sdk/core': 3.775.0 - '@aws-sdk/credential-provider-node': 3.777.0 + '@aws-sdk/credential-provider-node': 3.787.0 '@aws-sdk/middleware-host-header': 3.775.0 '@aws-sdk/middleware-logger': 3.775.0 '@aws-sdk/middleware-recursion-detection': 3.775.0 '@aws-sdk/middleware-sdk-sqs': 3.775.0 - '@aws-sdk/middleware-user-agent': 3.775.0 + '@aws-sdk/middleware-user-agent': 3.787.0 '@aws-sdk/region-config-resolver': 3.775.0 '@aws-sdk/types': 3.775.0 - '@aws-sdk/util-endpoints': 3.775.0 + '@aws-sdk/util-endpoints': 3.787.0 '@aws-sdk/util-user-agent-browser': 3.775.0 - '@aws-sdk/util-user-agent-node': 3.775.0 + '@aws-sdk/util-user-agent-node': 3.787.0 '@smithy/config-resolver': 4.1.0 '@smithy/core': 3.2.0 '@smithy/fetch-http-handler': 5.0.2 @@ -9674,7 +9668,7 @@ snapshots: transitivePeerDependencies: - aws-crt - '@aws-sdk/client-sso@3.777.0': + '@aws-sdk/client-sso@3.787.0': dependencies: '@aws-crypto/sha256-browser': 5.2.0 '@aws-crypto/sha256-js': 5.2.0 @@ -9682,12 +9676,12 @@ snapshots: '@aws-sdk/middleware-host-header': 3.775.0 '@aws-sdk/middleware-logger': 3.775.0 '@aws-sdk/middleware-recursion-detection': 3.775.0 - '@aws-sdk/middleware-user-agent': 3.775.0 + '@aws-sdk/middleware-user-agent': 3.787.0 '@aws-sdk/region-config-resolver': 3.775.0 '@aws-sdk/types': 3.775.0 - '@aws-sdk/util-endpoints': 3.775.0 + '@aws-sdk/util-endpoints': 3.787.0 '@aws-sdk/util-user-agent-browser': 3.775.0 - '@aws-sdk/util-user-agent-node': 3.775.0 + '@aws-sdk/util-user-agent-node': 3.787.0 '@smithy/config-resolver': 4.1.0 '@smithy/core': 3.2.0 '@smithy/fetch-http-handler': 5.0.2 @@ -9929,15 +9923,15 @@ snapshots: - '@aws-sdk/client-sso-oidc' - aws-crt - '@aws-sdk/credential-provider-ini@3.777.0': + '@aws-sdk/credential-provider-ini@3.787.0': dependencies: '@aws-sdk/core': 3.775.0 '@aws-sdk/credential-provider-env': 3.775.0 '@aws-sdk/credential-provider-http': 3.775.0 '@aws-sdk/credential-provider-process': 3.775.0 - '@aws-sdk/credential-provider-sso': 3.777.0 - '@aws-sdk/credential-provider-web-identity': 3.777.0 - '@aws-sdk/nested-clients': 3.777.0 + '@aws-sdk/credential-provider-sso': 3.787.0 + '@aws-sdk/credential-provider-web-identity': 3.787.0 + '@aws-sdk/nested-clients': 3.787.0 '@aws-sdk/types': 3.775.0 '@smithy/credential-provider-imds': 4.0.2 '@smithy/property-provider': 4.0.2 @@ -9982,14 +9976,14 @@ snapshots: - '@aws-sdk/client-sts' - aws-crt - '@aws-sdk/credential-provider-node@3.777.0': + '@aws-sdk/credential-provider-node@3.787.0': dependencies: '@aws-sdk/credential-provider-env': 3.775.0 '@aws-sdk/credential-provider-http': 3.775.0 - '@aws-sdk/credential-provider-ini': 3.777.0 + '@aws-sdk/credential-provider-ini': 3.787.0 '@aws-sdk/credential-provider-process': 3.775.0 - '@aws-sdk/credential-provider-sso': 3.777.0 - '@aws-sdk/credential-provider-web-identity': 3.777.0 + '@aws-sdk/credential-provider-sso': 3.787.0 + '@aws-sdk/credential-provider-web-identity': 3.787.0 '@aws-sdk/types': 3.775.0 '@smithy/credential-provider-imds': 4.0.2 '@smithy/property-provider': 4.0.2 @@ -10051,11 +10045,11 @@ snapshots: - '@aws-sdk/client-sso-oidc' - aws-crt - '@aws-sdk/credential-provider-sso@3.777.0': + '@aws-sdk/credential-provider-sso@3.787.0': dependencies: - '@aws-sdk/client-sso': 3.777.0 + '@aws-sdk/client-sso': 3.787.0 '@aws-sdk/core': 3.775.0 - '@aws-sdk/token-providers': 3.777.0 + '@aws-sdk/token-providers': 3.787.0 '@aws-sdk/types': 3.775.0 '@smithy/property-provider': 4.0.2 '@smithy/shared-ini-file-loader': 4.0.2 @@ -10080,10 +10074,10 @@ snapshots: '@smithy/types': 4.1.0 tslib: 2.8.1 - '@aws-sdk/credential-provider-web-identity@3.777.0': + '@aws-sdk/credential-provider-web-identity@3.787.0': dependencies: '@aws-sdk/core': 3.775.0 - '@aws-sdk/nested-clients': 3.777.0 + '@aws-sdk/nested-clients': 3.787.0 '@aws-sdk/types': 3.775.0 '@smithy/property-provider': 4.0.2 '@smithy/types': 4.2.0 @@ -10288,17 +10282,17 @@ snapshots: '@smithy/types': 4.1.0 tslib: 2.8.1 - '@aws-sdk/middleware-user-agent@3.775.0': + '@aws-sdk/middleware-user-agent@3.787.0': dependencies: '@aws-sdk/core': 3.775.0 '@aws-sdk/types': 3.775.0 - '@aws-sdk/util-endpoints': 3.775.0 + '@aws-sdk/util-endpoints': 3.787.0 '@smithy/core': 3.2.0 '@smithy/protocol-http': 5.1.0 '@smithy/types': 4.2.0 tslib: 2.8.1 - '@aws-sdk/nested-clients@3.777.0': + '@aws-sdk/nested-clients@3.787.0': dependencies: '@aws-crypto/sha256-browser': 5.2.0 '@aws-crypto/sha256-js': 5.2.0 @@ -10306,12 +10300,12 @@ snapshots: '@aws-sdk/middleware-host-header': 3.775.0 '@aws-sdk/middleware-logger': 3.775.0 '@aws-sdk/middleware-recursion-detection': 3.775.0 - '@aws-sdk/middleware-user-agent': 3.775.0 + '@aws-sdk/middleware-user-agent': 3.787.0 '@aws-sdk/region-config-resolver': 3.775.0 '@aws-sdk/types': 3.775.0 - '@aws-sdk/util-endpoints': 3.775.0 + '@aws-sdk/util-endpoints': 3.787.0 '@aws-sdk/util-user-agent-browser': 3.775.0 - '@aws-sdk/util-user-agent-node': 3.775.0 + '@aws-sdk/util-user-agent-node': 3.787.0 '@smithy/config-resolver': 4.1.0 '@smithy/core': 3.2.0 '@smithy/fetch-http-handler': 5.0.2 @@ -10437,9 +10431,9 @@ snapshots: '@smithy/types': 4.1.0 tslib: 2.8.1 - '@aws-sdk/token-providers@3.777.0': + '@aws-sdk/token-providers@3.787.0': dependencies: - '@aws-sdk/nested-clients': 3.777.0 + '@aws-sdk/nested-clients': 3.787.0 '@aws-sdk/types': 3.775.0 '@smithy/property-provider': 4.0.2 '@smithy/shared-ini-file-loader': 4.0.2 @@ -10484,7 +10478,7 @@ snapshots: '@smithy/util-endpoints': 3.0.1 tslib: 2.8.1 - '@aws-sdk/util-endpoints@3.775.0': + '@aws-sdk/util-endpoints@3.787.0': dependencies: '@aws-sdk/types': 3.775.0 '@smithy/types': 4.2.0 @@ -10538,9 +10532,9 @@ snapshots: '@smithy/types': 4.1.0 tslib: 2.8.1 - '@aws-sdk/util-user-agent-node@3.775.0': + '@aws-sdk/util-user-agent-node@3.787.0': dependencies: - '@aws-sdk/middleware-user-agent': 3.775.0 + '@aws-sdk/middleware-user-agent': 3.787.0 '@aws-sdk/types': 3.775.0 '@smithy/node-config-provider': 4.0.2 '@smithy/types': 4.2.0 @@ -12335,36 +12329,14 @@ snapshots: dependencies: '@octokit/openapi-types': 22.2.0 - '@opennextjs/aws@3.5.3': + '@opennextjs/aws@https://pkg.pr.new/@opennextjs/aws@821': dependencies: '@ast-grep/napi': 0.35.0 '@aws-sdk/client-cloudfront': 3.398.0 - '@aws-sdk/client-dynamodb': 3.777.0 - '@aws-sdk/client-lambda': 3.777.0 + '@aws-sdk/client-dynamodb': 3.788.0 + '@aws-sdk/client-lambda': 3.787.0 '@aws-sdk/client-s3': 3.726.1 - '@aws-sdk/client-sqs': 3.777.0 - '@node-minify/core': 8.0.6 - '@node-minify/terser': 8.0.6 - '@tsconfig/node18': 1.0.3 - aws4fetch: 1.0.20 - chalk: 5.3.0 - esbuild: 0.19.2 - express: 5.0.1 - path-to-regexp: 6.3.0 - urlpattern-polyfill: 10.0.0 - yaml: 2.7.0 - transitivePeerDependencies: - - aws-crt - - supports-color - - '@opennextjs/aws@3.5.6': - dependencies: - '@ast-grep/napi': 0.35.0 - '@aws-sdk/client-cloudfront': 3.398.0 - '@aws-sdk/client-dynamodb': 3.777.0 - '@aws-sdk/client-lambda': 3.777.0 - '@aws-sdk/client-s3': 3.726.1 - '@aws-sdk/client-sqs': 3.777.0 + '@aws-sdk/client-sqs': 3.787.0 '@node-minify/core': 8.0.6 '@node-minify/terser': 8.0.6 '@tsconfig/node18': 1.0.3 @@ -15327,7 +15299,7 @@ snapshots: debug: 4.3.6 enhanced-resolve: 5.17.1 eslint: 8.57.1 - eslint-module-utils: 2.11.0(@typescript-eslint/parser@8.7.0(eslint@8.57.1)(typescript@5.7.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@8.7.0(eslint@8.57.1)(typescript@5.7.3))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.30.0)(eslint@8.57.1))(eslint@8.57.1) + eslint-module-utils: 2.11.0(@typescript-eslint/parser@8.7.0(eslint@8.57.1)(typescript@5.7.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3)(eslint@8.57.1) fast-glob: 3.3.2 get-tsconfig: 4.8.0 is-bun-module: 1.2.1 @@ -15346,7 +15318,7 @@ snapshots: debug: 4.3.6 enhanced-resolve: 5.17.1 eslint: 8.57.1 - eslint-module-utils: 2.11.0(@typescript-eslint/parser@8.7.0(eslint@8.57.1)(typescript@5.7.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@8.7.0(eslint@8.57.1)(typescript@5.7.3))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.31.0)(eslint@8.57.1))(eslint@8.57.1) + eslint-module-utils: 2.11.0(@typescript-eslint/parser@8.7.0(eslint@8.57.1)(typescript@5.7.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3)(eslint@8.57.1) fast-glob: 3.3.2 get-tsconfig: 4.8.0 is-bun-module: 1.2.1 @@ -15365,7 +15337,7 @@ snapshots: debug: 4.3.6 enhanced-resolve: 5.17.1 eslint: 9.11.1(jiti@1.21.6) - eslint-module-utils: 2.11.0(@typescript-eslint/parser@8.7.0(eslint@9.11.1(jiti@1.21.6))(typescript@5.7.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@8.7.0(eslint@9.11.1(jiti@1.21.6))(typescript@5.7.3))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.31.0)(eslint@9.11.1(jiti@1.21.6)))(eslint@9.11.1(jiti@1.21.6)) + eslint-module-utils: 2.11.0(@typescript-eslint/parser@8.7.0(eslint@9.11.1(jiti@1.21.6))(typescript@5.7.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3)(eslint@9.11.1(jiti@1.21.6)) fast-glob: 3.3.2 get-tsconfig: 4.8.0 is-bun-module: 1.2.1 @@ -15384,7 +15356,7 @@ snapshots: debug: 4.3.6 enhanced-resolve: 5.17.1 eslint: 9.19.0(jiti@1.21.6) - eslint-module-utils: 2.11.0(@typescript-eslint/parser@8.7.0(eslint@9.19.0(jiti@1.21.6))(typescript@5.7.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@8.7.0(eslint@9.19.0(jiti@1.21.6))(typescript@5.7.3))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.31.0)(eslint@9.19.0(jiti@1.21.6)))(eslint@9.19.0(jiti@1.21.6)) + eslint-module-utils: 2.11.0(@typescript-eslint/parser@8.7.0(eslint@9.19.0(jiti@1.21.6))(typescript@5.7.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3)(eslint@9.19.0(jiti@1.21.6)) fast-glob: 3.3.2 get-tsconfig: 4.8.0 is-bun-module: 1.2.1 @@ -15397,18 +15369,7 @@ snapshots: - eslint-import-resolver-webpack - supports-color - eslint-module-utils@2.11.0(@typescript-eslint/parser@8.7.0(eslint@8.57.1)(typescript@5.7.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@8.7.0(eslint@8.57.1)(typescript@5.7.3))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.30.0)(eslint@8.57.1))(eslint@8.57.1): - dependencies: - debug: 3.2.7 - optionalDependencies: - '@typescript-eslint/parser': 8.7.0(eslint@8.57.1)(typescript@5.7.3) - eslint: 8.57.1 - eslint-import-resolver-node: 0.3.9 - eslint-import-resolver-typescript: 3.6.3(@typescript-eslint/parser@8.7.0(eslint@8.57.1)(typescript@5.7.3))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.30.0)(eslint@8.57.1) - transitivePeerDependencies: - - supports-color - - eslint-module-utils@2.11.0(@typescript-eslint/parser@8.7.0(eslint@8.57.1)(typescript@5.7.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@8.7.0(eslint@8.57.1)(typescript@5.7.3))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.31.0)(eslint@8.57.1))(eslint@8.57.1): + eslint-module-utils@2.11.0(@typescript-eslint/parser@8.7.0(eslint@8.57.1)(typescript@5.7.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3)(eslint@8.57.1): dependencies: debug: 3.2.7 optionalDependencies: @@ -15419,7 +15380,7 @@ snapshots: transitivePeerDependencies: - supports-color - eslint-module-utils@2.11.0(@typescript-eslint/parser@8.7.0(eslint@9.11.1(jiti@1.21.6))(typescript@5.7.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@8.7.0(eslint@9.11.1(jiti@1.21.6))(typescript@5.7.3))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.31.0)(eslint@9.11.1(jiti@1.21.6)))(eslint@9.11.1(jiti@1.21.6)): + eslint-module-utils@2.11.0(@typescript-eslint/parser@8.7.0(eslint@9.11.1(jiti@1.21.6))(typescript@5.7.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3)(eslint@9.11.1(jiti@1.21.6)): dependencies: debug: 3.2.7 optionalDependencies: @@ -15430,7 +15391,7 @@ snapshots: transitivePeerDependencies: - supports-color - eslint-module-utils@2.11.0(@typescript-eslint/parser@8.7.0(eslint@9.19.0(jiti@1.21.6))(typescript@5.7.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@8.7.0(eslint@9.19.0(jiti@1.21.6))(typescript@5.7.3))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.31.0)(eslint@9.19.0(jiti@1.21.6)))(eslint@9.19.0(jiti@1.21.6)): + eslint-module-utils@2.11.0(@typescript-eslint/parser@8.7.0(eslint@9.19.0(jiti@1.21.6))(typescript@5.7.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3)(eslint@9.19.0(jiti@1.21.6)): dependencies: debug: 3.2.7 optionalDependencies: @@ -15441,7 +15402,7 @@ snapshots: transitivePeerDependencies: - supports-color - eslint-module-utils@2.12.0(@typescript-eslint/parser@8.7.0(eslint@8.57.1)(typescript@5.7.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@8.7.0(eslint@8.57.1)(typescript@5.7.3))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.31.0)(eslint@8.57.1))(eslint@8.57.1): + eslint-module-utils@2.12.0(@typescript-eslint/parser@8.7.0(eslint@8.57.1)(typescript@5.7.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3)(eslint@8.57.1): dependencies: debug: 3.2.7 optionalDependencies: @@ -15452,7 +15413,7 @@ snapshots: transitivePeerDependencies: - supports-color - eslint-module-utils@2.12.0(@typescript-eslint/parser@8.7.0(eslint@9.11.1(jiti@1.21.6))(typescript@5.7.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@8.7.0(eslint@9.11.1(jiti@1.21.6))(typescript@5.7.3))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.31.0)(eslint@9.11.1(jiti@1.21.6)))(eslint@9.11.1(jiti@1.21.6)): + eslint-module-utils@2.12.0(@typescript-eslint/parser@8.7.0(eslint@9.11.1(jiti@1.21.6))(typescript@5.7.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3)(eslint@9.11.1(jiti@1.21.6)): dependencies: debug: 3.2.7 optionalDependencies: @@ -15463,7 +15424,7 @@ snapshots: transitivePeerDependencies: - supports-color - eslint-module-utils@2.12.0(@typescript-eslint/parser@8.7.0(eslint@9.19.0(jiti@1.21.6))(typescript@5.7.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@8.7.0(eslint@9.19.0(jiti@1.21.6))(typescript@5.7.3))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.31.0)(eslint@9.19.0(jiti@1.21.6)))(eslint@9.19.0(jiti@1.21.6)): + eslint-module-utils@2.12.0(@typescript-eslint/parser@8.7.0(eslint@9.19.0(jiti@1.21.6))(typescript@5.7.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3)(eslint@9.19.0(jiti@1.21.6)): dependencies: debug: 3.2.7 optionalDependencies: @@ -15485,7 +15446,7 @@ snapshots: doctrine: 2.1.0 eslint: 8.57.1 eslint-import-resolver-node: 0.3.9 - eslint-module-utils: 2.11.0(@typescript-eslint/parser@8.7.0(eslint@8.57.1)(typescript@5.7.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@8.7.0(eslint@8.57.1)(typescript@5.7.3))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.30.0)(eslint@8.57.1))(eslint@8.57.1) + eslint-module-utils: 2.11.0(@typescript-eslint/parser@8.7.0(eslint@8.57.1)(typescript@5.7.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3)(eslint@8.57.1) hasown: 2.0.2 is-core-module: 2.15.1 is-glob: 4.0.3 @@ -15513,7 +15474,7 @@ snapshots: doctrine: 2.1.0 eslint: 8.57.1 eslint-import-resolver-node: 0.3.9 - eslint-module-utils: 2.12.0(@typescript-eslint/parser@8.7.0(eslint@8.57.1)(typescript@5.7.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@8.7.0(eslint@8.57.1)(typescript@5.7.3))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.31.0)(eslint@8.57.1))(eslint@8.57.1) + eslint-module-utils: 2.12.0(@typescript-eslint/parser@8.7.0(eslint@8.57.1)(typescript@5.7.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3)(eslint@8.57.1) hasown: 2.0.2 is-core-module: 2.15.1 is-glob: 4.0.3 @@ -15542,7 +15503,7 @@ snapshots: doctrine: 2.1.0 eslint: 9.11.1(jiti@1.21.6) eslint-import-resolver-node: 0.3.9 - eslint-module-utils: 2.12.0(@typescript-eslint/parser@8.7.0(eslint@9.11.1(jiti@1.21.6))(typescript@5.7.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@8.7.0(eslint@9.11.1(jiti@1.21.6))(typescript@5.7.3))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.31.0)(eslint@9.11.1(jiti@1.21.6)))(eslint@9.11.1(jiti@1.21.6)) + eslint-module-utils: 2.12.0(@typescript-eslint/parser@8.7.0(eslint@9.11.1(jiti@1.21.6))(typescript@5.7.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3)(eslint@9.11.1(jiti@1.21.6)) hasown: 2.0.2 is-core-module: 2.15.1 is-glob: 4.0.3 @@ -15571,7 +15532,7 @@ snapshots: doctrine: 2.1.0 eslint: 9.19.0(jiti@1.21.6) eslint-import-resolver-node: 0.3.9 - eslint-module-utils: 2.12.0(@typescript-eslint/parser@8.7.0(eslint@9.19.0(jiti@1.21.6))(typescript@5.7.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3(@typescript-eslint/parser@8.7.0(eslint@9.19.0(jiti@1.21.6))(typescript@5.7.3))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.31.0)(eslint@9.19.0(jiti@1.21.6)))(eslint@9.19.0(jiti@1.21.6)) + eslint-module-utils: 2.12.0(@typescript-eslint/parser@8.7.0(eslint@9.19.0(jiti@1.21.6))(typescript@5.7.3))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.3)(eslint@9.19.0(jiti@1.21.6)) hasown: 2.0.2 is-core-module: 2.15.1 is-glob: 4.0.3 From e956b95c5cb4d62f5db5b111af58b3ea2bf65a95 Mon Sep 17 00:00:00 2001 From: Victor Berchet Date: Mon, 14 Apr 2025 14:59:09 +0200 Subject: [PATCH 2/5] fixup! bump aws to 3.5.7 --- packages/cloudflare/package.json | 2 +- pnpm-lock.yaml | 21 ++++++++++----------- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/packages/cloudflare/package.json b/packages/cloudflare/package.json index 6d2300ef1..662345c02 100644 --- a/packages/cloudflare/package.json +++ b/packages/cloudflare/package.json @@ -53,7 +53,7 @@ "homepage": "https://github.com/opennextjs/opennextjs-cloudflare", "dependencies": { "@dotenvx/dotenvx": "catalog:", - "@opennextjs/aws": "https://pkg.pr.new/@opennextjs/aws@821", + "@opennextjs/aws": "3.5.7", "enquirer": "^2.4.1", "glob": "catalog:", "ts-tqdm": "^0.8.6" diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 5594f5c36..c4911f6a6 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -961,8 +961,8 @@ importers: specifier: 'catalog:' version: 1.31.0 '@opennextjs/aws': - specifier: https://pkg.pr.new/@opennextjs/aws@821 - version: https://pkg.pr.new/@opennextjs/aws@821 + specifier: 3.5.7 + version: 3.5.7 enquirer: specifier: ^2.4.1 version: 2.4.1 @@ -3597,9 +3597,8 @@ packages: '@octokit/types@13.6.1': resolution: {integrity: sha512-PHZE9Z+kWXb23Ndik8MKPirBPziOc0D2/3KH1P+6jK5nGWe96kadZuE4jev2/Jq7FvIfTlT2Ltg8Fv2x1v0a5g==} - '@opennextjs/aws@https://pkg.pr.new/@opennextjs/aws@821': - resolution: {tarball: https://pkg.pr.new/@opennextjs/aws@821} - version: 3.5.6 + '@opennextjs/aws@3.5.7': + resolution: {integrity: sha512-YjyHJrkIHI7YwQRCp8GjDOudu86oOc1RiwxvBBpPHrplsS18H4ZmkzGggAKhK6B4myGsJQ/q9kNP2TraoZiNzg==} hasBin: true '@opentelemetry/api@1.9.0': @@ -9244,7 +9243,7 @@ snapshots: '@aws-crypto/sha256-js': 3.0.0 '@aws-crypto/supports-web-crypto': 3.0.0 '@aws-crypto/util': 3.0.0 - '@aws-sdk/types': 3.734.0 + '@aws-sdk/types': 3.775.0 '@aws-sdk/util-locate-window': 3.693.0 '@aws-sdk/util-utf8-browser': 3.259.0 tslib: 1.14.1 @@ -9262,7 +9261,7 @@ snapshots: '@aws-crypto/sha256-js@3.0.0': dependencies: '@aws-crypto/util': 3.0.0 - '@aws-sdk/types': 3.734.0 + '@aws-sdk/types': 3.775.0 tslib: 1.14.1 '@aws-crypto/sha256-js@5.2.0': @@ -9281,7 +9280,7 @@ snapshots: '@aws-crypto/util@3.0.0': dependencies: - '@aws-sdk/types': 3.734.0 + '@aws-sdk/types': 3.775.0 '@aws-sdk/util-utf8-browser': 3.259.0 tslib: 1.14.1 @@ -12329,7 +12328,7 @@ snapshots: dependencies: '@octokit/openapi-types': 22.2.0 - '@opennextjs/aws@https://pkg.pr.new/@opennextjs/aws@821': + '@opennextjs/aws@3.5.7': dependencies: '@ast-grep/napi': 0.35.0 '@aws-sdk/client-cloudfront': 3.398.0 @@ -15944,7 +15943,7 @@ snapshots: accepts: 2.0.0 body-parser: 2.2.0 content-disposition: 1.0.0 - content-type: 1.0.4 + content-type: 1.0.5 cookie: 0.7.1 cookie-signature: 1.2.2 debug: 4.3.6 @@ -18542,7 +18541,7 @@ snapshots: send@1.2.0: dependencies: - debug: 4.3.6 + debug: 4.4.0 encodeurl: 2.0.0 escape-html: 1.0.3 etag: 1.8.1 From 49dbd87e4126cdaedc324e031eeddb7e2950d0f4 Mon Sep 17 00:00:00 2001 From: Victor Berchet Date: Mon, 14 Apr 2025 16:10:02 +0200 Subject: [PATCH 3/5] fixup! changeset --- .changeset/silly-icons-battle.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/silly-icons-battle.md diff --git a/.changeset/silly-icons-battle.md b/.changeset/silly-icons-battle.md new file mode 100644 index 000000000..c8764fc85 --- /dev/null +++ b/.changeset/silly-icons-battle.md @@ -0,0 +1,5 @@ +--- +"@opennextjs/cloudflare": patch +--- + +bump @opennextjs/aws to 3.5.7 From 99d2e079201dfd52cb390a4ebf2ccef61f43cba9 Mon Sep 17 00:00:00 2001 From: Victor Berchet Date: Mon, 14 Apr 2025 16:14:26 +0200 Subject: [PATCH 4/5] fixup! sync createServerBundle withaws 3.5.7 --- .../src/cli/build/open-next/createServerBundle.ts | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/packages/cloudflare/src/cli/build/open-next/createServerBundle.ts b/packages/cloudflare/src/cli/build/open-next/createServerBundle.ts index c37a98706..5a87a07bd 100644 --- a/packages/cloudflare/src/cli/build/open-next/createServerBundle.ts +++ b/packages/cloudflare/src/cli/build/open-next/createServerBundle.ts @@ -14,10 +14,13 @@ import { installDependencies } from "@opennextjs/aws/build/installDeps.js"; import type { CodePatcher } from "@opennextjs/aws/build/patch/codePatcher.js"; import { applyCodePatches } from "@opennextjs/aws/build/patch/codePatcher.js"; import { + patchEnvVars, patchFetchCacheForISR, patchFetchCacheSetMissingWaitUntil, + patchNextServer, patchUnstableCacheForISR, } from "@opennextjs/aws/build/patch/patches/index.js"; +import { patchBackgroundRevalidation } from "@opennextjs/aws/build/patch/patches/patchBackgroundRevalidation.js"; import logger from "@opennextjs/aws/logger.js"; import { minifyAll } from "@opennextjs/aws/minimize-js.js"; import type { ContentUpdater } from "@opennextjs/aws/plugins/content-updater.js"; @@ -190,6 +193,9 @@ async function generateBundle( patchFetchCacheSetMissingWaitUntil, patchFetchCacheForISR, patchUnstableCacheForISR, + patchNextServer, + patchEnvVars, + patchBackgroundRevalidation, // Cloudflare specific patches patchResRevalidate, ...additionalCodePatches, @@ -220,6 +226,7 @@ async function generateBundle( ...(disableNextPrebundledReact ? ["applyNextjsPrebundledReact"] : []), ...(disableRouting ? ["withRouting"] : []), ...(isAfter142 ? ["patchAsyncStorage"] : []), + ...(isAfter141 ? ["appendPrefetch"] : []), ], }), openNextReplacementPlugin({ From 5223ac6eb3e961b42a8fcccd2f1aae18aafcbce2 Mon Sep 17 00:00:00 2001 From: Victor Berchet Date: Mon, 14 Apr 2025 16:31:01 +0200 Subject: [PATCH 5/5] fixup! review feedback --- packages/cloudflare/src/cli/build/bundle-server.ts | 1 + .../cloudflare/src/cli/build/open-next/createServerBundle.ts | 1 + 2 files changed, 2 insertions(+) diff --git a/packages/cloudflare/src/cli/build/bundle-server.ts b/packages/cloudflare/src/cli/build/bundle-server.ts index 954eaa345..f04512f21 100644 --- a/packages/cloudflare/src/cli/build/bundle-server.ts +++ b/packages/cloudflare/src/cli/build/bundle-server.ts @@ -176,6 +176,7 @@ export async function updateWorkerBundledCode( [ "'require(this.middlewareManifestPath)'", (code) => patches.inlineMiddlewareManifestRequire(code, buildOpts), + { isOptional: true }, ], [ "`require.resolve` call", diff --git a/packages/cloudflare/src/cli/build/open-next/createServerBundle.ts b/packages/cloudflare/src/cli/build/open-next/createServerBundle.ts index 5a87a07bd..3b136f483 100644 --- a/packages/cloudflare/src/cli/build/open-next/createServerBundle.ts +++ b/packages/cloudflare/src/cli/build/open-next/createServerBundle.ts @@ -20,6 +20,7 @@ import { patchNextServer, patchUnstableCacheForISR, } from "@opennextjs/aws/build/patch/patches/index.js"; +// TODO: import from patches/index.js when https://github.com/opennextjs/opennextjs-aws/pull/827 is released import { patchBackgroundRevalidation } from "@opennextjs/aws/build/patch/patches/patchBackgroundRevalidation.js"; import logger from "@opennextjs/aws/logger.js"; import { minifyAll } from "@opennextjs/aws/minimize-js.js";