Merge remote-tracking branch 'origin/master' into k2snowman69/addTests

Author: k2snowman69

.huskyrc

@@ -0,0 +1,5 @@
+{
+  "hooks": {  
+    "pre-commit": "lint-staged"
+  }
+}

.lintstagedrc

@@ -0,0 +1,11 @@
+{
+    "*.{json,css,md}": [
+      "prettier --write",
+      "git add"
+    ],
+    "*.{js,jsx,ts,tsx}": [
+      "prettier --write",
+      "sortier",
+      "git add"
+    ]
+  }

jest.config.js

@@ -2,6 +2,9 @@ module.exports = {
   collectCoverage: true,
   globals: {
     "ts-jest": {
+      diagnostics: {
+        ignoreCodes: [151001]
+      },
       tsConfig: "tsconfig.json"
     }
   },

package.json

@@ -26,27 +26,10 @@
     "build-webpack": "webpack --mode production",
     "clean": "rimraf coverage dist",
     "cover": "nyc npm run test",
-    "precommit": "lint-staged",
     "prepare": "npm run clean && npm run build",
     "test": "npm run jest",
     "jest": "jest"
   },
-  "husky": {
-    "hooks": {
-      "pre-commit": "lint-staged"
-    }
-  },
-  "lint-staged": {
-    "*.{json,css,md}": [
-      "prettier --write",
-      "git add"
-    ],
-    "*.{js,jsx,ts,tsx}": [
-      "prettier --write",
-      "sortier",
-      "git add"
-    ]
-  },
   "peerDependencies": {
     "@snowcoders/react-unstyled-button": ">=1.2.2",
     "classnames": ">=2.2.5",
@@ -57,38 +40,38 @@
     "tslib": ">=1.9.0"
   },
   "devDependencies": {
-    "@snowcoders/react-unstyled-button": "~1.2.2",
-    "@snowcoders/sortier": "^2.1.7",
-    "@types/classnames": "^2.2.6",
-    "@types/enzyme": "^3.1.12",
-    "@types/enzyme-adapter-react-15": "^1.0.2",
-    "@types/enzyme-adapter-react-16": "^1.0.2",
-    "@types/jest": "^23.3.1",
-    "@types/react": "^16.4.6",
-    "@types/react-dom": "^16.0.6",
-    "@types/react-resize-detector": "^3.0.0",
-    "awesome-typescript-loader": "^5.2.0",
-    "classnames": "^2.2.6",
-    "enzyme": "^3.3.0",
-    "enzyme-adapter-react-16": "^1.1.1",
-    "husky": "^0.14.3",
-    "jest": "^23.4.1",
-    "jsdom": "^12.0.0",
-    "lint-staged": "^7.2.0",
-    "node-sass": "^4.9.2",
-    "prettier": "^1.14.0",
-    "react": "^16.4.1",
-    "react-dom": "^16.4.1",
-    "react-popper": "^1.0.0",
-    "react-resize-detector": "^3.1.0",
-    "rimraf": "^2.6.2",
-    "source-map-loader": "^0.2.3",
-    "source-map-support": "^0.5.6",
-    "ts-jest": "^23.1.2",
-    "ts-loader": "^5.0.0",
-    "tslib": "^1.9.3",
-    "typescript": "^3.0.1",
-    "webpack": "^4.16.4",
-    "webpack-command": "^0.4.1"
+    "@snowcoders/react-unstyled-button": "1.2.2",
+    "@snowcoders/sortier": "2.1.13",
+    "@types/classnames": "2.2.6",
+    "@types/enzyme": "3.1.14",
+    "@types/enzyme-adapter-react-15": "1.0.3",
+    "@types/enzyme-adapter-react-16": "1.0.3",
+    "@types/jest": "23.3.5",
+    "@types/react": "16.4.16",
+    "@types/react-dom": "16.0.9",
+    "@types/react-resize-detector": "3.1.0",
+    "awesome-typescript-loader": "5.2.1",
+    "classnames": "2.2.6",
+    "enzyme": "3.7.0",
+    "enzyme-adapter-react-16": "1.6.0",
+    "husky": "1.1.2",
+    "jest": "23.6.0",
+    "jsdom": "12.2.0",
+    "lint-staged": "7.3.0",
+    "node-sass": "4.9.3",
+    "prettier": "1.14.3",
+    "react": "16.5.2",
+    "react-dom": "16.5.2",
+    "react-popper": "1.0.2",
+    "react-resize-detector": "3.1.3",
+    "rimraf": "2.6.2",
+    "source-map-loader": "0.2.4",
+    "source-map-support": "0.5.9",
+    "ts-jest": "23.10.4",
+    "ts-loader": "5.2.1",
+    "tslib": "1.9.3",
+    "typescript": "3.1.3",
+    "webpack": "4.20.2",
+    "webpack-command": "0.4.1"
   }
 }