Merge branch '2.0' into nb-strands-tut-both-simplifications

Author: nbogie

.github/workflows/beta_deploy.yml

@@ -1,4 +1,4 @@
-name: Deploy beta to Netlify
+name: Deploy beta to Cloudflare
 
 on:
   # Trigger the workflow every time you push to the `main` branch
@@ -18,25 +18,18 @@ jobs:
   build-deploy:
     runs-on: ubuntu-latest
     steps:
-    
+      - uses: actions/setup-node@v6.3.0
+        with:
+          node-version: 22.22.x
       - name: Checkout your repository using git
         uses: actions/checkout@v4
-        
-      - name: Install, build, and upload your site output
-        env:
-          NODE_OPTIONS: "--max_old_space_size=4096"
-        uses: withastro/action@v2
-        
-      - name: Deploy to Netlify
-        uses: nwtgck/actions-netlify@v3.0
+      - name: Install dependencies
+        run: npm ci
+      - name: Build website
+        run: npm run build
+      - name: Deploy to Cloudflare Workers
+        uses: cloudflare/wrangler-action@v3
         with:
-          publish-dir: './dist'
-          production-branch: "2.0"
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          deploy-message: "Deploy from GitHub Actions"
-          enable-pull-request-comment: false
-          enable-commit-comment: false
-          overwrites-pull-request-comment: false
-        env:
-          NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
-          NETLIFY_SITE_ID: ${{ secrets.NETLIFY_SITE_ID }}
+          apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
+          accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
+          environment: beta

.github/workflows/deploy.yml

@@ -15,23 +15,20 @@ permissions:
   id-token: write
 
 jobs:
-  build:
+  build-deploy:
     runs-on: ubuntu-latest
     steps:
+      - uses: actions/setup-node@v6.3.0
+        with:
+          node-version: 22.22.x
       - name: Checkout your repository using git
         uses: actions/checkout@v4
-      - name: Install, build, and upload your site output
-        env:
-          NODE_OPTIONS: "--max_old_space_size=4096"
-        uses: withastro/action@v2
-
-  deploy:
-    needs: build
-    runs-on: ubuntu-latest
-    environment:
-      name: github-pages
-      url: ${{ steps.deployment.outputs.page_url }}
-    steps:
-      - name: Deploy to GitHub Pages
-        id: deployment
-        uses: actions/deploy-pages@v4
+      - name: Install dependencies
+        run: npm ci
+      - name: Build website
+        run: npm run build
+      - name: Deploy to Cloudflare Workers
+        uses: cloudflare/wrangler-action@v3
+        with:
+          apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
+          accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}

.github/workflows/test.yml

@@ -12,6 +12,10 @@ jobs:
     steps:
       - name: Checkout your repository using git
         uses: actions/checkout@v4
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: '22'
       - name: Install dependencies
         run: npm ci
       - name: Test
@@ -21,6 +25,10 @@ jobs:
     steps:
       - name: Checkout your repository using git
         uses: actions/checkout@v4
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: '22'
       - name: Install dependencies
         run: npm ci
       - name: Lint
@@ -30,6 +38,10 @@ jobs:
     steps:
       - name: Checkout your repository using git
         uses: actions/checkout@v4
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: '22'
       - name: Install dependencies
         run: npm ci
       - name: Typecheck
@@ -39,6 +51,10 @@ jobs:
     steps:
       - name: Checkout your repository using git
         uses: actions/checkout@v4
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: '22'
       - name: Install dependencies
         run: npm ci
       - name: Build

.gitignore

@@ -29,4 +29,5 @@ translator/
 public/p5.min.js
 
 # optional local preferences for vscode
-local.code-workspace
+local.code-workspace
+.zed

.npmrc

@@ -0,0 +1,2 @@
+# Force npm to fail (not just warn) if the node.js version in "engines" isn't met
+engine-strict=true

docs/technical_overview.md

@@ -4,7 +4,7 @@
 
 ### Setup
 
-1. Make sure you have [node and npm installed on your machine](https://nodejs.org/en/learn/getting-started/how-to-install-nodejs).
+1. Make sure you have [node (at least version 22) and npm installed on your machine](https://nodejs.org/en/learn/getting-started/how-to-install-nodejs).
 2. Clone this repo by typing git clone https://github.com/processing/p5.js-website/ in your terminal. (You can also use [GitHub Desktop](https://desktop.github.com/)).
 3. Then install the project's dependencies with:
 
@@ -68,3 +68,8 @@ And then view it locally with
 ```shellsession
 npm run preview
 ```
+
+
+## Previewing the p5.js reference for work-in-progress
+
+If you're developing the p5.js library and want to preview your documentation, there are some specific notes at ["Generating and previewing the reference"](https://beta.p5js.org/contribute/contributing_to_the_p5js_reference/#generating-and-previewing-the-reference).

docs/url_conventions.md

@@ -0,0 +1,60 @@
+# URL conventions
+
+## Trailing slash in URLs
+
+All URLs for resources on the website should end with a slash character (`/`).  
+
+For example, the correct URL for the reference page about the `circle` function is
+* good: https://beta.p5js.org/reference/p5/circle/
+* bad: https://beta.p5js.org/reference/p5/circle
+
+More correctly, it should come at the end of the _path_ part of the URL.  
+
+If a query string or hash/fragment is present in the URL, the trailing slash should come before those, as shown in these examples:
+
+Example with a query string
+* good: https://beta.p5js.org/search/?term=colorMode
+* bad: https://beta.p5js.org/search?term=colorMode/
+* bad: https://beta.p5js.org/search?term=colorMode
+
+Example with a hash / fragment part
+* good: https://beta.p5js.org/contribute/documentation_style_guide/#comments
+* bad: https://beta.p5js.org/contribute/documentation_style_guide#comments/
+
+#### Other correct examples
+* https://beta.p5js.org/download/
+* https://beta.p5js.org/reference/
+* https://beta.p5js.org/tutorials/
+* https://beta.p5js.org/examples/
+* https://beta.p5js.org/tutorials/get-started/
+* https://beta.p5js.org/examples/shapes-and-color-shape-primitives/
+* https://beta.p5js.org/
+
+### Automatic trailing slash addition
+While the production webserver _may_ add a trailing slash to a requested URL when it is missing, but this should not be relied upon.  
+Instead write (or generate) links that follow the rules above.
+
+## Case in URLs
+
+URL casing is somewhat inconsistent across the website.  Guidelines for new resources:
+
+* Prefer lower-case
+* Spaces should not be used in URLs.
+* In place of spaces, dashes (`-`) should ideally be used in preference to underscores (`_`).
+* First, however, follow established local conventions used by other resources of the same type
+  * e.g. all contributor docs use underscores "like_this"
+
+#### Examples of kebab-case URL:
+* https://beta.p5js.org/tutorials/variables-and-change/
+* https://beta.p5js.org/examples/3d-orbit-control/
+* https://beta.p5js.org/code-of-conduct/
+
+### A case exception: reference pages
+
+In reference pages, the URLs follow the names of the functions, classes, and variables.  So, they include some capitals and use "camel-case" e.g. `createCanvas`.
+
+#### Examples of reference page URLs
+* https://p5js.org/reference/p5.Vector/fromAngle/
+* https://beta.p5js.org/reference/p5/p5.Image/
+
+More on reference page URLs can be found in https://beta.p5js.org/contribute/contributing_to_the_p5js_reference/#linking