From 1f03155eb0a9fee5fc8393edbeb6113ec8a9c7dd Mon Sep 17 00:00:00 2001
From: Sylvain <sylvain@sleede.com>
Date: Wed, 7 Oct 2020 14:25:48 +0200
Subject: [PATCH] fix compilation of angular-ui-tour

---
 config/webpack/environment.js     |  4 ++--
 config/webpack/loaders/ui-tour.js | 14 ++++++++++++
 package.json                      |  1 +
 yarn.lock                         | 36 ++++++++++++++++++++++++++++++-
 4 files changed, 52 insertions(+), 3 deletions(-)
 create mode 100644 config/webpack/loaders/ui-tour.js

diff --git a/config/webpack/environment.js b/config/webpack/environment.js
index 6af15f0d9..bdb1b8155 100644
--- a/config/webpack/environment.js
+++ b/config/webpack/environment.js
@@ -8,14 +8,13 @@ const jsErb = require('./loaders/js_erb');
 const sass = require('./loaders/sass');
 const sassErb = require('./loaders/sass_erb');
 const html = require('./loaders/html');
+const uiTour = require('./loaders/ui-tour');
 
 environment.plugins.prepend('Provide', new webpack.ProvidePlugin({
   $: 'jquery',
   jQuery: 'jquery',
   'window.jQuery': 'jquery',
   _: 'lodash',
-  Hone: 'hone',
-  Tether: 'tether',
   Holder: 'holderjs',
   'window.CodeMirror': 'codemirror',
   MediumEditor: 'medium-editor',
@@ -30,6 +29,7 @@ environment.loaders.prepend('sass-erb', sassErb);
 environment.loaders.prepend('js', js);
 environment.loaders.append('html', html);
 environment.loaders.append('sass', sass);
+environment.loaders.append('uiTour', uiTour);
 
 environment.splitChunks();
 
diff --git a/config/webpack/loaders/ui-tour.js b/config/webpack/loaders/ui-tour.js
new file mode 100644
index 000000000..cb3dd6f30
--- /dev/null
+++ b/config/webpack/loaders/ui-tour.js
@@ -0,0 +1,14 @@
+module.exports = {
+  test: /angular-ui-tour\/.*\.js$/i,
+  use: [
+    {
+      loader: 'imports-loader',
+      options: {
+        imports: [
+          'default hone Hone',
+          'default tether Tether'
+        ]
+      }
+    }
+  ]
+};
diff --git a/package.json b/package.json
index ac83d7fb4..1f9ea7bd0 100644
--- a/package.json
+++ b/package.json
@@ -26,6 +26,7 @@
     "eslint-plugin-promise": "~4.2.1",
     "eslint-plugin-standard": "~4.0.1",
     "html-loader": "^1.3.0",
+    "imports-loader": "^1.2.0",
     "ngtemplate-loader": "^2.1.0",
     "rails-erb-loader": "^5.5.2",
     "resolve-url-loader": "^3.1.1",
diff --git a/yarn.lock b/yarn.lock
index e90597b0b..944b8f163 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -933,7 +933,7 @@
     "@types/minimatch" "*"
     "@types/node" "*"
 
-"@types/json-schema@^7.0.5":
+"@types/json-schema@^7.0.5", "@types/json-schema@^7.0.6":
   version "7.0.6"
   resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.6.tgz#f4c7ec43e81b319a9815115031709f26987891f0"
   integrity sha512-3c+yGKvVP5Y9TYBEibGNR+kLtijnj7mYrXRg+WpFb2X9xm04g/DXYkfg4hmzJQosc9snFNUPkbYIhu+KAm6jJw==
@@ -1201,6 +1201,16 @@ ajv@^6.10.0, ajv@^6.10.2:
     json-schema-traverse "^0.4.1"
     uri-js "^4.2.2"
 
+ajv@^6.12.5:
+  version "6.12.5"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.5.tgz#19b0e8bae8f476e5ba666300387775fb1a00a4da"
+  integrity sha512-lRF8RORchjpKG50/WFf8xmg7sgCLFiYNNnqdKflk63whMQcWR5ngGjiSXkL9bjxy6B2npOK2HSMN49jEBMSkag==
+  dependencies:
+    fast-deep-equal "^3.1.1"
+    fast-json-stable-stringify "^2.0.0"
+    json-schema-traverse "^0.4.1"
+    uri-js "^4.2.2"
+
 alphanum-sort@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/alphanum-sort/-/alphanum-sort-1.0.2.tgz#97a1119649b211ad33691d9f9f486a8ec9fbe0a3"
@@ -4440,6 +4450,16 @@ import-local@^2.0.0:
     pkg-dir "^3.0.0"
     resolve-cwd "^2.0.0"
 
+imports-loader@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/imports-loader/-/imports-loader-1.2.0.tgz#b06823d0bb42e6f5ff89bc893829000eda46693f"
+  integrity sha512-zPvangKEgrrPeqeUqH0Uhc59YqK07JqZBi9a9cQ3v/EKUIqrbJHY4CvUrDus2lgQa5AmPyXuGrWP8JJTqzE5RQ==
+  dependencies:
+    loader-utils "^2.0.0"
+    schema-utils "^3.0.0"
+    source-map "^0.6.1"
+    strip-comments "^2.0.1"
+
 imurmurhash@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
@@ -7643,6 +7663,15 @@ schema-utils@^2.6.1, schema-utils@^2.6.5, schema-utils@^2.6.6, schema-utils@^2.7
     ajv "^6.12.4"
     ajv-keywords "^3.5.2"
 
+schema-utils@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.0.0.tgz#67502f6aa2b66a2d4032b4279a2944978a0913ef"
+  integrity sha512-6D82/xSzO094ajanoOSbe4YvXWMfn2A//8Y1+MUqFAJul5Bs+yn36xbK9OtNDcRVSBJ9jjeoXftM6CfztsjOAA==
+  dependencies:
+    "@types/json-schema" "^7.0.6"
+    ajv "^6.12.5"
+    ajv-keywords "^3.5.2"
+
 scss-tokenizer@^0.2.3:
   version "0.2.3"
   resolved "https://registry.yarnpkg.com/scss-tokenizer/-/scss-tokenizer-0.2.3.tgz#8eb06db9a9723333824d3f5530641149847ce5d1"
@@ -8197,6 +8226,11 @@ strip-bom@^3.0.0:
   resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
   integrity sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=
 
+strip-comments@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/strip-comments/-/strip-comments-2.0.1.tgz#4ad11c3fbcac177a67a40ac224ca339ca1c1ba9b"
+  integrity sha512-ZprKx+bBLXv067WTCALv8SSz5l2+XhpYCsVtSqlMnkAXMWDq+/ekVbl1ghqP9rUHTzv6sm/DwCOiYutU/yp1fw==
+
 strip-eof@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf"