Skip to content

Commit d06d11b

Browse files
committed
Update auxillary repo stuff
1 parent 5f520ee commit d06d11b

File tree

4 files changed

+49
-14
lines changed

4 files changed

+49
-14
lines changed

.vscode/settings.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"json.schemas": [
33
{
44
"fileMatch": ["src/bundles/**/manifest.json"],
5-
"url": "./lib/buildtools/src/build/modules/manifest.schema.json"
5+
"url": "./lib/modules-lib/src/internal/manifest.schema.json"
66
},
77
{
88
"fileMatch": ["./tsconfig.*.json"],

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ The following set of instructions explain how to transpile and serve the modules
6767
To transpile the modules' files from `src` into JavaScript files in `build`, run the following command.
6868

6969
```bash
70-
yarn run build
70+
yarn run build:all
7171
```
7272

7373
To start the server that serves all the contents of the `build` folder in the root directory of the project, run the following command. By default, running this command serves the contents of the `build` folder on <http://localhost:8022>.

yarn.config.cjs

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
// @ts-check
22

33
const { defineConfig } = require('@yarnpkg/types');
4+
const { name } = require('./package.json');
45

56
module.exports = defineConfig({
67
async constraints({ Yarn }) {
@@ -9,16 +10,17 @@ module.exports = defineConfig({
910
workspace.set('type', 'module');
1011
}
1112

12-
// make sure that all dependencies have the same version
13-
for (const dependency of Yarn.dependencies()) {
14-
if (dependency.type === 'peerDependencies')
15-
continue;
13+
// Make sure that if the dependency is defined in the root workspace
14+
// that all child workspaces use the same version of that dependency
15+
const [mainWorkspace] = Yarn.workspaces({ ident: name });
1616

17-
for (const otherDependency of Yarn.dependencies({ident: dependency.ident})) {
18-
if (otherDependency.type === 'peerDependencies')
19-
continue;
17+
for (const workspaceDep of Yarn.dependencies({ workspace: mainWorkspace })) {
18+
if (workspaceDep.type === 'peerDependencies') continue;
2019

21-
dependency.update(otherDependency.range);
20+
for (const otherDep of Yarn.dependencies({ ident: workspaceDep.ident })) {
21+
if (otherDep.type === 'peerDependencies') continue;
22+
23+
otherDep.update(workspaceDep.range);
2224
}
2325
}
2426
}

yarn.lock

Lines changed: 37 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2238,6 +2238,7 @@ __metadata:
22382238
resolution: "@sourceacademy/bundle-communication@workspace:src/bundles/communication"
22392239
dependencies:
22402240
"@sourceacademy/modules-buildtools": "workspace:^"
2241+
"@types/uniqid": "npm:^5.3.4"
22412242
mqtt: "npm:^4.3.7"
22422243
typescript: "npm:^5.8.2"
22432244
uniqid: "npm:^5.4.0"
@@ -2275,6 +2276,7 @@ __metadata:
22752276
gl-matrix: "npm:^3.3.0"
22762277
js-slang: "npm:^1.0.81"
22772278
typescript: "npm:^5.8.2"
2279+
vitest: "npm:^3.2.3"
22782280
languageName: unknown
22792281
linkType: soft
22802282

@@ -2298,6 +2300,15 @@ __metadata:
22982300
languageName: unknown
22992301
linkType: soft
23002302

2303+
"@sourceacademy/bundle-midi@workspace:src/bundles/midi":
2304+
version: 0.0.0-use.local
2305+
resolution: "@sourceacademy/bundle-midi@workspace:src/bundles/midi"
2306+
dependencies:
2307+
"@sourceacademy/modules-buildtools": "workspace:^"
2308+
typescript: "npm:^5.8.2"
2309+
languageName: unknown
2310+
linkType: soft
2311+
23012312
"@sourceacademy/bundle-nbody@workspace:src/bundles/nbody":
23022313
version: 0.0.0-use.local
23032314
resolution: "@sourceacademy/bundle-nbody@workspace:src/bundles/nbody"
@@ -2347,6 +2358,7 @@ __metadata:
23472358
version: 0.0.0-use.local
23482359
resolution: "@sourceacademy/bundle-plotly@workspace:src/bundles/plotly"
23492360
dependencies:
2361+
"@sourceacademy/bundle-curve": "workspace:^"
23502362
"@sourceacademy/bundle-sound": "workspace:^"
23512363
"@sourceacademy/modules-buildtools": "workspace:^"
23522364
"@types/plotly.js": "npm:^2.35.4"
@@ -2505,6 +2517,7 @@ __metadata:
25052517
dependencies:
25062518
"@typescript-eslint/rule-tester": "npm:^8.33.1"
25072519
esbuild: "npm:^0.25.5"
2520+
eslint: "npm:^9.28.0"
25082521
typescript: "npm:^5.8.2"
25092522
vitest: "npm:^3.2.3"
25102523
peerDependencies:
@@ -2535,7 +2548,6 @@ __metadata:
25352548
commander: "npm:^13.0.0"
25362549
esbuild: "npm:^0.25.5"
25372550
eslint: "npm:^9.28.0"
2538-
jsonschema: "npm:^1.5.0"
25392551
lodash: "npm:^4.17.21"
25402552
typedoc: "npm:^0.28.4"
25412553
typescript: "npm:^5.8.2"
@@ -2559,6 +2571,7 @@ __metadata:
25592571
ace-builds: "npm:^1.25.1"
25602572
classnames: "npm:^2.3.1"
25612573
commander: "npm:^13.0.0"
2574+
eslint: "npm:^9.28.0"
25622575
js-slang: "npm:^1.0.81"
25632576
playwright: "npm:^1.52.0"
25642577
re-resizable: "npm:^6.9.11"
@@ -2584,14 +2597,27 @@ __metadata:
25842597
"@blueprintjs/icons": "npm:^5.9.0"
25852598
"@types/react": "npm:^18.3.1"
25862599
"@types/react-dom": "npm:^18.3.1"
2600+
eslint: "npm:^9.28.0"
25872601
js-slang: "npm:^1.0.81"
2602+
jsonschema: "npm:^1.5.0"
25882603
react: "npm:^18.3.1"
25892604
react-dom: "npm:^18.3.1"
25902605
typescript: "npm:^5.8.2"
25912606
vitest: "npm:^3.2.3"
25922607
languageName: unknown
25932608
linkType: soft
25942609

2610+
"@sourceacademy/modules-vitestplugin@workspace:^, @sourceacademy/modules-vitestplugin@workspace:lib/vitestplugin":
2611+
version: 0.0.0-use.local
2612+
resolution: "@sourceacademy/modules-vitestplugin@workspace:lib/vitestplugin"
2613+
dependencies:
2614+
typescript: "npm:^5.8.2"
2615+
peerDependencies:
2616+
"@sourceacademy/modules-lib": "workspace:^"
2617+
vitest: ^3.2.3
2618+
languageName: unknown
2619+
linkType: soft
2620+
25952621
"@sourceacademy/modules@workspace:.":
25962622
version: 0.0.0-use.local
25972623
resolution: "@sourceacademy/modules@workspace:."
@@ -2600,6 +2626,7 @@ __metadata:
26002626
"@sourceacademy/modules-buildtools": "workspace:^"
26012627
"@sourceacademy/modules-devserver": "workspace:^"
26022628
"@sourceacademy/modules-lib": "workspace:^"
2629+
"@sourceacademy/modules-vitestplugin": "workspace:^"
26032630
"@stylistic/eslint-plugin": "npm:^4.4.1"
26042631
"@types/node": "npm:^22.15.30"
26052632
"@types/react": "npm:^18.3.1"
@@ -2624,9 +2651,6 @@ __metadata:
26242651
typescript-eslint: "npm:^8.33.1"
26252652
vitest: "npm:^3.2.3"
26262653
yarnhook: "npm:^0.6.0"
2627-
dependenciesMeta:
2628-
"@sourceacademy/modules-devserver":
2629-
optional: true
26302654
languageName: unknown
26312655
linkType: soft
26322656

@@ -2703,6 +2727,7 @@ __metadata:
27032727
"@types/react-dom": "npm:^18.3.1"
27042728
react: "npm:^18.3.1"
27052729
react-dom: "npm:^18.3.1"
2730+
vitest: "npm:^3.2.3"
27062731
languageName: unknown
27072732
linkType: soft
27082733

@@ -2848,6 +2873,7 @@ __metadata:
28482873
"@types/react": "npm:^18.3.1"
28492874
react: "npm:^18.3.1"
28502875
react-dom: "npm:^18.3.1"
2876+
vitest: "npm:^3.2.3"
28512877
languageName: unknown
28522878
linkType: soft
28532879

@@ -3276,6 +3302,13 @@ __metadata:
32763302
languageName: node
32773303
linkType: hard
32783304

3305+
"@types/uniqid@npm:^5.3.4":
3306+
version: 5.3.4
3307+
resolution: "@types/uniqid@npm:5.3.4"
3308+
checksum: 10c0/0075a77f2d67ef0cfeb5b55d27b059e4302ea4f5adb9038be198a344495df814778e5765cb69303ad7b22977f2d0a6bd98ed0b3a3120e89a8a724b8a2dff6272
3309+
languageName: node
3310+
linkType: hard
3311+
32793312
"@types/unist@npm:*":
32803313
version: 3.0.3
32813314
resolution: "@types/unist@npm:3.0.3"

0 commit comments

Comments
 (0)