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 #1630

Open
wants to merge 19 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
925 changes: 925 additions & 0 deletions .yarn/releases/yarn-4.4.0.cjs

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
nodeLinker: node-modules

yarnPath: .yarn/releases/yarn-4.4.0.cjs
15 changes: 7 additions & 8 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 All @@ -47,9 +45,6 @@
"lodash": "^4.17.21",
"source-map": "0.7.3"
},
"resolutions": {
"**/gl": "^6.0.2"
},
"scripts": {
"build": "yarn docs && yarn build:slang",
"build:slang": "tsc --project tsconfig.prod.json",
Expand Down Expand Up @@ -86,10 +81,13 @@
"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"
},
"resolutions": {
"gl": "^8.0.2"
},
"jest": {
"snapshotFormat": {
"escapeString": true,
Expand Down Expand Up @@ -130,5 +128,6 @@
}
]
]
}
},
"packageManager": "yarn@4.4.0"
}
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.0.2"
},
"main": "dist/sicp",
"types": "dist/sicp",
Expand Down
Loading
Loading