Merge branch 'master' into bemba-language-upstream

kopachef · web-flow · commit efefc6a24a8a · 2026-04-27T00:21:32.000+01:00
diff --git a/.github/workflows/fix-formatting.yml b/.github/workflows/fix-formatting.yml
@@ -34,7 +34,7 @@ jobs:
           version: ${{ env.PNPM_VERSION }}
 
       - name: Install formatter
-        run: pnpm install -D -w oxfmt
+        run: pnpm install -D -w oxfmt --ignore-scripts
 
       - name: Get changed files
         id: get-changed-files
@@ -52,10 +52,11 @@ jobs:
             return changedFiles.filter(file=> file.status !== "removed").map(file => file.filename).join(' ');
 
       - name: Fix formatting
+        env:
+          CHANGED_FILES: ${{ steps.get-changed-files.outputs.result }}
         run: |
-          CHANGED_FILES=$(echo ${{ steps.get-changed-files.outputs.result }})
           if [ -n "$CHANGED_FILES" ]; then
-            pnpm oxfmt $CHANGED_FILES --no-error-on-unmatched-pattern
+            echo "$CHANGED_FILES" | tr ' ' '\n' | xargs pnpm oxfmt --no-error-on-unmatched-pattern
           fi
 
       - name: Commit changes
diff --git a/backend/package.json b/backend/package.json
@@ -80,8 +80,8 @@
     "@vitest/coverage-v8": "4.0.15",
     "concurrently": "8.2.2",
     "openapi3-ts": "2.0.2",
-    "oxlint": "1.59.0",
-    "oxlint-tsgolint": "0.20.0",
+    "oxlint": "1.60.0",
+    "oxlint-tsgolint": "0.21.0",
     "readline-sync": "1.4.10",
     "supertest": "7.1.4",
     "testcontainers": "11.11.0",
diff --git a/frontend/package.json b/frontend/package.json
@@ -106,8 +106,8 @@
     "madge": "8.0.0",
     "magic-string": "0.30.17",
     "normalize.css": "8.0.1",
-    "oxlint": "1.59.0",
-    "oxlint-tsgolint": "0.20.0",
+    "oxlint": "1.60.0",
+    "oxlint-tsgolint": "0.21.0",
     "postcss": "8.5.8",
     "sass": "1.70.0",
     "solid-devtools": "0.34.5",
diff --git a/package.json b/package.json
@@ -61,16 +61,17 @@
     "@commitlint/cli": "17.7.1",
     "@commitlint/config-conventional": "19.2.2",
     "@monkeytype/release": "workspace:*",
+    "@types/node": "24.9.1",
     "@vitest/coverage-v8": "4.0.15",
     "caniuse-lite": "1.0.30001778",
     "conventional-changelog": "6.0.0",
     "husky": "8.0.1",
     "knip": "2.19.2",
     "lint-staged": "13.2.3",
     "only-allow": "1.2.1",
-    "oxfmt": "0.44.0",
-    "oxlint": "1.59.0",
-    "oxlint-tsgolint": "0.20.0",
+    "oxfmt": "0.45.0",
+    "oxlint": "1.60.0",
+    "oxlint-tsgolint": "0.21.0",
     "prettier": "3.7.1",
     "turbo": "2.7.5",
     "vitest": "4.1.0",
diff --git a/packages/contracts/package.json b/packages/contracts/package.json
@@ -29,8 +29,8 @@
     "@monkeytype/tsup-config": "workspace:*",
     "@monkeytype/typescript-config": "workspace:*",
     "madge": "8.0.0",
-    "oxlint": "1.59.0",
-    "oxlint-tsgolint": "0.20.0",
+    "oxlint": "1.60.0",
+    "oxlint-tsgolint": "0.21.0",
     "tsup": "8.4.0",
     "typescript": "6.0.2",
     "vitest": "4.1.0"
diff --git a/packages/funbox/package.json b/packages/funbox/package.json
@@ -25,8 +25,8 @@
     "@monkeytype/tsup-config": "workspace:*",
     "@monkeytype/typescript-config": "workspace:*",
     "madge": "8.0.0",
-    "oxlint": "1.59.0",
-    "oxlint-tsgolint": "0.20.0",
+    "oxlint": "1.60.0",
+    "oxlint-tsgolint": "0.21.0",
     "tsup": "8.4.0",
     "typescript": "6.0.2",
     "vitest": "4.1.0"
diff --git a/packages/release/package.json b/packages/release/package.json
@@ -20,7 +20,7 @@
   },
   "devDependencies": {
     "nodemon": "3.1.14",
-    "oxlint": "1.59.0",
-    "oxlint-tsgolint": "0.20.0"
+    "oxlint": "1.60.0",
+    "oxlint-tsgolint": "0.21.0"
   }
 }
diff --git a/packages/schemas/package.json b/packages/schemas/package.json
@@ -26,8 +26,8 @@
     "@monkeytype/tsup-config": "workspace:*",
     "@monkeytype/typescript-config": "workspace:*",
     "madge": "8.0.0",
-    "oxlint": "1.59.0",
-    "oxlint-tsgolint": "0.20.0",
+    "oxlint": "1.60.0",
+    "oxlint-tsgolint": "0.21.0",
     "tsup": "8.4.0",
     "typescript": "6.0.2",
     "vitest": "4.1.0"
diff --git a/packages/tsup-config/package.json b/packages/tsup-config/package.json
@@ -17,8 +17,8 @@
   },
   "devDependencies": {
     "@monkeytype/typescript-config": "workspace:*",
-    "oxlint": "1.59.0",
-    "oxlint-tsgolint": "0.20.0",
+    "oxlint": "1.60.0",
+    "oxlint-tsgolint": "0.21.0",
     "typescript": "6.0.2"
   },
   "peerDependencies": {
diff --git a/packages/util/package.json b/packages/util/package.json
@@ -20,8 +20,8 @@
     "@monkeytype/tsup-config": "workspace:*",
     "@monkeytype/typescript-config": "workspace:*",
     "madge": "8.0.0",
-    "oxlint": "1.59.0",
-    "oxlint-tsgolint": "0.20.0",
+    "oxlint": "1.60.0",
+    "oxlint-tsgolint": "0.21.0",
     "tsup": "8.4.0",
     "typescript": "6.0.2",
     "vitest": "4.1.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@`
`20`	`20`	`},`
`21`	`21`	`"devDependencies": {`
`22`	`22`	`"nodemon": "3.1.14",`
`23`		`- "oxlint": "1.59.0",`
`24`		`- "oxlint-tsgolint": "0.20.0"`
	`23`	`+ "oxlint": "1.60.0",`
	`24`	`+ "oxlint-tsgolint": "0.21.0"`
`25`	`25`	`}`
`26`	`26`	`}`