Merge branch 'main' into issue#27

devhatt · May 8, 2024 · b75f82d · b75f82d
2 parents 8b09357 + 0b72433
commit b75f82d
Show file tree

Hide file tree

Showing 41 changed files with 8,750 additions and 2,131 deletions.
diff --git a/.github/workflows/code-style.yml b/.github/workflows/code-style.yml
@@ -59,17 +59,3 @@ jobs:
           files: ${{ steps.changed-files.outputs.code_all_changed_files }}
         run: pnpm exec eslint $files --report-unused-disable-directives --max-warnings 0 --output-file eslint_report.json --format json
         continue-on-error: true
-
-      - name: Annotate Code Linting Results
-        if: steps.changed-files.outputs.code_any_changed == 'true'
-        uses: ataylorme/eslint-annotate-action@v2
-        with:
-          repo-token: '${{ secrets.GITHUB_TOKEN }}'
-          report-json: 'eslint_report.json'
-
-      - name: Upload ESLint report
-        if: steps.changed-files.outputs.code_any_changed == 'true'
-        uses: actions/upload-artifact@v4
-        with:
-          name: eslint_report.json
-          path: eslint_report.json
diff --git a/package.json b/package.json
@@ -61,7 +61,8 @@
     "vitest": "^1.2.2"
   },
   "dependencies": {
-    "dayjs": "1.11.10",
+    "concurrently": "8.2.2",
+    "dayjs": "^1.11.10",
     "pet-dex-utilities": "^1.0.1",
     "reset-css": "^5.0.2",
     "vite": "^5.0.12",