diff options
-rw-r--r-- | .dockerignore | 1 | ||||
-rw-r--r-- | .husky/.gitignore | 1 | ||||
-rwxr-xr-x | .husky/pre-commit | 4 | ||||
-rw-r--r-- | package-lock.json | 129 | ||||
-rw-r--r-- | package.json | 9 |
5 files changed, 14 insertions, 130 deletions
diff --git a/.dockerignore b/.dockerignore index 89570af5b..b60be5324 100644 --- a/.dockerignore +++ b/.dockerignore | |||
@@ -5,6 +5,7 @@ out | |||
5 | **/.idea | 5 | **/.idea |
6 | **/build | 6 | **/build |
7 | .tmp | 7 | .tmp |
8 | .husky/ | ||
8 | .stage | 9 | .stage |
9 | **/.env | 10 | **/.env |
10 | **/yarn-error.log | 11 | **/yarn-error.log |
diff --git a/.husky/.gitignore b/.husky/.gitignore new file mode 100644 index 000000000..31354ec13 --- /dev/null +++ b/.husky/.gitignore | |||
@@ -0,0 +1 @@ | |||
_ | |||
diff --git a/.husky/pre-commit b/.husky/pre-commit new file mode 100755 index 000000000..f1e7b9824 --- /dev/null +++ b/.husky/pre-commit | |||
@@ -0,0 +1,4 @@ | |||
1 | #!/bin/sh | ||
2 | . "$(dirname "$0")/_/husky.sh" | ||
3 | |||
4 | npm run lint && npm run reformat-files && npm run manage-translations && npm run apply-branding | ||
diff --git a/package-lock.json b/package-lock.json index 913d50b4c..f6807932e 100644 --- a/package-lock.json +++ b/package-lock.json | |||
@@ -12081,23 +12081,6 @@ | |||
12081 | "resolved": "https://registry.npmjs.org/caller/-/caller-1.0.1.tgz", | 12081 | "resolved": "https://registry.npmjs.org/caller/-/caller-1.0.1.tgz", |
12082 | "integrity": "sha1-uFGGD3Dhlds9J3OVqhp+I+ow7PU=" | 12082 | "integrity": "sha1-uFGGD3Dhlds9J3OVqhp+I+ow7PU=" |
12083 | }, | 12083 | }, |
12084 | "caller-callsite": { | ||
12085 | "version": "2.0.0", | ||
12086 | "resolved": "https://registry.npmjs.org/caller-callsite/-/caller-callsite-2.0.0.tgz", | ||
12087 | "integrity": "sha1-hH4PzgoiN1CpoCfFSzNzGtMVQTQ=", | ||
12088 | "dev": true, | ||
12089 | "requires": { | ||
12090 | "callsites": "^2.0.0" | ||
12091 | }, | ||
12092 | "dependencies": { | ||
12093 | "callsites": { | ||
12094 | "version": "2.0.0", | ||
12095 | "resolved": "https://registry.npmjs.org/callsites/-/callsites-2.0.0.tgz", | ||
12096 | "integrity": "sha1-BuuE8A7qQT2oav/vrL/7Ngk7PFA=", | ||
12097 | "dev": true | ||
12098 | } | ||
12099 | } | ||
12100 | }, | ||
12101 | "caller-path": { | 12084 | "caller-path": { |
12102 | "version": "0.1.0", | 12085 | "version": "0.1.0", |
12103 | "resolved": "https://registry.npmjs.org/caller-path/-/caller-path-0.1.0.tgz", | 12086 | "resolved": "https://registry.npmjs.org/caller-path/-/caller-path-0.1.0.tgz", |
@@ -13973,30 +13956,6 @@ | |||
13973 | "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", | 13956 | "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", |
13974 | "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=" | 13957 | "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=" |
13975 | }, | 13958 | }, |
13976 | "cosmiconfig": { | ||
13977 | "version": "5.2.1", | ||
13978 | "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-5.2.1.tgz", | ||
13979 | "integrity": "sha512-H65gsXo1SKjf8zmrJ67eJk8aIRKV5ff2D4uKZIBZShbhGSpEmsQOPW/SKMKYhSTrqR7ufy6RP69rPogdaPh/kA==", | ||
13980 | "dev": true, | ||
13981 | "requires": { | ||
13982 | "import-fresh": "^2.0.0", | ||
13983 | "is-directory": "^0.3.1", | ||
13984 | "js-yaml": "^3.13.1", | ||
13985 | "parse-json": "^4.0.0" | ||
13986 | }, | ||
13987 | "dependencies": { | ||
13988 | "js-yaml": { | ||
13989 | "version": "3.14.0", | ||
13990 | "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.0.tgz", | ||
13991 | "integrity": "sha512-/4IbIeHcD9VMHFqDR/gQ7EdZdLimOvW2DdcxFjdyyZ9NsbS+ccrXqVWDtab/lRl5AlUqmpBx8EhPaWR+OtY17A==", | ||
13992 | "dev": true, | ||
13993 | "requires": { | ||
13994 | "argparse": "^1.0.7", | ||
13995 | "esprima": "^4.0.0" | ||
13996 | } | ||
13997 | } | ||
13998 | } | ||
13999 | }, | ||
14000 | "crc": { | 13959 | "crc": { |
14001 | "version": "3.8.0", | 13960 | "version": "3.8.0", |
14002 | "resolved": "https://registry.npmjs.org/crc/-/crc-3.8.0.tgz", | 13961 | "resolved": "https://registry.npmjs.org/crc/-/crc-3.8.0.tgz", |
@@ -21946,39 +21905,10 @@ | |||
21946 | } | 21905 | } |
21947 | }, | 21906 | }, |
21948 | "husky": { | 21907 | "husky": { |
21949 | "version": "1.3.1", | 21908 | "version": "6.0.0", |
21950 | "resolved": "https://registry.npmjs.org/husky/-/husky-1.3.1.tgz", | 21909 | "resolved": "https://registry.npmjs.org/husky/-/husky-6.0.0.tgz", |
21951 | "integrity": "sha512-86U6sVVVf4b5NYSZ0yvv88dRgBSSXXmHaiq5pP4KDj5JVzdwKgBjEtUPOm8hcoytezFwbU+7gotXNhpHdystlg==", | 21910 | "integrity": "sha512-SQS2gDTB7tBN486QSoKPKQItZw97BMOd+Kdb6ghfpBc0yXyzrddI0oDV5MkDAbuB4X2mO3/nj60TRMcYxwzZeQ==", |
21952 | "dev": true, | 21911 | "dev": true |
21953 | "requires": { | ||
21954 | "cosmiconfig": "^5.0.7", | ||
21955 | "execa": "^1.0.0", | ||
21956 | "find-up": "^3.0.0", | ||
21957 | "get-stdin": "^6.0.0", | ||
21958 | "is-ci": "^2.0.0", | ||
21959 | "pkg-dir": "^3.0.0", | ||
21960 | "please-upgrade-node": "^3.1.1", | ||
21961 | "read-pkg": "^4.0.1", | ||
21962 | "run-node": "^1.0.0", | ||
21963 | "slash": "^2.0.0" | ||
21964 | }, | ||
21965 | "dependencies": { | ||
21966 | "get-stdin": { | ||
21967 | "version": "6.0.0", | ||
21968 | "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-6.0.0.tgz", | ||
21969 | "integrity": "sha512-jp4tHawyV7+fkkSKyvjuLZswblUtz+SQKzSWnBbii16BuZksJlU1wuBYXY75r+duh/llF1ur6oNwi+2ZzjKZ7g==", | ||
21970 | "dev": true | ||
21971 | }, | ||
21972 | "pkg-dir": { | ||
21973 | "version": "3.0.0", | ||
21974 | "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz", | ||
21975 | "integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==", | ||
21976 | "dev": true, | ||
21977 | "requires": { | ||
21978 | "find-up": "^3.0.0" | ||
21979 | } | ||
21980 | } | ||
21981 | } | ||
21982 | }, | 21912 | }, |
21983 | "hyphenate-style-name": { | 21913 | "hyphenate-style-name": { |
21984 | "version": "1.0.3", | 21914 | "version": "1.0.3", |
@@ -22039,33 +21969,6 @@ | |||
22039 | "minimatch": "^3.0.4" | 21969 | "minimatch": "^3.0.4" |
22040 | } | 21970 | } |
22041 | }, | 21971 | }, |
22042 | "import-fresh": { | ||
22043 | "version": "2.0.0", | ||
22044 | "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-2.0.0.tgz", | ||
22045 | "integrity": "sha1-2BNVwVYS04bGH53dOSLUMEgipUY=", | ||
22046 | "dev": true, | ||
22047 | "requires": { | ||
22048 | "caller-path": "^2.0.0", | ||
22049 | "resolve-from": "^3.0.0" | ||
22050 | }, | ||
22051 | "dependencies": { | ||
22052 | "caller-path": { | ||
22053 | "version": "2.0.0", | ||
22054 | "resolved": "https://registry.npmjs.org/caller-path/-/caller-path-2.0.0.tgz", | ||
22055 | "integrity": "sha1-Ro+DBE42mrIBD6xfBs7uFbsssfQ=", | ||
22056 | "dev": true, | ||
22057 | "requires": { | ||
22058 | "caller-callsite": "^2.0.0" | ||
22059 | } | ||
22060 | }, | ||
22061 | "resolve-from": { | ||
22062 | "version": "3.0.0", | ||
22063 | "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz", | ||
22064 | "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=", | ||
22065 | "dev": true | ||
22066 | } | ||
22067 | } | ||
22068 | }, | ||
22069 | "import-lazy": { | 21972 | "import-lazy": { |
22070 | "version": "2.1.0", | 21973 | "version": "2.1.0", |
22071 | "resolved": "https://registry.npmjs.org/import-lazy/-/import-lazy-2.1.0.tgz", | 21974 | "resolved": "https://registry.npmjs.org/import-lazy/-/import-lazy-2.1.0.tgz", |
@@ -22481,12 +22384,6 @@ | |||
22481 | } | 22384 | } |
22482 | } | 22385 | } |
22483 | }, | 22386 | }, |
22484 | "is-directory": { | ||
22485 | "version": "0.3.1", | ||
22486 | "resolved": "https://registry.npmjs.org/is-directory/-/is-directory-0.3.1.tgz", | ||
22487 | "integrity": "sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE=", | ||
22488 | "dev": true | ||
22489 | }, | ||
22490 | "is-docker": { | 22387 | "is-docker": { |
22491 | "version": "2.2.1", | 22388 | "version": "2.2.1", |
22492 | "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz", | 22389 | "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz", |
@@ -30307,15 +30204,6 @@ | |||
30307 | "resolved": "https://registry.npmjs.org/platform/-/platform-1.3.5.tgz", | 30204 | "resolved": "https://registry.npmjs.org/platform/-/platform-1.3.5.tgz", |
30308 | "integrity": "sha512-TuvHS8AOIZNAlE77WUDiR4rySV/VMptyMfcfeoMgs4P8apaZM3JrnbzBiixKUv+XR6i+BXrQh8WAnjaSPFO65Q==" | 30205 | "integrity": "sha512-TuvHS8AOIZNAlE77WUDiR4rySV/VMptyMfcfeoMgs4P8apaZM3JrnbzBiixKUv+XR6i+BXrQh8WAnjaSPFO65Q==" |
30309 | }, | 30206 | }, |
30310 | "please-upgrade-node": { | ||
30311 | "version": "3.2.0", | ||
30312 | "resolved": "https://registry.npmjs.org/please-upgrade-node/-/please-upgrade-node-3.2.0.tgz", | ||
30313 | "integrity": "sha512-gQR3WpIgNIKwBMVLkpMUeR3e1/E1y42bqDQZfql+kDeXd8COYfM8PQA4X6y7a8u9Ua9FHmsrrmirW2vHs45hWg==", | ||
30314 | "dev": true, | ||
30315 | "requires": { | ||
30316 | "semver-compare": "^1.0.0" | ||
30317 | } | ||
30318 | }, | ||
30319 | "plist": { | 30207 | "plist": { |
30320 | "version": "3.0.2", | 30208 | "version": "3.0.2", |
30321 | "resolved": "https://registry.npmjs.org/plist/-/plist-3.0.2.tgz", | 30209 | "resolved": "https://registry.npmjs.org/plist/-/plist-3.0.2.tgz", |
@@ -32523,12 +32411,6 @@ | |||
32523 | "is-promise": "^2.1.0" | 32411 | "is-promise": "^2.1.0" |
32524 | } | 32412 | } |
32525 | }, | 32413 | }, |
32526 | "run-node": { | ||
32527 | "version": "1.0.0", | ||
32528 | "resolved": "https://registry.npmjs.org/run-node/-/run-node-1.0.0.tgz", | ||
32529 | "integrity": "sha512-kc120TBlQ3mih1LSzdAJXo4xn/GWS2ec0l3S+syHDXP9uRr0JAT8Qd3mdMuyjqCzeZktgP3try92cEgf9Nks8A==", | ||
32530 | "dev": true | ||
32531 | }, | ||
32532 | "run-parallel": { | 32414 | "run-parallel": { |
32533 | "version": "1.2.0", | 32415 | "version": "1.2.0", |
32534 | "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz", | 32416 | "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz", |
@@ -32806,7 +32688,8 @@ | |||
32806 | "version": "1.0.0", | 32688 | "version": "1.0.0", |
32807 | "resolved": "https://registry.npmjs.org/semver-compare/-/semver-compare-1.0.0.tgz", | 32689 | "resolved": "https://registry.npmjs.org/semver-compare/-/semver-compare-1.0.0.tgz", |
32808 | "integrity": "sha1-De4hahyUGrN+nvsXiPavxf9VN/w=", | 32690 | "integrity": "sha1-De4hahyUGrN+nvsXiPavxf9VN/w=", |
32809 | "dev": true | 32691 | "dev": true, |
32692 | "optional": true | ||
32810 | }, | 32693 | }, |
32811 | "semver-diff": { | 32694 | "semver-diff": { |
32812 | "version": "3.1.1", | 32695 | "version": "3.1.1", |
diff --git a/package.json b/package.json index 1174f9810..ca8097183 100644 --- a/package.json +++ b/package.json | |||
@@ -186,7 +186,7 @@ | |||
186 | "gulp-sass-variables": "^1.2.0", | 186 | "gulp-sass-variables": "^1.2.0", |
187 | "hex-rgb": "^3.0.0", | 187 | "hex-rgb": "^3.0.0", |
188 | "html-webpack-plugin": "^4.0.0-beta.5", | 188 | "html-webpack-plugin": "^4.0.0-beta.5", |
189 | "husky": "^1.1.4", | 189 | "husky": "^6.0.0", |
190 | "jest": "^26.6.3", | 190 | "jest": "^26.6.3", |
191 | "kebab-case": "^1.0.0", | 191 | "kebab-case": "^1.0.0", |
192 | "lerna": "4.0.0", | 192 | "lerna": "4.0.0", |
@@ -214,10 +214,5 @@ | |||
214 | }, | 214 | }, |
215 | "browserslist": [ | 215 | "browserslist": [ |
216 | "Chrome 69" | 216 | "Chrome 69" |
217 | ], | 217 | ] |
218 | "husky": { | ||
219 | "hooks": { | ||
220 | "pre-commit": "npm run lint && npm run reformat-files && npm run manage-translations && npm run apply-branding" | ||
221 | } | ||
222 | } | ||
223 | } | 218 | } |