Merge branch 'develop'

Brings the Cloudflare Pages migration to master: modernized build toolchain,
wrangler.toml (project + R2 FEEDS binding), functions/_middleware.js for
serving RSS/sitemap feeds from R2, updated deploy workflow, and relative
landing-page game links.

Author: oskarrisberg

.github/workflows/nodejs.yml

@@ -1,4 +1,4 @@
-name: Build
+name: Build & Deploy
 
 on:
   workflow_dispatch:
@@ -7,22 +7,29 @@ on:
       - master
 
 jobs:
-  build:
+  deploy:
 
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v1
-    - name: Use Node.js 18.x
-      uses: actions/setup-node@v1
+    - uses: actions/checkout@v4
+    - name: Use Node.js 20.x
+      uses: actions/setup-node@v4
       with:
-        node-version: 18.x
+        node-version: 20.x
 
     - run: npm ci
 
-    - run: npm run build --if-present
+    - run: npm run build
+
+    - name: Generate static site
+      run: node scripts/build.js
       env:
-        CI: true
         API_TOKEN: ${{ secrets.API_TOKEN }}
-        AWS_ACCESS_KEY: ${{ secrets.AWS_ACCESS_KEY }}
-        AWS_SECRET_KEY: ${{ secrets.AWS_SECRET_KEY }}
+
+    - name: Deploy to Cloudflare Pages
+      uses: cloudflare/wrangler-action@v3
+      with:
+        apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
+        accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
+        command: pages deploy

.gitignore

@@ -12,8 +12,11 @@ config/cron/
 Developers - *.csv
 *.log
 web/scripts/app\.js\.map
+web/scripts/*.LICENSE.txt
 config/keys.json
 .env
 .idea/
 stage
 dev/assets/theme*
+.wrangler/
+.dev.vars

app/actions.js

@@ -9,16 +9,10 @@ export const SET_SEARCH_TERM = 'SET_SEARCH_TERM';
 export const TOGGLE_SERVICE = 'TOGGLE_SERVICE';
 
 const FETCH_DEBOUNCE_INTERVAL = 250;
-let API_HOSTNAME = 'api.developertracker.com';
-let API_PORT = 443;
+const API_HOSTNAME = 'api.developertracker.com';
+const API_PORT = 443;
 let trackTiming = true;
 
-if ( window.location.hostname === 'localhost' ) {
-    API_HOSTNAME = 'lvh.me';
-    // eslint-disable-next-line no-magic-numbers
-    API_PORT = 3000;
-}
-
 const setSearchTerm = function setSearchTerm ( term ) {
     const currentQuery = queryString.parse( location.search.substr( 1 ) );
 

docker-compose.yml

@@ -190,6 +190,12 @@ services:
       API_TOKEN: ${API_TOKEN:-}
       AWS_ACCESS_KEY: ${AWS_ACCESS_KEY:-}
       AWS_SECRET_KEY: ${AWS_SECRET_KEY:-}
+      # R2 credentials enable the dual-write of RSS/sitemaps to the Cloudflare
+      # R2 bucket the Pages site serves feeds from. Without these two, turtle
+      # falls back to S3-only and the R2 feeds go stale. Bucket + account id
+      # default correctly in turtle/r2.js, so only the keys are needed here.
+      R2_ACCESS_KEY_ID: ${R2_ACCESS_KEY_ID:-}
+      R2_SECRET_ACCESS_KEY: ${R2_SECRET_ACCESS_KEY:-}
     restart: unless-stopped
     depends_on:
       rest-api:

eslint.config.js

@@ -0,0 +1,69 @@
+const js = require( '@eslint/js' );
+const globals = require( 'globals' );
+const reactPlugin = require( 'eslint-plugin-react' );
+
+module.exports = [
+    {
+        ignores: [
+            'node_modules/**',
+            'web/**',
+            'dev/**',
+            'stage/**',
+            'games/**',
+        ],
+    },
+    js.configs.recommended,
+    {
+        // React frontend — ES modules + JSX, browser globals.
+        files: [ 'app/**/*.{js,jsx}' ],
+        plugins: {
+            react: reactPlugin,
+        },
+        languageOptions: {
+            ecmaVersion: 'latest',
+            sourceType: 'module',
+            parserOptions: {
+                ecmaFeatures: {
+                    jsx: true,
+                },
+            },
+            globals: {
+                ...globals.browser,
+            },
+        },
+        settings: {
+            react: {
+                version: 'detect',
+            },
+        },
+        rules: {
+            ...reactPlugin.configs.flat.recommended.rules,
+            'react/prop-types': 'off',
+        },
+    },
+    {
+        // Build scripts + config — CommonJS, node globals.
+        files: [ 'scripts/**/*.js', '*.js' ],
+        languageOptions: {
+            ecmaVersion: 'latest',
+            sourceType: 'commonjs',
+            globals: {
+                ...globals.node,
+            },
+        },
+    },
+    {
+        // Cloudflare Pages Functions — ES modules, Workers runtime globals.
+        files: [ 'functions/**/*.js' ],
+        languageOptions: {
+            ecmaVersion: 'latest',
+            sourceType: 'module',
+            globals: {
+                ...globals.serviceworker,
+                Response: 'readonly',
+                Request: 'readonly',
+                URL: 'readonly',
+            },
+        },
+    },
+];

functions/_middleware.js

@@ -0,0 +1,42 @@
+// Serves the RSS + sitemap feeds that the `turtle` service writes to the R2
+// bucket bound as FEEDS (see wrangler.toml). The static site is generated by
+// scripts/build.js and is immutable per Pages deploy, so these dynamic feeds
+// can't live in stage/ — they're fetched from R2 on request instead.
+//
+// _headers rules do NOT apply to Function responses, so we set Cache-Control
+// here (600s, matching turtle's S3 CacheControl). Every other request falls
+// through via next() to the static asset pipeline, where _headers still applies.
+
+export async function onRequest( context ) {
+    const { request, env, next } = context;
+    const path = new URL( request.url ).pathname;
+
+    let key = null;
+    let fallbackType = 'application/xml';
+
+    if ( /^\/sitemap(\.[^/]+)?\.xml$/.test( path ) ) {
+        // /sitemap.xml or /sitemap.<game>.xml
+        key = path.slice( 1 );
+    } else if ( /^\/[^/]+\/rss$/.test( path ) ) {
+        // /<game>/rss
+        key = path.slice( 1 );
+        fallbackType = 'application/rss+xml';
+    }
+
+    if ( !key ) {
+        return next();
+    }
+
+    const object = await env.FEEDS.get( key );
+
+    if ( !object ) {
+        return new Response( 'Not found', { status: 404 } );
+    }
+
+    return new Response( object.body, {
+        headers: {
+            'Content-Type': object.httpMetadata?.contentType || fallbackType,
+            'Cache-Control': 'public, max-age=600',
+        },
+    } );
+}