Merge branch 'main' into touchstarted-fix

Author: davepagurek

.all-contributorsrc

@@ -5583,6 +5583,33 @@
         "doc",
         "bug"
       ]
+    },
+    {
+      "login": "deveshidwivedi",
+      "name": "Deveshi Dwivedi",
+      "avatar_url": "https://avatars.githubusercontent.com/u/120312681?v=4",
+      "profile": "https://github.com/deveshidwivedi",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "mohitbalwani",
+      "name": "Mohit Balwani",
+      "avatar_url": "https://avatars.githubusercontent.com/u/73066030?v=4",
+      "profile": "https://github.com/mohitbalwani",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "rahulrangers",
+      "name": "rahulrangers",
+      "avatar_url": "https://avatars.githubusercontent.com/u/127782777?v=4",
+      "profile": "https://github.com/rahulrangers",
+      "contributions": [
+        "code"
+      ]
     }
   ],
   "repoType": "github",

.github/ISSUE_TEMPLATE/1-p5.js-2.0-RFC-proposal.yml

@@ -0,0 +1,98 @@
+name: 📃 p5.js 2.0 RFC Proposal
+description: This template is for submitting a proposal to the p5.js 2.0 RFC.
+title: "[p5.js 2.0 RFC Proposal]: "
+labels: [p5.js 2.0]
+body:
+  - type: textarea
+    attributes:
+      label: Increasing access
+      description: How would this proposal help [increase access](https://github.com/processing/p5.js/blob/main/contributor_docs/access.md) to p5.js? (If you're not sure, you can type "Unsure" here and let others from the community offer their thoughts.)
+    validations:
+      required: true
+  - type: markdown
+    attributes:
+      value: |
+        ### Acceptance criteria
+        The [p5.js 2.0 RFC](https://github.com/processing/p5.js/blob/dev-2.0/rfc_p5js_2.md) is a compilation of proposals for the next major version of p5.js. 
+        
+        **✖️ New features**: In order to focus the community's efforts, proposals for new features will typically not be accepted into the RFC. A [New Feature Request](https://github.com/processing/p5.js/issues/new?assignees=&labels=Feature+Request&projects=&template=feature-request.yml) may still be submitted, but it will only be considered after the release of p5.js 2.0. 
+        
+        **✔️Existing features**: This proposal will be accepted if the community determines it would improve an existing feature through a breaking change, a systemic change, or an overdue change.
+  - type: checkboxes
+    id: type-of-change
+    attributes:
+      label: Which types of changes would be made? 
+      description: Please select at least one.
+      options:
+        - label: Breaking change (Add-on libraries or sketches will work differently even if their code stays the same.)
+        - label: Systemic change (Many features or contributor workflows will be affected.)
+        - label: Overdue change (Modifications will be made that have been desirable for a long time.)
+        - label: Unsure (The community can help to determine the type of change.)
+  - type: checkboxes
+    id: sub-area
+    attributes:
+      label: Most appropriate sub-area of p5.js?
+      description: Please select at least one.
+      options:
+        - label: Accessibility
+        - label: Color
+        - label: Core/Environment/Rendering
+        - label: Data
+        - label: DOM
+        - label: Events
+        - label: Image
+        - label: IO
+        - label: Math
+        - label: Typography
+        - label: Utilities
+        - label: WebGL
+        - label: Build process
+        - label: Unit testing
+        - label: Internationalization
+        - label: Friendly errors
+        - label: Other (specify if possible)
+  - type: textarea
+    attributes:
+      label: What's the problem?
+      description: Describe the problem this proposal aims to solve. (Use as much space as you need.)
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: What's the solution?
+      description: Describe how you would solve the problem. (For large proposals, a summary is fine; this proposal can link to sub-issues for details.)
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Pros (updated based on community comments)
+      description: Indicate the advantages of implementing this proposal. If the community identifies more advantages in the comments, please add them.
+      value: |
+        Example list:
+        * **Consistency:** This proposal increases API consistency by...
+        * **Readability:** This proposal makes the source code more readable by...
+        * Other advantages...
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Cons (updated based on community comments)
+      description: Indicate the disadvantages of implementing this proposal, if you know of any. If the community identifies disadvantages in the comments, please add them.
+      placeholder: None so far...
+    validations:
+      required: true
+  - type: dropdown
+    attributes:
+      label: Proposal status
+      options:
+        - Under review
+        - Accepted
+        - Not accepted
+      default: 0
+    validations:
+      required: true
+  - type: markdown
+    attributes:
+      value: |
+        ### Implementation process
+        If this proposal is accepted, it will be included in the p5.js 2.0 RFC. A contributor who has participated in the discussion will then be assigned to lead the implementation, which will happen on the [dev-2.0](https://github.com/processing/p5.js/tree/dev-2.0) branch.

.github/ISSUE_TEMPLATE/discussion.yml renamed to .github/ISSUE_TEMPLATE/2-discussion.yml

@@ -4,7 +4,7 @@ labels: [Enhancement]
 body:
   - type: textarea
     attributes:
-      label: Increasing Access
+      label: Increasing access
       description: How would this new feature help [increase access](https://github.com/processing/p5.js/blob/main/contributor_docs/access.md) to p5.js? (If you're not sure, you can type "Unsure" here and let others from the community offer their thoughts.)
     validations:
       required: true
@@ -26,13 +26,18 @@ body:
         - label: Typography
         - label: Utilities
         - label: WebGL
-        - label: Build Process
-        - label: Unit Testing
-        - label: Internalization
-        - label: Friendly Errors
+        - label: Build process
+        - label: Unit testing
+        - label: Internationalization
+        - label: Friendly errors
         - label: Other (specify if possible)
   - type: textarea
     attributes:
       label: Feature enhancement details
     validations:
       required: true
+  - type: markdown
+    attributes:
+      value: |
+        ### Implementation process
+        We are currently prioritizing proposals for [p5.js 2.0](https://github.com/processing/p5.js/blob/dev-2.0/rfc_p5js_2.md). Work on this issue may begin after that version is released, provided there is community support.

.github/ISSUE_TEMPLATE/existing-feature-enhancement.yml renamed to .github/ISSUE_TEMPLATE/3-existing-feature-enhancement.yml

@@ -4,7 +4,7 @@ labels: [Feature Request]
 body:
   - type: textarea
     attributes:
-      label: Increasing Access
+      label: Increasing access
       description: How would this new feature help [increase access](https://github.com/processing/p5.js/blob/main/contributor_docs/access.md) to p5.js? (If you're not sure, you can type "Unsure" here and let others from the community offer their thoughts.)
     validations:
       required: true
@@ -26,13 +26,18 @@ body:
         - label: Typography
         - label: Utilities
         - label: WebGL
-        - label: Build Process
-        - label: Unit Testing
-        - label: Internalization
-        - label: Friendly Errors
+        - label: Build process
+        - label: Unit testing
+        - label: Internationalization
+        - label: Friendly errors
         - label: Other (specify if possible)
   - type: textarea
     attributes:
       label: Feature request details
     validations:
       required: true
+  - type: markdown
+    attributes:
+      value: |
+        ### Implementation process
+        We are currently prioritizing proposals for [p5.js 2.0](https://github.com/processing/p5.js/blob/dev-2.0/rfc_p5js_2.md). Work on this issue may begin after that version is released, provided there is community support.

.github/ISSUE_TEMPLATE/feature-request.yml renamed to .github/ISSUE_TEMPLATE/4-feature-request.yml

@@ -20,10 +20,10 @@ body:
         - label: Typography
         - label: Utilities
         - label: WebGL
-        - label: Build Process
-        - label: Unit Testing
-        - label: Internalization
-        - label: Friendly Errors
+        - label: Build process
+        - label: Unit testing
+        - label: Internationalization
+        - label: Friendly errors
         - label: Other (specify if possible)
 - type: input
   attributes:
@@ -39,7 +39,7 @@ body:
     required: false
 - type: input
   attributes:
-    label: Operating System 
+    label: Operating system 
     description: "Ex: Windows/MacOSX/Linux/Android/iOS along with version"
   validations:
     required: false

.github/ISSUE_TEMPLATE/found-a-bug.yml renamed to .github/ISSUE_TEMPLATE/5-found-a-bug.yml

@@ -8,6 +8,7 @@ on:
   push:
     tags:
       - 'v*.*.*' # Push events to matching v*.*.*, i.e. v20.15.10
+      - 'v*.*.*-*' # Push events to matching v*.*.*-*, i.e. v20.15.10-0
 
 jobs:
   release:
@@ -21,11 +22,18 @@ jobs:
       - uses: actions/setup-node@v3
         with:
           node-version: 18
+      - name: Get semver info
+        id: semver
+        uses: akshens/semver-tag@v4
+        with:
+          version: ${{ github.ref_name }}
+
       - name: Get version number
         id: version-number
         run: |
           version=$(echo ${{ github.ref_name }} | cut -c 2-)
           echo "version=$version" >> $GITHUB_OUTPUT
+
       - name: Get current date
         id: date
         run: echo "date=$(date +"%B %Oe, %Y")" >> $GITHUB_OUTPUT
@@ -56,27 +64,33 @@ jobs:
         uses: softprops/[email protected]
         with:
           draft: true
+          prerelease: ${{ steps.semver.outputs.is-prerelease == 'true' }}
           files: release/*
           generate_release_notes: true
           token: ${{ secrets.ACCESS_TOKEN }}
       - name: Publish to NPM
+        if: ${{ steps.semver.outputs.is-prerelease != 'true' }}
         uses: JS-DevTools/npm-publish@v1
         with:
           token: ${{ secrets.NPM_TOKEN }}
 
       # 4. Update website files
       - name: Checkout website repo
+        if: ${{ steps.semver.outputs.is-prerelease != 'true' }}
         uses: actions/checkout@v3
         with:
           repository: processing/p5.js-website
           path: website
           fetch-depth: 0
           token: ${{ secrets.ACCESS_TOKEN }}
       - name: Copy reference files to website repo
+        if: ${{ steps.semver.outputs.is-prerelease != 'true' }}
         run: cp docs/reference/data.* website/src/templates/pages/reference/
       - name: Copy library files to website repo
+        if: ${{ steps.semver.outputs.is-prerelease != 'true' }}
         run: cp lib/p5.min.js lib/addons/p5.sound.min.js website/src/assets/js/
       - name: Modify version number on website
+        if: ${{ steps.semver.outputs.is-prerelease != 'true' }}
         uses: fjogeleit/[email protected]
         with:
           valueFile: website/src/data/data.yml
@@ -85,23 +99,27 @@ jobs:
           commitChange: false
           updateFile: true
       - name: Update version.json on website repo
+        if: ${{ steps.semver.outputs.is-prerelease != 'true' }}
         uses: restackio/[email protected]
         with:
           file: website/dist/download/version.json
           fields: '{"version": "${{ steps.version-number.outputs.version }}", "date": "${{ steps.date.outputs.date }}"}'
       - name: Update en.json on website repo
+        if: ${{ steps.semver.outputs.is-prerelease != 'true' }}
         run: |
           cd website
           npm ci
           npx grunt generate_enJSON
       - name: Commit updated website files
+        if: ${{ steps.semver.outputs.is-prerelease != 'true' }}
         run: |
           cd website
           git config --local user.email "41898282+github-actions[bot]@users.noreply.github.com"
           git config --local user.name "github-actions[bot]"
           git add .
           git commit -m "Update p5.js to ${{ github.ref_name }}"
       - name: Push updated website repo
+        if: ${{ steps.semver.outputs.is-prerelease != 'true' }}
         uses: ad-m/[email protected]
         with:
           github_token: ${{ secrets.ACCESS_TOKEN }}
@@ -111,24 +129,28 @@ jobs:
 
       # 5. Update Bower files
       - name: Checkout Bower repo
+        if: ${{ steps.semver.outputs.is-prerelease != 'true' }}
         uses: actions/checkout@v3
         with:
           repository: processing/p5.js-release
           path: bower
           fetch-depth: 0
           token: ${{ secrets.ACCESS_TOKEN }}
       - name: Copy new version files to Bower repo
+        if: ${{ steps.semver.outputs.is-prerelease != 'true' }}
         run: |
           cp lib/*.js bower/lib/
           cp lib/addons/* bower/lib/addons/
       - name: Commit updated Bower files
+        if: ${{ steps.semver.outputs.is-prerelease != 'true' }}
         run: |
           cd bower
           git config --local user.email "41898282+github-actions[bot]@users.noreply.github.com"
           git config --local user.name "github-actions[bot]"
           git add .
           git commit -m "Update p5.js to ${{ github.ref_name }}"
       - name: Push updated Bower repo
+        if: ${{ steps.semver.outputs.is-prerelease != 'true' }}
         uses: ad-m/[email protected]
         with:
           github_token: ${{ secrets.ACCESS_TOKEN }}

.github/workflows/release.yml

@@ -37,7 +37,7 @@ Check out [p5js.org](https://p5js.org) for lots more! Here are some quick-links
 * [p5.js overview](https://github.com/processing/p5.js/wiki/p5.js-overview): An overview of the main features and functionality of p5.js
 * [Reference](https://p5js.org/reference): The functionality supported by p5.js
 * [Learn](https://p5js.org/learn): Tutorials and short, prototypical examples exploring the basics of p5.js
-* [Forum](https://discourse.processing.org/c/p5js): Ask and answers questions about how to make things with p5.js here
+* [Forum](https://discourse.processing.org/c/p5js): Ask and answer questions about how to make things with p5.js here
 * [Libraries](https://p5js.org/libraries): Extend p5 functionality to interact with HTML, manipulate sound, and more!
 * [The Coding Train p5.js Tutorials](https://thecodingtrain.com/beginners/p5js/): A huge trove of tutorials created by Dan Shiffman and friends
 
@@ -947,6 +947,11 @@ We recognize all types of contributions. This project follows the [all-contribut
       <td align="center" valign="top" width="16.66%"><a href="https://github.com/PracDuckling"><img src="https://avatars.githubusercontent.com/u/68885144?v=4?s=120" width="120px;" alt="PracDuckling"/><br /><sub><b>PracDuckling</b></sub></a><br /><a href="https://github.com/processing/p5.js/issues?q=author%3APracDuckling" title="Bug reports">🐛</a> <a href="https://github.com/processing/p5.js/commits?author=PracDuckling" title="Documentation">📖</a></td>
       <td align="center" valign="top" width="16.66%"><a href="https://github.com/PoulavBhowmick03"><img src="https://avatars.githubusercontent.com/u/133862694?v=4?s=120" width="120px;" alt="Poulav Bhowmick"/><br /><sub><b>Poulav Bhowmick</b></sub></a><br /><a href="https://github.com/processing/p5.js/issues?q=author%3APoulavBhowmick03" title="Bug reports">🐛</a> <a href="https://github.com/processing/p5.js/commits?author=PoulavBhowmick03" title="Documentation">📖</a></td>
       <td align="center" valign="top" width="16.66%"><a href="https://keshav-malik99.netlify.app/"><img src="https://avatars.githubusercontent.com/u/91189139?v=4?s=120" width="120px;" alt="Keshav Malik"/><br /><sub><b>Keshav Malik</b></sub></a><br /><a href="https://github.com/processing/p5.js/commits?author=keshav-0907" title="Code">💻</a> <a href="https://github.com/processing/p5.js/commits?author=keshav-0907" title="Documentation">📖</a> <a href="https://github.com/processing/p5.js/issues?q=author%3Akeshav-0907" title="Bug reports">🐛</a></td>
+      <td align="center" valign="top" width="16.66%"><a href="https://github.com/deveshidwivedi"><img src="https://avatars.githubusercontent.com/u/120312681?v=4?s=120" width="120px;" alt="Deveshi Dwivedi"/><br /><sub><b>Deveshi Dwivedi</b></sub></a><br /><a href="https://github.com/processing/p5.js/commits?author=deveshidwivedi" title="Code">💻</a></td>
+    </tr>
+    <tr>
+      <td align="center" valign="top" width="16.66%"><a href="https://github.com/mohitbalwani"><img src="https://avatars.githubusercontent.com/u/73066030?v=4?s=120" width="120px;" alt="Mohit Balwani"/><br /><sub><b>Mohit Balwani</b></sub></a><br /><a href="https://github.com/processing/p5.js/commits?author=mohitbalwani" title="Code">💻</a></td>
+      <td align="center" valign="top" width="16.66%"><a href="https://github.com/rahulrangers"><img src="https://avatars.githubusercontent.com/u/127782777?v=4?s=120" width="120px;" alt="rahulrangers"/><br /><sub><b>rahulrangers</b></sub></a><br /><a href="https://github.com/processing/p5.js/commits?author=rahulrangers" title="Code">💻</a></td>
     </tr>
   </tbody>
 </table>

README.md

@@ -24,7 +24,7 @@
       "node --require @babel/register ./utils/sample-linter.js"
     ]
   },
-  "version": "1.9.0",
+  "version": "1.9.1-1",
   "devDependencies": {
     "@babel/core": "^7.7.7",
     "@babel/preset-env": "^7.10.2",