WIP #2922 @1

diff --git a/package.json b/package.json
index 6f68ec860d83ab3c5beba4e69df31bd00702014b..10caffd53d38447c1ecc3babc26f8a0d5095af8d 100644 (file)
--- a/package.json
+++ b/package.json
@@ -21,7 +21,7 @@
         "laravel-mix-purgecss": "^4.1.0",
         "lodash": "^4.17.5",
         "lost": "^8.3.1",
-        "mmenu-light": "^2.1.0",
+        "mmenu-light": "^2.1.1",
         "popper.js": "^1.12",
         "portal-vue": "^2.1.5",
         "resolve-url-loader": "^2.3.1",

diff --git a/resources/js/menu.js b/resources/js/menu.js
index d72d257f6ee540692b50b26f64248a244fdb37a7..a416228d4d6f0e60fa0521a607b0b16d85b70fad 100644 (file)
--- a/resources/js/menu.js
+++ b/resources/js/menu.js
@@ -1,22 +1,8 @@
-// Note: for now, mmenu-light doesn't support webpack properly
-// so we're taking the contents of src/mmenu-light.js and placing
-// it here in order to make the initialisation work correctly
-// Ref: https://github.com/FrDH/mmenu-light/issues/7
-
-//===============================================================
-//     Core
+//=== MMenu Setup
 import MmenuLight from 'mmenu-light/dist/js/mmlight';
-
-//     Add-ons
 import offcanvas from 'mmenu-light/dist/js/mmlight.offcanvas';
-
 MmenuLight.prototype.offcanvas = offcanvas;
 
-//     Global namespace
-window.MmenuLight = MmenuLight;
-//===============================================================
-
-//=== MMenu Setup
 document.addEventListener(
     'DOMContentLoaded', () => {
         const menuSelector = '#menu';

diff --git a/yarn.lock b/yarn.lock
index ed8025459e9d8ec9ddebb762f5a563cb5763c7b2..0f907d062f03b77aa705a2e130533cb3eb7c0323 100644 (file)
--- a/yarn.lock
+++ b/yarn.lock
@@ -3152,7 +3152,7 @@ glob-to-regexp@^0.3.0:
   resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz#8c5a1494d2066c570cc3bfe4496175acc4d502ab"
   integrity sha1-jFoUlNIGbFcMw7/kSWF1rMTVAqs=
 
-glob@^7.0.3, glob@^7.0.5, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3:
+glob@^7.0.3, glob@^7.0.5, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@~7.1.2:
   version "7.1.4"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.4.tgz#aa608a2f6c577ad357e1ae5a5c26d9a8d1969255"
   integrity sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==
@@ -4562,10 +4562,10 @@ mkdirp@0.5.x, mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0, mkdirp@~0.5.1, mkdirp
   dependencies:
     minimist "0.0.8"
 
-mmenu-light@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/mmenu-light/-/mmenu-light-2.1.0.tgz#9387249d56649e3e776707e59a90ed018868cc10"
-  integrity sha512-s4FMXwYILw3UL7kpcjrDSXgn0AWEA+CQXnkrJhWEjLTONbHhFFI0Ln5BCQ4/kE6B5wD1WnR20o1eT8nAR7QYpw==
+mmenu-light@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/mmenu-light/-/mmenu-light-2.1.1.tgz#8e20f294c6388814ffb86622025cd9ac8b408584"
+  integrity sha512-cLycH5h0jfVvA5NNM4ckzeo3rzRh4e3sILnNn7ntXBLxZPL9cO4oTYDrHKDQHa2wBbc040X9rJgM+7rhaEzg4Q==
 
 move-concurrently@^1.0.1:
   version "1.0.1"
@@ -6164,7 +6164,7 @@ safe-regex@^1.1.0:
   dependencies:
     ret "~0.1.10"
 
-"safer-buffer@>= 2.1.2 < 3", safer-buffer@^2.1.2:
+"safer-buffer@>= 2.1.2 < 3":
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
   integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
@@ -6208,11 +6208,6 @@ selfsigned@^1.10.4:
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.0.tgz#790a7cf6fea5459bac96110b29b60412dc8ff96b"
   integrity sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==
 
-semver@^6.0.0:
-  version "6.2.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-6.2.0.tgz#4d813d9590aaf8a9192693d6c85b9344de5901db"
-  integrity sha512-jdFC1VdUGT/2Scgbimf7FSx9iJLXoqfglSF+gJeuNWVpiE37OIbc1jywR/GJyFdz3mnkz2/id0L0J/cr0izR5A==
-
 semver@^6.1.0, semver@^6.1.1:
   version "6.1.1"
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.1.1.tgz#53f53da9b30b2103cd4f15eab3a18ecbcb210c9b"
@@ -6545,7 +6540,7 @@ source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.0, source-map@~0.6.1:
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
   integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
 
-source-map@^0.7.3:
+source-map@~0.7.2:
   version "0.7.3"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383"
   integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==