Convert .htaccess files to use _headers and _redirects.

.editorconfig

@@ -0,0 +1,12 @@
+# EditorConfig is awesome: https://EditorConfig.org
+
+# top-most EditorConfig file
+root = true
+
+[*]
+indent_style = space
+indent_size = 2
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true

.eleventy.js

@@ -12,10 +12,12 @@ const drafts = [
   'latest'
 ];
 
-module.exports = function(eleventyConfig) {
+export default async function(eleventyConfig) {
   eleventyConfig.addPassthroughCopy('404.html');
   eleventyConfig.addPassthroughCopy('.htaccess');
   eleventyConfig.addPassthroughCopy('LICENSE.md');
+  eleventyConfig.addPassthroughCopy('_headers');
+  eleventyConfig.addPassthroughCopy('_redirects');
   eleventyConfig.addPassthroughCopy('benchmarks/**/*.{jsonld,nq,md}');
   eleventyConfig.addPassthroughCopy('contexts/**/*.{htaccess,html,jsonld}');
   eleventyConfig.addPassthroughCopy('contexts/{event,person,place,recipe,remote-context}');
@@ -35,13 +37,13 @@ module.exports = function(eleventyConfig) {
   }
   eleventyConfig.addPassthroughCopy('static');
   eleventyConfig.addPassthroughCopy('test-suite');
-  eleventyConfig.addPassthroughCopy('utils');
   eleventyConfig.ignores.add('CONTRIBUTING.md');
   eleventyConfig.ignores.add('LICENSE.md');
   eleventyConfig.ignores.add('README.md');
   eleventyConfig.ignores.add('benchmarks/README.md');
   eleventyConfig.ignores.add('contexts/person.html');
   eleventyConfig.ignores.add('examples');
+  eleventyConfig.ignores.add('images/Makefile');
   eleventyConfig.ignores.add('images/README.md');
   eleventyConfig.ignores.add('minutes/**/*');
   eleventyConfig.ignores.add('ns/json-ld.html');

.gitignore

@@ -3,6 +3,7 @@
 *.sw[op]
 .DS_Store
 .wrangler
-node_modules
+node_modules/
 playground/jsonld.js
-_site
+_site/
+package-lock.json

404.html

@@ -16,15 +16,15 @@
     <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
 
     <!-- Style Sheets -->
-    <link rel="stylesheet" type="text/css" href="static/css/bootstrap/bootstrap.css">
-    <link rel="stylesheet" type="text/css" href="static/css/bootstrap/bootstrap-responsive.css">
-    <link rel="stylesheet" type="text/css" href="static/css/bootstrap/font-awesome.css">
+    <link rel="stylesheet" type="text/css" href="/static/css/bootstrap/bootstrap.css">
+    <link rel="stylesheet" type="text/css" href="/static/css/bootstrap/bootstrap-responsive.css">
+    <link rel="stylesheet" type="text/css" href="/static/css/bootstrap/font-awesome.css">
     <style>
       /** bootstrap 2.3.2 overrides **/
       .alert.alert-success a {color: #3d9400; text-decoration: underline }
     </style>
 
-    <link rel="shortcut icon" href="favicon.ico" />
+    <link rel="shortcut icon" href="/favicon.ico" />
 
     <!-- Script tags -->
     <script src="//ajax.googleapis.com/ajax/libs/jquery/1.9.0/jquery.min.js"></script>
@@ -53,10 +53,10 @@
           <div class="nav-collapse">
           <ul class="nav">
             <li>
-              <a href="playground/"><span class="icon-beer"></span> Playground</a>
+              <a href="/playground/"><span class="icon-beer"></span> Playground</a>
             </li>
             <li>
-              <a href="learn/"><span class="icon-book"></span> Documentation</a>
+              <a href="/learn/"><span class="icon-book"></span> Documentation</a>
             </li>
             <li><a href="#developers"><span class="icon-beaker"></span> Developers</a></li>
             <li class="dropdown">
@@ -82,7 +82,7 @@
                   <li><a href="/spec/">1.0 drafts (historic)</a></li>
               </ul>
             </li>
-            <li><a href="images/"><span class="icon-picture"></span> Branding</a></li>
+            <li><a href="/images/"><span class="icon-picture"></span> Branding</a></li>
             </ul>
           </div>
           <!--/.nav-collapse -->

README.md

@@ -74,10 +74,12 @@ To develop this website locally:
 ```sh
 # install dependencies
 npm i
-# to rebuild on changes and run a server:
-npm run serve
-# to rebuild on changes:
+# to just build the static files to `_site/`
+npm run build
+# to rebuild the files on changes
 npm run watch
+# to serve `_site/` with Cloudflare Pages feature support
+npm run pages # visit http://localhost:8788/
 ```
 
 Additionally, if you want to use or test the playground `http:` proxy, also run

_headers

@@ -0,0 +1,30 @@
+/contexts/event
+    Content-Type: application/ld+json
+    Access-Control-Allow-Origin: "*"
+/contexts/person
+    Content-Type: application/ld+json
+    Access-Control-Allow-Origin: "*"
+/contexts/place
+    Content-Type: application/ld+json
+    Access-Control-Allow-Origin: "*"
+/contexts/recipe
+    Content-Type: application/ld+json
+    Access-Control-Allow-Origin: "*"
+
+# Tests 0009-0011 Add link header
+/test-suite/tests/remote-doc-0009-in.jsonld
+    Link: <remote-doc-0009-context.jsonld>; rel="http://www.w3.org/ns/json-ld#context"
+/test-suite/tests/remote-doc-0010-in.json
+    Link: <remote-doc-0010-context.jsonld>; rel="http://www.w3.org/ns/json-ld#context"
+/test-suite/tests/remote-doc-0011-in.jldt
+    Link: <remote-doc-0011-context.jsonld>; rel="http://www.w3.org/ns/json-ld#context"
+
+# Test 00012 adds multiple link headers
+/test-suite/tests/remote-doc-0012-in.json
+    Link: <remote-doc-0012-context1.jsonld>; rel="http://www.w3.org/ns/json-ld#context"
+    Link: <remote-doc-0012-context2.jsonld>; rel="http://www.w3.org/ns/json-ld#context"
+
+/test-suite/tests/*.jldt
+    Content-Type: application/jldTest+json
+/test-suite/tests/*.jldte
+    Content-Type: application/jldTest

_redirects

@@ -0,0 +1,20 @@
+/playground-dev /playground 302
+
+/contexts/schema.org.jsonld https://schema.org/ 301
+
+/spec/latest/json-ld-syntax https://www.w3.org/TR/json-ld/ 301
+/spec/latest/json-ld-syntax/ https://www.w3.org/TR/json-ld/ 301
+
+# Tests 0005-0007, status redirect to 0001
+/test-suite/remote-doc-0005-in.jsonld /test-suite/tests/remote-doc-0001-in.jsonld 301
+/test-suite/remote-doc-0006-in.jsonld /test-suite/tests/remote-doc-0001-in.jsonld 303
+/test-suite/remote-doc-0007-in.jsonld /test-suite/tests/remote-doc-0001-in.jsonld 307
+
+/spec/latest/rdf-graph-normalization https://w3c-ccg.github.io/rdf-dataset-canonicalization/spec/ 307
+/spec/latest/rdf-graph-normalization/* https://w3c-ccg.github.io/rdf-dataset-canonicalization/spec/:splat 307
+/spec/latest/rdf-dataset-normalization/* https://w3c-ccg.github.io/rdf-dataset-canonicalization/spec/:splat 307
+/spec/latest/rdf-dataset-canonicalization/* https://w3c-ccg.github.io/rdf-dataset-canonicalization/spec/:splat 307
+
+/spec/latest/json-ld/* https://www.w3.org/TR/json-ld/:splat 301
+/spec/latest/json-ld-api/* https://www.w3.org/TR/json-ld-api/:splat 301
+/spec/latest/json-ld-framing/* https://www.w3.org/TR/json-ld-framing/:splat 301

functions/test-suite/_middleware.js

@@ -0,0 +1,57 @@
+function parseAcceptHeader(acceptHeader) {
+  // generated by Google AI "parse accept header javascript"
+  if (!acceptHeader) {
+    return [];
+  }
+
+  return acceptHeader.split(',')
+    .map(item => item.trim())
+    .map(item => {
+      const parts = item.split(';');
+      const value = parts[0].trim();
+      let quality = 1;
+
+      if (parts.length > 1) {
+        const q = parts[1].trim();
+        if (q.startsWith('q=')) {
+          quality = parseFloat(q.substring(2));
+        }
+      }
+
+      return { value, quality };
+    })
+    .sort((a, b) => b.quality - a.quality);
+    // From:
+    // text/html, application/xhtml+xml, application/xml;q=0.9, */*;q=0.8
+    // Expected output:
+    // [
+    //   { value: 'text/html', quality: 1 },
+    //   { value: 'application/xhtml+xml', quality: 1 },
+    //   { value: 'application/xml', quality: 0.9 },
+    //   { value: '*/*', quality: 0.8 }
+    // ]
+}
+
+const typeToExt = {
+  "text/turtle": "ttl",
+  "application/ld+json": "jsonld"
+};
+
+export async function onRequest(context) {
+  try {
+    const parsedAccept = parseAcceptHeader(context.request.headers.get('Accept'));
+    const accept = parsedAccept[0].value;
+
+    // if we have a mapping for this extension, send it. Otherwise fall through.
+    if(Object.keys(typeToExt).indexOf(accept) > -1) {
+      const ext = typeToExt[accept] || `html`;
+      const rewrittenUrl = context.request.url + '.' + ext;
+      const asset = await context.env.ASSETS.fetch(rewrittenUrl);
+      const response = new Response(asset.body, asset);
+      return response;
+    }
+    return context.next();
+  } catch (err) {
+    return new Response(`${err.message}\n${err.stack}`, { status: 500 });
+  }
+}

package.json

@@ -2,14 +2,16 @@
   "name": "json-ld.org",
   "private": true,
   "description": "json-ld.org homepage",
+  "type": "module",
   "scripts": {
     "build": "eleventy",
-    "serve": "eleventy --serve",
+    "pages": "wrangler pages dev _site/ --compatibility-date=2025-04-02",
     "watch": "eleventy --watch",
     "dev": "wrangler pages dev _site --compatibility-date=2024-04-27 --live-reload --port 8788",
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "devDependencies": {
-    "@11ty/eleventy": "^3.0.0-alpha.9"
+    "@11ty/eleventy": "^3.0.0",
+    "wrangler": "^4.6.0"
   }
 }

requirements/index.11tydata.js

@@ -1,5 +1,8 @@
-const fs = require('node:fs/promises');
-const path = require('node:path');
+import { fileURLToPath } from 'url';
+import fs from 'node:fs/promises';
+import path from 'node:path';
+
+const __dirname = path.dirname(fileURLToPath(import.meta.url));
 
 const specStatuses = ['ED'];
 
@@ -35,7 +38,7 @@ const specs = [
   'requirements'
 ];
 
-module.exports = async function() {
+export default async function() {
   return {
     specs: Object.fromEntries(await Promise.all(specs.map(async spec => {
       return [spec, await getDrafts(spec)];

spec/index.11tydata.js

@@ -1,5 +1,8 @@
-const fs = require('node:fs/promises');
-const path = require('node:path');
+import { fileURLToPath } from 'url';
+import fs from 'node:fs/promises';
+import path from 'node:path';
+
+const __dirname = path.dirname(fileURLToPath(import.meta.url));
 
 const specStatuses = ['ED', 'FCGS', 'WD', 'CR', 'PR', 'REC'/*, 'CG-FINAL'*/];
 
@@ -33,14 +36,14 @@ async function getDrafts(spec) {
 
 const specs = [
   'json-ld',
-  'json-ld-syntax', 
-  'json-ld-api', 
-  'json-ld-api-best-practices', 
-  'json-ld-framing', 
+  'json-ld-syntax',
+  'json-ld-api',
+  'json-ld-api-best-practices',
+  'json-ld-framing',
   'json-ld-rdf'
 ];
 
-module.exports = async function() {
+export default async function() {
   return {
     specs: Object.fromEntries(await Promise.all(specs.map(async spec => {
       return [spec, await getDrafts(spec)];