Merge branch 'staging' into develop

Author: gregrickaby

lefthook.yml

@@ -0,0 +1,14 @@
+# https://github.com/Arkweid/lefthook/blob/master/docs/full_guide.md
+
+pre-commit:
+  parallel: true
+  commands:
+    eslint:
+      glob: '*.{js,jsx,ts,tsx}'
+      run: npx eslint --config=.eslintrc.js --fix {staged_files}
+    stylelint:
+      glob: '*.{css,scss}'
+      run: npx stylelint --config=stylelint.config.js --fix {staged_files}
+    prettier:
+      glob: '*.{md,html,json,yml}'
+      run: npx prettier --config=prettier.config.js --write {staged_files}

package.json

@@ -24,7 +24,7 @@
     "dev": "yarn clean && next dev",
     "develop": "yarn dev",
     "export": "next export",
-    "format": "npx prettier --config=prettier.config.js '**/*.{js,jsx,ts,tsx,md,html,css,scss,json}' --write || true",
+    "format": "npx prettier --config=prettier.config.js '**/*.{js,jsx,ts,tsx,md,html,css,scss,json,yml}' --write || true",
     "lint": "yarn format && yarn lint:js && yarn lint:css",
     "lint:css": "npx stylelint --config=stylelint.config.js '**/*.css' --fix || true",
     "lint:js": "npx eslint --config=.eslintrc.js ./ --fix || true",
@@ -39,12 +39,13 @@
   },
   "devDependencies": {
     "@apollo/client": "^3.3.8",
+    "@arkweid/lefthook": "^0.7.2",
     "@babel/core": "^7.12.13",
     "@storybook/addon-a11y": "^6.1.17",
     "@storybook/addon-essentials": "^6.1.17",
     "@storybook/addon-links": "^6.1.17",
     "@storybook/react": "^6.1.17",
-    "algoliasearch": "^4.8.4",
+    "algoliasearch": "^4.8.5",
     "apollo-link-rest": "^0.8.0-beta.0",
     "babel-loader": "^8.2.2",
     "chromatic": "^5.6.1",
@@ -62,10 +63,8 @@
     "graphql": "^15.5.0",
     "graphql-anywhere": "^4.2.7",
     "hamburger-react": "^2.4.0",
-    "husky": "^4.3.8",
-    "lint-staged": "^10.5.4",
     "next-seo": "^4.19.0",
-    "next-sitemap": "^1.4.17",
+    "next-sitemap": "^1.4.19",
     "postcss-flexbugs-fixes": "^4.2.1",
     "postcss-preset-env": "^6.7.0",
     "prettier": "^2.2.1",
@@ -74,21 +73,11 @@
     "react-is": "^17.0.1",
     "react-syntax-highlighter": "^15.4.3",
     "react-twitter-embed": "^3.0.3",
-    "storybook-addon-next-router": "^2.0.0",
+    "storybook-addon-next-router": "^2.0.4",
     "storybook-css-modules-preset": "^1.0.5",
     "stylelint": "^13.9.0",
     "stylelint-config-standard": "^20.0.0",
     "tailwindcss": "npm:@tailwindcss/postcss7-compat",
     "yup": "^0.32.8"
-  },
-  "husky": {
-    "hooks": {
-      "pre-commit": "lint-staged"
-    }
-  },
-  "lint-staged": {
-    "*.{js,jsx,ts,tsx}": "npx eslint --config=.eslintrc.js --fix",
-    "*.{css,scss}": "npx stylelint --config=stylelint.config.js --fix",
-    "*.{md,html,json}": "npx prettier --config=prettier.config.js --write"
   }
 }