From 46c29465a2dd41c71475416a09a0148ff0a04d4f Mon Sep 17 00:00:00 2001
From: simon lehericey <simon.lehericey@gmail.com>
Date: Fri, 24 Aug 2018 17:37:58 +0200
Subject: [PATCH 01/27] Import DB: fix location

---
 lib/tasks/dev.rake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/tasks/dev.rake b/lib/tasks/dev.rake
index d14c6782b..ad0ff0d5a 100644
--- a/lib/tasks/dev.rake
+++ b/lib/tasks/dev.rake
@@ -12,7 +12,7 @@ namespace :dev do
     local_file = "/tmp/#{filename}"
 
     if !File.exist?(local_file)
-      run_and_stop_if_error "scp -C deploy@sgmap_backup:/var/backup/production1/db/#{filename} #{local_file}"
+      run_and_stop_if_error "scp -C db1:/data/backup/#{filename} #{local_file}"
     end
 
     dev_env_param = "RAILS_ENV=development"

From 539f15af92ef61a8e223af6907993675934e8423 Mon Sep 17 00:00:00 2001
From: Paul Chavard <git@paul.chavard.net>
Date: Wed, 19 Sep 2018 14:45:10 +0200
Subject: [PATCH 02/27] Fix new lines in confirm dialogs

---
 .../_left_panel_users_recapitulatifcontroller_show.html.haml    | 2 +-
 app/views/shared/dossiers/_edit.html.haml                       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/layouts/left_panels/_left_panel_users_recapitulatifcontroller_show.html.haml b/app/views/layouts/left_panels/_left_panel_users_recapitulatifcontroller_show.html.haml
index dd534209b..c14f2782f 100644
--- a/app/views/layouts/left_panels/_left_panel_users_recapitulatifcontroller_show.html.haml
+++ b/app/views/layouts/left_panels/_left_panel_users_recapitulatifcontroller_show.html.haml
@@ -16,7 +16,7 @@
 
   - if current_user.owns?(@facade.dossier) && !@facade.dossier.instruction_commencee?
     .text-center.mt-1
-      = link_to ask_deletion_dossier_path(@facade.dossier), method: :post, class: "btn btn-danger", data: { confirm: "Vous vous apprêtez à supprimer votre dossier ainsi que les informations qu’il contient. Nous vous rappelons que toute suppression entraine l’annulation de la démarche en cours. Confirmer la suppression ?" } do
+      = link_to ask_deletion_dossier_path(@facade.dossier), method: :post, class: "btn btn-danger", data: { confirm: "Vous vous apprêtez à supprimer votre dossier ainsi que les informations qu’il contient. Nous vous rappelons que toute suppression entraine l’annulation de la démarche en cours.\n\n Confirmer la suppression ?" } do
         Supprimer définitivement
         %br
         ce dossier
diff --git a/app/views/shared/dossiers/_edit.html.haml b/app/views/shared/dossiers/_edit.html.haml
index f298f5d89..dec841f67 100644
--- a/app/views/shared/dossiers/_edit.html.haml
+++ b/app/views/shared/dossiers/_edit.html.haml
@@ -71,7 +71,7 @@
             = link_to ask_deletion_dossier_path(dossier),
               method: :post,
               class: 'button danger',
-              data: { disable: true, confirm: 'En continuant, vous allez supprimer ce dossier ainsi que les informations qu’il contient. Toute suppression entraine l’annulation de la démarche en cours.\n\nConfirmer la suppression ?' } do
+              data: { disable: true, confirm: "En continuant, vous allez supprimer ce dossier ainsi que les informations qu’il contient. Toute suppression entraine l’annulation de la démarche en cours.\n\nConfirmer la suppression ?" } do
               Supprimer le brouillon
 
           = f.button 'Enregistrer le brouillon',

From acaf7ff5a7c5b53130a2738cdeb361e783306bd2 Mon Sep 17 00:00:00 2001
From: gregoirenovel <log@kinko.fr>
Date: Wed, 19 Sep 2018 14:58:03 +0200
Subject: [PATCH 03/27] =?UTF-8?q?Adresse=20=C3=A9lectronique=20=E2=86=92?=
 =?UTF-8?q?=20adresse=20email?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/devise_mailer/email_changed.html.haml |  8 ++++----
 config/locales/devise.fr.yml                    | 14 +++++++-------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/app/views/devise_mailer/email_changed.html.haml b/app/views/devise_mailer/email_changed.html.haml
index fdc53dc5d..cfc75241f 100644
--- a/app/views/devise_mailer/email_changed.html.haml
+++ b/app/views/devise_mailer/email_changed.html.haml
@@ -1,4 +1,4 @@
-- content_for(:title, 'Votre nouvelle adresse électronique')
+- content_for(:title, 'Votre nouvelle adresse email')
 
 %p
   Bonjour,
@@ -6,13 +6,13 @@
 - unconfirmed_email = @resource.try(:unconfirmed_email?)
 - if unconfirmed_email.present?
   %p
-    Nous avons reçu une demande de changement d’adresse électronique pour votre
+    Nous avons reçu une demande de changement d’adresse email pour votre
     compte #{@email} sur demarches-simplifiees.fr.
-    Une fois la demande prise en compte, la nouvelle adresse électronique de
+    Une fois la demande prise en compte, la nouvelle adresse email de
     votre compte sera #{unconfirmed_email}.
 - else
   %p
-    Le changement d’adresse électronique de votre compte #{@email} sur
+    Le changement d’adresse email de votre compte #{@email} sur
     demarches-simplifiees.fr a bien été pris en compte.
     Vous pouvez désormais vous connecter avec l’adresse #{@resource.email}.
 
diff --git a/config/locales/devise.fr.yml b/config/locales/devise.fr.yml
index f8bc1580e..f90487052 100755
--- a/config/locales/devise.fr.yml
+++ b/config/locales/devise.fr.yml
@@ -5,14 +5,14 @@ fr:
     confirmations:
       confirmed: "Votre compte a été validé."
       send_instructions: 'Vous allez recevoir un courriel avec les instructions nécessaires à la confirmation de votre compte dans quelques minutes.'
-      send_paranoid_instructions: "Si votre adresse électronique existe dans notre base de données, vous allez bientôt recevoir un courriel contenant les instructions de confirmation de votre compte."
+      send_paranoid_instructions: "Si votre adresse email existe dans notre base de données, vous allez bientôt recevoir un courriel contenant les instructions de confirmation de votre compte."
     failure:
       already_authenticated: "Vous êtes déjà connecté"
       inactive: "Votre compte n'est pas encore activé."
-      invalid: "Adresse électronique ou mot de passe incorrect."
+      invalid: "adresse email ou mot de passe incorrect."
       last_attempt: "Vous avez droit à une tentative avant que votre compte ne soit verrouillé."
       locked: "Votre compte est verrouillé."
-      not_found_in_database: "Adresse électronique ou mot de passe invalide."
+      not_found_in_database: "adresse email ou mot de passe invalide."
       timeout: "Votre session est expirée. Veuillez vous reconnecter pour continuer."
       unauthenticated: "Vous devez vous connecter ou vous inscrire pour continuer."
       unconfirmed: "Vous devez valider votre compte pour continuer."
@@ -24,7 +24,7 @@ fr:
       unlock_instructions:
         subject: "Instructions pour déverrouiller le compte"
       email_changed:
-        subject: "Changement d’adresse électronique"
+        subject: "Changement d’adresse email"
       password_change:
         subject: "Votre mot de passe a été modifié avec succés."
     omniauth_callbacks:
@@ -33,7 +33,7 @@ fr:
     passwords:
       no_token: "Vous ne pouvez accéder à cette page sans passer par un courriel de réinitialisation de mot de passe. Si vous êtes passé par un courriel de ce type, assurez-vous d'utiliser l'URL complète."
       send_instructions: "Vous allez recevoir les instructions de réinitialisation du mot de passe dans quelques instants"
-      send_paranoid_instructions: "Si votre adresse électronique existe dans notre base de données, vous allez recevoir un lien de réinitialisation par courriel"
+      send_paranoid_instructions: "Si votre adresse email existe dans notre base de données, vous allez recevoir un lien de réinitialisation par courriel"
       updated: "Votre mot de passe a été édité avec succès, vous êtes maintenant connecté"
       updated_not_active: "Votre mot de passe a été changé avec succès."
     registrations:
@@ -41,8 +41,8 @@ fr:
       signed_up: "Bienvenue, vous êtes connecté."
       signed_up_but_inactive: "Vous êtes bien enregistré. Vous ne pouvez cependant pas vous connecter car votre compte n'est pas encore activé."
       signed_up_but_locked: "Vous êtes bien enregistré. Vous ne pouvez cependant pas vous connecter car votre compte est verrouillé."
-      signed_up_but_unconfirmed: "Un message contenant un lien de confirmation a été envoyé à votre adresse électronique. Ouvrez ce lien pour activer votre compte."
-      update_needs_confirmation: "Votre compte a bien été mis à jour mais nous devons vérifier votre nouvelle adresse électronique. Merci de vérifier vos courriels et de cliquer sur le lien de confirmation pour finaliser la validation de votre nouvelle adresse."
+      signed_up_but_unconfirmed: "Un message contenant un lien de confirmation a été envoyé à votre adresse email. Ouvrez ce lien pour activer votre compte."
+      update_needs_confirmation: "Votre compte a bien été mis à jour mais nous devons vérifier votre nouvelle adresse email. Merci de vérifier vos courriels et de cliquer sur le lien de confirmation pour finaliser la validation de votre nouvelle adresse."
       updated: "Votre compte a été modifié avec succès."
     sessions:
       signed_in: "Connecté."

From f86cc835f86d07dcf29559ce6d559b76108658ae Mon Sep 17 00:00:00 2001
From: gregoirenovel <log@kinko.fr>
Date: Wed, 19 Sep 2018 15:02:32 +0200
Subject: [PATCH 04/27] =?UTF-8?q?courriel=20=E2=86=92=20email=20/=20adress?=
 =?UTF-8?q?e=20email?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reset_password_instructions.html.haml            |  2 +-
 .../new_administrateur/services/_form.html.haml      |  2 +-
 config/locales/devise.fr.yml                         | 12 ++++++------
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/views/devise_mailer/reset_password_instructions.html.haml b/app/views/devise_mailer/reset_password_instructions.html.haml
index 2b81633a1..9aaf2ad9d 100644
--- a/app/views/devise_mailer/reset_password_instructions.html.haml
+++ b/app/views/devise_mailer/reset_password_instructions.html.haml
@@ -7,7 +7,7 @@
   = link_to edit_password_url(@resource, reset_password_token: @token), edit_password_url(@resource, reset_password_token: @token)
 
 %p
-  Si vous n'avez pas effectué une telle demande, merci d'ignorer ce courriel. Votre mot de passe ne sera pas changé.
+  Si vous n'avez pas effectué une telle demande, merci d'ignorer cet email. Votre mot de passe ne sera pas changé.
 
 %p
   Bonne journée,
diff --git a/app/views/new_administrateur/services/_form.html.haml b/app/views/new_administrateur/services/_form.html.haml
index 0fb2e0a3b..29006ebb2 100644
--- a/app/views/new_administrateur/services/_form.html.haml
+++ b/app/views/new_administrateur/services/_form.html.haml
@@ -31,7 +31,7 @@
   %p.explication Ces informations seront visibles par les utilisateurs du formulaire.
 
   = f.label :email do
-    Courriel
+    Adresse email
     %span.mandatory *
   = f.email_field :email, placeholder: 'contact@mon-service.fr', required: true
 
diff --git a/config/locales/devise.fr.yml b/config/locales/devise.fr.yml
index f90487052..5dc00dbd8 100755
--- a/config/locales/devise.fr.yml
+++ b/config/locales/devise.fr.yml
@@ -4,8 +4,8 @@ fr:
   devise:
     confirmations:
       confirmed: "Votre compte a été validé."
-      send_instructions: 'Vous allez recevoir un courriel avec les instructions nécessaires à la confirmation de votre compte dans quelques minutes.'
-      send_paranoid_instructions: "Si votre adresse email existe dans notre base de données, vous allez bientôt recevoir un courriel contenant les instructions de confirmation de votre compte."
+      send_instructions: 'Vous allez recevoir un email avec les instructions nécessaires à la confirmation de votre compte dans quelques minutes.'
+      send_paranoid_instructions: "Si votre adresse email existe dans notre base de données, vous allez bientôt recevoir un email contenant les instructions de confirmation de votre compte."
     failure:
       already_authenticated: "Vous êtes déjà connecté"
       inactive: "Votre compte n'est pas encore activé."
@@ -31,9 +31,9 @@ fr:
       failure: "Nous n'avons pas pu vous authentifier via %{kind} : '%{reason}'."
       success: "Authentifié avec succès via %{kind}."
     passwords:
-      no_token: "Vous ne pouvez accéder à cette page sans passer par un courriel de réinitialisation de mot de passe. Si vous êtes passé par un courriel de ce type, assurez-vous d'utiliser l'URL complète."
+      no_token: "Vous ne pouvez accéder à cette page sans passer par un email de réinitialisation de mot de passe. Si vous êtes passé par un email de ce type, assurez-vous d'utiliser l'URL complète."
       send_instructions: "Vous allez recevoir les instructions de réinitialisation du mot de passe dans quelques instants"
-      send_paranoid_instructions: "Si votre adresse email existe dans notre base de données, vous allez recevoir un lien de réinitialisation par courriel"
+      send_paranoid_instructions: "Si votre adresse email existe dans notre base de données, vous allez recevoir un lien de réinitialisation par email"
       updated: "Votre mot de passe a été édité avec succès, vous êtes maintenant connecté"
       updated_not_active: "Votre mot de passe a été changé avec succès."
     registrations:
@@ -42,7 +42,7 @@ fr:
       signed_up_but_inactive: "Vous êtes bien enregistré. Vous ne pouvez cependant pas vous connecter car votre compte n'est pas encore activé."
       signed_up_but_locked: "Vous êtes bien enregistré. Vous ne pouvez cependant pas vous connecter car votre compte est verrouillé."
       signed_up_but_unconfirmed: "Un message contenant un lien de confirmation a été envoyé à votre adresse email. Ouvrez ce lien pour activer votre compte."
-      update_needs_confirmation: "Votre compte a bien été mis à jour mais nous devons vérifier votre nouvelle adresse email. Merci de vérifier vos courriels et de cliquer sur le lien de confirmation pour finaliser la validation de votre nouvelle adresse."
+      update_needs_confirmation: "Votre compte a bien été mis à jour mais nous devons vérifier votre nouvelle adresse email. Merci de vérifier vos email et de cliquer sur le lien de confirmation pour finaliser la validation de votre nouvelle adresse."
       updated: "Votre compte a été modifié avec succès."
     sessions:
       signed_in: "Connecté."
@@ -50,7 +50,7 @@ fr:
       already_signed_out: "Déconnecté."
     unlocks:
       send_instructions: "Vous allez recevoir les instructions nécessaires au déverrouillage de votre compte dans quelques instants"
-      send_paranoid_instructions: "Si votre compte existe, vous allez bientôt recevoir un courriel contenant les instructions pour le déverrouiller."
+      send_paranoid_instructions: "Si votre compte existe, vous allez bientôt recevoir un email contenant les instructions pour le déverrouiller."
       unlocked: "Votre compte a été déverrouillé avec succès, vous êtes maintenant connecté."
   errors:
     messages:

From b317b49b3df9f8ae0f1d087210411385bbdccd2d Mon Sep 17 00:00:00 2001
From: gregoirenovel <log@kinko.fr>
Date: Wed, 19 Sep 2018 15:05:26 +0200
Subject: [PATCH 05/27] =?UTF-8?q?Confirmation=20=E2=86=92=20activation?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/manager/users_controller.rb |  4 ++--
 config/locales/devise.fr.yml                | 16 ++++++++--------
 spec/features/new_user/invite_spec.rb       |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/app/controllers/manager/users_controller.rb b/app/controllers/manager/users_controller.rb
index 9e59c1500..882993909 100644
--- a/app/controllers/manager/users_controller.rb
+++ b/app/controllers/manager/users_controller.rb
@@ -3,14 +3,14 @@ module Manager
     def resend_confirmation_instructions
       user = User.find(params[:id])
       user.resend_confirmation_instructions
