Fix CORS error when loading icons in 2c (#3162)

Author: SamyPesse

.github/composite/deploy-cloudflare/action.yaml

@@ -70,7 +70,7 @@ runs:
               apiToken: ${{ inputs.apiToken }}
               accountId: ${{ inputs.accountId }}
               workingDirectory: ./
-              wranglerVersion: '3.112.0'
+              wranglerVersion: '4.10.0'
               environment: ${{ inputs.environment }}
               command: ${{ inputs.deploy == 'true' && 'deploy' || format('versions upload --tag {0} --message "{1}"', inputs.commitTag, inputs.commitMessage) }} --config ./packages/gitbook-v2/wrangler.jsonc
         - name: Outputs

bun.lock

@@ -21,10 +21,10 @@
     },
     "devDependencies": {
         "typescript": "^5.5.3",
-        "wrangler": "^3.112.0"
+        "wrangler": "^4.10.0"
     },
     "scripts": {
-        "generate": "wrangler types --experimental-include-runtime",
+        "generate": "wrangler types",
         "build": "tsc",
         "typecheck": "tsc --noEmit",
         "dev": "tsc -w",

packages/cache-do/package.json

@@ -14,7 +14,7 @@
         "resolveJsonModule": true,
         "isolatedModules": true,
         "incremental": true,
-        "types": ["./.wrangler/types/runtime.d.ts"]
+        "types": ["./worker-configuration.d.ts"]
     },
     "include": ["src/**/*.ts"],
     "exclude": ["node_modules"]

packages/cache-do/tsconfig.json

@@ -53,6 +53,24 @@ const nextConfig = {
             },
         ],
     },
+
+    async headers() {
+        return [
+            {
+                source: '/~gitbook/static/:path*',
+                headers: [
+                    {
+                        key: 'Cache-Control',
+                        value: 'public, max-age=31536000, immutable',
+                    },
+                    {
+                        key: 'Access-Control-Allow-Origin',
+                        value: '*',
+                    },
+                ],
+            },
+        ];
+    },
 };
 
 export default nextConfig;

packages/gitbook-v2/next.config.mjs

@@ -17,7 +17,7 @@
     },
     "devDependencies": {
         "gitbook": "*",
-        "@opennextjs/cloudflare": "https://pkg.pr.new/opennextjs/opennextjs-cloudflare/@opennextjs/cloudflare@8f7ed38",
+        "@opennextjs/cloudflare": "^1.0.0-beta.3",
         "@types/rison": "^0.0.9",
         "tailwindcss": "^3.4.0",
         "postcss": "^8"

packages/gitbook-v2/package.json

@@ -1,7 +1,7 @@
 {
     "main": ".open-next/worker.js",
     "name": "gitbook-open-v2",
-    "compatibility_date": "2025-03-11",
+    "compatibility_date": "2025-04-14",
     "compatibility_flags": ["nodejs_compat", "allow_importable_env"],
     "assets": {
         "directory": ".open-next/assets",
@@ -12,13 +12,6 @@
     },
     "env": {
         "preview": {
-            "d1_databases": [
-                {
-                    "binding": "NEXT_CACHE_D1",
-                    "database_id": "f59ddb40-ad72-4312-9395-0ac6a129af8e",
-                    "database_name": "gitbook-open-v2-tags-preview"
-                }
-            ],
             "r2_buckets": [
                 {
                     "binding": "NEXT_INC_CACHE_R2_BUCKET",
@@ -55,13 +48,6 @@
                     "bucket_name": "gitbook-open-v2-cache-staging"
                 }
             ],
-            "d1_databases": [
-                {
-                    "binding": "NEXT_CACHE_D1",
-                    "database_id": "9df62e39-1f35-4066-83aa-e9b8ed3ac8d5",
-                    "database_name": "gitbook-open-v2-tags-staging"
-                }
-            ],
             "services": [
                 {
                     "binding": "WORKER_SELF_REFERENCE",
@@ -113,13 +99,6 @@
                     "bucket_name": "gitbook-open-v2-cache-production"
                 }
             ],
-            "d1_databases": [
-                {
-                    "binding": "NEXT_CACHE_D1",
-                    "database_id": "a6f16fce-5f45-43a9-89a4-7b83ddf25b77",
-                    "database_name": "gitbook-open-v2-tags-production"
-                }
-            ],
             "services": [
                 {
                     "binding": "WORKER_SELF_REFERENCE",

packages/gitbook-v2/wrangler.jsonc

@@ -1,3 +1,5 @@
 # GitBook immutable static assets
+# Duplicated from next.config.mjs until OpenNext supports generating static headers
 /~gitbook/static/*
   cache-control: public,max-age=31536000,immutable
+  Access-Control-Allow-Origin: *