Skip to content

Commit f21e878

Browse files
authored
Merge branch 'dev-2.0' into server-usage
2 parents 4dd62c3 + d9b9a9a commit f21e878

146 files changed

Lines changed: 10911 additions & 4198 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.all-contributorsrc

Lines changed: 190 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1456,8 +1456,8 @@
14561456
{
14571457
"login": "FreddieRa",
14581458
"name": "Freddie Rawlins",
1459-
"avatar_url": "https://discourse-cdn-sjc2.com/standard10/user_avatar/discourse.processing.org/freddiera/120/4078_2.png",
1460-
"profile": "https://freddierawlins.wixsite.com/site",
1459+
"avatar_url": "https://avatars.githubusercontent.com/u/14854492?v=4",
1460+
"profile": "https://github.com/FreddieRa",
14611461
"contributions": [
14621462
"code",
14631463
"doc"
@@ -1466,7 +1466,7 @@
14661466
{
14671467
"login": "Luke_",
14681468
"name": "Luc de wit",
1469-
"avatar_url": "https://media.discordapp.net/attachments/499488127245615135/499488260435869696/normal_luke.png",
1469+
"avatar_url": "https://avatars.githubusercontent.com/u/37410843?v=4",
14701470
"profile": "https://github.com/justlucdewit",
14711471
"contributions": [
14721472
"code",
@@ -1860,7 +1860,7 @@
18601860
{
18611861
"login": "shaharyar-shamshi",
18621862
"name": "shaharyarshamshi",
1863-
"avatar_url": "https://avatars3.githubusercontent.com/u/17377195?v=4",
1863+
"avatar_url": "https://avatars.githubusercontent.com/u/17377195?v=4",
18641864
"profile": "https://github.com/shaharyar-shamshi",
18651865
"contributions": [
18661866
"translation"
@@ -7144,7 +7144,8 @@
71447144
"profile": "https://github.com/Homaid",
71457145
"contributions": [
71467146
"a11y",
7147-
"code"
7147+
"code",
7148+
"doc"
71487149
]
71497150
},
71507151
{
@@ -7229,6 +7230,190 @@
72297230
"code",
72307231
"doc"
72317232
]
7233+
},
7234+
{
7235+
"login": "VANSH3104",
7236+
"name": "vansh kabra",
7237+
"avatar_url": "https://avatars.githubusercontent.com/u/134841334?v=4",
7238+
"profile": "https://vansh-dev.netlify.app/",
7239+
"contributions": [
7240+
"code"
7241+
]
7242+
},
7243+
{
7244+
"login": "menacingly-coded",
7245+
"name": "Shreya Sharma",
7246+
"avatar_url": "https://avatars.githubusercontent.com/u/121508087?v=4",
7247+
"profile": "https://github.com/menacingly-coded",
7248+
"contributions": [
7249+
"doc"
7250+
]
7251+
},
7252+
{
7253+
"login": "Itsrajsk",
7254+
"name": "Raj Kashid",
7255+
"avatar_url": "https://avatars.githubusercontent.com/u/117977675?v=4",
7256+
"profile": "https://github.com/Itsrajsk",
7257+
"contributions": [
7258+
"code"
7259+
]
7260+
},
7261+
{
7262+
"login": "Geethegreat",
7263+
"name": "krishnageeth",
7264+
"avatar_url": "https://avatars.githubusercontent.com/u/86944224?v=4",
7265+
"profile": "https://github.com/Geethegreat",
7266+
"contributions": [
7267+
"code"
7268+
]
7269+
},
7270+
{
7271+
"login": "Piyushrathoree",
7272+
"name": "PIYUSH RATHORE",
7273+
"avatar_url": "https://avatars.githubusercontent.com/u/163632958?v=4",
7274+
"profile": "http://piyushh.me",
7275+
"contributions": [
7276+
"code"
7277+
]
7278+
},
7279+
{
7280+
"login": "Aayushdev18",
7281+
"name": "Ayush Dev",
7282+
"avatar_url": "https://avatars.githubusercontent.com/u/148681565?v=4",
7283+
"profile": "https://github.com/Aayushdev18",
7284+
"contributions": [
7285+
"code"
7286+
]
7287+
},
7288+
{
7289+
"login": "rakesh2OO5",
7290+
"name": "Rakesh D",
7291+
"avatar_url": "https://avatars.githubusercontent.com/u/160116250?v=4",
7292+
"profile": "https://github.com/rakesh2OO5",
7293+
"contributions": [
7294+
"code"
7295+
]
7296+
},
7297+
{
7298+
"login": "doradocodes",
7299+
"name": "Dora Do",
7300+
"avatar_url": "https://avatars.githubusercontent.com/u/140831752?v=4",
7301+
"profile": "https://doradocodes.com/",
7302+
"contributions": [
7303+
"review"
7304+
]
7305+
},
7306+
{
7307+
"login": "Nwakaego-Ego",
7308+
"name": "Nwakaego Glory Nwaekpe",
7309+
"avatar_url": "https://avatars.githubusercontent.com/u/81041326?v=4",
7310+
"profile": "https://github.com/Nwakaego-Ego",
7311+
"contributions": [
7312+
"review"
7313+
]
7314+
},
7315+
{
7316+
"login": "vietnguyen2358",
7317+
"name": "Viet Nguyen",
7318+
"avatar_url": "https://avatars.githubusercontent.com/u/107826279?v=4",
7319+
"profile": "https://github.com/vietnguyen2358",
7320+
"contributions": [
7321+
"code"
7322+
]
7323+
},
7324+
{
7325+
"login": "shuklaaryan367-byte",
7326+
"name": "aryan-shukla",
7327+
"avatar_url": "https://avatars.githubusercontent.com/u/228463828?v=4",
7328+
"profile": "https://github.com/shuklaaryan367-byte",
7329+
"contributions": [
7330+
"code"
7331+
]
7332+
},
7333+
{
7334+
"login": "skyash-dev",
7335+
"name": "yash",
7336+
"avatar_url": "https://avatars.githubusercontent.com/u/52105266?v=4",
7337+
"profile": "http://skyash.me",
7338+
"contributions": [
7339+
"code"
7340+
]
7341+
},
7342+
{
7343+
"login": "aashu2006",
7344+
"name": "akshat patil",
7345+
"avatar_url": "https://avatars.githubusercontent.com/u/170659176?v=4",
7346+
"profile": "https://github.com/aashu2006",
7347+
"contributions": [
7348+
"doc"
7349+
]
7350+
},
7351+
{
7352+
"login": "avinxshKD",
7353+
"name": "Avinash Kumar Deepak",
7354+
"avatar_url": "https://avatars.githubusercontent.com/u/152387616?v=4",
7355+
"profile": "https://github.com/avinxshKD",
7356+
"contributions": [
7357+
"code"
7358+
]
7359+
},
7360+
{
7361+
"login": "jjnawaaz",
7362+
"name": "Junaid Nawaz",
7363+
"avatar_url": "https://avatars.githubusercontent.com/u/124430303?v=4",
7364+
"profile": "https://github.com/jjnawaaz",
7365+
"contributions": [
7366+
"doc"
7367+
]
7368+
},
7369+
{
7370+
"login": "Sanchit2662",
7371+
"name": "SANCHIT KUMAR",
7372+
"avatar_url": "https://avatars.githubusercontent.com/u/217499010?v=4",
7373+
"profile": "https://github.com/Sanchit2662",
7374+
"contributions": [
7375+
"code"
7376+
]
7377+
},
7378+
{
7379+
"login": "LuLaValva",
7380+
"name": "Luke LaValva",
7381+
"avatar_url": "https://avatars.githubusercontent.com/u/26027232?v=4",
7382+
"profile": "http://lavalva.dev",
7383+
"contributions": [
7384+
"bug",
7385+
"code"
7386+
]
7387+
},
7388+
{
7389+
"login": "saurabh24thakur",
7390+
"name": "Saurabh Singh",
7391+
"avatar_url": "https://avatars.githubusercontent.com/u/187937240?v=4",
7392+
"profile": "https://my-portfolio-phi-seven-50.vercel.app/",
7393+
"contributions": [
7394+
"code",
7395+
"test"
7396+
]
7397+
},
7398+
{
7399+
"login": "imrinahru",
7400+
"name": "imrinahru",
7401+
"avatar_url": "https://avatars.githubusercontent.com/u/120927437?v=4",
7402+
"profile": "https://github.com/imrinahru",
7403+
"contributions": [
7404+
"bug",
7405+
"code",
7406+
"test"
7407+
]
7408+
},
7409+
{
7410+
"login": "Nitin2332",
7411+
"name": "Nitin Rajpoot",
7412+
"avatar_url": "https://avatars.githubusercontent.com/u/175546686?v=4",
7413+
"profile": "https://github.com/Nitin2332",
7414+
"contributions": [
7415+
"code"
7416+
]
72327417
}
72337418
],
72347419
"repoType": "github",

.github/ISSUE_TEMPLATE/1-p5.js-2.0-bug-report.yml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,16 @@
1-
name: 📃 p5.js 2.0 Beta Bug Report
2-
description: This template is for submitting a bug report for bugs found in the p5.js 2.0 beta releases.
3-
title: "[p5.js 2.0 Beta Bug Report]: "
4-
labels: [p5.js 2.0]
1+
name: 📃 p5.js 2.0+ Bug Report
2+
description: This template is for submitting a bug report for bugs found in p5v2!
3+
title: "[p5.js 2.0+ Bug Report]: "
4+
labels: [p5.js 2.0+]
55
body:
66
- type: markdown
77
attributes:
88
value: |
99
### What falls under this category?
10-
There has been many changes to p5.js in 2.0 that is currently released as beta versions. If you suspect there may be a bug, please follow the below steps before opening a bug report using this template:
11-
12-
1. There are some differences in behavior between p5.js 1.x and 2.0 beta, please check the changelog and/or [proposal list](https://github.com/orgs/processing/projects/21) to see if the difference in behavior is intended. If in doubt, feel free to open the issue anyway and ask.
13-
2. Breaking changes may still happen between beta versions, please make sure to include the full beta version number and use the latest beta release where possible.
14-
3. We are not considering any new proposal for p5.js 2.0 at this stage and if you would like to request new features, please use the "New feature request" issue template.
15-
4. The documentation and examples may be outdated at this stage while we work on updating them.
10+
There has been many changes to p5.js in 2.0! You can try it in p5.js Editor by updating the version in "Settings," and reference is available [on the beta version of the site](https://beta.p5js.org/). If you suspect there may be a bug, please follow the below steps before opening a bug report using this template:
11+
1. There are some differences in behavior between p5.js 1.x and 2.0 beta, please check the changelog and/or [2.0 status board](https://github.com/orgs/processing/projects/21) to see if the difference in behavior is intended. If in doubt, feel free to open the issue anyway and ask.
12+
2. New proposals for future p5.js 2.x minor releases may be considered! Please use the "New feature request" issue template, or check the [2.0 status board](https://github.com/orgs/processing/projects/21) is there is already discussion abotu this proposal.
13+
3. Reports of errors or potential improvements in documentation and examples is expecially helpful, since many things have been updated from 1.x to 2.0!
1614
- type: checkboxes
1715
id: sub-area
1816
attributes:
@@ -31,6 +29,8 @@ body:
3129
- label: Typography
3230
- label: Utilities
3331
- label: WebGL
32+
- label: WebGPU
33+
- label: p5.strands
3434
- label: Build process
3535
- label: Unit testing
3636
- label: Internationalization
@@ -78,4 +78,4 @@ body:
7878
7979
```"
8080
validations:
81-
required: true
81+
required: true
Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
name: Publish approved pull requests and latest commit to pkg.pr.new
2+
on:
3+
pull_request:
4+
branches:
5+
- 'dev-2.0'
6+
push:
7+
branches:
8+
- 'dev-2.0'
9+
tags:
10+
- '!**'
11+
12+
permissions:
13+
pull-requests: write
14+
issues: write
15+
16+
jobs:
17+
publish:
18+
if: github.repository == 'processing/p5.js'
19+
runs-on: ubuntu-latest
20+
steps:
21+
- name: Checkout code
22+
uses: actions/checkout@v4
23+
- uses: actions/setup-node@v4
24+
with:
25+
node-version: 22
26+
27+
- name: Install dependencies
28+
run: npm ci
29+
30+
- name: Build library
31+
run: npm run build
32+
33+
- name: Publish library
34+
run: npx pkg-pr-new publish --no-template --json output.json --comment=off
35+
36+
- name: Include PR info in output file
37+
uses: actions/github-script@v8
38+
env:
39+
PR_NUMBER: ${{ github.event.pull_request.number }}
40+
with:
41+
script: |
42+
const fs = require('fs');
43+
const output = JSON.parse(fs.readFileSync('output.json', 'utf8'));
44+
output.workflow = {
45+
pull_request: process.env.PR_NUMBER ? {
46+
number: process.env.PR_NUMBER
47+
} : null
48+
};
49+
fs.writeFileSync('output.json', JSON.stringify(output));
50+
51+
- name: Upload output data
52+
uses: actions/upload-artifact@v4
53+
with:
54+
name: output.zip
55+
path: output.json
Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
name: Generate Contributors PNG
2+
3+
on:
4+
push:
5+
paths:
6+
- '.all-contributorsrc'
7+
8+
jobs:
9+
build:
10+
if: github.ref == 'refs/heads/main' && github.repository == 'processing/p5.js'
11+
runs-on: ubuntu-latest
12+
steps:
13+
- uses: actions/checkout@v3
14+
15+
- name: Setup Node
16+
uses: actions/setup-node@v4
17+
with:
18+
node-version: 20
19+
20+
- name: Install dependencies
21+
run: npm install canvas
22+
23+
- name: Run contributors-png generator
24+
run: node utils/contributors-png.js
25+
26+
- name: Reset all changes except contributors.png
27+
run: |
28+
git restore --staged .
29+
git add contributors.png
30+
git checkout -- .
31+
32+
- name: Create Pull Request
33+
uses: peter-evans/create-pull-request@v7
34+
with:
35+
commit-message: "Update contributors.png from .all-contributorsrc"
36+
branch: update-contributors-png
37+
title: "chore: update contributors.png from .all-contributorsrc"
38+
body: "This PR updates the contributors.png to reflect changes in .all-contributorsrc"
39+
add-paths: contributors.png
40+
token: ${{ secrets.ACCESS_TOKEN }}

0 commit comments

Comments
 (0)