-      flash[:notice] = "Le message de confirmation de l’adresse email a été renvoyé."
+      flash[:notice] = "L'email d'activation de votre compte a été renvoyé."
       redirect_to manager_user_path(user)
     end
 
     def confirm
       user = User.find(params[:id])
       user.confirm
-      flash[:notice] = "L’adresse email de l’utilisateur a été marquée comme confirmée."
+      flash[:notice] = "L’adresse email de l’utilisateur a été marquée comme activée."
       redirect_to manager_user_path(user)
     end
   end
diff --git a/config/locales/devise.fr.yml b/config/locales/devise.fr.yml
index 5dc00dbd8..0abdf51f4 100755
--- a/config/locales/devise.fr.yml
+++ b/config/locales/devise.fr.yml
@@ -3,9 +3,9 @@
 fr:
   devise:
     confirmations:
-      confirmed: "Votre compte a été validé."
-      send_instructions: 'Vous allez recevoir un email avec les instructions nécessaires à la confirmation de votre compte dans quelques minutes.'
-      send_paranoid_instructions: "Si votre adresse email existe dans notre base de données, vous allez bientôt recevoir un email contenant les instructions de confirmation de votre compte."
+      confirmed: "Votre compte a été activé."
+      send_instructions: "Vous allez recevoir un email avec les instructions nécessaires à l'activation de votre compte dans quelques minutes."
+      send_paranoid_instructions: "Si votre adresse email existe dans notre base de données, vous allez bientôt recevoir un email contenant les instructions d'activation de votre compte."
     failure:
       already_authenticated: "Vous êtes déjà connecté"
       inactive: "Votre compte n'est pas encore activé."
@@ -15,10 +15,10 @@ fr:
       not_found_in_database: "adresse email ou mot de passe invalide."
       timeout: "Votre session est expirée. Veuillez vous reconnecter pour continuer."
       unauthenticated: "Vous devez vous connecter ou vous inscrire pour continuer."
-      unconfirmed: "Vous devez valider votre compte pour continuer."
+      unconfirmed: "Vous devez activer votre compte pour continuer."
     mailer:
       confirmation_instructions:
-        subject: "Instructions de confirmation"
+        subject: "Instructions d'activation de votre compte"
       reset_password_instructions:
         subject: "Instructions pour changer le mot de passe"
       unlock_instructions:
@@ -41,8 +41,8 @@ fr:
       signed_up: "Bienvenue, vous êtes connecté."
       signed_up_but_inactive: "Vous êtes bien enregistré. Vous ne pouvez cependant pas vous connecter car votre compte n'est pas encore activé."
       signed_up_but_locked: "Vous êtes bien enregistré. Vous ne pouvez cependant pas vous connecter car votre compte est verrouillé."
-      signed_up_but_unconfirmed: "Un message contenant un lien de confirmation a été envoyé à votre adresse email. Ouvrez ce lien pour activer votre compte."
-      update_needs_confirmation: "Votre compte a bien été mis à jour mais nous devons vérifier votre nouvelle adresse email. Merci de vérifier vos email et de cliquer sur le lien de confirmation pour finaliser la validation de votre nouvelle adresse."
+      signed_up_but_unconfirmed: "Un message contenant un lien d'activation a été envoyé à votre adresse email. Ouvrez ce lien pour activer votre compte."
+      update_needs_confirmation: "Votre compte a bien été mis à jour mais nous devons vérifier votre nouvelle adresse email. Merci de vérifier vos email et de cliquer sur le lien d'activation pour finaliser la validation de votre nouvelle adresse."
       updated: "Votre compte a été modifié avec succès."
     sessions:
       signed_in: "Connecté."
@@ -55,7 +55,7 @@ fr:
   errors:
     messages:
       already_confirmed: "a déjà été validé(e), veuillez essayer de vous connecter"
-      confirmation_period_expired: "à confirmer dans les %{period}, merci de faire une nouvelle demande"
+      confirmation_period_expired: "à activer dans les %{period}, merci de faire une nouvelle demande"
       expired: "a expiré, merci d'en faire une nouvelle demande"
       not_found: "n'a pas été trouvé(e)"
       not_locked: "n'était pas verrouillé(e)"
diff --git a/spec/features/new_user/invite_spec.rb b/spec/features/new_user/invite_spec.rb
index ae9de45d6..08c4d6385 100644
--- a/spec/features/new_user/invite_spec.rb
+++ b/spec/features/new_user/invite_spec.rb
@@ -38,7 +38,7 @@ feature 'Invitations' do
         fill_in 'user_password', with: user_password
         click_on 'Créer un compte'
 
-        expect(page).to have_content('lien de confirmation')
+        expect(page).to have_content("lien d'activation")
 
         # Confirm the email
         user = User.find_by(email: invite.email)

From 6e867bb9ee1fd6a5e48cabc8635aa1a70e258659 Mon Sep 17 00:00:00 2001
From: gregoirenovel <log@kinko.fr>
Date: Thu, 20 Sep 2018 11:17:34 +0200
Subject: [PATCH 06/27] Remove unused tasks from Rakefile

---
 Rakefile | 22 ----------------------
 1 file changed, 22 deletions(-)

diff --git a/Rakefile b/Rakefile
index b1ed331ca..d0e8aa243 100644
--- a/Rakefile
+++ b/Rakefile
@@ -13,31 +13,9 @@ task :lint do
   sh "yarn lint:js"
 end
 
-task :deploy do
-  domains = %w(37.187.249.111 149.202.72.152 149.202.198.6)
-  domains.each do |domain|
-    sh "mina deploy domain=#{domain}"
-  end
-end
-
 task :deploy_ha do
   domains = %w(149.202.72.152 149.202.198.6)
   domains.each do |domain|
     sh "mina deploy domain=#{domain}"
   end
 end
-
-task :deploy_old do
-  domains = %w(37.187.154.237 37.187.249.111)
-  domains.each do |domain|
-    sh "mina deploy domain=#{domain}"
-  end
-end
-
-task :deploy_test do
-  domains = %w(192.168.0.116)
-  branch = 'clamav'
-  domains.each do |domain|
-    sh "mina deploy domain=#{domain} branch=#{branch}"
-  end
-end

From fa2afe6820a7587d6d683128b82074c1f28b84d0 Mon Sep 17 00:00:00 2001
From: gregoirenovel <log@kinko.fr>
Date: Thu, 20 Sep 2018 11:19:55 +0200
Subject: [PATCH 07/27] Extract the lint task in a dedicated file

---
 Rakefile            | 8 --------
 lib/tasks/lint.rake | 7 +++++++
 2 files changed, 7 insertions(+), 8 deletions(-)
 create mode 100644 lib/tasks/lint.rake

diff --git a/Rakefile b/Rakefile
index d0e8aa243..f6261c343 100644
--- a/Rakefile
+++ b/Rakefile
@@ -5,14 +5,6 @@ require File.expand_path('config/application', __dir__)
 
 Rails.application.load_tasks
 
-task :lint do
-  sh "bundle exec rubocop"
-  sh "bundle exec haml-lint app/views/"
-  sh "bundle exec scss-lint app/assets/stylesheets/"
-  sh "bundle exec brakeman --no-pager"
-  sh "yarn lint:js"
-end
-
 task :deploy_ha do
   domains = %w(149.202.72.152 149.202.198.6)
   domains.each do |domain|
diff --git a/lib/tasks/lint.rake b/lib/tasks/lint.rake
new file mode 100644
index 000000000..a5c8a0985
--- /dev/null
+++ b/lib/tasks/lint.rake
@@ -0,0 +1,7 @@
+task :lint do
+  sh "bundle exec rubocop"
+  sh "bundle exec haml-lint app/views/"
+  sh "bundle exec scss-lint app/assets/stylesheets/"
+  sh "bundle exec brakeman --no-pager"
+  sh "yarn lint:js"
+end

From e2b09df049522c4e240e614950389dd9025954f4 Mon Sep 17 00:00:00 2001
From: gregoirenovel <log@kinko.fr>
Date: Thu, 20 Sep 2018 11:20:23 +0200
Subject: [PATCH 08/27] Extract the deploy_ha task in a dedicated file

---
 Rakefile                 | 7 -------
 lib/tasks/deploy_ha.rake | 6 ++++++
 2 files changed, 6 insertions(+), 7 deletions(-)
 create mode 100644 lib/tasks/deploy_ha.rake

diff --git a/Rakefile b/Rakefile
index f6261c343..f7a26ddaf 100644
--- a/Rakefile
+++ b/Rakefile
@@ -4,10 +4,3 @@
 require File.expand_path('config/application', __dir__)
 
 Rails.application.load_tasks
-
-task :deploy_ha do
-  domains = %w(149.202.72.152 149.202.198.6)
-  domains.each do |domain|
-    sh "mina deploy domain=#{domain}"
-  end
-end
diff --git a/lib/tasks/deploy_ha.rake b/lib/tasks/deploy_ha.rake
new file mode 100644
index 000000000..492b4742b
--- /dev/null
+++ b/lib/tasks/deploy_ha.rake
@@ -0,0 +1,6 @@
+task :deploy_ha do
+  domains = %w(149.202.72.152 149.202.198.6)
+  domains.each do |domain|
+    sh "mina deploy domain=#{domain}"
+  end
+end

From 516860c92ee97f22fec0a77ddf11f836fb6073e2 Mon Sep 17 00:00:00 2001
From: gregoirenovel <log@kinko.fr>
Date: Thu, 20 Sep 2018 11:20:57 +0200
Subject: [PATCH 09/27] =?UTF-8?q?deploy=5Fha=20=E2=86=92=20deploy?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .circleci/config.yml                      | 4 ++--
 lib/tasks/{deploy_ha.rake => deploy.rake} | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename lib/tasks/{deploy_ha.rake => deploy.rake} (86%)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index baba1cf04..9955ed5da 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -104,11 +104,11 @@ jobs:
       - deploy:
           command: |
             if [ "${CIRCLE_BRANCH}" == "dev" ]; then
-              bundle exec rake deploy_ha
+              bundle exec rake deploy
             fi
 
             if [ "${CIRCLE_BRANCH}" == "master" ]; then
-              bundle exec rake deploy_ha to=production
+              bundle exec rake deploy to=production
             fi
 
 workflows:
diff --git a/lib/tasks/deploy_ha.rake b/lib/tasks/deploy.rake
similarity index 86%
rename from lib/tasks/deploy_ha.rake
rename to lib/tasks/deploy.rake
index 492b4742b..e111efa73 100644
--- a/lib/tasks/deploy_ha.rake
+++ b/lib/tasks/deploy.rake
@@ -1,4 +1,4 @@
-task :deploy_ha do
+task :deploy do
   domains = %w(149.202.72.152 149.202.198.6)
   domains.each do |domain|
     sh "mina deploy domain=#{domain}"

From 2f940eed6d152d99638bc4bbfdae06d272809238 Mon Sep 17 00:00:00 2001
From: gregoirenovel <log@kinko.fr>
Date: Thu, 20 Sep 2018 11:25:25 +0200
Subject: [PATCH 10/27] Remove a useless comment from deploy.rb

---
 config/deploy.rb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/config/deploy.rb b/config/deploy.rb
index 30b987ac6..04f2b18fa 100644
--- a/config/deploy.rb
+++ b/config/deploy.rb
@@ -15,7 +15,6 @@ raise "Bad to=#{+ENV['to']}" if !["staging", "production"].include?(ENV['to'])
 
 raise "missing domain, run with 'rake deploy domain=37.187.154.237'" if ENV['domain'].nil?
 
-# set :domain, '5.135.190.60'
 set :domain, ENV['domain']
 set :repository, 'https://github.com/betagouv/tps.git'
 set :port, 2200

From 276cb55d9ae3171624ba76af3463913e73383772 Mon Sep 17 00:00:00 2001
From: gregoirenovel <log@kinko.fr>
Date: Thu, 20 Sep 2018 11:25:40 +0200
Subject: [PATCH 11/27] Remove a useless instruction from deploy.rb

---
 config/deploy.rb | 2 --
 1 file changed, 2 deletions(-)

diff --git a/config/deploy.rb b/config/deploy.rb
index 04f2b18fa..04a507fdd 100644
--- a/config/deploy.rb
+++ b/config/deploy.rb
@@ -19,8 +19,6 @@ set :domain, ENV['domain']
 set :repository, 'https://github.com/betagouv/tps.git'
 set :port, 2200
 
-set :deploy_to, '/var/www/tps_dev'
-
 case ENV["to"]
 when "staging"
   set :branch, ENV['branch'] || 'dev'

From ec545758c362fc37b63d925276f6fd7957a7907c Mon Sep 17 00:00:00 2001
From: gregoirenovel <log@kinko.fr>
Date: Thu, 20 Sep 2018 11:26:25 +0200
Subject: [PATCH 12/27] Improve deploy.rb readability

---
 config/deploy.rb | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/config/deploy.rb b/config/deploy.rb
index 04a507fdd..feaa46084 100644
--- a/config/deploy.rb
+++ b/config/deploy.rb
@@ -11,9 +11,13 @@ require 'mina/rbenv' # for rbenv support. (http://rbenv.org)
 #   branch       - Branch name to deploy. (needed by mina/git)
 
 ENV['to'] ||= "staging"
-raise "Bad to=#{+ENV['to']}" if !["staging", "production"].include?(ENV['to'])
+if !["staging", "production"].include?(ENV['to'])
+  raise "Bad to=#{+ENV['to']}"
+end
 
-raise "missing domain, run with 'rake deploy domain=37.187.154.237'" if ENV['domain'].nil?
+if ENV['domain'].nil?
+  raise "missing domain, run with 'rake deploy domain=37.187.154.237'"
+end
 
 set :domain, ENV['domain']
 set :repository, 'https://github.com/betagouv/tps.git'

From fd13f9dbb2c67ee0f79e29d094b6e768a4045ef0 Mon Sep 17 00:00:00 2001
From: gregoirenovel <log@kinko.fr>
Date: Thu, 20 Sep 2018 11:28:58 +0200
Subject: [PATCH 13/27] Remove default fallback on staging for the deploy
 destination

Explicit > implicit
---
 .circleci/config.yml | 2 +-
 config/deploy.rb     | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 9955ed5da..d3e04fc3c 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -104,7 +104,7 @@ jobs:
       - deploy:
           command: |
             if [ "${CIRCLE_BRANCH}" == "dev" ]; then
-              bundle exec rake deploy
+              bundle exec rake deploy to=staging
             fi
 
             if [ "${CIRCLE_BRANCH}" == "master" ]; then
diff --git a/config/deploy.rb b/config/deploy.rb
index feaa46084..21f37c4ff 100644
--- a/config/deploy.rb
+++ b/config/deploy.rb
@@ -10,7 +10,6 @@ require 'mina/rbenv' # for rbenv support. (http://rbenv.org)
 #   repository   - Git repo to clone from. (needed by mina/git)
 #   branch       - Branch name to deploy. (needed by mina/git)
 
-ENV['to'] ||= "staging"
 if !["staging", "production"].include?(ENV['to'])
   raise "Bad to=#{+ENV['to']}"
 end

From 6dbb916c6a869e6300f3e8f3b8bbe2d64fc52c31 Mon Sep 17 00:00:00 2001
From: gregoirenovel <log@kinko.fr>
Date: Thu, 20 Sep 2018 11:33:33 +0200
Subject: [PATCH 14/27] Remove useless comments from deploy.rb

---
 config/deploy.rb | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

diff --git a/config/deploy.rb b/config/deploy.rb
index 21f37c4ff..eafd61382 100644
--- a/config/deploy.rb
+++ b/config/deploy.rb
@@ -1,8 +1,7 @@
 require 'mina/bundler'
 require 'mina/rails'
 require 'mina/git'
-require 'mina/rbenv' # for rbenv support. (http://rbenv.org)
-# require 'mina/rvm'    # for rvm support. (http://rvm.io)
+require 'mina/rbenv'
 
 # Basic settings:
 #   domain       - The hostname to SSH to.
@@ -39,9 +38,6 @@ print "Deploy to #{ENV['to']} environment branch #{branch}\n"
 
 set :rails_env, 'production'
 
