Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade gl to v8, Prettier to v3 #1630

Open
wants to merge 32 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
834a996
Bump gl dependency to v8
RichDom2185 Apr 1, 2024
4ffe152
Update GitHub Actions workflows
RichDom2185 Apr 1, 2024
db7bc5c
Merge branch 'master' into gl-8-upgrade
martin-henz Apr 2, 2024
7660d65
Merge branch 'master' into gl-8-upgrade
RichDom2185 Apr 5, 2024
15e549f
Merge branch 'master' into gl-8-upgrade
RichDom2185 Apr 10, 2024
d6b58b9
Merge branch 'master' of https://github.com/source-academy/js-slang i…
RichDom2185 Aug 15, 2024
cd9fd66
Update lockfile post-merge
RichDom2185 Aug 15, 2024
e456bd0
Bump prettier
RichDom2185 Aug 15, 2024
3609c86
Reformat post prettier bump
RichDom2185 Aug 15, 2024
a3f87f8
Deduplicate dependencies
RichDom2185 Aug 15, 2024
31d35a6
Regenerate lockfile
RichDom2185 Aug 15, 2024
d09d53b
For CJS for some dependencies
RichDom2185 Aug 15, 2024
c29e8d1
Migrate to latest yarn
RichDom2185 Aug 15, 2024
5968763
Update .gitignore
RichDom2185 Aug 15, 2024
4a0fb10
Restore old dependencies
RichDom2185 Aug 15, 2024
16d019d
Fix resolutions and subfolder
RichDom2185 Aug 15, 2024
601a9a3
Replace deprecated flag
RichDom2185 Aug 15, 2024
4659c56
Deduplicate dependencies
RichDom2185 Aug 15, 2024
18d7839
Update .gitignore
RichDom2185 Aug 15, 2024
3bee0cc
Merge branch 'master' of https://github.com/source-academy/js-slang i…
RichDom2185 Jan 22, 2025
030e246
Update lockfile post-merge
RichDom2185 Jan 22, 2025
dce03c6
Upgrade yarn to 4.6.0
RichDom2185 Jan 22, 2025
76136ad
Merge branch 'master' of https://github.com/source-academy/js-slang i…
RichDom2185 Jan 22, 2025
e516c13
Update files post-merge
RichDom2185 Jan 22, 2025
58ed032
Update sicp_publish
RichDom2185 Jan 22, 2025
a6d2a11
Restore old types
RichDom2185 Jan 22, 2025
8f70bdd
Merge branch 'master' into gl-8-upgrade
RichDom2185 Jan 22, 2025
204c6e5
Fix compile errors post-merge
RichDom2185 Jan 22, 2025
ecd130c
Fix import format
RichDom2185 Jan 22, 2025
6ad2380
Use old ace-builds
RichDom2185 Jan 22, 2025
9006c4e
Revert types change
RichDom2185 Jan 22, 2025
aa16b5a
Fix parser version
RichDom2185 Jan 22, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions .github/workflows/deploy-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,14 @@ jobs:
run: |
sudo apt-get update && \
sudo apt-get install -y --no-install-recommends \
texlive texlive-fonts-extra texlive-lang-cjk latexmk latex-cjk-all \
libxi-dev libgl1-mesa-dev
texlive texlive-fonts-extra texlive-lang-cjk latexmk latex-cjk-all
- name: Use Node.js
uses: actions/setup-node@v4
with:
node-version: 20
cache: yarn
- name: Install yarn dependencies
run: yarn install --frozen-lockfile
run: yarn install --immutable
- name: Build
run: |
yarn run jsdoc prepare
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/nodejs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,13 @@ jobs:
run: |
sudo apt-get update && \
sudo apt-get install -y --no-install-recommends \
libxi-dev libgl1-mesa-dev \
texlive texlive-fonts-extra texlive-lang-cjk latexmk latex-cjk-all
- name: Setup Node
uses: actions/setup-node@v4
with:
node-version: 20
cache: yarn
- run: yarn install --frozen-lockfile
- run: yarn install --immutable
- run: yarn build
- run: yarn format:ci
- run: yarn eslint
Expand Down
6 changes: 1 addition & 5 deletions .github/workflows/publish-npm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,16 +37,12 @@ jobs:
with:
ref: master
submodules: recursive
- name: Install dependencies (apt)
run: |
sudo apt-get update && \
sudo apt-get install -y --no-install-recommends libxi-dev libgl1-mesa-dev
- name: Setup Node.js
uses: actions/setup-node@v4
with:
node-version: 20
- name: Install dependencies
run: yarn install --frozen-lockfile
run: yarn install --immutable
- name: Publish to npm
run: npm publish
env:
Expand Down
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,5 @@ coverage/
*.tsbuildinfo
test-report.html

yarn-error.log
yarn-error.log
**/.yarn/install-state.gz
9 changes: 4 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,7 @@
"files": [
"dist"
],
"bin": {
"js-slang": "dist/repl/index.js"
},
"bin": "dist/repl/index.js",
"dependencies": {
"@babel/parser": "^7.19.4",
"@commander-js/extra-typings": "^12.0.1",
Expand Down Expand Up @@ -86,7 +84,7 @@
"jest-html-reporter": "^3.2.0",
"jsdoc": "3.6.11",
"jsdom": "^19.0.0",
"prettier": "^2.1.2",
"prettier": "^3.3.3",
"ts-jest": "^29.0.0",
"typescript": "^4.0.3"
},
Expand Down Expand Up @@ -130,5 +128,6 @@
}
]
]
}
},
"packageManager": "[email protected]"
}
2 changes: 1 addition & 1 deletion sicp_publish/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"xmlhttprequest-ts": "^1.0.1"
},
"resolutions": {
"**/gl": "^6.0.2"
"**/gl": "^8.1.6"
},
"main": "dist/sicp",
"types": "dist/sicp",
Expand Down
Loading
Loading