deps: update devDependencies (#577)

peaceiris · Mar 6, 2021 · 0a4c122 · 0a4c122
1 parent 07f38c6
commit 0a4c122
Show file tree

Hide file tree

Showing 6 changed files with 1,356 additions and 1,413 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -9,8 +9,7 @@
     "plugin:@typescript-eslint/eslint-recommended",
     "plugin:@typescript-eslint/recommended",
     "plugin:jest/recommended",
-    "plugin:prettier/recommended",
-    "prettier/@typescript-eslint"
+    "plugin:prettier/recommended"
   ],
   "plugins": ["@typescript-eslint"],
   "globals": {

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -78,6 +78,12 @@ jobs:
       - name: Run ncc
         run: npm run build
 
+      - name: Remove lint-staged husky
+        if: github.ref == 'refs/heads/main'
+        run: |
+          npm uninstall lint-staged husky
+          git checkout package-lock.json package.json
+
       - name: Setup mdBook
         if: github.ref == 'refs/heads/main'
         uses: peaceiris/[email protected]

diff --git a/.husky/post-merge b/.husky/post-merge
@@ -0,0 +1,2 @@
+npm ci
+git remote prune origin
diff --git a/.husky/pre-commit b/.husky/pre-commit
@@ -0,0 +1 @@
+npx lint-staged