-# For system-wide RVM install.
-#   set :rvm_path, '/usr/local/rvm/bin/rvm'
-
 # Manually create these paths in shared/ (eg: shared/config/database.yml) in your server.
 # They will be linked in the 'deploy:link_shared_paths' step.
 set :shared_paths, [
@@ -58,9 +54,6 @@ set :shared_paths, [
 
 set :rbenv_path, "/usr/local/rbenv/bin/rbenv"
 
-# Optional settings:
-#   set :user, 'foobar'    # Username in the server to SSH to.
-#   set :port, '30000'     # SSH port number.
 set :forward_agent, true # SSH forward_agent.
 
 # This task is the environment that is loaded for most commands, such as
@@ -144,9 +137,3 @@ task :deploy => :environment do
     end
   end
 end
-# For help in making your deploy script, see the Mina documentation:
-#
-#  - http://nadarei.co/mina
-#  - http://nadarei.co/mina/tasks
-#  - http://nadarei.co/mina/settings
-#  - http://nadarei.co/mina/helpers

From c445de9f83ad1229218fea10eada79ef7ec81fc0 Mon Sep 17 00:00:00 2001
From: gregoirenovel <log@kinko.fr>
Date: Thu, 20 Sep 2018 11:34:59 +0200
Subject: [PATCH 15/27] Regroup definitions at the top of deploy.rb

---
 config/deploy.rb | 33 +++++++++++++++------------------
 1 file changed, 15 insertions(+), 18 deletions(-)

diff --git a/config/deploy.rb b/config/deploy.rb
index eafd61382..d3dca9ca5 100644
--- a/config/deploy.rb
+++ b/config/deploy.rb
@@ -20,23 +20,9 @@ end
 set :domain, ENV['domain']
 set :repository, 'https://github.com/betagouv/tps.git'
 set :port, 2200
-
-case ENV["to"]
-when "staging"
-  set :branch, ENV['branch'] || 'dev'
-  set :deploy_to, '/var/www/tps_dev'
-  set :user, 'tps_dev' # Username in the server to SSH to.
-  appname = 'tps_dev'
-when "production"
-  set :branch, ENV['branch'] || 'master'
-  set :deploy_to, '/var/www/tps'
-  set :user, 'tps' # Username in the server to SSH to.
-  appname = 'tps'
-end
-
-print "Deploy to #{ENV['to']} environment branch #{branch}\n"
-
 set :rails_env, 'production'
+set :rbenv_path, "/usr/local/rbenv/bin/rbenv"
+set :forward_agent, true # SSH forward_agent.
 
 # Manually create these paths in shared/ (eg: shared/config/database.yml) in your server.
 # They will be linked in the 'deploy:link_shared_paths' step.
@@ -52,9 +38,20 @@ set :shared_paths, [
   'config/unicorn.rb'
 ]
 
-set :rbenv_path, "/usr/local/rbenv/bin/rbenv"
+case ENV["to"]
+when "staging"
+  set :branch, ENV['branch'] || 'dev'
+  set :deploy_to, '/var/www/tps_dev'
+  set :user, 'tps_dev' # Username in the server to SSH to.
+  appname = 'tps_dev'
+when "production"
+  set :branch, ENV['branch'] || 'master'
+  set :deploy_to, '/var/www/tps'
+  set :user, 'tps' # Username in the server to SSH to.
+  appname = 'tps'
+end
 
-set :forward_agent, true # SSH forward_agent.
+print "Deploy to #{ENV['to']} environment branch #{branch}\n"
 
 # This task is the environment that is loaded for most commands, such as
 # `mina deploy` or `mina rake`.

From 90e7a5d276b8989443af4e60e2d63a28123c3417 Mon Sep 17 00:00:00 2001
From: gregoirenovel <log@kinko.fr>
Date: Thu, 20 Sep 2018 11:39:02 +0200
Subject: [PATCH 16/27] Improve error messages

---
 config/deploy.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/deploy.rb b/config/deploy.rb
index d3dca9ca5..04b4e1c0d 100644
--- a/config/deploy.rb
+++ b/config/deploy.rb
@@ -10,11 +10,11 @@ require 'mina/rbenv'
 #   branch       - Branch name to deploy. (needed by mina/git)
 
 if !["staging", "production"].include?(ENV['to'])
-  raise "Bad to=#{+ENV['to']}"
+  raise "missing or incorrect `to` (should be 'staging' or 'production')"
 end
 
 if ENV['domain'].nil?
-  raise "missing domain, run with 'rake deploy domain=37.187.154.237'"
+  raise "missing `domain`"
 end
 
 set :domain, ENV['domain']

From 591e6f25c3a6f8f4d599a91dce72250462405981 Mon Sep 17 00:00:00 2001
From: Mathieu Magnin <mathieu.magnin@gmail.com>
Date: Thu, 20 Sep 2018 14:11:39 +0200
Subject: [PATCH 17/27] Change ssh key for deploy

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index d3e04fc3c..1a14fd998 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -100,7 +100,7 @@ jobs:
       - *bundle_install
       - add_ssh_keys:
           fingerprints:
-            - "0a:67:42:7d:7e:b7:e1:3c:48:8f:bf:68:10:51:a8:44"
+            - "0e:db:db:9c:54:ac:60:1a:d3:ba:28:03:2e:7d:0e:9a"
       - deploy:
           command: |
             if [ "${CIRCLE_BRANCH}" == "dev" ]; then

From 905a715e16ddd2a6f50c1483fbf1852b7ecf8697 Mon Sep 17 00:00:00 2001
From: Paul Chavard <git@paul.chavard.net>
Date: Wed, 19 Sep 2018 17:03:00 +0200
Subject: [PATCH 18/27] Fix dossier link

---
 app/controllers/application_controller.rb                  | 2 --
 app/views/shared/champs/dossier_link/_help_block.html.haml | 4 +++-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index e1b052a25..ed758ddbf 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -90,8 +90,6 @@ class ApplicationController < ActionController::Base
     logged_users.first
   end
 
-  helper_method :logged_user
-
   def logged_user_roles
     roles = logged_users.map { |logged_user| logged_user.class.name }
     roles.any? ? roles.join(', ') : 'Guest'
diff --git a/app/views/shared/champs/dossier_link/_help_block.html.haml b/app/views/shared/champs/dossier_link/_help_block.html.haml
index 624dc21c8..ebf725a29 100644
--- a/app/views/shared/champs/dossier_link/_help_block.html.haml
+++ b/app/views/shared/champs/dossier_link/_help_block.html.haml
@@ -1,5 +1,7 @@
 - if id.present?
-  - dossier = logged_user.dossiers.find_by(id: id)
+  - dossier = current_user&.dossiers&.find_by(id: id)
+  - dossier ||= current_gestionnaire&.dossiers&.find_by(id: id)
+  - dossier ||= current_administrateur&.dossiers&.find_by(id: id)
   - if dossier.blank?
     %p.text-warning
       Ce dossier est inconnu

From f2139552c2612e4bbf523b3c2eabbb0055362188 Mon Sep 17 00:00:00 2001
From: Paul Chavard <git@paul.chavard.net>
Date: Wed, 19 Sep 2018 17:11:25 +0200
Subject: [PATCH 19/27] Reset Flipflop before each test

---
 spec/controllers/new_user/dossiers_controller_spec.rb | 8 --------
 spec/features/new_user/dossier_details_spec.rb        | 4 ----
 spec/spec_helper.rb                                   | 2 ++
 3 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/spec/controllers/new_user/dossiers_controller_spec.rb b/spec/controllers/new_user/dossiers_controller_spec.rb
index 88b0ccbe7..de694100a 100644
--- a/spec/controllers/new_user/dossiers_controller_spec.rb
+++ b/spec/controllers/new_user/dossiers_controller_spec.rb
@@ -585,10 +585,6 @@ describe NewUser::DossiersController, type: :controller do
       sign_in(user)
     end
 
-    after do
-      Flipflop::FeatureSet.current.test!.switch!(:new_dossier_details, false)
-    end
-
     subject! { get(:show, params: { id: dossier.id }) }
 
     context 'when the dossier is a brouillon' do
@@ -620,10 +616,6 @@ describe NewUser::DossiersController, type: :controller do
       sign_in(user)
     end
 
-    after do
-      Flipflop::FeatureSet.current.test!.switch!(:new_dossier_details, false)
-    end
-
     subject! { get(:demande, params: { id: dossier.id }) }
 
     it { expect(assigns(:dossier)).to eq(dossier) }
diff --git a/spec/features/new_user/dossier_details_spec.rb b/spec/features/new_user/dossier_details_spec.rb
index ae3ec8248..fb62483bf 100644
--- a/spec/features/new_user/dossier_details_spec.rb
+++ b/spec/features/new_user/dossier_details_spec.rb
@@ -10,10 +10,6 @@ describe 'Dossier details:' do
     Flipflop::FeatureSet.current.test!.switch!(:new_dossier_details, true)
   end
 
-  after do
-    Flipflop::FeatureSet.current.test!.switch!(:new_dossier_details, false)
-  end
-
   scenario 'the user can see the summary of the dossier status' do
     visit_dossier dossier
 
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index e9a3be72a..0bb43cb55 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -127,6 +127,8 @@ RSpec.configure do |config|
   config.before(:each) do
     allow_any_instance_of(PieceJustificativeUploader).to receive(:generate_secure_token).and_return("3dbb3535-5388-4a37-bc2d-778327b9f997")
     allow_any_instance_of(ProcedureLogoUploader).to receive(:generate_secure_token).and_return("3dbb3535-5388-4a37-bc2d-778327b9f998")
+
+    Flipflop::FeatureSet.current.test!.reset!
   end
 
   config.before(:all) {

From a9da6047c39043ff984b3916cd17691fc1f69ef1 Mon Sep 17 00:00:00 2001
From: gregoirenovel <log@kinko.fr>
Date: Thu, 20 Sep 2018 13:58:39 +0200
Subject: [PATCH 20/27] Add eclint to package.json

---
 package.json |   1 +
 yarn.lock    | 707 +++++++++++++++++++++++++++++++++++++++++++++++++--
 2 files changed, 688 insertions(+), 20 deletions(-)

diff --git a/package.json b/package.json
index d40a59cc6..89b84f3ee 100644
--- a/package.json
+++ b/package.json
@@ -15,6 +15,7 @@
     "turbolinks": "^5.1.1"
   },
   "devDependencies": {
+    "eclint": "^2.8.0",
     "eslint": "^5.2.0",
     "eslint-config-prettier": "^2.9.0",
     "eslint-plugin-prettier": "^2.6.2",
diff --git a/yarn.lock b/yarn.lock
index 2921fab46..f482442fc 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -96,6 +96,16 @@
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.7.0.tgz#9a06f4f137ee84d7df0460c1fdb1135ffa6c50fd"
 
+"@types/commander@^2.11.0":
+  version "2.12.2"
+  resolved "https://registry.yarnpkg.com/@types/commander/-/commander-2.12.2.tgz#183041a23842d4281478fa5d23c5ca78e6fd08ae"
+  dependencies:
+    commander "*"
+
+"@types/semver@^5.4.0":
+  version "5.5.0"
+  resolved "https://registry.yarnpkg.com/@types/semver/-/semver-5.5.0.tgz#146c2a29ee7d3bae4bf2fcb274636e264c813c45"
+
 "@webassemblyjs/ast@1.5.13":
   version "1.5.13"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.5.13.tgz#81155a570bd5803a30ec31436bc2c9c0ede38f25"
@@ -317,18 +327,42 @@ amdefine@>=0.0.4:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5"
 
+ansi-colors@^1.0.1:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-1.1.0.tgz#6374b4dd5d4718ff3ce27a671a3b1cad077132a9"
+  dependencies:
+    ansi-wrap "^0.1.0"
+
+ansi-cyan@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/ansi-cyan/-/ansi-cyan-0.1.1.tgz#538ae528af8982f28ae30d86f2f17456d2609873"
+  dependencies:
+    ansi-wrap "0.1.0"
+
 ansi-escapes@^1.0.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-1.4.0.tgz#d3a8a83b319aa67793662b13e761c7911422306e"
 
-ansi-escapes@^3.0.0:
+ansi-escapes@^3.0.0, ansi-escapes@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.1.0.tgz#f73207bb81207d75fd6c83f125af26eea378ca30"
 
+ansi-gray@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/ansi-gray/-/ansi-gray-0.1.1.tgz#2962cf54ec9792c48510a3deb524436861ef7251"
+  dependencies:
+    ansi-wrap "0.1.0"
+
 ansi-html@0.0.7:
   version "0.0.7"
   resolved "https://registry.yarnpkg.com/ansi-html/-/ansi-html-0.0.7.tgz#813584021962a9e9e6fd039f940d12f56ca7859e"
 
+ansi-red@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/ansi-red/-/ansi-red-0.1.1.tgz#8c638f9d1080800a353c9c28c8a81ca4705d946c"
+  dependencies:
+    ansi-wrap "0.1.0"
+
 ansi-regex@^2.0.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
@@ -351,6 +385,10 @@ ansi-styles@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-1.0.0.tgz#cb102df1c56f5123eab8b67cd7b98027a0279178"
 
+ansi-wrap@0.1.0, ansi-wrap@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/ansi-wrap/-/ansi-wrap-0.1.0.tgz#a82250ddb0015e9a27ca82e82ea603bbfa45efaf"
+
 any-observable@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/any-observable/-/any-observable-0.3.0.tgz#af933475e5806a67d0d7df090dd5e8bef65d119b"
@@ -362,6 +400,12 @@ anymatch@^2.0.0:
     micromatch "^3.1.4"
     normalize-path "^2.1.1"
 
+append-buffer@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/append-buffer/-/append-buffer-1.0.2.tgz#d8220cf466081525efea50614f3de6514dfa58f1"
+  dependencies:
+    buffer-equal "^1.0.0"
+
 aproba@^1.0.3, aproba@^1.1.1:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
@@ -379,6 +423,13 @@ argparse@^1.0.7:
   dependencies:
     sprintf-js "~1.0.2"
 
+arr-diff@^1.0.1:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-1.1.0.tgz#687c32758163588fef7de7b36fabe495eb1a399a"
+  dependencies:
+    arr-flatten "^1.0.1"
+    array-slice "^0.2.3"
+
 arr-diff@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-2.0.0.tgz#8f3b827f955a8bd669697e4a4256ac3ceae356cf"
@@ -393,6 +444,10 @@ arr-flatten@^1.0.1, arr-flatten@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1"
 
+arr-union@^2.0.1:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-2.1.0.tgz#20f9eab5ec70f5c7d215b1077b1c39161d292c7d"
+
 arr-union@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4"
@@ -420,6 +475,10 @@ array-includes@^3.0.3:
     define-properties "^1.1.2"
     es-abstract "^1.7.0"
 
+array-slice@^0.2.3:
+  version "0.2.3"
+  resolved "https://registry.yarnpkg.com/array-slice/-/array-slice-0.2.3.tgz#dd3cfb80ed7973a75117cdac69b0b99ec86186f5"
+
 array-union@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/array-union/-/array-union-1.0.2.tgz#9a34410e4f4e3da23dea375be5be70f24778ec39"
@@ -1227,6 +1286,10 @@ big.js@^3.1.3:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/big.js/-/big.js-3.2.0.tgz#a5fc298b81b9e0dca2e458824784b65c52ba588e"
 
+bignumber.js@^2.4.0:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/bignumber.js/-/bignumber.js-2.4.0.tgz#838a992da9f9d737e0f4b2db0be62bb09dd0c5e8"
+
 binary-extensions@^1.0.0:
   version "1.11.0"
   resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.11.0.tgz#46aa1751fb6a2f93ee5e689bb1087d4b14c6c205"
@@ -1389,6 +1452,14 @@ browserslist@^3.2.6:
     caniuse-lite "^1.0.30000844"
     electron-to-chromium "^1.3.47"
 
+buffer-equal@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/buffer-equal/-/buffer-equal-1.0.0.tgz#59616b498304d556abd466966b22eeda3eca5fbe"
+
+buffer-equals@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/buffer-equals/-/buffer-equals-1.0.4.tgz#0353b54fd07fd9564170671ae6f66b9cf10d27f5"
+
 buffer-from@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.0.tgz#87fcaa3a298358e0ade6e442cfce840740d1ad04"
@@ -1409,6 +1480,18 @@ buffer@^4.3.0:
     ieee754 "^1.1.4"
     isarray "^1.0.0"
 
+buffered-spawn@^3.3.2:
+  version "3.3.2"
+  resolved "https://registry.yarnpkg.com/buffered-spawn/-/buffered-spawn-3.3.2.tgz#97b9846c4e446aa23320b4a94c5209edd32dacbb"
+  dependencies:
+    cross-spawn "^4.0.0"
+
+bufferstreams@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/bufferstreams/-/bufferstreams-2.0.1.tgz#441b267c2fc3fee02bb1d929289da113903bd5ef"
+  dependencies:
+    readable-stream "^2.3.6"
+
 builtin-modules@^1.0.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f"
@@ -1542,7 +1625,7 @@ chalk@^1.0.0, chalk@^1.1.1, chalk@^1.1.3:
     strip-ansi "^3.0.0"
     supports-color "^2.0.0"
 
-chalk@^2.0, chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.0, chalk@^2.3.2, chalk@^2.4.1:
+chalk@^2.0, chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.0, chalk@^2.3.2, chalk@^2.4.0, chalk@^2.4.1:
   version "2.4.1"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.1.tgz#18c49ab16a037b6eb0152cc83e3471338215b66e"
   dependencies:
@@ -1566,6 +1649,12 @@ chartkick@^2.3.6:
   version "2.3.6"
   resolved "https://registry.yarnpkg.com/chartkick/-/chartkick-2.3.6.tgz#a507c54da7d117e66c9a9c5309f7ecccc2d28b51"
 
+checkstyle-formatter@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/checkstyle-formatter/-/checkstyle-formatter-1.1.0.tgz#1c4922dbac72d67242cfb85e7706917d5587b512"
+  dependencies:
+    xml-escape "^1.0.0"
+
 chokidar@^2.0.0, chokidar@^2.0.2:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.0.4.tgz#356ff4e2b0e8e43e322d18a372460bbcf3accd26"
@@ -1595,6 +1684,10 @@ chrome-trace-event@^1.0.0:
   dependencies:
     tslib "^1.9.0"
 
+ci-info@^1.1.3:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-1.6.0.tgz#2ca20dbb9ceb32d4524a683303313f0304b1e497"
+
 cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/cipher-base/-/cipher-base-1.0.4.tgz#8760e4ecc272f4c363532f926d874aae2c1397de"
@@ -1650,6 +1743,13 @@ cli-truncate@^0.2.1:
     slice-ansi "0.0.4"
     string-width "^1.0.1"
 
+cli-truncate@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-1.1.0.tgz#2b2dfd83c53cfd3572b87fc4d430a808afb04086"
+  dependencies:
+    slice-ansi "^1.0.0"
+    string-width "^2.0.0"
+
 cli-width@^2.0.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.0.tgz#ff19ede8a9a5e579324147b0c11f0fbcbabed639"
@@ -1761,6 +1861,10 @@ color-string@^1.4.0, color-string@^1.5.2:
     color-name "^1.0.0"
     simple-swizzle "^0.2.2"
 
+color-support@^1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/color-support/-/color-support-1.1.3.tgz#93834379a1cc9a0c61f82f52f0d04322251bd5a2"
+
 color@^0.11.0:
   version "0.11.4"
   resolved "https://registry.yarnpkg.com/color/-/color-0.11.4.tgz#6d7b5c74fb65e841cd48792ad1ed5e07b904d764"
@@ -1809,6 +1913,10 @@ combined-stream@1.0.6, combined-stream@^1.0.5, combined-stream@~1.0.5:
   dependencies:
     delayed-stream "~1.0.0"
 
+commander@*, commander@^2.11.0:
+  version "2.18.0"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.18.0.tgz#2bf063ddee7c7891176981a2cc798e5754bc6970"
+
 commander@~2.13.0:
   version "2.13.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.13.0.tgz#6964bca67685df7c1f1430c584f07d7597885b9c"
@@ -1888,6 +1996,12 @@ content-type@~1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b"
 
+convert-source-map@^1.5.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.6.0.tgz#51b537a8c43e0f04dec1993bffcdd504e758ac20"
+  dependencies:
+    safe-buffer "~5.1.1"
+
 convert-source-map@^1.5.1:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.5.1.tgz#b8278097b9bc229365de5c62cf5fcaed8b5599e5"
@@ -1967,6 +2081,13 @@ cross-spawn@^3.0.0:
     lru-cache "^4.0.1"
     which "^1.2.9"
 
+cross-spawn@^4.0.0:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-4.0.2.tgz#7b9247621c23adfdd3856004a823cbe397424d41"
+  dependencies:
+    lru-cache "^4.0.1"
+    which "^1.2.9"
+
 cross-spawn@^5.0.1:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449"
@@ -1975,7 +2096,7 @@ cross-spawn@^5.0.1:
     shebang-command "^1.2.0"
     which "^1.2.9"
 
-cross-spawn@^6.0.5:
+cross-spawn@^6.0.0, cross-spawn@^6.0.5:
   version "6.0.5"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"
   dependencies:
@@ -2129,6 +2250,10 @@ date-fns@^1.27.2:
   version "1.29.0"
   resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-1.29.0.tgz#12e609cdcb935127311d04d33334e2960a2a54e6"
 
+date-format@0.0.2:
+  version "0.0.2"
+  resolved "https://registry.yarnpkg.com/date-format/-/date-format-0.0.2.tgz#fafd448f72115ef1e2b739155ae92f2be6c28dd1"
+
 date-now@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/date-now/-/date-now-0.1.4.tgz#eaf439fd4d4848ad74e5cc7dbef200672b9e345b"
@@ -2157,6 +2282,12 @@ decamelize@^1.1.1, decamelize@^1.1.2:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
 
+decamelize@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-2.0.0.tgz#656d7bbc8094c4c788ea53c5840908c9c7d063c7"
+  dependencies:
+    xregexp "4.0.0"
+
 decode-uri-component@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
@@ -2346,10 +2477,41 @@ ecc-jsbn@~0.1.1:
   dependencies:
     jsbn "~0.1.0"
 
+eclint@^2.8.0:
+  version "2.8.0"
+  resolved "https://registry.yarnpkg.com/eclint/-/eclint-2.8.0.tgz#583e655ced485c37510587dce6277def0670e16f"
+  dependencies:
+    editorconfig "^0.15.0"
+    file-type "^8.1.0"
+    gulp-exclude-gitignore "^1.2.0"
+    gulp-filter "^5.1.0"
+    gulp-reporter "^2.9.0"
+    gulp-tap "^1.0.1"
+    linez "^4.1.4"
+    lodash "^4.17.10"
+    minimatch "^3.0.4"
+    os-locale "^2.1.0"
+    plugin-error "^1.0.1"
+    through2 "^2.0.3"
+    vinyl "^2.2.0"
+    vinyl-fs "^3.0.3"
+    yargs "^12.0.1"
+
 editions@^1.3.3:
   version "1.3.4"
   resolved "https://registry.yarnpkg.com/editions/-/editions-1.3.4.tgz#3662cb592347c3168eb8e498a0ff73271d67f50b"
 
+editorconfig@^0.15.0:
+  version "0.15.0"
+  resolved "https://registry.yarnpkg.com/editorconfig/-/editorconfig-0.15.0.tgz#b6dd4a0b6b9e76ce48e066bdc15381aebb8804fd"
+  dependencies:
+    "@types/commander" "^2.11.0"
+    "@types/semver" "^5.4.0"
+    commander "^2.11.0"
+    lru-cache "^4.1.1"
+    semver "^5.4.1"
+    sigmund "^1.0.1"
+
 ee-first@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
@@ -2382,6 +2544,14 @@ emojis-list@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-2.1.0.tgz#4daa4d9db00f9819880c79fa457ae5b09a1fd389"
 
+emphasize@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/emphasize/-/emphasize-2.0.0.tgz#452e94a71f7eac65bc8ebdcc79fde71051c82cbe"
+  dependencies:
+    chalk "^2.4.0"
+    highlight.js "~9.12.0"
+    lowlight "~1.9.0"
+
 encodeurl@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
@@ -2611,6 +2781,18 @@ evp_bytestokey@^1.0.0, evp_bytestokey@^1.0.3:
     md5.js "^1.3.4"
     safe-buffer "^5.1.1"
 
+execa@^0.10.0:
+  version "0.10.0"
+  resolved "https://registry.yarnpkg.com/execa/-/execa-0.10.0.tgz#ff456a8f53f90f8eccc71a96d11bdfc7f082cb50"
+  dependencies:
+    cross-spawn "^6.0.0"
+    get-stream "^3.0.0"
+    is-stream "^1.1.0"
+    npm-run-path "^2.0.0"
+    p-finally "^1.0.0"
+    signal-exit "^3.0.0"
+    strip-eof "^1.0.0"
+
 execa@^0.7.0:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/execa/-/execa-0.7.0.tgz#944becd34cc41ee32a63a9faf27ad5a65fc59777"
@@ -2692,6 +2874,12 @@ express@^4.16.2:
     utils-merge "1.0.1"
     vary "~1.1.2"
 
+extend-shallow@^1.1.2:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-1.1.4.tgz#19d6bf94dfc09d76ba711f39b872d21ff4dd9071"
+  dependencies:
+    kind-of "^1.1.0"
+
 extend-shallow@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f"
@@ -2705,6 +2893,10 @@ extend-shallow@^3.0.0, extend-shallow@^3.0.2:
     assign-symbols "^1.0.0"
     is-extendable "^1.0.1"
 
+extend@^3.0.0:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
+
 extend@~3.0.0, extend@~3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.1.tgz#a755ea7bc1adfcc5a31ce7e762dbaadc5e636444"
@@ -2744,6 +2936,14 @@ extsprintf@^1.2.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f"
 
+fancy-log@^1.3.2:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/fancy-log/-/fancy-log-1.3.2.tgz#f41125e3d84f2e7d89a43d06d958c8f78be16be1"
+  dependencies:
+    ansi-gray "^0.1.1"
+    color-support "^1.1.3"
+    time-stamp "^1.0.0"
+
 fast-deep-equal@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz#c053477817c86b51daa853c81e059b733d023614"
@@ -2779,6 +2979,12 @@ fastparse@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/fastparse/-/fastparse-1.1.1.tgz#d1e2643b38a94d7583b479060e6c4affc94071f8"
 
+fault@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/fault/-/fault-1.0.2.tgz#c3d0fec202f172a3a4d414042ad2bb5e2a3ffbaa"
+  dependencies:
+    format "^0.2.2"
+
 faye-websocket@^0.10.0:
   version "0.10.0"
   resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.10.0.tgz#4e492f8d04dfb6f89003507f6edbf2d501e7c6f4"
@@ -2818,6 +3024,10 @@ file-loader@^1.1.11:
     loader-utils "^1.0.2"
     schema-utils "^0.4.5"
 
+file-type@^8.1.0:
+  version "8.1.0"
+  resolved "https://registry.yarnpkg.com/file-type/-/file-type-8.1.0.tgz#244f3b7ef641bbe0cca196c7276e4b332399f68c"
+
 filename-regex@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/filename-regex/-/filename-regex-2.0.1.tgz#c1c4b9bee3e09725ddb106b75c1e301fe2f18b26"
@@ -2874,6 +3084,12 @@ find-up@^2.0.0, find-up@^2.1.0:
   dependencies:
     locate-path "^2.0.0"
 
+find-up@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73"
+  dependencies:
+    locate-path "^3.0.0"
+
 first-chunk-stream@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/first-chunk-stream/-/first-chunk-stream-2.0.0.tgz#1bdecdb8e083c0664b91945581577a43a9f31d70"
@@ -2897,7 +3113,7 @@ flow-parser@^0.*:
   version "0.76.0"
   resolved "https://registry.yarnpkg.com/flow-parser/-/flow-parser-0.76.0.tgz#f7d4c4d26df74805c3a0babd5d8ea4c2cd57190b"
 
-flush-write-stream@^1.0.0:
+flush-write-stream@^1.0.0, flush-write-stream@^1.0.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/flush-write-stream/-/flush-write-stream-1.0.3.tgz#c5d586ef38af6097650b49bc41b55fabb19f35bd"
   dependencies:
@@ -2954,6 +3170,10 @@ form-data@~2.3.1:
     combined-stream "1.0.6"
     mime-types "^2.1.12"
 
+format@^0.2.2:
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/format/-/format-0.2.2.tgz#d6170107e9efdc4ed30c9dc39016df942b5cb58b"
+
 forwarded@~0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.1.2.tgz#98c23dab1175657b8c0573e8ceccd91b0ff18c84"
@@ -2975,12 +3195,27 @@ from2@^2.1.0, from2@^2.1.1:
     inherits "^2.0.1"
     readable-stream "^2.0.0"
 
+fs-extra@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-6.0.1.tgz#8abc128f7946e310135ddc93b98bddb410e7a34b"
+  dependencies:
+    graceful-fs "^4.1.2"
+    jsonfile "^4.0.0"
+    universalify "^0.1.0"
+
 fs-minipass@^1.2.5:
   version "1.2.5"
   resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.5.tgz#06c277218454ec288df77ada54a03b8702aacb9d"
   dependencies:
     minipass "^2.2.1"
 
+fs-mkdirp-stream@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/fs-mkdirp-stream/-/fs-mkdirp-stream-1.0.0.tgz#0b7815fc3201c6a69e14db98ce098c16935259eb"
+  dependencies:
+    graceful-fs "^4.1.11"
+    through2 "^2.0.3"
+
 fs-write-stream-atomic@^1.0.8:
   version "1.0.10"
   resolved "https://registry.yarnpkg.com/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz#b47df53493ef911df75731e70a9ded0189db40c9"
@@ -3103,6 +3338,21 @@ glob-parent@^3.1.0:
     is-glob "^3.1.0"
     path-dirname "^1.0.0"
 
+glob-stream@^6.1.0:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/glob-stream/-/glob-stream-6.1.0.tgz#7045c99413b3eb94888d83ab46d0b404cc7bdde4"
+  dependencies:
+    extend "^3.0.0"
+    glob "^7.1.1"
+    glob-parent "^3.1.0"
+    is-negated-glob "^1.0.0"
+    ordered-read-streams "^1.0.0"
+    pumpify "^1.3.5"
+    readable-stream "^2.1.5"
+    remove-trailing-separator "^1.0.1"
+    to-absolute-glob "^2.0.0"
+    unique-stream "^2.0.2"
+
 glob-to-regexp@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz#8c5a1494d2066c570cc3bfe4496175acc4d502ab"
@@ -3128,6 +3378,17 @@ glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.1.2, glob@~7.1.1:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
+glob@^7.1.1:
+  version "7.1.3"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.3.tgz#3960832d3f1574108342dafd3a67b332c0969df1"
+  dependencies:
+    fs.realpath "^1.0.0"
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "^3.0.4"
+    once "^1.3.0"
+    path-is-absolute "^1.0.0"
+
 global-modules@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-1.0.0.tgz#6d770f0eb523ac78164d72b5e71a8877265cc3ea"
@@ -3225,7 +3486,7 @@ got@^7.0.0:
     url-parse-lax "^1.0.0"
     url-to-options "^1.0.1"
 
-got@^8.3.1:
+got@^8.3.1, got@^8.3.2:
   version "8.3.2"
   resolved "https://registry.yarnpkg.com/got/-/got-8.3.2.tgz#1d23f64390e97f776cac52e5b936e5f514d2e937"
   dependencies:
@@ -3247,7 +3508,7 @@ got@^8.3.1:
     url-parse-lax "^3.0.0"
     url-to-options "^1.0.1"
 
-graceful-fs@^4.1.11, graceful-fs@^4.1.2:
+graceful-fs@^4.0.0, graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.6:
   version "4.1.11"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"
 
@@ -3257,6 +3518,66 @@ grouped-queue@^0.3.3:
   dependencies:
     lodash "^4.17.2"
 
+gulp-exclude-gitignore@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/gulp-exclude-gitignore/-/gulp-exclude-gitignore-1.2.0.tgz#341aeb62faab428af5550da9359ceff99388f1d0"
+  dependencies:
+    gulp-ignore "^2.0.2"
+
+gulp-filter@^5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/gulp-filter/-/gulp-filter-5.1.0.tgz#a05e11affb07cf7dcf41a7de1cb7b63ac3783e73"
+  dependencies:
+    multimatch "^2.0.0"
+    plugin-error "^0.1.2"
+    streamfilter "^1.0.5"
+
+gulp-ignore@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/gulp-ignore/-/gulp-ignore-2.0.2.tgz#5c2ea2a0a4402e0ab4a2bcd12efd9295344d78f2"
+  dependencies:
+    gulp-match "^1.0.3"
+    through2 "^2.0.1"
+
+gulp-match@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/gulp-match/-/gulp-match-1.0.3.tgz#91c7c0d7f29becd6606d57d80a7f8776a87aba8e"
+  dependencies:
+    minimatch "^3.0.3"
+
+gulp-reporter@^2.9.0:
+  version "2.9.0"
+  resolved "https://registry.yarnpkg.com/gulp-reporter/-/gulp-reporter-2.9.0.tgz#e831e2716466390ed44e3a57a18b541de506002f"
+  dependencies:
+    ansi-escapes "^3.1.0"
+    buffered-spawn "^3.3.2"
+    bufferstreams "^2.0.1"
+    chalk "^2.4.1"
+    checkstyle-formatter "^1.1.0"
+    ci-info "^1.1.3"
+    cli-truncate "^1.1.0"
+    emphasize "^2.0.0"
+    fancy-log "^1.3.2"
+    fs-extra "^6.0.1"
+    got "^8.3.2"
+    in-gfw "^1.2.0"
+    is-windows "^1.0.2"
+    js-yaml "^3.12.0"
+    junit-report-builder "^1.3.1"
+    lodash.get "^4.4.2"
+    os-locale "^2.1.0"
+    plugin-error "^1.0.1"
+    string-width "^2.1.1"
+    term-size "^1.2.0"
+    through2 "^2.0.3"
+    to-time "^1.0.2"
+
+gulp-tap@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/gulp-tap/-/gulp-tap-1.0.1.tgz#e671124e1259b4cea219ed1ca97b7f585c334690"
+  dependencies:
+    through2 "^2.0.3"
+
 handle-thing@^1.2.5:
   version "1.2.5"
   resolved "https://registry.yarnpkg.com/handle-thing/-/handle-thing-1.2.5.tgz#fd7aad726bf1a5fd16dfc29b2f7a6601d27139c4"
@@ -3379,6 +3700,10 @@ highcharts@^6.1.1:
   version "6.1.1"
   resolved "https://registry.yarnpkg.com/highcharts/-/highcharts-6.1.1.tgz#49dc34f5e963744ecd7eb87603b6cdaf8304c13a"
 
+highlight.js@~9.12.0:
+  version "9.12.0"
+  resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-9.12.0.tgz#e6d9dbe57cbefe60751f02af336195870c90c01e"
+
 hmac-drbg@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1"
@@ -3496,6 +3821,12 @@ iconv-lite@0.4.19:
   version "0.4.19"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.19.tgz#f7468f60135f5e5dad3399c0a81be9a1603a082b"
 
+iconv-lite@^0.4.15:
+  version "0.4.24"
+  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
+  dependencies:
+    safer-buffer ">= 2.1.2 < 3"
+
 iconv-lite@^0.4.17, iconv-lite@^0.4.4:
   version "0.4.23"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.23.tgz#297871f63be507adcfbfca715d0cd0eed84e9a63"
@@ -3561,6 +3892,14 @@ imurmurhash@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
 
+in-gfw@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/in-gfw/-/in-gfw-1.2.0.tgz#95b419a89cb0319db412fae353883c3b9ac177d7"
+  dependencies:
+    glob "^7.1.2"
+    is-wsl "^1.1.0"
+    mem "^3.0.1"
+
 in-publish@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/in-publish/-/in-publish-2.0.0.tgz#e20ff5e3a2afc2690320b6dc552682a9c7fadf51"
@@ -3647,6 +3986,10 @@ invert-kv@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-1.0.0.tgz#104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6"
 
+invert-kv@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-2.0.0.tgz#7393f5afa59ec9ff5f67a27620d11c226e3eec02"
+
 ip@^1.1.0, ip@^1.1.5:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.5.tgz#bdded70114290828c0a039e72ef25f5aaec4354a"
@@ -3659,6 +4002,13 @@ is-absolute-url@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/is-absolute-url/-/is-absolute-url-2.1.0.tgz#50530dfb84fcc9aa7dbe7852e83a37b93b9f2aa6"
 
+is-absolute@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-absolute/-/is-absolute-1.0.0.tgz#395e1ae84b11f26ad1795e73c17378e48a301576"
+  dependencies:
+    is-relative "^1.0.0"
+    is-windows "^1.0.1"
+
 is-accessor-descriptor@^0.1.6:
   version "0.1.6"
   resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz#a9e12cb3ae8d876727eeef3843f8a0897b5c98d6"
@@ -3797,6 +4147,10 @@ is-glob@^4.0.0:
   dependencies:
     is-extglob "^2.1.1"
 
+is-negated-glob@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-negated-glob/-/is-negated-glob-1.0.0.tgz#6910bca5da8c95e784b5751b976cf5a10fee36d2"
+
 is-number@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-2.1.0.tgz#01fcbbb393463a548f2f466cce16dece49db908f"
@@ -3867,6 +4221,12 @@ is-regex@^1.0.4:
   dependencies:
     has "^1.0.1"
 
+is-relative@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-relative/-/is-relative-1.0.0.tgz#a1bb6935ce8c5dba1e8b9754b9b2dcc020e2260d"
+  dependencies:
+    is-unc-path "^1.0.0"
+
 is-resolvable@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-resolvable/-/is-resolvable-1.1.0.tgz#fb18f87ce1feb925169c9a407c19318a3206ed88"
@@ -3899,10 +4259,20 @@ is-typedarray@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
 
-is-utf8@^0.2.0:
+is-unc-path@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-unc-path/-/is-unc-path-1.0.0.tgz#d731e8898ed090a12c352ad2eaed5095ad322c9d"
+  dependencies:
+    unc-path-regex "^0.1.2"
+
+is-utf8@^0.2.0, is-utf8@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72"
 
+is-valid-glob@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-valid-glob/-/is-valid-glob-1.0.0.tgz#29bf3eff701be2d4d315dbacc39bc39fe8f601aa"
+
 is-windows@^1.0.1, is-windows@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d"
@@ -3980,7 +4350,7 @@ js-tokens@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"
 
-js-yaml@^3.11.0, js-yaml@^3.9.0:
+js-yaml@^3.11.0, js-yaml@^3.12.0, js-yaml@^3.9.0:
   version "3.12.0"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.12.0.tgz#eaed656ec8344f10f527c6bfa1b6e2244de167d1"
   dependencies:
@@ -4070,7 +4440,7 @@ json-stable-stringify-without-jsonify@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651"
 
-json-stable-stringify@^1.0.1:
+json-stable-stringify@^1.0.0, json-stable-stringify@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz#9a759d39c5f2ff503fd5300646ed445f88c4f9af"
   dependencies:
@@ -4088,6 +4458,12 @@ json5@^0.5.0, json5@^0.5.1:
   version "0.5.1"
   resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821"
 
+jsonfile@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb"
+  optionalDependencies:
+    graceful-fs "^4.1.6"
+
 jsonify@~0.0.0:
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.0.tgz#2c74b6ee41d93ca51b7b5aaee8f503631d252a73"
@@ -4101,6 +4477,15 @@ jsprim@^1.2.2:
     json-schema "0.2.3"
     verror "1.10.0"
 
+junit-report-builder@^1.3.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/junit-report-builder/-/junit-report-builder-1.3.1.tgz#65923e2587a54762e8fb91505ea5604dba519d55"
+  dependencies:
+    date-format "0.0.2"
+    lodash "^4.17.10"
+    mkdirp "^0.5.0"
+    xmlbuilder "^10.0.0"
+
 keyv@3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/keyv/-/keyv-3.0.0.tgz#44923ba39e68b12a7cec7df6c3268c031f2ef373"
@@ -4111,6 +4496,10 @@ killable@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/killable/-/killable-1.0.0.tgz#da8b84bd47de5395878f95d64d02f2449fe05e6b"
 
+kind-of@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-1.1.0.tgz#140a3d2d41a36d2efcfa9377b62c24f8495a5c44"
+
 kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0:
   version "3.2.2"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64"
@@ -4131,12 +4520,30 @@ kind-of@^6.0.0, kind-of@^6.0.2:
   version "6.0.2"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.2.tgz#01146b36a6218e64e58f3a8d66de5d7fc6f6d051"
 
+lazystream@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/lazystream/-/lazystream-1.0.0.tgz#f6995fe0f820392f61396be89462407bb77168e4"
+  dependencies:
+    readable-stream "^2.0.5"
+
 lcid@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/lcid/-/lcid-1.0.0.tgz#308accafa0bc483a3867b4b6f2b9506251d1b835"
   dependencies:
     invert-kv "^1.0.0"
 
+lcid@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/lcid/-/lcid-2.0.0.tgz#6ef5d2df60e52f82eb228a4c373e8d1f397253cf"
+  dependencies:
+    invert-kv "^2.0.0"
+
+lead@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/lead/-/lead-1.0.0.tgz#6f14f99a37be3a9dd784f5495690e5903466ee42"
+  dependencies:
+    flush-write-stream "^1.0.2"
+
 leaflet@^1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/leaflet/-/leaflet-1.3.1.tgz#86f336d2fb0e2d0ff446677049a5dc34cf0ea60e"
@@ -4148,6 +4555,13 @@ levn@^0.3.0, levn@~0.3.0:
     prelude-ls "~1.1.2"
     type-check "~0.3.2"
 
+linez@^4.1.4:
+  version "4.1.4"
+  resolved "https://registry.yarnpkg.com/linez/-/linez-4.1.4.tgz#4f1db16965c3a19e394a29313023cc9cb29f02a7"
+  dependencies:
+    buffer-equals "^1.0.4"
+    iconv-lite "^0.4.15"
+
 listr-silent-renderer@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/listr-silent-renderer/-/listr-silent-renderer-1.1.1.tgz#924b5a3757153770bf1a8e3fbf74b8bbf3f9242e"
@@ -4233,6 +4647,13 @@ locate-path@^2.0.0:
     p-locate "^2.0.0"
     path-exists "^3.0.0"
 
+locate-path@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-3.0.0.tgz#dbec3b3ab759758071b58fe59fc41871af21400e"
+  dependencies:
+    p-locate "^3.0.0"
+    path-exists "^3.0.0"
+
 lodash._reinterpolate@~3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d"
@@ -4253,7 +4674,7 @@ lodash.debounce@^4.0.8:
   version "4.0.8"
   resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af"
 
-lodash.get@^4.0:
+lodash.get@^4.0, lodash.get@^4.4.2:
   version "4.4.2"
   resolved "https://registry.yarnpkg.com/lodash.get/-/lodash.get-4.4.2.tgz#2d177f652fa31e939b4438d5341499dfa3825e99"
 
@@ -4353,6 +4774,13 @@ lowercase-keys@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.1.tgz#6f9e30b47084d971a7c820ff15a6c5167b74c26f"
 
+lowlight@~1.9.0:
+  version "1.9.2"
+  resolved "https://registry.yarnpkg.com/lowlight/-/lowlight-1.9.2.tgz#0b9127e3cec2c3021b7795dd81005c709a42fdd1"
+  dependencies:
+    fault "^1.0.2"
+    highlight.js "~9.12.0"
+
 lru-cache@^4.0.1, lru-cache@^4.1.1:
   version "4.1.3"
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.3.tgz#a1175cf3496dfc8436c156c334b4955992bce69c"
@@ -4370,6 +4798,12 @@ mamacro@^0.0.3:
   version "0.0.3"
   resolved "https://registry.yarnpkg.com/mamacro/-/mamacro-0.0.3.tgz#ad2c9576197c9f1abf308d0787865bd975a3f3e4"
 
+map-age-cleaner@^0.1.1:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/map-age-cleaner/-/map-age-cleaner-0.1.2.tgz#098fb15538fd3dbe461f12745b0ca8568d4e3f74"
+  dependencies:
+    p-defer "^1.0.0"
+
 map-cache@^0.2.2:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"
@@ -4433,6 +4867,21 @@ mem@^1.1.0:
   dependencies:
     mimic-fn "^1.0.0"
 
+mem@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/mem/-/mem-3.0.1.tgz#152410d0d7e835e4a4363e626238d9e5be3d6f5a"
+  dependencies:
+    mimic-fn "^1.0.0"
+    p-is-promise "^1.1.0"
+
+mem@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/mem/-/mem-4.0.0.tgz#6437690d9471678f6cc83659c00cbafcd6b0cdaf"
+  dependencies:
+    map-age-cleaner "^0.1.1"
+    mimic-fn "^1.0.0"
+    p-is-promise "^1.1.0"
+
 memory-fs@^0.4.0, memory-fs@~0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.4.1.tgz#3a9a20b8462523e447cfbc7e8bb80ed667bfc552"
@@ -4556,7 +5005,7 @@ minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"
 
-"minimatch@2 || 3", minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.4, minimatch@~3.0.2:
+"minimatch@2 || 3", minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4, minimatch@~3.0.2:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
   dependencies:
@@ -4857,6 +5306,12 @@ normalize-url@^1.4.0:
     query-string "^4.1.0"
     sort-keys "^1.0.0"
 
+now-and-later@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/now-and-later/-/now-and-later-2.0.0.tgz#bc61cbb456d79cb32207ce47ca05136ff2e7d6ee"
+  dependencies:
+    once "^1.3.2"
+
 npm-bundled@^1.0.1:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.0.3.tgz#7e71703d973af3370a9591bafe3a63aca0be2308"
@@ -4917,7 +5372,7 @@ object-visit@^1.0.0:
   dependencies:
     isobject "^3.0.0"
 
-object.assign@^4.1.0:
+object.assign@^4.0.4, object.assign@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.0.tgz#968bf1100d7956bb3ca086f006f846b3bc4008da"
   dependencies:
@@ -4953,7 +5408,7 @@ on-headers@~1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.1.tgz#928f5d0f470d49342651ea6794b0857c100693f7"
 
-once@^1.3.0, once@^1.3.1, once@^1.4.0:
+once@^1.3.0, once@^1.3.1, once@^1.3.2, once@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
   dependencies:
@@ -4999,6 +5454,12 @@ ora@^0.2.3:
     cli-spinners "^0.1.2"
     object-assign "^4.0.1"
 
+ordered-read-streams@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/ordered-read-streams/-/ordered-read-streams-1.0.1.tgz#77c0cb37c41525d64166d990ffad7ec6a0e1363e"
+  dependencies:
+    readable-stream "^2.0.1"
+
 original@>=0.0.5:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/original/-/original-1.0.1.tgz#b0a53ff42ba997a8c9cd1fb5daaeb42b9d693190"
@@ -5019,7 +5480,7 @@ os-locale@^1.4.0:
   dependencies:
     lcid "^1.0.0"
 
-os-locale@^2.0.0:
+os-locale@^2.0.0, os-locale@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-2.1.0.tgz#42bc2900a6b5b8bd17376c8e882b65afccf24bf2"
   dependencies:
@@ -5027,6 +5488,14 @@ os-locale@^2.0.0:
     lcid "^1.0.0"
     mem "^1.1.0"
 
+os-locale@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-3.0.1.tgz#3b014fbf01d87f60a1e5348d80fe870dc82c4620"
+  dependencies:
+    execa "^0.10.0"
+    lcid "^2.0.0"
+    mem "^4.0.0"
+
 os-tmpdir@^1.0.0, os-tmpdir@^1.0.1, os-tmpdir@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
@@ -5046,6 +5515,10 @@ p-cancelable@^0.4.0:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-0.4.1.tgz#35f363d67d52081c8d9585e37bcceb7e0bbcb2a0"
 
+p-defer@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/p-defer/-/p-defer-1.0.0.tgz#9f6eb182f6c9aa8cd743004a7d4f96b196b0fb0c"
+
 p-each-series@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/p-each-series/-/p-each-series-1.0.0.tgz#930f3d12dd1f50e7434457a22cd6f04ac6ad7f71"
@@ -5070,12 +5543,24 @@ p-limit@^1.1.0:
   dependencies:
     p-try "^1.0.0"
 
+p-limit@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.0.0.tgz#e624ed54ee8c460a778b3c9f3670496ff8a57aec"
+  dependencies:
+    p-try "^2.0.0"
+
 p-locate@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-2.0.0.tgz#20a0103b222a70c8fd39cc2e580680f3dde5ec43"
   dependencies:
     p-limit "^1.1.0"
 
+p-locate@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-3.0.0.tgz#322d69a05c0264b25997d9f40cd8a891ab0064a4"
+  dependencies:
+    p-limit "^2.0.0"
+
 p-map@^1.1.1:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/p-map/-/p-map-1.2.0.tgz#e4e94f311eabbc8633a1e79908165fca26241b6b"
@@ -5100,6 +5585,10 @@ p-try@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz#cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3"
 
+p-try@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.0.0.tgz#85080bb87c64688fa47996fe8f7dfbe8211760b1"
+
 pako@~1.0.5:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.6.tgz#0101211baa70c4bca4a0f63f2206e97b7dfaf258"
@@ -5269,6 +5758,25 @@ pleeease-filters@^4.0.0:
     onecolor "^3.0.4"
     postcss "^6.0.1"
 
+plugin-error@^0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/plugin-error/-/plugin-error-0.1.2.tgz#3b9bb3335ccf00f425e07437e19276967da47ace"
+  dependencies:
+    ansi-cyan "^0.1.1"
+    ansi-red "^0.1.1"
+    arr-diff "^1.0.1"
+    arr-union "^2.0.1"
+    extend-shallow "^1.1.2"
+
+plugin-error@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/plugin-error/-/plugin-error-1.0.1.tgz#77016bd8919d0ac377fdcdd0322328953ca5781c"
+  dependencies:
+    ansi-colors "^1.0.1"
+    arr-diff "^4.0.0"
+    arr-union "^3.1.0"
+    extend-shallow "^3.0.2"
+
 pluralize@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-7.0.0.tgz#298b89df8b93b0221dbf421ad2b1b1ea23fc6777"
@@ -5859,7 +6367,7 @@ pump@^2.0.0, pump@^2.0.1:
     end-of-stream "^1.1.0"
     once "^1.3.1"
 
-pumpify@^1.3.3:
+pumpify@^1.3.3, pumpify@^1.3.5:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/pumpify/-/pumpify-1.5.1.tgz#36513be246ab27570b1a374a5ce278bfd74370ce"
   dependencies:
@@ -6012,7 +6520,7 @@ read-pkg@^3.0.0:
     normalize-package-data "^2.3.2"
     path-type "^3.0.0"
 
-"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.4, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.2.9, readable-stream@^2.3.3, readable-stream@^2.3.5, readable-stream@^2.3.6:
+"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.4, readable-stream@^2.0.5, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.2.9, readable-stream@^2.3.3, readable-stream@^2.3.5, readable-stream@^2.3.6:
   version "2.3.6"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf"
   dependencies:
@@ -6155,6 +6663,21 @@ regjsparser@^0.1.4:
   dependencies:
     jsesc "~0.5.0"
 
+remove-bom-buffer@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/remove-bom-buffer/-/remove-bom-buffer-3.0.0.tgz#c2bf1e377520d324f623892e33c10cac2c252b53"
+  dependencies:
+    is-buffer "^1.1.5"
+    is-utf8 "^0.2.1"
+
+remove-bom-stream@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/remove-bom-stream/-/remove-bom-stream-1.2.0.tgz#05f1a593f16e42e1fb90ebf59de8e569525f9523"
+  dependencies:
+    remove-bom-buffer "^3.0.0"
+    safe-buffer "^5.1.0"
+    through2 "^2.0.3"
+
 remove-trailing-separator@^1.0.1:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef"
@@ -6277,6 +6800,12 @@ resolve-from@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-3.0.0.tgz#b22c7af7d9d6881bc8b6e653335eebcb0a188748"
 
+resolve-options@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/resolve-options/-/resolve-options-1.1.0.tgz#32bb9e39c06d67338dc9378c0d6d6074566ad131"
+  dependencies:
+    value-or-function "^3.0.0"
+
 resolve-url@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
@@ -6440,6 +6969,10 @@ selfsigned@^1.9.1:
   version "5.5.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.0.tgz#dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab"
 
+semver@^5.4.1:
+  version "5.5.1"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.1.tgz#7dfdd8814bdb7cabc7be0fb1d734cfb66c940477"
+
 semver@~5.3.0:
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"
@@ -6558,6 +7091,10 @@ shelljs@^0.8.0:
     interpret "^1.0.0"
     rechoir "^0.6.2"
 
+sigmund@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/sigmund/-/sigmund-1.0.1.tgz#3ff21f198cad2175f9f3b781853fd94d0d19b590"
+
 signal-exit@^3.0.0, signal-exit@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
@@ -6576,7 +7113,7 @@ slice-ansi@0.0.4:
   version "0.0.4"
   resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-0.0.4.tgz#edbf8903f66f7ce2f8eafd6ceed65e264c831b35"
 
-slice-ansi@1.0.0:
+slice-ansi@1.0.0, slice-ansi@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-1.0.0.tgz#044f1a49d8842ff307aad6b505ed178bd950134d"
   dependencies:
@@ -6816,6 +7353,12 @@ stream-shift@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.0.tgz#d5c752825e5367e786f78e18e445ea223a155952"
 
+streamfilter@^1.0.5:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/streamfilter/-/streamfilter-1.0.7.tgz#ae3e64522aa5a35c061fd17f67620c7653c643c9"
+  dependencies:
+    readable-stream "^2.0.2"
+
 strict-uri-encode@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz#279b225df1d582b1f54e65addd4352e18faa0713"
@@ -6991,6 +7534,12 @@ temp@^0.8.1:
     os-tmpdir "^1.0.0"
     rimraf "~2.2.6"
 
+term-size@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/term-size/-/term-size-1.2.0.tgz#458b83887f288fc56d6fffbfad262e26638efa69"
+  dependencies:
+    execa "^0.7.0"
+
 text-table@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
@@ -6999,7 +7548,14 @@ textextensions@2:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/textextensions/-/textextensions-2.2.0.tgz#38ac676151285b658654581987a0ce1a4490d286"
 
-through2@^2.0.0:
+through2-filter@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/through2-filter/-/through2-filter-2.0.0.tgz#60bc55a0dacb76085db1f9dae99ab43f83d622ec"
+  dependencies:
+    through2 "~2.0.0"
+    xtend "~4.0.0"
+
+through2@^2.0.0, through2@^2.0.1, through2@^2.0.3, through2@~2.0.0:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.3.tgz#0004569b37c7c74ba39c43f3ced78d1ad94140be"
   dependencies:
@@ -7014,6 +7570,10 @@ thunky@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/thunky/-/thunky-1.0.2.tgz#a862e018e3fb1ea2ec3fce5d55605cf57f247371"
 
+time-stamp@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/time-stamp/-/time-stamp-1.1.0.tgz#764a5a11af50561921b133f3b44e618687e0f5c3"
+
 timed-out@^4.0.0, timed-out@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/timed-out/-/timed-out-4.0.1.tgz#f32eacac5a175bea25d7fab565ab3ed8741ef56f"
@@ -7030,6 +7590,13 @@ tmp@^0.0.33:
   dependencies:
     os-tmpdir "~1.0.2"
 
+to-absolute-glob@^2.0.0:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/to-absolute-glob/-/to-absolute-glob-2.0.2.tgz#1865f43d9e74b0822db9f145b78cff7d0f7c849b"
+  dependencies:
+    is-absolute "^1.0.0"
+    is-negated-glob "^1.0.0"
+
 to-arraybuffer@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz#7d229b1fcc637e466ca081180836a7aabff83f43"
@@ -7060,6 +7627,18 @@ to-regex@^3.0.1, to-regex@^3.0.2:
     regex-not "^1.0.2"
     safe-regex "^1.1.0"
 
+to-through@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/to-through/-/to-through-2.0.0.tgz#fc92adaba072647bc0b67d6b03664aa195093af6"
+  dependencies:
+    through2 "^2.0.3"
+
+to-time@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/to-time/-/to-time-1.0.2.tgz#4f8145a07d85f6356a62e1cea0a7a9e6661776e3"
+  dependencies:
+    bignumber.js "^2.4.0"
+
 tough-cookie@~2.3.0, tough-cookie@~2.3.3:
   version "2.3.4"
   resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.3.4.tgz#ec60cee38ac675063ffc97a5c18970578ee83655"
@@ -7139,6 +7718,10 @@ uglifyjs-webpack-plugin@^1.2.4:
     webpack-sources "^1.1.0"
     worker-farm "^1.5.2"
 
+unc-path-regex@^0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/unc-path-regex/-/unc-path-regex-0.1.2.tgz#e73dd3d7b0d7c5ed86fbac6b0ae7d8c6a69d50fa"
+
 underscore@~1.6.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.6.0.tgz#8b38b10cacdef63337b8b24e4ff86d45aea529a8"
@@ -7172,6 +7755,13 @@ unique-slug@^2.0.0:
   dependencies:
     imurmurhash "^0.1.4"
 
+unique-stream@^2.0.2:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/unique-stream/-/unique-stream-2.2.1.tgz#5aa003cfbe94c5ff866c4e7d668bb1c4dbadb369"
+  dependencies:
+    json-stable-stringify "^1.0.0"
+    through2-filter "^2.0.0"
+
 units-css@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/units-css/-/units-css-0.4.0.tgz#d6228653a51983d7c16ff28f8b9dc3b1ffed3a07"
@@ -7179,6 +7769,10 @@ units-css@^0.4.0:
     isnumeric "^0.2.0"
     viewport-dimensions "^0.2.0"
 
+universalify@^0.1.0:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66"
+
 unpipe@1.0.0, unpipe@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"
@@ -7283,6 +7877,10 @@ validate-npm-package-license@^3.0.1:
     spdx-correct "^3.0.0"
     spdx-expression-parse "^3.0.0"
 
+value-or-function@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/value-or-function/-/value-or-function-3.0.0.tgz#1c243a50b595c1be54a754bfece8563b9ff8d813"
+
 vary@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"
@@ -7314,6 +7912,40 @@ vinyl-file@^2.0.0:
     strip-bom-stream "^2.0.0"
     vinyl "^1.1.0"
 
+vinyl-fs@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/vinyl-fs/-/vinyl-fs-3.0.3.tgz#c85849405f67428feabbbd5c5dbdd64f47d31bc7"
+  dependencies:
+    fs-mkdirp-stream "^1.0.0"
+    glob-stream "^6.1.0"
+    graceful-fs "^4.0.0"
+    is-valid-glob "^1.0.0"
+    lazystream "^1.0.0"
+    lead "^1.0.0"
+    object.assign "^4.0.4"
+    pumpify "^1.3.5"
+    readable-stream "^2.3.3"
+    remove-bom-buffer "^3.0.0"
+    remove-bom-stream "^1.2.0"
+    resolve-options "^1.1.0"
+    through2 "^2.0.0"
+    to-through "^2.0.0"
+    value-or-function "^3.0.0"
+    vinyl "^2.0.0"
+    vinyl-sourcemap "^1.1.0"
+
+vinyl-sourcemap@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/vinyl-sourcemap/-/vinyl-sourcemap-1.1.0.tgz#92a800593a38703a8cdb11d8b300ad4be63b3e16"
+  dependencies:
+    append-buffer "^1.0.2"
+    convert-source-map "^1.5.0"
+    graceful-fs "^4.1.6"
+    normalize-path "^2.1.1"
+    now-and-later "^2.0.0"
+    remove-bom-buffer "^3.0.0"
+    vinyl "^2.0.0"
+
 vinyl@^1.1.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-1.2.0.tgz#5c88036cf565e5df05558bfc911f8656df218884"
@@ -7322,7 +7954,7 @@ vinyl@^1.1.0:
     clone-stats "^0.0.1"
     replace-ext "0.0.1"
 
-vinyl@^2.0.1:
+vinyl@^2.0.0, vinyl@^2.0.1, vinyl@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-2.2.0.tgz#d85b07da96e458d25b2ffe19fece9f2caa13ed86"
   dependencies:
@@ -7562,6 +8194,18 @@ write@^0.2.1:
   dependencies:
     mkdirp "^0.5.1"
 
+xml-escape@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/xml-escape/-/xml-escape-1.1.0.tgz#3904c143fa8eb3a0030ec646d2902a2f1b706c44"
+
+xmlbuilder@^10.0.0:
+  version "10.0.0"
+  resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-10.0.0.tgz#c64e52f8ae097fe5fd46d1c38adaade071ee1b55"
+
+xregexp@4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/xregexp/-/xregexp-4.0.0.tgz#e698189de49dd2a18cc5687b05e17c8e43943020"
+
 xtend@^4.0.0, xtend@~4.0.0, xtend@~4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"
@@ -7570,7 +8214,7 @@ y18n@^3.2.1:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.1.tgz#6d15fba884c08679c0d77e88e7759e811e07fa41"
 
-y18n@^4.0.0:
+"y18n@^3.2.1 || ^4.0.0", y18n@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b"
 
@@ -7582,6 +8226,12 @@ yallist@^3.0.0, yallist@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.0.2.tgz#8452b4bb7e83c7c188d8041c1a837c773d6d8bb9"
 
+yargs-parser@^10.1.0:
+  version "10.1.0"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-10.1.0.tgz#7202265b89f7e9e9f2e5765e0fe735a905edbaa8"
+  dependencies:
+    camelcase "^4.1.0"
+
 yargs-parser@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-5.0.0.tgz#275ecf0d7ffe05c77e64e7c86e4cd94bf0e1228a"
@@ -7628,6 +8278,23 @@ yargs@^11.1.0:
     y18n "^3.2.1"
     yargs-parser "^9.0.2"
 
+yargs@^12.0.1:
+  version "12.0.2"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-12.0.2.tgz#fe58234369392af33ecbef53819171eff0f5aadc"
+  dependencies:
+    cliui "^4.0.0"
+    decamelize "^2.0.0"
+    find-up "^3.0.0"
+    get-caller-file "^1.0.1"
+    os-locale "^3.0.0"
+    require-directory "^2.1.1"
+    require-main-filename "^1.0.1"
+    set-blocking "^2.0.0"
+    string-width "^2.0.0"
+    which-module "^2.0.0"
+    y18n "^3.2.1 || ^4.0.0"
+    yargs-parser "^10.1.0"
+
 yargs@^7.0.0:
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-7.1.0.tgz#6ba318eb16961727f5d284f8ea003e8d6154d0c8"

From a87e79ac1fd6332951990564f5ff0873c1b65ac7 Mon Sep 17 00:00:00 2001
From: gregoirenovel <log@kinko.fr>
Date: Thu, 20 Sep 2018 14:45:35 +0200
Subject: [PATCH 21/27] Update a test to comply with Rubocop rules

---
 spec/models/concern/tags_substitution_concern_spec.rb | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/spec/models/concern/tags_substitution_concern_spec.rb b/spec/models/concern/tags_substitution_concern_spec.rb
index 98e1693b5..966c658b0 100644
--- a/spec/models/concern/tags_substitution_concern_spec.rb
+++ b/spec/models/concern/tags_substitution_concern_spec.rb
@@ -15,7 +15,6 @@ describe TagsSubstitutionConcern, type: :model do
   let(:template_concern) do
     (Class.new do
        include TagsSubstitutionConcern
-       public :replace_tags
 
        def initialize(p, s)
          @procedure = p
@@ -35,7 +34,7 @@ describe TagsSubstitutionConcern, type: :model do
 
     before { Timecop.freeze(Time.now) }
 
-    subject { template_concern.replace_tags(template, dossier) }
+    subject { template_concern.send(:replace_tags, template, dossier) }
 
     after { Timecop.return }
 
@@ -253,7 +252,7 @@ describe TagsSubstitutionConcern, type: :model do
       let(:template) { '--motivation-- --date de décision--' }
       let(:state) { Dossier.states.fetch(:en_instruction) }
 
-      subject { template_concern.replace_tags(template, dossier) }
+      subject { template_concern.send(:replace_tags, template, dossier) }
 
       it "does not treat motivation or date de décision as tags" do
         is_expected.to eq('--motivation-- --date de décision--')

From 66fcdda59bed1a119a6018dc33f85c05e194128a Mon Sep 17 00:00:00 2001
From: gregoirenovel <log@kinko.fr>
Date: Thu, 20 Sep 2018 15:03:42 +0200
Subject: [PATCH 22/27] Extract some code in a helper

It makes the code clearer and will avoid some
linting issues
---
 app/helpers/demande_helper.rb    | 21 +++++++++++++++++++++
 app/views/demandes/new.html.haml | 12 ++----------
 2 files changed, 23 insertions(+), 10 deletions(-)
 create mode 100644 app/helpers/demande_helper.rb

diff --git a/app/helpers/demande_helper.rb b/app/helpers/demande_helper.rb
new file mode 100644
index 000000000..26266b204
--- /dev/null
+++ b/app/helpers/demande_helper.rb
@@ -0,0 +1,21 @@
+module DemandeHelper
+  def nb_of_procedures_options
+    {
+      'je ne sais pas' => Pipedrive::DealAdapter::PIPEDRIVE_NB_OF_PROCEDURES_DO_NOT_KNOW_VALUE,
+      '1'              => Pipedrive::DealAdapter::PIPEDRIVE_NB_OF_PROCEDURES_1_VALUE,
+      '1 à 10'         => Pipedrive::DealAdapter::PIPEDRIVE_NB_OF_PROCEDURES_1_TO_10_VALUE,
+      '10 à 100 '      => Pipedrive::DealAdapter::PIPEDRIVE_NB_OF_PROCEDURES_10_TO_100_VALUE,
+      'plus de 100'    => Pipedrive::DealAdapter::PIPEDRIVE_NB_OF_PROCEDURES_ABOVE_100_VALUE
+    }
+  end
+
+  def deadline_options
+    {
+      'le plus vite possible'      => Pipedrive::DealAdapter::PIPEDRIVE_DEADLINE_ASAP_VALUE,
+      'dans les 3 prochains mois'  => Pipedrive::DealAdapter::PIPEDRIVE_DEADLINE_NEXT_3_MONTHS_VALUE,
+      'dans les 6 prochains mois'  => Pipedrive::DealAdapter::PIPEDRIVE_DEADLINE_NEXT_6_MONTHS_VALUE,
+      'dans les 12 prochains mois' => Pipedrive::DealAdapter::PIPEDRIVE_DEADLINE_NEXT_12_MONTHS_VALUE,
+      'pas de date'                => Pipedrive::DealAdapter::PIPEDRIVE_DEADLINE_NO_DATE_VALUE
+    }
+  end
+end
diff --git a/app/views/demandes/new.html.haml b/app/views/demandes/new.html.haml
index 215cfafaf..5f94d4696 100644
--- a/app/views/demandes/new.html.haml
+++ b/app/views/demandes/new.html.haml
@@ -46,11 +46,7 @@
       Combien de démarches souhaitez-vous dématerialiser ?
       %span.mandatory *
       = select_tag :nb_of_procedures,
-        options_for_select({ 'je ne sais pas' => Pipedrive::DealAdapter::PIPEDRIVE_NB_OF_PROCEDURES_DO_NOT_KNOW_VALUE,
-                             '1'              => Pipedrive::DealAdapter::PIPEDRIVE_NB_OF_PROCEDURES_1_VALUE,
-                             '1 à 10'         => Pipedrive::DealAdapter::PIPEDRIVE_NB_OF_PROCEDURES_1_TO_10_VALUE,
-                             '10 à 100 '      => Pipedrive::DealAdapter::PIPEDRIVE_NB_OF_PROCEDURES_10_TO_100_VALUE,
-                             'plus de 100'    => Pipedrive::DealAdapter::PIPEDRIVE_NB_OF_PROCEDURES_ABOVE_100_VALUE }),
+        options_for_select(nb_of_procedures_options),
         prompt: 'choisir un intervalle',
         required: true
 
@@ -58,11 +54,7 @@
       À quelle échance voudriez-vous dématerialiser ?
       %span.mandatory *
       = select_tag :deadline,
-        options_for_select({ 'le plus vite possible'      => Pipedrive::DealAdapter::PIPEDRIVE_DEADLINE_ASAP_VALUE,
-                             'dans les 3 prochains mois'  => Pipedrive::DealAdapter::PIPEDRIVE_DEADLINE_NEXT_3_MONTHS_VALUE,
-                             'dans les 6 prochains mois'  => Pipedrive::DealAdapter::PIPEDRIVE_DEADLINE_NEXT_6_MONTHS_VALUE,
-                             'dans les 12 prochains mois' => Pipedrive::DealAdapter::PIPEDRIVE_DEADLINE_NEXT_12_MONTHS_VALUE,
-                             'pas de date'                => Pipedrive::DealAdapter::PIPEDRIVE_DEADLINE_NO_DATE_VALUE }),
+        options_for_select(deadline_options),
         prompt: 'choisir une échéance',
         required: true
 

From 0c9628c1803b1ec3133309ecb35959f967e47c60 Mon Sep 17 00:00:00 2001
From: gregoirenovel <log@kinko.fr>
Date: Thu, 20 Sep 2018 14:34:49 +0200
Subject: [PATCH 23/27] Fix some files according the the .editorconfig rules

---
 app/assets/stylesheets/new_design/forms.scss  |  2 +-
 app/assets/stylesheets/new_design/reset.scss  | 41 ++++++++++---------
 app/controllers/users/carte_controller.rb     |  2 +-
 app/lib/carto/geo_api/pays.json               |  2 +-
 app/mailers/administrateur_mailer.rb          |  4 +-
 app/mailers/administration_mailer.rb          | 12 +++---
 app/mailers/gestionnaire_mailer.rb            |  4 +-
 app/mailers/invite_mailer.rb                  |  4 +-
 app/mailers/preactivate_users_mailer.rb       |  6 +--
 .../concerns/tags_substitution_concern.rb     |  2 +-
 app/views/admin/procedures/publish.js.erb     |  2 +-
 .../dossiers/_edit_pieces_jointes.html.haml   |  6 +--
 app/views/dossiers/add_siret.js.erb           |  2 +-
 app/views/dossiers/new_siret.js.erb           |  2 +-
 app/views/users/shared/_links.html.erb        |  2 +-
 config/locales/fr.yml                         |  2 +-
 lib/cellar/amazon_v2_request_signer.rb        |  2 +-
 .../admin/procedures_controller_spec.rb       |  6 +--
 spec/lib/carto/sgmap/api_spec.rb              |  2 +-
 .../concern/email_sanitizable_concern_spec.rb | 24 +++++------
 .../concern/tags_substitution_concern_spec.rb | 18 ++++----
 spec/support/files/ban_address_search.json    |  2 +-
 .../files/ban_address_search_no_result.json   |  2 +-
 spec/support/files/entreprise.json            |  2 +-
 spec/support/files/etablissement.json         |  2 +-
 .../files/geojson/request_cadastre.json       |  2 +-
 spec/support/files/geojson/request_qp.json    |  2 +-
 .../files/geojson/response_cadastre.json      |  2 +-
 spec/support/files/geojson/response_qp.json   |  2 +-
 spec/support/files/rna.json                   |  2 +-
 30 files changed, 83 insertions(+), 82 deletions(-)

diff --git a/app/assets/stylesheets/new_design/forms.scss b/app/assets/stylesheets/new_design/forms.scss
index 95a971cf1..25af18eb4 100644
--- a/app/assets/stylesheets/new_design/forms.scss
+++ b/app/assets/stylesheets/new_design/forms.scss
@@ -193,7 +193,7 @@
     // CAUTION: IE hackery ahead
     &::-ms-expand {
       display: none; // remove default arrow in IE 10 and 11 */
-     }
+    }
 
     // target Internet Explorer 9 to undo the custom arrow */
     @media screen and (min-width:0\0) {
diff --git a/app/assets/stylesheets/new_design/reset.scss b/app/assets/stylesheets/new_design/reset.scss
index e29c0f5f4..0de633a83 100644
--- a/app/assets/stylesheets/new_design/reset.scss
+++ b/app/assets/stylesheets/new_design/reset.scss
@@ -1,6 +1,7 @@
-/* http://meyerweb.com/eric/tools/css/reset/ 
-   v2.0 | 20110126
-   License: none (public domain)
+/*
+  http://meyerweb.com/eric/tools/css/reset/
+  v2.0 | 20110126
+  License: none (public domain)
 */
 
 html, body, div, span, applet, object, iframe,
@@ -12,37 +13,37 @@ b, u, i, center,
 dl, dt, dd, ol, ul, li,
 fieldset, form, label, legend,
 table, caption, tbody, tfoot, thead, tr, th, td,
-article, aside, canvas, details, embed, 
-figure, figcaption, footer, header, hgroup, 
+article, aside, canvas, details, embed,
+figure, figcaption, footer, header, hgroup,
 menu, nav, output, ruby, section, summary,
 time, mark, audio, video {
-	margin: 0;
-	padding: 0;
-	border: 0;
-	font-size: 100%;
-	font: inherit;
-	vertical-align: baseline;
+  margin: 0;
+  padding: 0;
+  border: 0;
+  font-size: 100%;
+  font: inherit;
+  vertical-align: baseline;
 }
 /* HTML5 display-role reset for older browsers */
-article, aside, details, figcaption, figure, 
+article, aside, details, figcaption, figure,
 footer, header, hgroup, menu, nav, section {
-	display: block;
+  display: block;
 }
 body {
-	line-height: 1;
+  line-height: 1;
 }
 ol, ul {
-	list-style: none;
+  list-style: none;
 }
 blockquote, q {
-	quotes: none;
+  quotes: none;
 }
 blockquote:before, blockquote:after,
 q:before, q:after {
-	content: '';
-	content: none;
+  content: '';
+  content: none;
 }
 table {
-	border-collapse: collapse;
-	border-spacing: 0;
+  border-collapse: collapse;
+  border-spacing: 0;
 }
diff --git a/app/controllers/users/carte_controller.rb b/app/controllers/users/carte_controller.rb
index 89a5eab33..e8ce6d116 100644
--- a/app/controllers/users/carte_controller.rb
+++ b/app/controllers/users/carte_controller.rb
@@ -76,5 +76,5 @@ class Users::CarteController < UsersController
         multipolygone.to_json
       end
     end
-   end
+  end
 end
diff --git a/app/lib/carto/geo_api/pays.json b/app/lib/carto/geo_api/pays.json
index 4eef440b5..b6f24425e 100644
--- a/app/lib/carto/geo_api/pays.json
+++ b/app/lib/carto/geo_api/pays.json
@@ -848,4 +848,4 @@
   {
     "nom": "ZIMBABWE"
   }
-]
\ No newline at end of file
+]
diff --git a/app/mailers/administrateur_mailer.rb b/app/mailers/administrateur_mailer.rb
index e41e9a88f..b31ab2633 100644
--- a/app/mailers/administrateur_mailer.rb
+++ b/app/mailers/administrateur_mailer.rb
@@ -8,7 +8,7 @@ class AdministrateurMailer < ApplicationMailer
     @subject = "N'oubliez pas d'activer votre compte administrateur"
 
     mail(to: administrateur.email,
-         subject: @subject,
-         reply_to: CONTACT_EMAIL)
+      subject: @subject,
+      reply_to: CONTACT_EMAIL)
   end
 end
diff --git a/app/mailers/administration_mailer.rb b/app/mailers/administration_mailer.rb
index d2944805d..e84f70cb6 100644
--- a/app/mailers/administration_mailer.rb
+++ b/app/mailers/administration_mailer.rb
@@ -7,7 +7,7 @@ class AdministrationMailer < ApplicationMailer
     subject = "Création d'un compte admininistrateur"
 
     mail(to: TECH_EMAIL,
-         subject: subject)
+      subject: subject)
   end
 
   def invite_admin(admin, reset_password_token, administration_id)
