Moved "trunk:*" scripts into the existing lint scripts

realm · Apr 9, 2024 · 8223927 · 8223927
1 parent 8609ae1
commit 8223927
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/.github/workflows/pr-linting.yml b/.github/workflows/pr-linting.yml
@@ -20,5 +20,3 @@ jobs:
         run: npm ci
       - name: Run linting of subpackages
         run: npm run lint
-      - name: Run trunk to lint C++ code
-        run: npm run trunk:check-all
diff --git a/package.json b/package.json
@@ -9,9 +9,6 @@
     "bundle": "wireit",
     "lint": "wireit",
     "lint:fix": "wireit",
-    "trunk:check": "trunk check",
-    "trunk:check-all": "trunk check --all",
-    "trunk:fmt": "trunk fmt",
     "clean": "git clean -fdx -e node_modules -e .env",
     "prepend-changelog-header": "tsx scripts/prepend-changelog-header.ts"
   },
@@ -33,13 +30,13 @@
       ]
     },
     "lint": {
-      "command": "npm run lint --workspaces --if-present",
+      "command": "npm run lint --workspaces --if-present && trunk check --all",
       "dependencies": [
         "./packages/babel-plugin:bundle"
       ]
     },
     "lint:fix": {
-      "command": "npm run lint --workspaces --if-present -- --fix",
+      "command": "npm run lint --workspaces --if-present -- --fix && trunk fmt",
       "dependencies": [
         "./packages/babel-plugin:bundle"
       ]