Skip to content

Commit 9fe530a

Browse files
authored
Merge branch 'develop' into pr05/migrate_client_utils_folder
2 parents c832736 + 539d481 commit 9fe530a

File tree

9 files changed

+52
-5
lines changed

9 files changed

+52
-5
lines changed

README.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,13 @@ The p5.js Editor is a collaborative project created by many individuals, mostly
2626

2727
3. [All Contributors list on the p5.js repository](https://github.com/processing/p5.js?tab=readme-ov-file#contributors) - Explore the All Contributors list to see the wide range of contributions by our amazing community!
2828

29+
> **TypeScript Migration:**
30+
> As of July 2025, we are working on migrating the repo to TypeScript as part of the **[p5.js Web Editor pr05 Grant](https://github.com/processing/pr05-grant/wiki/2025-pr05-Program-Page)**.
31+
> This migration will occur in two phases:
32+
> 1. **Grant Work (July – October 31, 2025)** – Setting up TypeScript configuration, tooling, and starting partial migration. Contributions will be **closed** during this period.
33+
> 2. **Open Contribution (After October 31, 2025)** – TypeScript migration tasks will **open** to all contributors, with guidelines and tutorials available.
34+
>
35+
> For full details, see [TypeScript Migration Plan](./contributor_docs/typescript-migration.md).
2936
3037
## Acknowledgements 🙏
3138

client/styles/components/_console.scss

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,13 @@
5757
& path {
5858
fill: getThemifyVariable('secondary-text-color');
5959
}
60+
&:hover {
61+
& g,
62+
& polygon,
63+
& path {
64+
fill: getThemifyVariable('logo-color');
65+
}
66+
}
6067
}
6168
.preview-console--collapsed & {
6269
display: none;
@@ -72,6 +79,13 @@
7279
& path {
7380
fill: getThemifyVariable('secondary-text-color');
7481
}
82+
&:hover {
83+
& g,
84+
& polygon,
85+
& path {
86+
fill: getThemifyVariable('logo-color');
87+
}
88+
}
7589
}
7690
display: none;
7791
.preview-console--collapsed & {

common/p5Versions.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,12 @@ export const currentP5Version = '1.11.8'; // Don't update to 2.x until 2026
55
// JSON.stringify([...document.querySelectorAll('._132722c7')].map(n => n.innerText), null, 2)
66
// TODO: use their API for this to grab these at build time?
77
export const p5Versions = [
8+
'2.0.4',
89
'2.0.3',
910
'2.0.2',
1011
'2.0.1',
1112
'2.0.0',
13+
'1.11.9',
1214
'1.11.8',
1315
'1.11.7',
1416
'1.11.6',

contributor_docs/README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Contributor Documentatation
1+
# Contributor Documentation
22
This folder contains guides for contributing to the p5.js Web Editor. You don't need to know everything to get started—explore at your own pace! To begin, we highly recommend starting with the [Contribution Guide](https://github.com/processing/p5.js-web-editor/blob/develop/.github/CONTRIBUTING.md)!
33

44
These guides aren't exhaustive, and do not cover all the possible ways you can contribute to a project. If you have an idea for how you'd like to help and don't see a guide for it here, you're welcome to add it to the "Documents to Create" list below by opening an issue!
@@ -15,6 +15,7 @@ These guides aren't exhaustive, and do not cover all the possible ways you can c
1515
* [Translations Guidelines](translations.md) - Guidelines for translating the p5.js editor.
1616
* [Deployment](deployment.md) - A guide to production deployment, and all platforms that are being used.
1717
* [Release](./release.md) - A guide to creating a production release.
18+
* [Typescript Migration](./typescript_migration.md) - About the Typescript Migration project.
1819

1920

2021
## Documents to Create

contributor_docs/preparing_a_pull_request.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ Pull-requests are easier when your code is up to date!
88
Before submitting a pull request, make sure that:
99

1010
- Your work is related to an issue. **Pull requests that do not have an associated issue will not be accepted.**
11+
- **The issue is not already assigned to another contributor.** We follow a "first assigned, first served" approach to avoid duplicated work. If you open a PR for an issue that someone else is already working on, your PR will be closed.
1112
- Your work adheres to the style guidelines and fits in with the rest of the codebase.
1213
- You ran the project locally and tested your changes. Pay special attention to any specific areas of the p5.js editor that may be affected by your changes. Does everything still work as before? Great!
1314

contributor_docs/s3_configuration.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# S3 Bucket Configuration
2-
1. [Create an S3 bucket](https://docs.aws.amazon.com/AmazonS3/latest/userguide/create-bucket-overview.html), with any name
2+
1. [Create an S3 bucket](https://docs.aws.amazon.com/AmazonS3/latest/userguide/create-bucket-overview.html), with any name.
33
2. Navigate to the S3 bucket permissions and add the following CORS policy. This is for development only, as it allows CORS from any origin.
44
```
55
[
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
# TypeScript Migration
2+
3+
This repository is undergoing a TypeScript migration as part of the **2025 pr05 Grant: Incremental Typescript Migration of the p5.js Web Editor**, running **July – October 31, 2025**. Details on the [pr05 grant](https://github.com/processing/pr05-grant/wiki/2025-pr05-Program-Page) and [migration project](https://github.com/processing/pr05-grant/wiki/2025-pr05-Project-List#incremental-typescript-migration-for-the-p5js-editor).
4+
5+
## Phase 1: Grant Work (July – October 31, 2025)
6+
7+
During this period, the grant team will:
8+
9+
- Configure and enable TypeScript across the project (`tsconfig`, linting, type checking, etc).
10+
- Set up linting, testing, and other related developer tooling for TS.
11+
- Begin migrating selected JavaScript files to TypeScript.
12+
- Prepare documentation and workflow so migration tasks can become **good first issues** for new contributors.
13+
14+
> **Note:** While this initial setup and partial migration is in progress, contributions to the migration itself will **not** be open to the public.
15+
16+
## Phase 2: Open Contribution (After October 31, 2025)
17+
18+
When the grant period ends:
19+
20+
- The migration effort will open up to all contributors.
21+
- This section will include **guidelines, tutorials, and examples** for migrating files from JavaScript to TypeScript in this project.
22+
- Migration tasks will be clearly labeled in the issue tracker (e.g., `good first issue`, `typescript migration`).

package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "p5.js-web-editor",
3-
"version": "2.17.1",
3+
"version": "2.17.2",
44
"description": "The web editor for p5.js.",
55
"scripts": {
66
"clean": "rimraf dist",

0 commit comments

Comments
 (0)