@@ -17,16 +17,16 @@ class AdministrationMailer < ApplicationMailer
     subject = "Activez votre compte administrateur"
 
     mail(to: admin.email,
-         subject: subject,
-         reply_to: CONTACT_EMAIL)
+      subject: subject,
+      reply_to: CONTACT_EMAIL)
   end
 
   def refuse_admin(admin_email)
     subject = "Votre demande de compte a été refusée"
 
     mail(to: admin_email,
-         subject: subject,
-         reply_to: CONTACT_EMAIL)
+      subject: subject,
+      reply_to: CONTACT_EMAIL)
   end
 
   def dubious_procedures(procedures_and_type_de_champs)
@@ -34,6 +34,6 @@ class AdministrationMailer < ApplicationMailer
     subject = "[RGS] De nouvelles démarches comportent des champs interdits"
 
     mail(to: EQUIPE_EMAIL,
-         subject: subject)
+      subject: subject)
   end
 end
diff --git a/app/mailers/gestionnaire_mailer.rb b/app/mailers/gestionnaire_mailer.rb
index 87e822a03..105eb7243 100644
--- a/app/mailers/gestionnaire_mailer.rb
+++ b/app/mailers/gestionnaire_mailer.rb
@@ -7,8 +7,8 @@ class GestionnaireMailer < ApplicationMailer
     subject = "Activez votre compte instructeur"
 
     mail(to: gestionnaire.email,
-         subject: subject,
-         reply_to: CONTACT_EMAIL)
+      subject: subject,
+      reply_to: CONTACT_EMAIL)
   end
 
   def user_to_gestionnaire(email)
