Skip to content

Commit a2db697

Browse files
committed
Merge branch 'main' into merge-2.0
1 parent 3c9de13 commit a2db697

File tree

811 files changed

+149148
-116063
lines changed

Some content is hidden

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

811 files changed

+149148
-116063
lines changed

.eslintrc.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,17 @@
33
"node": true,
44
"browser": true,
55
"amd": true,
6-
"es6": true
6+
"es2022": true
77
},
88
"globals": {
99
"p5": true
1010
},
1111
"root": true,
1212
"extends": ["eslint:recommended"],
1313
"parserOptions": {
14-
"ecmaVersion": 2017,
1514
"sourceType": "module"
1615
},
16+
"ignorePatterns": ["node_modules/**/*", "test/js/*", "lib/**/*", "contributor_docs/**/*"],
1717
"rules": {
1818
"no-cond-assign": [2, "except-parens"],
1919
"eqeqeq": ["error", "smart"],

.github/workflows/ci-test.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ on:
44
push:
55
branches:
66
- main
7+
- dev-2.0
78
pull_request:
89
branches:
910
- '*'

.github/workflows/release-workflow.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,12 @@ jobs:
4141
run: npm ci
4242
env:
4343
CI: true
44-
- name: Run build
44+
- name: Run test
4545
run: npm test
4646
env:
4747
CI: true
48-
- run: rm ./lib/p5-test.js ./lib/p5.pre-min.js
48+
- name: Run build
49+
run: npm run build
4950

5051
# 2. Prepare release files
5152
- run: mkdir release && mkdir p5 && cp -r ./lib/* p5/

.gitignore

Lines changed: 25 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,25 @@
1-
*.DS_Store
2-
.project
3-
node_modules/*
4-
experiments/*
5-
lib_old/*
6-
lib/p5.*
7-
lib/modules
8-
docs/reference/*
9-
!*.gitkeep
10-
examples/3d/
11-
.idea
12-
dist/
13-
p5.zip
14-
bower-repo/
15-
p5-website/
16-
.vscode/settings.json
17-
.nyc_output/*
18-
coverage/
19-
lib/p5-test.js
20-
release/
21-
parameterData.json
22-
yarn.lock
1+
*.DS_Store
2+
.project
3+
node_modules/*
4+
experiments/*
5+
lib_old/*
6+
lib/p5.*
7+
lib/modules
8+
docs/reference/*
9+
!*.gitkeep
10+
examples/3d/
11+
.idea
12+
dist/
13+
p5.zip
14+
bower-repo/
15+
p5-website/
16+
.vscode/settings.json
17+
.nyc_output/*
18+
coverage/
19+
lib/p5-test.js
20+
release/
21+
yarn.lock
22+
docs/data.json
23+
analyzer/
24+
preview/
25+
__screenshots__/

0 commit comments

Comments
 (0)