Skip to content

Commit

Permalink
Merge branch 'main' into merge-2.0
Browse files Browse the repository at this point in the history
  • Loading branch information
limzykenneth committed Jan 30, 2025
1 parent 3c9de13 commit a2db697
Show file tree
Hide file tree
Showing 811 changed files with 149,148 additions and 116,063 deletions.
4 changes: 2 additions & 2 deletions .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,17 @@
"node": true,
"browser": true,
"amd": true,
"es6": true
"es2022": true
},
"globals": {
"p5": true
},
"root": true,
"extends": ["eslint:recommended"],
"parserOptions": {
"ecmaVersion": 2017,
"sourceType": "module"
},
"ignorePatterns": ["node_modules/**/*", "test/js/*", "lib/**/*", "contributor_docs/**/*"],
"rules": {
"no-cond-assign": [2, "except-parens"],
"eqeqeq": ["error", "smart"],
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/ci-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ on:
push:
branches:
- main
- dev-2.0
pull_request:
branches:
- '*'
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/release-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,12 @@ jobs:
run: npm ci
env:
CI: true
- name: Run build
- name: Run test
run: npm test
env:
CI: true
- run: rm ./lib/p5-test.js ./lib/p5.pre-min.js
- name: Run build
run: npm run build

# 2. Prepare release files
- run: mkdir release && mkdir p5 && cp -r ./lib/* p5/
Expand Down
47 changes: 25 additions & 22 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,22 +1,25 @@
*.DS_Store
.project
node_modules/*
experiments/*
lib_old/*
lib/p5.*
lib/modules
docs/reference/*
!*.gitkeep
examples/3d/
.idea
dist/
p5.zip
bower-repo/
p5-website/
.vscode/settings.json
.nyc_output/*
coverage/
lib/p5-test.js
release/
parameterData.json
yarn.lock
*.DS_Store
.project
node_modules/*
experiments/*
lib_old/*
lib/p5.*
lib/modules
docs/reference/*
!*.gitkeep
examples/3d/
.idea
dist/
p5.zip
bower-repo/
p5-website/
.vscode/settings.json
.nyc_output/*
coverage/
lib/p5-test.js
release/
yarn.lock
docs/data.json
analyzer/
preview/
__screenshots__/
Loading

0 comments on commit a2db697

Please sign in to comment.