diff --git a/app/mailers/invite_mailer.rb b/app/mailers/invite_mailer.rb
index eff179b52..0cf3752cb 100644
--- a/app/mailers/invite_mailer.rb
+++ b/app/mailers/invite_mailer.rb
@@ -20,7 +20,7 @@ class InviteMailer < ApplicationMailer
     email = invite.email
 
     mail(to: email,
-         subject: subject,
-         reply_to: reply_to)
+      subject: subject,
+      reply_to: reply_to)
   end
 end
diff --git a/app/mailers/preactivate_users_mailer.rb b/app/mailers/preactivate_users_mailer.rb
index 408ea5a54..169c65671 100644
--- a/app/mailers/preactivate_users_mailer.rb
+++ b/app/mailers/preactivate_users_mailer.rb
@@ -26,8 +26,8 @@ class PreactivateUsersMailer < ApplicationMailer
     END_OF_MAIL
 
     mail(to: model.email,
-         subject: subject,
-         reply_to: CONTACT_EMAIL,
-         body: body)
+      subject: subject,
+      reply_to: CONTACT_EMAIL,
+      body: body)
   end
 end
diff --git a/app/models/concerns/tags_substitution_concern.rb b/app/models/concerns/tags_substitution_concern.rb
index a3c6c5cf3..b4e194186 100644
--- a/app/models/concerns/tags_substitution_concern.rb
+++ b/app/models/concerns/tags_substitution_concern.rb
@@ -193,7 +193,7 @@ module TagsSubstitutionConcern
     tags_and_datas
       .map { |(tags, data)| [filter_tags(tags), data] }
       .inject(text) { |acc, (tags, data)| replace_tags_with_values_from_data(acc, tags, data) }
