Skip to content

Commit 98bdfec

Browse files
authored
Merge branch 'develop' into develop
2 parents 9ebff5c + e5e79f4 commit 98bdfec

File tree

86 files changed

+82069
-34052
lines changed

Some content is hidden

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

86 files changed

+82069
-34052
lines changed

.babelrc

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,8 @@
4040
],
4141
"@babel/plugin-proposal-nullish-coalescing-operator",
4242
"@babel/plugin-proposal-do-expressions",
43-
"@babel/plugin-proposal-function-bind"
43+
"@babel/plugin-proposal-function-bind",
44+
["@babel/plugin-proposal-private-methods", { "loose": true }]
4445
],
4546
"presets": [
4647
"@babel/preset-env",
@@ -85,6 +86,8 @@
8586
],
8687
"@babel/plugin-proposal-nullish-coalescing-operator",
8788
"@babel/plugin-proposal-do-expressions",
88-
"@babel/plugin-proposal-function-bind"
89+
"@babel/plugin-proposal-function-bind",
90+
["@babel/plugin-proposal-private-methods", { "loose": true }],
91+
["@babel/plugin-proposal-private-property-in-object", { "loose": true }]
8992
]
9093
}

.eslintrc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"extends": ["airbnb", "prettier"],
3-
"parser": "babel-eslint",
3+
"parser": "@babel/eslint-parser",
44
"env": {
55
"browser": true,
66
"node": true,
@@ -69,7 +69,7 @@
6969
"react", "jsx-a11y", "import", "prettier"
7070
],
7171
"settings": {
72-
"import/parser": "babel-eslint",
72+
"import/parser": "@babel/eslint-parser",
7373
"import/resolve": {
7474
"moduleDirectory": ["node_modules"]
7575
}

.github/CONTRIBUTING.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@ Don't know where to begin? Here are some suggestions to get started:
3535
- Translations: Application and documentation
3636
* Use the [p5.js Web Editor](https://editor.p5js.org)! Find a bug? Think of something you think would add to the project? Open an issue.
3737
* Expand an existing issue. Sometimes issues are missing steps to reproduce, or need suggestions for potential solutions. Sometimes they need another voice saying, "this is really important!"
38-
* Try getting the project running locally on your computer by following the [installation steps](./../developer_docs/installation.md).
39-
* Look through the documentation in the [developer docs](../developer_docs/). Is there anything that could be expanded? Is there anything missing?
40-
* Look at the [development guide](./../developer_docs/development.md).
38+
* Try getting the project running locally on your computer by following the [installation steps](./../contributor_docs/installation.md).
39+
* Look through the documentation in the [developer docs](../contributor_docs/). Is there anything that could be expanded? Is there anything missing?
40+
* Look at the [development guide](./../contributor_docs/development.md).
4141

4242
### Good First Issues
4343
For first-time contributors or those who want to start with a small task, [check out the list of good first issues](https://github.com/processing/p5.js-web-editor/labels/good%20first%20issue), or [issues that need documentation of steps to reproduce](https://github.com/processing/p5.js-web-editor/issues?q=is%3Aissue+is%3Aopen+label%3A%22needs+steps+to+reproduce%22). If the issue has not been assigned to anyone, then you can work on it! It's okay to not know how to fix an issue, and feel free to ask questions about to approach the problem! We are all here to learn and make something awesome. Someone from the community would help you out and these are great issues for learning about the web editor, its file structure and its development process.
@@ -60,7 +60,7 @@ If you feel like an issue is tagged incorrectly (e.g. it's low priority and you
6060

6161
If you'd like to work on an issue, please comment on it to let the maintainers know, so that they can assign it to you. If someone else has already commented and taken up that issue, please refrain from working on it and submitting a PR without asking the maintainers as it leads to unnecessary duplication of effort.
6262

63-
Then, look at the [development guide](https://github.com/processing/p5.js-web-editor/blob/develop/developer_docs/development.md) for instructions on how to install the project locally and follow the right development workflow.
63+
Then, look at the [development guide](https://github.com/processing/p5.js-web-editor/blob/develop/contributor_docs/development.md) for instructions on how to install the project locally and follow the right development workflow.
6464

6565
### Contribution Guides
6666

.github/ISSUE_TEMPLATE.md

Lines changed: 0 additions & 27 deletions
This file was deleted.
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
---
2+
name: Existing Feature Enhancement
3+
about: This template is for suggesting an improvement for an existing feature.
4+
title: ''
5+
labels: enhancement
6+
assignees: ''
7+
8+
---
9+
10+
<!--
11+
Hi there!
12+
13+
To check an option in the sub-areas list, replace the "[ ]" with a "[x]". Be sure to check out how it looks in the Preview tab! Feel free to remove any portion of the template that is not relevant for your issue.
14+
-->
15+
16+
### How would this new feature help [increase access](https://github.com/processing/p5.js/blob/main/contributor_docs/access.md) to the p5.js Editor?
17+
18+
#### Feature enhancement details:
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
---
2+
name: New Feature Request
3+
about: This template is for requesting a new feature be added.
4+
title: ''
5+
labels: feature request
6+
assignees: ''
7+
8+
---
9+
10+
<!--
11+
Hi there!
12+
13+
Thank you for contributing to the p5.js Editor project
14+
15+
Until further notice, we will only add new features that increase access.
16+
17+
In order to request a new feature for the p5.js Editor, we need to know how the new feature will increase access.
18+
-->
19+
20+
### How would this new feature help [increase access](https://github.com/processing/p5.js/blob/main/contributor_docs/access.md) to the p5.js Editor?
21+
22+
#### New feature details:

.github/ISSUE_TEMPLATE/found-a-bug.md

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
---
2+
name: Found a Bug
3+
about: This template is for reporting bugs (broken or incorrect behavior). If you have questions about your own code, please visit our forum discourse.processing.org instead.
4+
title: ''
5+
labels: bug
6+
assignees: ''
7+
8+
---
9+
10+
<!--
11+
Hi there!
12+
13+
To check any option, replace the "[ ]" with a "[x]". Be sure to check out how it looks in the Preview tab! Feel free to remove any portion of the template that is not relevant for your issue.
14+
-->
15+
16+
#### Details about the bug:
17+
18+
- p5.js version: <!-- You can find this in the first line of the p5.js file -->
19+
- Web browser and version: <!-- In the address bar, on Chrome enter "chrome://version", on Firefox enter "about:support". On Safari, use "About Safari". -->
20+
- Operating System: <!-- Ex: Windows/MacOSX/Linux/Android/iOS along with version -->
21+
- Steps to reproduce this:
22+
<!-- Include a simple code snippet that demonstrates the problem, along with any console errors produced. If this isn't possible, then simply describe the issue as best you can! -->

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
Fixes #issue-number
22

3+
Changes:
4+
35
I have verified that this pull request:
46

57
* [ ] has no linting errors (`npm run lint`)
6-
* [ ] is from a uniquely-named feature branch and has been rebased on top of the latest `develop` branch. (If I was asked to make more changes, I have made sure to rebase onto `develop` then too)
8+
* [ ] has no test errors (`npm run test`)
9+
* [ ] is from a uniquely-named feature branch and is up to date with the `develop` branch.
710
* [ ] is descriptively named and links to an issue number, i.e. `Fixes #123`

.github/workflows/deploy-staging.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ on:
88
- completed
99
env:
1010
PROJECT_ID: ${{ secrets.GKE_PROJECT }}
11-
GKE_CLUSTER: p5js-web-editor-cluster
12-
GKE_ZONE: us-east1-c
11+
GKE_CLUSTER: p5-gke-cluster
12+
GKE_ZONE: us-east4
1313
DEPLOYMENT_NAME: web-editor-node
1414
IMAGE: ${{ secrets.DOCKER_USERNAME }}/p5.js-web-editor-staging
1515
jobs:

.github/workflows/deploy.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ on:
88
- completed
99
env:
1010
PROJECT_ID: ${{ secrets.GKE_PROJECT }}
11-
GKE_CLUSTER: p5js-web-editor-cluster
12-
GKE_ZONE: us-east1-c
11+
GKE_CLUSTER: p5-gke-cluster
12+
GKE_ZONE: us-east4
1313
DEPLOYMENT_NAME: web-editor-node
1414
IMAGE: ${{ secrets.DOCKER_USERNAME }}/p5.js-web-editor
1515
jobs:
@@ -60,6 +60,6 @@ jobs:
6060
# Deploy the Docker image to the GKE cluster
6161
- name: Deploy
6262
run: |-
63-
kubectl set image deployment/$DEPLOYMENT_NAME web-editor-app=index.docker.io/$IMAGE:$GITHUB_SHA
63+
kubectl set image deployment/$DEPLOYMENT_NAME web-editor-app=index.docker.io/$IMAGE:$GITHUB_SHA --namespace=production
6464
kubectl get services -o wide
6565

0 commit comments

Comments
 (0)