From 9b0e36d8a3a1efef20c567ea4cd7b441c438b206 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 6 Apr 2021 18:56:15 +0200
Subject: [PATCH] chore(deps): update dependency husky to v6 (#381)

* chore(deps): update dependency husky to v6

* chore: add husky prepare

* chore: add is-ci

* Revert "chore: add is-ci"

This reverts commit 67fafd0f1dc0eb403d6e3f8f985337c8a017a2ae.

* chore: add test -n CI

* chore: dress docker as a CI to skip postinstalls

* Update targets/frontend/Dockerfile

* update yarn lock

Co-authored-by: Renovate Bot <bot@renovateapp.com>
Co-authored-by: LionelB <=>
Co-authored-by: Douglas DUTEIL <douglasduteil@gmail.com>
Co-authored-by: Lionel <lionel.breduillieard@beta.gouv.fr>
---
 .husky/pre-push             | 5 +++--
 package.json                | 5 +++--
 targets/frontend/Dockerfile | 2 ++
 yarn.lock                   | 8 ++++----
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/.husky/pre-push b/.husky/pre-push
index 53b4c9d6d..db8bd4cda 100755
--- a/.husky/pre-push
+++ b/.husky/pre-push
@@ -2,8 +2,9 @@
 . "$(dirname $0)/_/husky.sh"
 
 yarn lerna run \
-  --parallel prepush \
-  --since origin/alpha \
+  --exclude-dependents \
+  --parallel pre-push\
+  --since master \
   --stream \
   ;
 
diff --git a/package.json b/package.json
index 872f9407e..f082927e9 100644
--- a/package.json
+++ b/package.json
@@ -7,7 +7,7 @@
   "devDependencies": {
     "@commitlint/cli": "^12.1.1",
     "@commitlint/config-conventional": "^12.1.1",
-    "husky": "^5.2.0",
+    "husky": "^6.0.0",
     "lerna": "^4.0.0",
     "nps": "^5.10.0",
     "nps-utils": "^1.7.0"
@@ -26,7 +26,8 @@
     "lint": "nps lint",
     "start": "nps",
     "test": "nps test",
-    "k8s": "yarn --silent --cwd .k8s"
+    "k8s": "yarn --silent --cwd .k8s",
+    "prepare": "test -n \"$CI\" || husky install"
   },
   "workspaces": [
     "shared/*",
diff --git a/targets/frontend/Dockerfile b/targets/frontend/Dockerfile
index cc3ac638e..1cb72b25a 100644
--- a/targets/frontend/Dockerfile
+++ b/targets/frontend/Dockerfile
@@ -11,6 +11,8 @@ COPY shared/id-generator/package.json /app/shared/id-generator/
 
 COPY targets/frontend/package.json /app/targets/frontend/
 
+# NOTE(douglasduteil): disable most post install script by faking a CI
+ENV CI=true
 RUN  npx @socialgouv/yarn-workspace-focus-install \
   --cwd targets/frontend \
   --production \
diff --git a/yarn.lock b/yarn.lock
index b073e9f43..eafbc9195 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7669,10 +7669,10 @@ humanize-ms@^1.2.1:
   dependencies:
     ms "^2.0.0"
 
-husky@^5.2.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/husky/-/husky-5.2.0.tgz#fc5e1c2300d34855d47de4753607d00943fc0802"
-  integrity sha512-AM8T/auHXRBxlrfPVLKP6jt49GCM2Zz47m8G3FOMsLmTv8Dj/fKVWE0Rh2d4Qrvmy131xEsdQnb3OXRib67PGg==
+husky@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/husky/-/husky-6.0.0.tgz#810f11869adf51604c32ea577edbc377d7f9319e"
+  integrity sha512-SQS2gDTB7tBN486QSoKPKQItZw97BMOd+Kdb6ghfpBc0yXyzrddI0oDV5MkDAbuB4X2mO3/nj60TRMcYxwzZeQ==
 
 iconv-lite@0.4, iconv-lite@0.4.24, iconv-lite@^0.4.24, iconv-lite@^0.4.4:
   version "0.4.24"