-   end
+  end
 
   def replace_type_de_champ_tags(text, types_de_champ, dossier_champs)
     types_de_champ.inject(text) do |acc, tag|
diff --git a/app/views/admin/procedures/publish.js.erb b/app/views/admin/procedures/publish.js.erb
index 04a6b2229..9c11731ef 100644
--- a/app/views/admin/procedures/publish.js.erb
+++ b/app/views/admin/procedures/publish.js.erb
@@ -1 +1 @@
-<%= "togglePathMessage(true, #{@mine})" %>
\ No newline at end of file
+<%= "togglePathMessage(true, #{@mine})" %>
diff --git a/app/views/dossiers/_edit_pieces_jointes.html.haml b/app/views/dossiers/_edit_pieces_jointes.html.haml
index df439eb7d..a5c537296 100644
--- a/app/views/dossiers/_edit_pieces_jointes.html.haml
+++ b/app/views/dossiers/_edit_pieces_jointes.html.haml
@@ -3,9 +3,9 @@
     - if @facade.dossier.types_de_piece_justificative.size > 0
       .col-lg-4.col-md-4.col-sm-4.col-xs-4.action
         %a#maj_pj.action{ "data-target" => "#upload-pj-modal",
-                           "data-toggle" => "modal",
-                           :type => "button",
-                           style: 'margin-bottom: 15px; margin-top: -30px;' }
+                          "data-toggle" => "modal",
+                          :type => "button",
+                          style: 'margin-bottom: 15px; margin-top: -30px;' }
           Modifier les documents
         %br
         = render partial: 'users/recapitulatif/modal_upload_pj'
