Skip to content

Commit d909ce9

Browse files
committed
Merge branch 'robot-minigame' of github.com:source-academy/modules into robot-minigame
2 parents 202181b + 6fe3ea3 commit d909ce9

File tree

6 files changed

+10959
-7699
lines changed

6 files changed

+10959
-7699
lines changed

.github/workflows/pages-deploy.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@ jobs:
1313
uses: actions/checkout@v4
1414
with:
1515
submodules: recursive
16+
17+
- name: Enable Corepack
18+
run: corepack enable
1619

1720
- name: Use Node.js 💻
1821
uses: actions/setup-node@v4
@@ -21,7 +24,7 @@ jobs:
2124
cache: yarn
2225

2326
- name: Install Dependencies 📦
24-
run: yarn install --frozen-lockfile
27+
run: yarn install --immutable
2528

2629
- name: Build Modules 🔧
2730
run: yarn build --tsc --lint

.github/workflows/pull-request.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@ jobs:
1313
uses: actions/checkout@v4
1414
with:
1515
submodules: recursive
16+
17+
- name: Enable Corepack
18+
run: corepack enable
1619

1720
- name: Use Node.js 💻
1821
uses: actions/setup-node@v4
@@ -21,7 +24,7 @@ jobs:
2124
cache: yarn
2225

2326
- name: Install dependencies
24-
run: yarn install --frozen-lockfile
27+
run: yarn install --immutable
2528

2629
- name: Build bundles and tabs
2730
run: yarn build --tsc --lint

.yarnrc.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
nodeLinker: node-modules

package.json

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -53,19 +53,17 @@
5353
},
5454
"devDependencies": {
5555
"@commander-js/extra-typings": "^12.0.0",
56-
"@stylistic/eslint-plugin": "^1.7.0",
57-
"@types/dom-mediacapture-record": "^1.0.11",
56+
"@stylistic/eslint-plugin": "^4.2.0",
5857
"@types/estree": "^1.0.0",
5958
"@types/jest": "^27.4.1",
6059
"@types/lodash": "^4.14.198",
6160
"@types/node": "^20.12.12",
62-
"@types/plotly.js-dist": "npm:@types/plotly.js",
61+
"@types/plotly.js": "^2.35.4",
6362
"@types/react": "^18.3.2",
6463
"@types/react-dom": "^18.3.0",
6564
"@types/three": "^0.163.0",
6665
"@vitejs/plugin-react": "^4.3.4",
6766
"acorn": "^8.8.1",
68-
"acorn-jsx": "^5.3.2",
6967
"astring": "^1.8.6",
7068
"chalk": "^5.0.1",
7169
"commander": "^12.0.0",
@@ -82,13 +80,15 @@
8280
"husky": "^9.0.11",
8381
"jest": "^29.7.0",
8482
"jest-environment-jsdom": "^29.4.1",
83+
"jest-mock": "^29.7.0",
84+
"postinstall-postinstall": "^2.1.0",
8585
"re-resizable": "^6.9.11",
8686
"sass": "^1.85.0",
8787
"ts-jest": "^29.1.2",
8888
"typedoc": "^0.25.12",
8989
"typescript": "^5.8.2",
9090
"typescript-eslint": "^8.24.1",
91-
"vite": "^6.2.4",
91+
"vite": "^6.2.5",
9292
"yarnhook": "^0.5.1"
9393
},
9494
"dependencies": {
@@ -102,18 +102,14 @@
102102
"@jscad/stl-serializer": "2.1.11",
103103
"ace-builds": "^1.25.1",
104104
"classnames": "^2.3.1",
105-
"dayjs": "^1.10.4",
106-
"events": "^3.3.0",
107105
"gl-matrix": "^3.3.0",
108106
"js-slang": "^1.0.81",
109107
"lodash": "^4.17.21",
110108
"mqtt": "^4.3.7",
111109
"nbody": "^0.1.1",
112-
"os": "^0.1.2",
113110
"patch-package": "^6.5.1",
114111
"phaser": "^3.54.0",
115112
"plotly.js-dist": "^2.17.1",
116-
"postinstall-postinstall": "^2.1.0",
117113
"react": "^18.3.1",
118114
"react-ace": "^10.1.0",
119115
"react-dom": "^18.3.1",
@@ -123,15 +119,13 @@
123119
"source-academy-utils": "^1.0.0",
124120
"source-academy-wabt": "^1.0.4",
125121
"three": "^0.163.0",
126-
"tslib": "^2.3.1",
127-
"uniqid": "^5.4.0",
128-
"url": "^0.11.3"
122+
"uniqid": "^5.4.0"
129123
},
130124
"jest": {
131125
"projects": [
132126
"src/jest.config.js",
133127
"scripts/jest.config.js"
134128
]
135129
},
136-
"packageManager": "yarn@1.22.22+sha1.ac34549e6aa8e7ead463a7407e1c7390f61a6610"
130+
"packageManager": "yarn@4.8.1"
137131
}

renovate.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
3+
"extends": [
4+
"config:recommended"
5+
]
6+
}

0 commit comments

Comments
 (0)