Refactor some package scripts

DawnbrandBots · Aug 24, 2024 · 6134325 · 6134325
1 parent 1dca995
commit 6134325
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
@@ -65,6 +65,6 @@ jobs:
           cache: yarn
           cache-dependency-path: yarn.lock
       - run: yarn
-      - run: yarn prettier --check 'src/**/*.{js,ts}'
+      - run: yarn format:check
       - if: ${{ !cancelled() }}
-        run: yarn eslint 'src/**/*.ts'
+        run: yarn lint
diff --git a/.github/workflows/merge.yaml b/.github/workflows/merge.yaml
@@ -119,8 +119,8 @@ jobs:
         env:
           OPENSEARCH_URL: ${{ secrets.OS_URL }}
         run: |
-          yarn ts-node src/load.ts ../aggregate/cards.yaml yu-gi-oh_ocg-tcg
-          yarn ts-node src/load.ts ../aggregate/rush.yaml yu-gi-oh_rush
+          yarn load ../aggregate/cards.yaml yu-gi-oh_ocg-tcg
+          yarn load ../aggregate/rush.yaml yu-gi-oh_rush
   deploy-pages:
     needs: merge
     if: needs.merge.outputs.status > 0 && !cancelled()

diff --git a/package.json b/package.json
@@ -8,7 +8,9 @@
   "scripts": {
     "load": "ts-node src/load.ts",
     "check-for-missing-fake-password": "ts-node src/assignments/check-for-missing.ts",
-    "check-for-missing-names": "ts-node src/check-for-missing-names.ts"
+    "check-for-missing-names": "ts-node src/check-for-missing-names.ts",
+    "format:check": "yarn prettier --check 'src/**/*.{js,ts}'",
+    "lint": "eslint 'src/**/*.ts'"
   },
   "engines": {
     "node": ">=20",