ci: reorder tsc and eslint

maplibre · Nov 26, 2024 · ff756d7 · ff756d7
1 parent b11fd54
commit ff756d7
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 17 deletions.
diff --git a/.github/workflows/review.yml b/.github/workflows/review.yml
@@ -12,8 +12,8 @@ on:
       - checks_requested
 
 jobs:
-  lint-eslint:
-    name: Lint ESLint
+  lint-tsc:
+    name: Lint TSC
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
@@ -22,14 +22,14 @@ jobs:
       - name: Setup
         uses: ./.github/actions/setup
 
-      - name: Lint with ESLint
-        run: yarn lint:eslint
+      - name: Lint with TSC
+        run: yarn lint:tsc
 
-      - name: Lint Plugin with ESLint
-        run: yarn plugin:lint:eslint
+      - name: Lint Plugin with TSC
+        run: yarn plugin:lint:tsc
 
-  lint-tsc:
-    name: Lint TSC
+  lint-eslint:
+    name: Lint ESLint
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
@@ -38,11 +38,11 @@ jobs:
       - name: Setup
         uses: ./.github/actions/setup
 
-      - name: Lint with TSC
-        run: yarn lint:tsc
+      - name: Lint with ESLint
+        run: yarn lint:eslint
 
-      - name: Lint Plugin with TSC
-        run: yarn plugin:lint:tsc
+      - name: Lint Plugin with ESLint
+        run: yarn plugin:lint:eslint
 
   test:
     name: Test

diff --git a/package.json b/package.json
@@ -27,13 +27,13 @@
     "codegen": "tsx scripts/codegen.ts",
     "test": "jest",
     "lint": "yarn lint:tsc && yarn lint:eslint",
-    "lint:eslint": "eslint .",
-    "lint:eslint:fix": "eslint . --fix",
-    "lint:tsc": "tsc --project . && tsc --project ./packages/examples",
+    "lint:tsc": "tsc --project ./ && tsc --project ./packages/examples",
+    "lint:eslint": "eslint ./",
+    "lint:eslint:fix": "eslint ./ --fix",
     "plugin:build": "tsc --build ./plugin",
-    "plugin:lint": "yarn plugin:lint:eslint && yarn plugin:lint:tsc",
+    "plugin:lint": "yarn plugin:lint:tsc && yarn plugin:lint:eslint",
+    "plugin:lint:tsc": "tsc --noEmit --project ./plugin",
     "plugin:lint:eslint": "eslint ./plugin/src/*",
-    "plugin:lint:tsc": "tsc --project ./plugin --noEmit",
     "plugin:test": "jest ./plugin",
     "prepack": "bob build && yarn plugin:build"
   },