diff --git a/app/views/dossiers/add_siret.js.erb b/app/views/dossiers/add_siret.js.erb
index fe0cdc53c..2ec6c4aa5 100644
--- a/app/views/dossiers/add_siret.js.erb
+++ b/app/views/dossiers/add_siret.js.erb
@@ -9,4 +9,4 @@ error_form_siret('<%= invalid_siret %>');
 
 function render_new_siret(){
     $('.row.etape.etape-2').html("<%= escape_javascript(render partial: '/dossiers/etapes/etape_2/entreprise', locals: { facade: @facade } ) %>");
-}
\ No newline at end of file
+}
diff --git a/app/views/dossiers/new_siret.js.erb b/app/views/dossiers/new_siret.js.erb
index a84df50d7..123aaf8db 100644
--- a/app/views/dossiers/new_siret.js.erb
+++ b/app/views/dossiers/new_siret.js.erb
@@ -10,4 +10,4 @@ error_form_siret('<%= invalid_siret %>');
 
 function render_new_siret(){
     $('.row.etape.etape-2').html("<%= escape_javascript(render partial: '/dossiers/etapes/etape2', locals: { facade: @facade } ) %>");
-}
\ No newline at end of file
+}
diff --git a/app/views/users/shared/_links.html.erb b/app/views/users/shared/_links.html.erb
index d6c21977c..b1d1b5381 100644
--- a/app/views/users/shared/_links.html.erb
+++ b/app/views/users/shared/_links.html.erb
@@ -3,4 +3,4 @@
 
 <% end -%>
 <br>
