Skip to content

Commit dfb74e6

Browse files
authored
Merge branch 'master' into robot-minigame
2 parents 880ebdf + fb1e5c6 commit dfb74e6

File tree

9 files changed

+591
-441
lines changed

9 files changed

+591
-441
lines changed

package.json

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -52,21 +52,21 @@
5252
"lint:build": "esbuild --bundle --format=esm --outfile=scripts/dist/typeimports.js scripts/src/linting/typeimports.ts"
5353
},
5454
"devDependencies": {
55-
"@commander-js/extra-typings": "^12.0.0",
55+
"@commander-js/extra-typings": "^14.0.0",
5656
"@stylistic/eslint-plugin": "^4.2.0",
5757
"@types/estree": "^1.0.0",
58-
"@types/jest": "^27.4.1",
58+
"@types/jest": "^29.0.0",
5959
"@types/lodash": "^4.14.198",
6060
"@types/node": "^20.12.12",
61-
"@types/plotly.js": "^2.35.4",
61+
"@types/plotly.js": "^3.0.0",
6262
"@types/react": "^18.3.2",
6363
"@types/react-dom": "^18.3.0",
6464
"@types/three": "^0.175.0",
6565
"@vitejs/plugin-react": "^4.3.4",
6666
"acorn": "^8.8.1",
6767
"astring": "^1.8.6",
6868
"chalk": "^5.0.1",
69-
"commander": "^12.0.0",
69+
"commander": "^14.0.0",
7070
"console-table-printer": "^2.11.1",
7171
"esbuild": "^0.25.0",
7272
"eslint": "^9.21.0",
@@ -75,8 +75,8 @@
7575
"eslint-plugin-jsx-a11y": "^6.10.2",
7676
"eslint-plugin-react": "^7.37.4",
7777
"eslint-plugin-react-hooks": "^5.1.0",
78-
"globals": "^15.11.0",
79-
"http-server": "^0.13.0",
78+
"globals": "^16.0.0",
79+
"http-server": "^14.0.0",
8080
"husky": "^9.0.11",
8181
"jest": "^29.7.0",
8282
"jest-environment-jsdom": "^29.4.1",
@@ -88,8 +88,8 @@
8888
"typedoc": "^0.25.12",
8989
"typescript": "^5.8.2",
9090
"typescript-eslint": "^8.24.1",
91-
"vite": "^6.2.5",
92-
"yarnhook": "^0.5.1"
91+
"vite": "^6.3.4",
92+
"yarnhook": "^0.6.0"
9393
},
9494
"dependencies": {
9595
"@blueprintjs/core": "^5.10.2",
@@ -107,11 +107,11 @@
107107
"lodash": "^4.17.21",
108108
"mqtt": "^4.3.7",
109109
"nbody": "^0.2.0",
110-
"patch-package": "^6.5.1",
110+
"patch-package": "^8.0.0",
111111
"phaser": "^3.54.0",
112-
"plotly.js-dist": "^2.17.1",
112+
"plotly.js-dist": "^3.0.0",
113113
"react": "^18.3.1",
114-
"react-ace": "^10.1.0",
114+
"react-ace": "^14.0.0",
115115
"react-dom": "^18.3.1",
116116
"regl": "^2.1.0",
117117
"saar": "^1.0.4",

scripts/scripts_manager.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ function runJest(patterns) {
7777
const testCommand = new Command('test')
7878
.description('Run tests for script files')
7979
.allowUnknownOption()
80+
.allowExcessArguments()
8081
.action((_, command) => runJest(command.args));
8182

8283
await new Command()

scripts/src/testing/index.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ export type TestCommandOptions = {
1212
const getTestCommand = () => new Command('test')
1313
.description('Run jest')
1414
.addOption(srcDirOption)
15+
.allowExcessArguments()
1516
.allowUnknownOption()
1617
.action(({ srcDir }, command) => {
1718
const [args, filePatterns] = lodash.partition(command.args, arg => arg.startsWith('-'));

src/bundles/csg/functions.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
/* [Imports] */
22
import { primitives } from '@jscad/modeling';
33
import { colorize as colorSolid } from '@jscad/modeling/src/colors';
4-
import { geom3 } from '@jscad/modeling/src/geometries';
54
import {
65
measureBoundingBox,
76
type BoundingBox

src/bundles/robot_simulation/engine/Core/RobotConsole.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
const logLevels = ['source', 'error'] as const;
2-
type LogLevel = typeof logLevels[number];
1+
type LogLevel = 'error' | 'source';
32

43
export type LogEntry = {
54
message: string;

src/bundles/sound/__tests__/sound.test.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
/* eslint-disable @typescript-eslint/no-unused-vars */
12
import { make_sound, play, play_in_tab } from '../functions';
23

34
describe('Test make_sound', () => {

src/tabs/Curve/__tests__/Curve.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
/* eslint-disable @typescript-eslint/no-unused-vars */
12
import { CurveTab } from '..';
23
import { animate_3D_curve, animate_curve, draw_3D_connected, draw_connected } from '../../../bundles/curve';
34
import type { CurveModuleState } from '../../../bundles/curve/types';

src/tabs/Rune/__tests__/Rune.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
/* eslint-disable @typescript-eslint/no-unused-vars */
12
import { RuneTab } from '..';
23
import { animate_rune } from '../../../bundles/rune';
34
import type { RuneModuleState } from '../../../bundles/rune/functions';

0 commit comments

Comments
 (0)