From 24420f0132643dbcaa5025dc6c7359ee01666dfd Mon Sep 17 00:00:00 2001 From: Nicolas Dorseuil Date: Fri, 1 Aug 2025 12:59:42 +0200 Subject: [PATCH 1/3] use fix from OpenNext --- bun.lock | 7 ++++--- package.json | 3 ++- .../openNext/customWorkers/middlewareWrangler.jsonc | 3 ++- packages/gitbook/package.json | 2 +- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/bun.lock b/bun.lock index 2df4437c17..bb6fe3da93 100644 --- a/bun.lock +++ b/bun.lock @@ -60,7 +60,7 @@ "@gitbook/react-contentkit": "workspace:*", "@gitbook/react-math": "workspace:*", "@gitbook/react-openapi": "workspace:*", - "@opennextjs/cloudflare": "^1.6.2", + "@opennextjs/cloudflare": "https://pkg.pr.new/@opennextjs/cloudflare@829", "@radix-ui/react-checkbox": "^1.0.4", "@radix-ui/react-dropdown-menu": "^2.1.12", "@radix-ui/react-navigation-menu": "^1.2.3", @@ -241,6 +241,7 @@ }, "overrides": { "@codemirror/state": "6.4.1", + "@opennextjs/aws": "https://pkg.pr.new/@opennextjs/aws@939", "esbuild": "0.24.2", "react": "^19.0.0", "react-dom": "^19.0.0", @@ -787,9 +788,9 @@ "@octokit/types": ["@octokit/types@14.1.0", "", { "dependencies": { "@octokit/openapi-types": "^25.1.0" } }, "sha512-1y6DgTy8Jomcpu33N+p5w58l6xyt55Ar2I91RPiIA0xCJBXyUAhXCcmZaDWSANiha7R9a6qJJ2CRomGPZ6f46g=="], - "@opennextjs/aws": ["@opennextjs/aws@3.7.1", "", { "dependencies": { "@ast-grep/napi": "^0.35.0", "@aws-sdk/client-cloudfront": "3.398.0", "@aws-sdk/client-dynamodb": "^3.398.0", "@aws-sdk/client-lambda": "^3.398.0", "@aws-sdk/client-s3": "^3.398.0", "@aws-sdk/client-sqs": "^3.398.0", "@node-minify/core": "^8.0.6", "@node-minify/terser": "^8.0.6", "@tsconfig/node18": "^1.0.1", "aws4fetch": "^1.0.18", "chalk": "^5.3.0", "cookie": "^1.0.2", "esbuild": "0.25.4", "express": "5.0.1", "path-to-regexp": "^6.3.0", "urlpattern-polyfill": "^10.0.0", "yaml": "^2.7.0" }, "bin": { "open-next": "dist/index.js" } }, "sha512-ryV5cQucSJDU0TF3+Jzqn9g0/+zhUZgjNopSnchPvH0SxSAbKkNaNH7SlnWBhykjusqHaFzQ8dfEjcjAq7TJSQ=="], + "@opennextjs/aws": ["@opennextjs/aws@https://pkg.pr.new/@opennextjs/aws@939", { "dependencies": { "@ast-grep/napi": "^0.35.0", "@aws-sdk/client-cloudfront": "3.398.0", "@aws-sdk/client-dynamodb": "^3.398.0", "@aws-sdk/client-lambda": "^3.398.0", "@aws-sdk/client-s3": "^3.398.0", "@aws-sdk/client-sqs": "^3.398.0", "@node-minify/core": "^8.0.6", "@node-minify/terser": "^8.0.6", "@tsconfig/node18": "^1.0.1", "aws4fetch": "^1.0.18", "chalk": "^5.3.0", "cookie": "^1.0.2", "esbuild": "0.25.4", "express": "5.0.1", "path-to-regexp": "^6.3.0", "urlpattern-polyfill": "^10.0.0", "yaml": "^2.7.0" }, "bin": { "open-next": "./dist/index.js" } }], - "@opennextjs/cloudflare": ["@opennextjs/cloudflare@1.6.2", "", { "dependencies": { "@dotenvx/dotenvx": "1.31.0", "@opennextjs/aws": "3.7.1", "cloudflare": "^4.4.1", "enquirer": "^2.4.1", "glob": "^11.0.0", "ts-tqdm": "^0.8.6", "yargs": "^18.0.0" }, "peerDependencies": { "wrangler": "^4.24.4" }, "bin": { "opennextjs-cloudflare": "dist/cli/index.js" } }, "sha512-N96OTbp1970NwLP6dNkAzBDrxjthLQ3VXHcjKl8edqNbJ/iT75H60ZYHU/ZZ7gSZQeJluPvPb1n0ZPQ08EooCQ=="], + "@opennextjs/cloudflare": ["@opennextjs/cloudflare@https://pkg.pr.new/@opennextjs/cloudflare@829", { "dependencies": { "@dotenvx/dotenvx": "1.31.0", "@opennextjs/aws": "3.7.2", "cloudflare": "^4.4.1", "enquirer": "^2.4.1", "glob": "^11.0.0", "ts-tqdm": "^0.8.6", "yargs": "^18.0.0" }, "peerDependencies": { "wrangler": "^4.24.4" }, "bin": { "opennextjs-cloudflare": "dist/cli/index.js" } }], "@opentelemetry/api": ["@opentelemetry/api@1.9.0", "", {}, "sha512-3giAOQvZiH5F9bMlMiv8+GSPMeqg0dbaeo58/0SlA9sxSqZhnUtxzX9/2FzyhS9sWQf5S0GJE0AKBrFqjpeYcg=="], diff --git a/package.json b/package.json index b08f09e156..d6f13403ab 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,8 @@ "@codemirror/state": "6.4.1", "react": "^19.0.0", "react-dom": "^19.0.0", - "esbuild": "0.24.2" + "esbuild": "0.24.2", + "@opennextjs/aws": "https://pkg.pr.new/@opennextjs/aws@939" }, "private": true, "scripts": { diff --git a/packages/gitbook/openNext/customWorkers/middlewareWrangler.jsonc b/packages/gitbook/openNext/customWorkers/middlewareWrangler.jsonc index e9bf9bcf1a..168686d439 100644 --- a/packages/gitbook/openNext/customWorkers/middlewareWrangler.jsonc +++ b/packages/gitbook/openNext/customWorkers/middlewareWrangler.jsonc @@ -25,7 +25,8 @@ // When deployed locally, we don't have access to the tag cache here, // we should just bypass the cache to go to the server directly "SHOULD_BYPASS_CACHE": "true", - "OPEN_NEXT_REQUEST_ID_HEADER": "true" + "OPEN_NEXT_REQUEST_ID_HEADER": "true", + "GITBOOK_URL": "http://localhost:8771" }, "r2_buckets": [ { diff --git a/packages/gitbook/package.json b/packages/gitbook/package.json index 54f185db61..c3e6a6835e 100644 --- a/packages/gitbook/package.json +++ b/packages/gitbook/package.json @@ -13,7 +13,7 @@ "@gitbook/react-contentkit": "workspace:*", "@gitbook/react-math": "workspace:*", "@gitbook/react-openapi": "workspace:*", - "@opennextjs/cloudflare": "^1.6.2", + "@opennextjs/cloudflare": "https://pkg.pr.new/@opennextjs/cloudflare@829", "@radix-ui/react-checkbox": "^1.0.4", "@radix-ui/react-dropdown-menu": "^2.1.12", "@radix-ui/react-navigation-menu": "^1.2.3", From a740f5bda967eab38307642adcc220a3db487385 Mon Sep 17 00:00:00 2001 From: Nicolas Dorseuil Date: Mon, 4 Aug 2025 10:05:59 +0200 Subject: [PATCH 2/3] use latest OpenNext --- bun.lock | 7 +++---- package.json | 3 +-- packages/gitbook/package.json | 2 +- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/bun.lock b/bun.lock index 24fb49901a..0ce6cc860c 100644 --- a/bun.lock +++ b/bun.lock @@ -60,7 +60,7 @@ "@gitbook/react-contentkit": "workspace:*", "@gitbook/react-math": "workspace:*", "@gitbook/react-openapi": "workspace:*", - "@opennextjs/cloudflare": "https://pkg.pr.new/@opennextjs/cloudflare@829", + "@opennextjs/cloudflare": "https://pkg.pr.new/@opennextjs/cloudflare@838", "@radix-ui/react-checkbox": "^1.0.4", "@radix-ui/react-dropdown-menu": "^2.1.12", "@radix-ui/react-navigation-menu": "^1.2.3", @@ -241,7 +241,6 @@ }, "overrides": { "@codemirror/state": "6.4.1", - "@opennextjs/aws": "https://pkg.pr.new/@opennextjs/aws@939", "esbuild": "0.24.2", "react": "^19.0.0", "react-dom": "^19.0.0", @@ -790,9 +789,9 @@ "@octokit/types": ["@octokit/types@14.1.0", "", { "dependencies": { "@octokit/openapi-types": "^25.1.0" } }, "sha512-1y6DgTy8Jomcpu33N+p5w58l6xyt55Ar2I91RPiIA0xCJBXyUAhXCcmZaDWSANiha7R9a6qJJ2CRomGPZ6f46g=="], - "@opennextjs/aws": ["@opennextjs/aws@https://pkg.pr.new/@opennextjs/aws@939", { "dependencies": { "@ast-grep/napi": "^0.35.0", "@aws-sdk/client-cloudfront": "3.398.0", "@aws-sdk/client-dynamodb": "^3.398.0", "@aws-sdk/client-lambda": "^3.398.0", "@aws-sdk/client-s3": "^3.398.0", "@aws-sdk/client-sqs": "^3.398.0", "@node-minify/core": "^8.0.6", "@node-minify/terser": "^8.0.6", "@tsconfig/node18": "^1.0.1", "aws4fetch": "^1.0.18", "chalk": "^5.3.0", "cookie": "^1.0.2", "esbuild": "0.25.4", "express": "5.0.1", "path-to-regexp": "^6.3.0", "urlpattern-polyfill": "^10.0.0", "yaml": "^2.7.0" }, "bin": { "open-next": "./dist/index.js" } }], + "@opennextjs/aws": ["@opennextjs/aws@3.7.3", "", { "dependencies": { "@ast-grep/napi": "^0.35.0", "@aws-sdk/client-cloudfront": "3.398.0", "@aws-sdk/client-dynamodb": "^3.398.0", "@aws-sdk/client-lambda": "^3.398.0", "@aws-sdk/client-s3": "^3.398.0", "@aws-sdk/client-sqs": "^3.398.0", "@node-minify/core": "^8.0.6", "@node-minify/terser": "^8.0.6", "@tsconfig/node18": "^1.0.1", "aws4fetch": "^1.0.18", "chalk": "^5.3.0", "cookie": "^1.0.2", "esbuild": "0.25.4", "express": "5.0.1", "path-to-regexp": "^6.3.0", "urlpattern-polyfill": "^10.0.0", "yaml": "^2.7.0" }, "bin": { "open-next": "dist/index.js" } }, "sha512-DCt7S16nov1ivrU/4nno528VO3oME6QRGXL2f39gNHY34Yy6ylml5kwztI4jxc9ibOZiR/UlBW1+uz3oTgKqVw=="], - "@opennextjs/cloudflare": ["@opennextjs/cloudflare@https://pkg.pr.new/@opennextjs/cloudflare@829", { "dependencies": { "@dotenvx/dotenvx": "1.31.0", "@opennextjs/aws": "3.7.2", "cloudflare": "^4.4.1", "enquirer": "^2.4.1", "glob": "^11.0.0", "ts-tqdm": "^0.8.6", "yargs": "^18.0.0" }, "peerDependencies": { "wrangler": "^4.24.4" }, "bin": { "opennextjs-cloudflare": "dist/cli/index.js" } }], + "@opennextjs/cloudflare": ["@opennextjs/cloudflare@https://pkg.pr.new/@opennextjs/cloudflare@838", { "dependencies": { "@dotenvx/dotenvx": "1.31.0", "@opennextjs/aws": "3.7.3", "cloudflare": "^4.4.1", "enquirer": "^2.4.1", "glob": "^11.0.0", "ts-tqdm": "^0.8.6", "yargs": "^18.0.0" }, "peerDependencies": { "wrangler": "^4.24.4" }, "bin": { "opennextjs-cloudflare": "dist/cli/index.js" } }], "@opentelemetry/api": ["@opentelemetry/api@1.9.0", "", {}, "sha512-3giAOQvZiH5F9bMlMiv8+GSPMeqg0dbaeo58/0SlA9sxSqZhnUtxzX9/2FzyhS9sWQf5S0GJE0AKBrFqjpeYcg=="], diff --git a/package.json b/package.json index e3d712af4b..7e95421fd7 100644 --- a/package.json +++ b/package.json @@ -12,8 +12,7 @@ "@codemirror/state": "6.4.1", "react": "^19.0.0", "react-dom": "^19.0.0", - "esbuild": "0.24.2", - "@opennextjs/aws": "https://pkg.pr.new/@opennextjs/aws@939" + "esbuild": "0.24.2" }, "private": true, "scripts": { diff --git a/packages/gitbook/package.json b/packages/gitbook/package.json index 6c01fc3259..45ebda3d70 100644 --- a/packages/gitbook/package.json +++ b/packages/gitbook/package.json @@ -13,7 +13,7 @@ "@gitbook/react-contentkit": "workspace:*", "@gitbook/react-math": "workspace:*", "@gitbook/react-openapi": "workspace:*", - "@opennextjs/cloudflare": "https://pkg.pr.new/@opennextjs/cloudflare@829", + "@opennextjs/cloudflare": "https://pkg.pr.new/@opennextjs/cloudflare@838", "@radix-ui/react-checkbox": "^1.0.4", "@radix-ui/react-dropdown-menu": "^2.1.12", "@radix-ui/react-navigation-menu": "^1.2.3", From 2996c7af77260ab609c022971a281a567ee81008 Mon Sep 17 00:00:00 2001 From: Nicolas Dorseuil Date: Mon, 4 Aug 2025 20:42:30 +0200 Subject: [PATCH 3/3] use released version --- bun.lock | 6 +++--- packages/gitbook/package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bun.lock b/bun.lock index 73374b9755..6ffe490e67 100644 --- a/bun.lock +++ b/bun.lock @@ -60,7 +60,7 @@ "@gitbook/react-contentkit": "workspace:*", "@gitbook/react-math": "workspace:*", "@gitbook/react-openapi": "workspace:*", - "@opennextjs/cloudflare": "https://pkg.pr.new/@opennextjs/cloudflare@838", + "@opennextjs/cloudflare": "^1.6.4", "@radix-ui/react-checkbox": "^1.0.4", "@radix-ui/react-dropdown-menu": "^2.1.12", "@radix-ui/react-navigation-menu": "^1.2.3", @@ -789,9 +789,9 @@ "@octokit/types": ["@octokit/types@14.1.0", "", { "dependencies": { "@octokit/openapi-types": "^25.1.0" } }, "sha512-1y6DgTy8Jomcpu33N+p5w58l6xyt55Ar2I91RPiIA0xCJBXyUAhXCcmZaDWSANiha7R9a6qJJ2CRomGPZ6f46g=="], - "@opennextjs/aws": ["@opennextjs/aws@3.7.3", "", { "dependencies": { "@ast-grep/napi": "^0.35.0", "@aws-sdk/client-cloudfront": "3.398.0", "@aws-sdk/client-dynamodb": "^3.398.0", "@aws-sdk/client-lambda": "^3.398.0", "@aws-sdk/client-s3": "^3.398.0", "@aws-sdk/client-sqs": "^3.398.0", "@node-minify/core": "^8.0.6", "@node-minify/terser": "^8.0.6", "@tsconfig/node18": "^1.0.1", "aws4fetch": "^1.0.18", "chalk": "^5.3.0", "cookie": "^1.0.2", "esbuild": "0.25.4", "express": "5.0.1", "path-to-regexp": "^6.3.0", "urlpattern-polyfill": "^10.0.0", "yaml": "^2.7.0" }, "bin": { "open-next": "dist/index.js" } }, "sha512-DCt7S16nov1ivrU/4nno528VO3oME6QRGXL2f39gNHY34Yy6ylml5kwztI4jxc9ibOZiR/UlBW1+uz3oTgKqVw=="], + "@opennextjs/aws": ["@opennextjs/aws@3.7.4", "", { "dependencies": { "@ast-grep/napi": "^0.35.0", "@aws-sdk/client-cloudfront": "3.398.0", "@aws-sdk/client-dynamodb": "^3.398.0", "@aws-sdk/client-lambda": "^3.398.0", "@aws-sdk/client-s3": "^3.398.0", "@aws-sdk/client-sqs": "^3.398.0", "@node-minify/core": "^8.0.6", "@node-minify/terser": "^8.0.6", "@tsconfig/node18": "^1.0.1", "aws4fetch": "^1.0.18", "chalk": "^5.3.0", "cookie": "^1.0.2", "esbuild": "0.25.4", "express": "5.0.1", "path-to-regexp": "^6.3.0", "urlpattern-polyfill": "^10.0.0", "yaml": "^2.7.0" }, "bin": { "open-next": "dist/index.js" } }, "sha512-s50dmKrgQ62GliffoI/hGGQVb3q/7ZN5VRa4jJw0ZsEGLfk25XuAulO/ySCYeE7/A23KoAYuhafnKr/h+vxOeQ=="], - "@opennextjs/cloudflare": ["@opennextjs/cloudflare@https://pkg.pr.new/@opennextjs/cloudflare@838", { "dependencies": { "@dotenvx/dotenvx": "1.31.0", "@opennextjs/aws": "3.7.3", "cloudflare": "^4.4.1", "enquirer": "^2.4.1", "glob": "^11.0.0", "ts-tqdm": "^0.8.6", "yargs": "^18.0.0" }, "peerDependencies": { "wrangler": "^4.24.4" }, "bin": { "opennextjs-cloudflare": "dist/cli/index.js" } }], + "@opennextjs/cloudflare": ["@opennextjs/cloudflare@1.6.4", "", { "dependencies": { "@dotenvx/dotenvx": "1.31.0", "@opennextjs/aws": "3.7.4", "cloudflare": "^4.4.1", "enquirer": "^2.4.1", "glob": "^11.0.0", "ts-tqdm": "^0.8.6", "yargs": "^18.0.0" }, "peerDependencies": { "wrangler": "^4.24.4" }, "bin": { "opennextjs-cloudflare": "dist/cli/index.js" } }, "sha512-vGEHr1+Dli4BSrs+CM+b2bnXoUdY/GUFiLfdH28UTRHggLMG7cL49M39LtzIVR5D8eqzZ38PDB2CZMn1LJ2gSw=="], "@opentelemetry/api": ["@opentelemetry/api@1.9.0", "", {}, "sha512-3giAOQvZiH5F9bMlMiv8+GSPMeqg0dbaeo58/0SlA9sxSqZhnUtxzX9/2FzyhS9sWQf5S0GJE0AKBrFqjpeYcg=="], diff --git a/packages/gitbook/package.json b/packages/gitbook/package.json index 41717ecd67..de56cb17e4 100644 --- a/packages/gitbook/package.json +++ b/packages/gitbook/package.json @@ -13,7 +13,7 @@ "@gitbook/react-contentkit": "workspace:*", "@gitbook/react-math": "workspace:*", "@gitbook/react-openapi": "workspace:*", - "@opennextjs/cloudflare": "https://pkg.pr.new/@opennextjs/cloudflare@838", + "@opennextjs/cloudflare": "^1.6.4", "@radix-ui/react-checkbox": "^1.0.4", "@radix-ui/react-dropdown-menu": "^2.1.12", "@radix-ui/react-navigation-menu": "^1.2.3",