-<%= link_to "Mot de passe oublié ?", new_password_path(resource_name) %><br />
\ No newline at end of file
+<%= link_to "Mot de passe oublié ?", new_password_path(resource_name) %><br />
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 363a2a904..638b058ab 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -158,7 +158,7 @@ fr:
       invalid_siret: "Le siret est incorrect"
       procedure_not_found: "La démarche n'existe pas"
       france_connect:
-       connexion: "Erreur lors de la connexion à France Connect."
+        connexion: "Erreur lors de la connexion à France Connect."
       extension_white_list_error: "Le format de fichier de la pièce jointe n'est pas valide."
       procedure_archived: "Cette démarche en ligne a été fermée, il n'est plus possible de déposer de dossier."
 
diff --git a/lib/cellar/amazon_v2_request_signer.rb b/lib/cellar/amazon_v2_request_signer.rb
index 6e2146b59..67891e00d 100644
--- a/lib/cellar/amazon_v2_request_signer.rb
+++ b/lib/cellar/amazon_v2_request_signer.rb
@@ -36,7 +36,7 @@ module Cellar
       canonicalized_amz_headers = ""
       canonicalized_resource = "/#{@bucket}/#{key}"
       string_to_sign = "#{method}\n#{checksum}\n#{content_type}\n#{expires}#{date}\n" +
-                       "#{canonicalized_amz_headers}#{canonicalized_resource}"
+        "#{canonicalized_amz_headers}#{canonicalized_resource}"
       Base64.encode64(OpenSSL::HMAC.digest(OpenSSL::Digest.new('sha1'), @secret_access_key, string_to_sign)).strip
     end
   end
diff --git a/spec/controllers/admin/procedures_controller_spec.rb b/spec/controllers/admin/procedures_controller_spec.rb
index ff8ffb920..3536c64d1 100644
--- a/spec/controllers/admin/procedures_controller_spec.rb
+++ b/spec/controllers/admin/procedures_controller_spec.rb
@@ -691,9 +691,9 @@ describe Admin::ProceduresController, type: :controller do
       let(:procedure) { create :procedure, :published, administrateur: admin }
 
       before do
-         subject
-         procedure.reload
-       end
+        subject
+        procedure.reload
+      end
 
       it { expect(procedure.hidden_at).not_to be_nil }
       it { expect(procedure.procedure_path).to be_nil }
diff --git a/spec/lib/carto/sgmap/api_spec.rb b/spec/lib/carto/sgmap/api_spec.rb
index d84f62cea..a13a7a571 100644
--- a/spec/lib/carto/sgmap/api_spec.rb
+++ b/spec/lib/carto/sgmap/api_spec.rb
@@ -55,7 +55,7 @@ describe CARTO::SGMAP::API do
     before do
       stub_request(:post, "https://apicarto.sgmap.fr/cadastre/geometrie")
         .with(:body => /.*/,
-             :headers => { 'Content-Type' => 'application/json' })
+          :headers => { 'Content-Type' => 'application/json' })
         .to_return(status: status, body: body)
     end
     context 'when geojson is empty' do
diff --git a/spec/models/concern/email_sanitizable_concern_spec.rb b/spec/models/concern/email_sanitizable_concern_spec.rb
index 7b98b7d82..810a8be42 100644
--- a/spec/models/concern/email_sanitizable_concern_spec.rb
+++ b/spec/models/concern/email_sanitizable_concern_spec.rb
@@ -2,21 +2,21 @@ describe EmailSanitizableConcern, type: :model do
   describe 'sanitize_email' do
     let(:email_concern) do
       (Class.new do
-         include EmailSanitizableConcern
-         attr_accessor :email
+        include EmailSanitizableConcern
+        attr_accessor :email
 
-         def initialize(email)
-           self.email = email
-         end
+        def initialize(email)
+          self.email = email
+        end
 
-         def [](key)
-           self.send(key)
-         end
+        def [](key)
+          self.send(key)
+        end
 
-         def []=(key, value)
-           self.send("#{key}=", value)
-         end
-       end).new(email)
+        def []=(key, value)
+          self.send("#{key}=", value)
+        end
+      end).new(email)
     end
 
     before do
diff --git a/spec/models/concern/tags_substitution_concern_spec.rb b/spec/models/concern/tags_substitution_concern_spec.rb
index 966c658b0..52718bee6 100644
--- a/spec/models/concern/tags_substitution_concern_spec.rb
+++ b/spec/models/concern/tags_substitution_concern_spec.rb
@@ -14,17 +14,17 @@ describe TagsSubstitutionConcern, type: :model do
 
   let(:template_concern) do
     (Class.new do
-       include TagsSubstitutionConcern
+      include TagsSubstitutionConcern
 
-       def initialize(p, s)
-         @procedure = p
-         self.class.const_set(:DOSSIER_STATE, s)
-       end
+      def initialize(p, s)
+        @procedure = p
+        self.class.const_set(:DOSSIER_STATE, s)
+      end
 
-       def procedure
-         @procedure
-       end
-     end).new(procedure, state)
+      def procedure
+        @procedure
+      end
+    end).new(procedure, state)
   end
 
   describe 'replace_tags' do
diff --git a/spec/support/files/ban_address_search.json b/spec/support/files/ban_address_search.json
index ac00ec114..53b0773ee 100644
--- a/spec/support/files/ban_address_search.json
+++ b/spec/support/files/ban_address_search.json
@@ -114,4 +114,4 @@
       "type": "Feature"
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/spec/support/files/ban_address_search_no_result.json b/spec/support/files/ban_address_search_no_result.json
index 1c2078f75..57f67f444 100644
--- a/spec/support/files/ban_address_search_no_result.json
+++ b/spec/support/files/ban_address_search_no_result.json
@@ -6,4 +6,4 @@
   "query": "Paris",
   "type": "FeatureCollection",
   "features": []
-}
\ No newline at end of file
+}
diff --git a/spec/support/files/entreprise.json b/spec/support/files/entreprise.json
index 0c4cbb294..55a1f4e8c 100644
--- a/spec/support/files/entreprise.json
+++ b/spec/support/files/entreprise.json
@@ -180,4 +180,4 @@
     }
   },
   "gateway_error": false
-}
\ No newline at end of file
+}
diff --git a/spec/support/files/etablissement.json b/spec/support/files/etablissement.json
index 6dc828828..835a18bf1 100644
--- a/spec/support/files/etablissement.json
+++ b/spec/support/files/etablissement.json
@@ -46,4 +46,4 @@
     }
   },
   "gateway_error": false
-}
\ No newline at end of file
+}
diff --git a/spec/support/files/geojson/request_cadastre.json b/spec/support/files/geojson/request_cadastre.json
index cacad9232..2093a4b0e 100644
--- a/spec/support/files/geojson/request_cadastre.json
+++ b/spec/support/files/geojson/request_cadastre.json
@@ -29,4 +29,4 @@
       ]
     }
   }
-}
\ No newline at end of file
+}
diff --git a/spec/support/files/geojson/request_qp.json b/spec/support/files/geojson/request_qp.json
index 627166c9a..0531fb480 100644
--- a/spec/support/files/geojson/request_qp.json
+++ b/spec/support/files/geojson/request_qp.json
@@ -26,4 +26,4 @@
       ]
     ]
   }
-}
\ No newline at end of file
+}
diff --git a/spec/support/files/geojson/response_cadastre.json b/spec/support/files/geojson/response_cadastre.json
index ae2ffd4b0..549d9d886 100644
--- a/spec/support/files/geojson/response_cadastre.json
+++ b/spec/support/files/geojson/response_cadastre.json
@@ -1214,4 +1214,4 @@
       }
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/spec/support/files/geojson/response_qp.json b/spec/support/files/geojson/response_qp.json
index 60bfc70be..4cb2b4104 100644
--- a/spec/support/files/geojson/response_qp.json
+++ b/spec/support/files/geojson/response_qp.json
@@ -27,4 +27,4 @@
       }
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/spec/support/files/rna.json b/spec/support/files/rna.json
index 057af35c5..39754f549 100644
--- a/spec/support/files/rna.json
+++ b/spec/support/files/rna.json
@@ -27,4 +27,4 @@
     "mise_a_jour": 1392295833
   },
   "date_extraction_donnees": 1427210585
-}
\ No newline at end of file
+}

From e8d51b93a9fbc87098ea7763204c0a1292b268ce Mon Sep 17 00:00:00 2001
From: gregoirenovel <log@kinko.fr>
Date: Thu, 20 Sep 2018 14:35:05 +0200
Subject: [PATCH 24/27] Ignore the final newline for ico, keep, pdf and svg
 files

---
 .editorconfig | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.editorconfig b/.editorconfig
index 16014361a..16ff5720c 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -9,3 +9,6 @@ charset = utf-8
 indent_size = 2
 indent_style = space
 trim_trailing_whitespace = true
+
+[*.{ico,keep,pdf,svg}]
+insert_final_newline = false

From 2edc882a29c4e6eba04d3a9acb7ac857227e382b Mon Sep 17 00:00:00 2001
From: gregoirenovel <log@kinko.fr>
Date: Thu, 20 Sep 2018 14:35:20 +0200
Subject: [PATCH 25/27] [Fix #1747] Add a new editorconfig lint task

---
 lib/tasks/lint.rake | 1 +
 package.json        | 1 +
 2 files changed, 2 insertions(+)

diff --git a/lib/tasks/lint.rake b/lib/tasks/lint.rake
index a5c8a0985..71d4dc99d 100644
--- a/lib/tasks/lint.rake
+++ b/lib/tasks/lint.rake
@@ -3,5 +3,6 @@ task :lint do
   sh "bundle exec haml-lint app/views/"
   sh "bundle exec scss-lint app/assets/stylesheets/"
   sh "bundle exec brakeman --no-pager"
+  sh "yarn lint:ec"
   sh "yarn lint:js"
 end
diff --git a/package.json b/package.json
index 89b84f3ee..8e208ebc6 100644
--- a/package.json
+++ b/package.json
@@ -23,6 +23,7 @@
     "webpack-dev-server": "^3.1.4"
   },
   "scripts": {
+    "lint:ec": "eclint check $({ git ls-files ; find vendor -type f ; echo 'db/schema.rb' ; } | sort | uniq -u)",
     "lint:js": "eslint ./app/javascript ./config/webpack"
   },
   "engines": {

From be5859af607aca6eb5efda85047be6d9ff0e0fa9 Mon Sep 17 00:00:00 2001
From: gregoirenovel <log@kinko.fr>
Date: Thu, 20 Sep 2018 13:40:06 +0200
Subject: [PATCH 26/27] Improve the documentation in deploy.rb

---
 config/deploy.rb | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/config/deploy.rb b/config/deploy.rb
index 04b4e1c0d..3da042697 100644
--- a/config/deploy.rb
+++ b/config/deploy.rb
@@ -4,10 +4,14 @@ require 'mina/git'
 require 'mina/rbenv'
 
 # Basic settings:
-#   domain       - The hostname to SSH to.
-#   deploy_to    - Path to deploy into.
-#   repository   - Git repo to clone from. (needed by mina/git)
-#   branch       - Branch name to deploy. (needed by mina/git)
+#   domain        - The hostname to SSH to.
+#   deploy_to     - Path to deploy into.
+#   repository    - Git repo to clone from. (needed by mina/git)
+#   branch        - Branch name to deploy. (needed by mina/git)
+#
+# Advanced settings:
+#   forward_agent - SSH forward_agent
+#   user          - Username in the server to SSH to
 
 if !["staging", "production"].include?(ENV['to'])
   raise "missing or incorrect `to` (should be 'staging' or 'production')"
@@ -22,7 +26,7 @@ set :repository, 'https://github.com/betagouv/tps.git'
 set :port, 2200
 set :rails_env, 'production'
 set :rbenv_path, "/usr/local/rbenv/bin/rbenv"
-set :forward_agent, true # SSH forward_agent.
+set :forward_agent, true
 
 # Manually create these paths in shared/ (eg: shared/config/database.yml) in your server.
 # They will be linked in the 'deploy:link_shared_paths' step.
@@ -42,12 +46,12 @@ case ENV["to"]
 when "staging"
   set :branch, ENV['branch'] || 'dev'
   set :deploy_to, '/var/www/tps_dev'
-  set :user, 'tps_dev' # Username in the server to SSH to.
+  set :user, 'tps_dev'
   appname = 'tps_dev'
 when "production"
   set :branch, ENV['branch'] || 'master'
   set :deploy_to, '/var/www/tps'
-  set :user, 'tps' # Username in the server to SSH to.
+  set :user, 'tps'
   appname = 'tps'
 end
 

From 5f1d68762b0e2e01b17ba18e2c788d41c0bf790b Mon Sep 17 00:00:00 2001
From: gregoirenovel <log@kinko.fr>
Date: Thu, 20 Sep 2018 13:40:56 +0200
Subject: [PATCH 27/27] Improve a message

---
 config/locales/devise.fr.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/locales/devise.fr.yml b/config/locales/devise.fr.yml
index 0abdf51f4..3582cd4ce 100755
--- a/config/locales/devise.fr.yml
+++ b/config/locales/devise.fr.yml
@@ -41,7 +41,7 @@ fr:
       signed_up: "Bienvenue, vous êtes connecté."
       signed_up_but_inactive: "Vous êtes bien enregistré. Vous ne pouvez cependant pas vous connecter car votre compte n'est pas encore activé."
       signed_up_but_locked: "Vous êtes bien enregistré. Vous ne pouvez cependant pas vous connecter car votre compte est verrouillé."
-      signed_up_but_unconfirmed: "Un message contenant un lien d'activation a été envoyé à votre adresse email. Ouvrez ce lien pour activer votre compte."
+      signed_up_but_unconfirmed: "Nous vous avons envoyé un email contenant un lien d'activation. Ouvrez ce lien pour activer votre compte."
       update_needs_confirmation: "Votre compte a bien été mis à jour mais nous devons vérifier votre nouvelle adresse email. Merci de vérifier vos email et de cliquer sur le lien d'activation pour finaliser la validation de votre nouvelle adresse."
       updated: "Votre compte a été modifié avec succès."
     sessions: