From b6b626ee5f2828fecd5e0c6dcb54717a47a569fc Mon Sep 17 00:00:00 2001
From: Sylvain <sylvain@sbx.pm>
Date: Wed, 16 Mar 2022 10:20:28 +0100
Subject: [PATCH] updated bootstrap-sass to 3.4.3

Also: restored webpack binaries
---
 CHANGELOG.md           |  1 +
 bin/webpack            | 18 ++++++++++++++++++
 bin/webpack-dev-server | 18 ++++++++++++++++++
 package.json           |  2 +-
 yarn.lock              |  7 ++++++-
 5 files changed, 44 insertions(+), 2 deletions(-)
 create mode 100755 bin/webpack
 create mode 100755 bin/webpack-dev-server

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 637aa1668..d3358f1bf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@
 - Updated i18next-icu to 2.0.3
 - Updated sidekiq-unique-jobs to 7.1.15
 - Updated @uirouter/angularjs to 1.0.30
+- Updated bootstrap-sass to 3.4.3
 - Removed unmaintained gem sidekiq-cron and replaced it with sidekiq-scheduler
 - Fix a bug: a sentence was not linked to a translation key
 - Fix a bug: the version check may be scheduled at an invalid time
diff --git a/bin/webpack b/bin/webpack
new file mode 100755
index 000000000..1031168d0
--- /dev/null
+++ b/bin/webpack
@@ -0,0 +1,18 @@
+#!/usr/bin/env ruby
+
+ENV["RAILS_ENV"] ||= ENV["RACK_ENV"] || "development"
+ENV["NODE_ENV"]  ||= "development"
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require "bundler/setup"
+
+require "webpacker"
+require "webpacker/webpack_runner"
+
+APP_ROOT = File.expand_path("..", __dir__)
+Dir.chdir(APP_ROOT) do
+  Webpacker::WebpackRunner.run(ARGV)
+end
diff --git a/bin/webpack-dev-server b/bin/webpack-dev-server
new file mode 100755
index 000000000..dd9662737
--- /dev/null
+++ b/bin/webpack-dev-server
@@ -0,0 +1,18 @@
+#!/usr/bin/env ruby
+
+ENV["RAILS_ENV"] ||= ENV["RACK_ENV"] || "development"
+ENV["NODE_ENV"]  ||= "development"
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require "bundler/setup"
+
+require "webpacker"
+require "webpacker/dev_server_runner"
+
+APP_ROOT = File.expand_path("..", __dir__)
+Dir.chdir(APP_ROOT) do
+  Webpacker::DevServerRunner.run(ARGV)
+end
diff --git a/package.json b/package.json
index 90c7c67e0..877c63616 100644
--- a/package.json
+++ b/package.json
@@ -91,7 +91,7 @@
     "babel-loader": "^8.2.3",
     "babel-plugin-macros": "^3.1.0",
     "babel-plugin-transform-react-remove-prop-types": "^0.4.24",
-    "bootstrap-sass": "3.4.1",
+    "bootstrap-sass": "3.4.3",
     "checklist-model": "0.2",
     "codemirror": "^5.58.2",
     "compression-webpack-plugin": "9",
diff --git a/yarn.lock b/yarn.lock
index d41bff742..55d71260b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2372,7 +2372,12 @@ boolbase@^1.0.0:
   resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"
   integrity sha1-aN/1++YMUes3cl6p4+0xDcwed24=
 
-bootstrap-sass@3.4.1, bootstrap-sass@>=3.4.1:
+bootstrap-sass@3.4.3:
+  version "3.4.3"
+  resolved "https://registry.yarnpkg.com/bootstrap-sass/-/bootstrap-sass-3.4.3.tgz#742cc8f4286303ae9fe8e4c95237321eae73766c"
+  integrity sha512-vPgFnGMp1jWZZupOND65WS6mkR8rxhJxndT/AcMbqcq1hHMdkcH4sMPhznLzzoHOHkSCrd6J9F8pWBriPCKP2Q==
+
+bootstrap-sass@>=3.4.1:
   version "3.4.1"
   resolved "https://registry.yarnpkg.com/bootstrap-sass/-/bootstrap-sass-3.4.1.tgz#6843c73b1c258a0ac5cb2cc6f6f5285b664a8e9a"
   integrity sha512-p5rxsK/IyEDQm2CwiHxxUi0MZZtvVFbhWmyMOt4lLkA4bujDA1TGoKT0i1FKIWiugAdP+kK8T5KMDFIKQCLYIA==