From 72b0e23a0942477f0ebc54a7b40b5be976edd70a Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 17 Apr 2025 13:10:19 +0000 Subject: [PATCH 1/7] Update dependency commander to v13 --- package.json | 2 +- yarn.lock | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index e1fc47b32..03ae1dd63 100644 --- a/package.json +++ b/package.json @@ -66,7 +66,7 @@ "acorn": "^8.8.1", "astring": "^1.8.6", "chalk": "^5.0.1", - "commander": "^12.0.0", + "commander": "^13.0.0", "console-table-printer": "^2.11.1", "esbuild": "^0.25.0", "eslint": "^9.21.0", diff --git a/yarn.lock b/yarn.lock index e90eee489..605fa2f95 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3545,6 +3545,13 @@ __metadata: languageName: node linkType: hard +"commander@npm:^13.0.0": + version: 13.1.0 + resolution: "commander@npm:13.1.0" + checksum: 10c0/7b8c5544bba704fbe84b7cab2e043df8586d5c114a4c5b607f83ae5060708940ed0b5bd5838cf8ce27539cde265c1cbd59ce3c8c6b017ed3eec8943e3a415164 + languageName: node + linkType: hard + "commist@npm:^1.0.0": version: 1.1.0 resolution: "commist@npm:1.1.0" @@ -7557,7 +7564,7 @@ __metadata: astring: "npm:^1.8.6" chalk: "npm:^5.0.1" classnames: "npm:^2.3.1" - commander: "npm:^12.0.0" + commander: "npm:^13.0.0" console-table-printer: "npm:^2.11.1" esbuild: "npm:^0.25.0" eslint: "npm:^9.21.0" From e15ea720ddd1fd73c8a17348b1aeb907799a951f Mon Sep 17 00:00:00 2001 From: Richard Dominick <34370238+RichDom2185@users.noreply.github.com> Date: Fri, 18 Apr 2025 04:33:11 +0800 Subject: [PATCH 2/7] Fix lint warnings --- src/bundles/robot_simulation/engine/Core/RobotConsole.ts | 3 +-- src/bundles/sound/__tests__/sound.test.ts | 1 + src/tabs/Curve/__tests__/Curve.tsx | 1 + src/tabs/Rune/__tests__/Rune.tsx | 1 + 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/bundles/robot_simulation/engine/Core/RobotConsole.ts b/src/bundles/robot_simulation/engine/Core/RobotConsole.ts index 1d6c87722..f3658b15a 100644 --- a/src/bundles/robot_simulation/engine/Core/RobotConsole.ts +++ b/src/bundles/robot_simulation/engine/Core/RobotConsole.ts @@ -1,5 +1,4 @@ -const logLevels = ['source', 'error'] as const; -type LogLevel = typeof logLevels[number]; +type LogLevel = 'error' | 'source'; export type LogEntry = { message: string; diff --git a/src/bundles/sound/__tests__/sound.test.ts b/src/bundles/sound/__tests__/sound.test.ts index b304adc13..c7980e5be 100644 --- a/src/bundles/sound/__tests__/sound.test.ts +++ b/src/bundles/sound/__tests__/sound.test.ts @@ -1,3 +1,4 @@ +/* eslint-disable @typescript-eslint/no-unused-vars */ import { make_sound, play, play_in_tab } from '../functions'; describe('Test make_sound', () => { diff --git a/src/tabs/Curve/__tests__/Curve.tsx b/src/tabs/Curve/__tests__/Curve.tsx index d0d87089e..77428afd6 100644 --- a/src/tabs/Curve/__tests__/Curve.tsx +++ b/src/tabs/Curve/__tests__/Curve.tsx @@ -1,3 +1,4 @@ +/* eslint-disable @typescript-eslint/no-unused-vars */ import { CurveTab } from '..'; import { animate_3D_curve, animate_curve, draw_3D_connected, draw_connected } from '../../../bundles/curve'; import type { CurveModuleState } from '../../../bundles/curve/types'; diff --git a/src/tabs/Rune/__tests__/Rune.tsx b/src/tabs/Rune/__tests__/Rune.tsx index c352b49bf..b41df9ea9 100644 --- a/src/tabs/Rune/__tests__/Rune.tsx +++ b/src/tabs/Rune/__tests__/Rune.tsx @@ -1,3 +1,4 @@ +/* eslint-disable @typescript-eslint/no-unused-vars */ import { RuneTab } from '..'; import { animate_rune } from '../../../bundles/rune'; import type { RuneModuleState } from '../../../bundles/rune/functions'; From 9b4605eaf3c5a649e15e5407f3742978c15b7990 Mon Sep 17 00:00:00 2001 From: Richard Dominick <34370238+RichDom2185@users.noreply.github.com> Date: Fri, 18 Apr 2025 04:35:37 +0800 Subject: [PATCH 3/7] Remove unused import --- src/bundles/csg/functions.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/bundles/csg/functions.ts b/src/bundles/csg/functions.ts index 0d79b721a..25ed861d7 100644 --- a/src/bundles/csg/functions.ts +++ b/src/bundles/csg/functions.ts @@ -1,7 +1,6 @@ /* [Imports] */ import { primitives } from '@jscad/modeling'; import { colorize as colorSolid } from '@jscad/modeling/src/colors'; -import { geom3 } from '@jscad/modeling/src/geometries'; import { measureBoundingBox, type BoundingBox From 7f2d750bee4bc21ffd5dd50f8602b39c7b853a6a Mon Sep 17 00:00:00 2001 From: Richard Dominick <34370238+RichDom2185@users.noreply.github.com> Date: Fri, 18 Apr 2025 04:35:53 +0800 Subject: [PATCH 4/7] Fix CI workflow --- .github/workflows/pull-request.yml | 4 ++-- .husky/pre-commit | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index ff5a8e2e5..bc37e0933 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -30,10 +30,10 @@ jobs: run: yarn build --tsc --lint - name: Test bundles and tabs - run: yarn test --color + run: yarn test - name: Test and lint scripts - run: yarn scripts:tsc && yarn scripts:lint && yarn scripts:test --color + run: yarn scripts:tsc && yarn scripts:lint && yarn scripts:test - name: Check and Lint Devserver run: yarn devserver:tsc && yarn devserver:lint diff --git a/.husky/pre-commit b/.husky/pre-commit index 9b110aca7..53e066ff1 100755 --- a/.husky/pre-commit +++ b/.husky/pre-commit @@ -1 +1 @@ -yarn test --color +yarn test From 0a682a46d34fd9c52b05e90f26561c6facb84223 Mon Sep 17 00:00:00 2001 From: Richard Dominick <34370238+RichDom2185@users.noreply.github.com> Date: Fri, 18 Apr 2025 04:40:09 +0800 Subject: [PATCH 5/7] Revert "Fix CI workflow" This reverts commit 7f2d750bee4bc21ffd5dd50f8602b39c7b853a6a. --- .github/workflows/pull-request.yml | 4 ++-- .husky/pre-commit | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index bc37e0933..ff5a8e2e5 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -30,10 +30,10 @@ jobs: run: yarn build --tsc --lint - name: Test bundles and tabs - run: yarn test + run: yarn test --color - name: Test and lint scripts - run: yarn scripts:tsc && yarn scripts:lint && yarn scripts:test + run: yarn scripts:tsc && yarn scripts:lint && yarn scripts:test --color - name: Check and Lint Devserver run: yarn devserver:tsc && yarn devserver:lint diff --git a/.husky/pre-commit b/.husky/pre-commit index 53e066ff1..9b110aca7 100755 --- a/.husky/pre-commit +++ b/.husky/pre-commit @@ -1 +1 @@ -yarn test +yarn test --color From 58633582889c80ae03297b0cb1d9b61f11dbaf4e Mon Sep 17 00:00:00 2001 From: Richard Dominick <34370238+RichDom2185@users.noreply.github.com> Date: Fri, 18 Apr 2025 04:40:59 +0800 Subject: [PATCH 6/7] Fix breaking change --- scripts/scripts_manager.js | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/scripts_manager.js b/scripts/scripts_manager.js index 7aa7a5278..308726f34 100644 --- a/scripts/scripts_manager.js +++ b/scripts/scripts_manager.js @@ -77,6 +77,7 @@ function runJest(patterns) { const testCommand = new Command('test') .description('Run tests for script files') .allowUnknownOption() + .allowExcessArguments() .action((_, command) => runJest(command.args)); await new Command() From 0fb20effcfafcbfcdae288d7ef493850fb7b9361 Mon Sep 17 00:00:00 2001 From: Richard Dominick <34370238+RichDom2185@users.noreply.github.com> Date: Fri, 18 Apr 2025 05:06:53 +0800 Subject: [PATCH 7/7] Fix scripts --- scripts/src/testing/index.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/src/testing/index.ts b/scripts/src/testing/index.ts index b6c606ee4..7d6517429 100644 --- a/scripts/src/testing/index.ts +++ b/scripts/src/testing/index.ts @@ -12,6 +12,7 @@ export type TestCommandOptions = { const getTestCommand = () => new Command('test') .description('Run jest') .addOption(srcDirOption) + .allowExcessArguments() .allowUnknownOption() .action(({ srcDir }, command) => { const [args, filePatterns] = lodash.partition(command.args, arg => arg.startsWith('-'));