Skip to content

Commit

Permalink
Merge branch 'processing:main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
Garima3110 authored Oct 18, 2023
2 parents c3a5bdc + ce8508c commit 4050926
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 5 deletions.
10 changes: 9 additions & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,10 @@ jobs:
id: version-number
run: |
version=$(echo ${{ github.ref_name }} | cut -c 2-)
echo "::set-output name=version::$version"
echo "version=$version" >> $GITHUB_OUTPUT
- name: Get current date
id: date
run: echo "date=$(date +"%B %Oe, %Y")" >> $GITHUB_OUTPUT
- name: Install dependencies
run: npm ci
env:
Expand Down Expand Up @@ -81,6 +84,11 @@ jobs:
value: ${{ steps.version-number.outputs.version }}
commitChange: false
updateFile: true
- name: Update version.json on website repo
uses: restackio/[email protected]
with:
file: website/dist/download/version.json
values: '{"version": "${{ steps.version-number.outputs.version }}", "date": "${{ steps.date.outputs.date }}"}'
- name: Update en.json on website repo
run: |
cd website
Expand Down
4 changes: 2 additions & 2 deletions contributor_docs/friendly_error_system.md
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ You can find the translation files used by the `translator()` inside:
These functions are mainly responsible for catching errors and generating FES messages:
* [`_friendlyFileLoadError()`] catches file loading errors.
* [`_validateParameters()`] checks a p5.js function’s input parameters based on inline documents.
* [`_fesErrorMontitor()`] handles global errors.
* [`_fesErrorMonitor()`] handles global errors.

For full reference, please see our [Dev Notes].

Expand Down Expand Up @@ -165,4 +165,4 @@ function setup() {

The single minified file of p5 (i.e., p5.min.js) automatically omits the FES.

[disable the FES for performance]: https://github.com/processing/p5.js/wiki/Optimizing-p5.js-Code-for-Performance#disable-the-friendly-error-system-fes
[disable the FES for performance]: https://github.com/processing/p5.js/wiki/Optimizing-p5.js-Code-for-Performance#disable-the-friendly-error-system-fes
4 changes: 2 additions & 2 deletions src/core/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ import * as constants from './constants';
* @return {p5} a p5 instance
*/
class p5 {
constructor(sketch, node, sync) {
constructor(sketch, node) {
//////////////////////////////////////////////
// PUBLIC p5 PROPERTIES AND METHODS
//////////////////////////////////////////////
Expand Down Expand Up @@ -776,7 +776,7 @@ for (const k in constants) {
}

// makes the `VERSION` constant available on the p5 object
// in instance mode, even if it hasn't been instatiated yet
// in instance mode, even if it hasn't been instantiated yet
p5.VERSION = constants.VERSION;

// functions that cause preload to wait
Expand Down

0 comments on commit 4050926

Please sign in to comment.