fix: libs.bundle.js

- Separate file to import jquery and bootstrap
- Remove separate jquery bundle from app as well as web
- Load jquery from node_modules

frappe/hooks.py

@@ -29,7 +29,7 @@ page_js = {
 
 # website
 app_include_js = [
-	"/assets/js/libs.min.js",
+	"frappe/public/js/libs.bundle.js",
 	"frappe/public/js/desk.bundle.js",
 	"frappe/public/js/list.bundle.js",
 	"frappe/public/js/form.bundle.js",

frappe/public/js/frappe-web.bundle.js

@@ -1,3 +1,4 @@
+import "./jquery-bootstrap";
 import "./frappe/class.js";
 import "./frappe/polyfill.js";
 import "./lib/md5.min.js";

frappe/public/js/jquery-bootstrap.js

@@ -0,0 +1,31 @@
+import jQuery from "jquery";
+import Alert from "bootstrap/js/dist/alert";
+import Button from "bootstrap/js/dist/button";
+import Carousel from "bootstrap/js/dist/carousel";
+import Collapse from "bootstrap/js/dist/collapse";
+import Dropdown from "bootstrap/js/dist/dropdown";
+import Modal from "bootstrap/js/dist/modal";
+import Popover from "bootstrap/js/dist/popover";
+import Scrollspy from "bootstrap/js/dist/scrollspy";
+import Tab from "bootstrap/js/dist/tab";
+import Toast from "bootstrap/js/dist/toast";
+import Tooltip from "bootstrap/js/dist/tooltip";
+import Util from "bootstrap/js/dist/util";
+
+window.jQuery = jQuery;
+window.$ = jQuery;
+
+export {
+	Util,
+	Alert,
+	Button,
+	Carousel,
+	Collapse,
+	Dropdown,
+	Modal,
+	Popover,
+	Scrollspy,
+	Tab,
+	Toast,
+	Tooltip
+};

frappe/public/js/libs.bundle.js

@@ -1,11 +1,14 @@
-import "bootstrap/dist/js/bootstrap.bundle.js";
+import "./jquery-bootstrap";
 import Vue from "vue/dist/vue.esm.js";
 import moment from "moment/min/moment-with-locales.js";
 import momentTimezone from "moment-timezone/builds/moment-timezone-with-data.js";
 import "socket.io-client/dist/socket.io.slim.js";
-import "./lib/Sortable.min.js";
-import "./lib/jquery/jquery.hotkeys.js";
-import "./lib/jSignature.min.js";
+import Sortable from "./lib/Sortable.min.js";
+// TODO: esbuild
+// Don't think jquery.hotkeys is being used anywhere. Will remove this after being sure.
+// import "./lib/jquery/jquery.hotkeys.js";
+
 
 window.moment = momentTimezone;
 window.Vue = Vue;
+window.Sortable = Sortable;

frappe/public/js/web/bootstrap-4.js

@@ -1,4 +1,3 @@
-import 'bootstrap/dist/js/bootstrap.bundle';
 
 // multilevel dropdown
 $('.dropdown-menu a.dropdown-toggle').on('click', function (e) {

frappe/templates/base.html

@@ -96,7 +96,6 @@
 
 	{% block base_scripts %}
 	<!-- js should be loaded in body! -->
-	<script type="text/javascript" src="/assets/frappe/js/lib/jquery/jquery.min.js"></script>
 	<script type="text/javascript" src="/assets/frappe/build/js/frappe-web.bundle.js"></script>
 	{% endblock %}
 

frappe/website/js/website.js

@@ -605,8 +605,7 @@ $(document).ready(function() {
 
 $(document).on("page-change", function() {
 	$(document).trigger("apply_permissions");
-	// TODO: esbuild
-	// $('.dropdown-toggle').dropdown();
+	$('.dropdown-toggle').dropdown();
 
 	//multilevel dropdown fix
 	$('.dropdown-menu .dropdown-submenu .dropdown-toggle').on('click', function(e) {

package.json

@@ -21,7 +21,7 @@
     "air-datepicker": "github:frappe/air-datepicker",
     "autoprefixer": "^9.8.6",
     "awesomplete": "^1.1.5",
-    "bootstrap": "4",
+    "bootstrap": "4.5.0",
     "cookie": "^0.4.0",
     "cssnano": "^4.1.10",
     "driver.js": "^0.9.8",
@@ -32,6 +32,7 @@
     "frappe-gantt": "^0.5.0",
     "fuse.js": "^3.4.6",
     "highlight.js": "^10.4.1",
+    "jquery": "2.2.4",
     "js-sha256": "^0.9.0",
     "jsbarcode": "^3.9.0",
     "localforage": "^1.9.0",
@@ -39,6 +40,7 @@
     "moment-timezone": "^0.5.28",
     "node-sass": "^4.14.1",
     "plyr": "^3.6.2",
+    "popper.js": "^1.16.0",
     "quagga": "^0.12.1",
     "quill": "2.0.0-dev.4",
     "quill-image-resize": "^3.0.9",

yarn.lock

@@ -1104,7 +1104,7 @@ boolean@^3.0.1:
   resolved "https://registry.yarnpkg.com/boolean/-/boolean-3.0.3.tgz#0fee0c9813b66bef25a8a6a904bb46736d05f024"
   integrity sha512-EqrTKXQX6Z3A2nRmMEIlAIfjQOgFnVO2nqZGpbcsPnYGWBwpFqzlrozU1dy+S2iqfYDLh26ef4KrgTxu9xQrxA==
 
-bootstrap@4:
+bootstrap@4.5.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.5.0.tgz#97d9dbcb5a8972f8722c9962483543b907d9b9ec"
   integrity sha512-Z93QoXvodoVslA+PWNdk23Hze4RBYIkpb5h8I2HY2Tu2h7A0LpAgLcyrhrSUyo2/Oxm2l1fRZPs1e5hnxnliXA==
@@ -4298,6 +4298,11 @@ jpeg-js@^0.3.2:
   resolved "https://registry.yarnpkg.com/jpeg-js/-/jpeg-js-0.3.6.tgz#c40382aac9506e7d1f2d856eb02f6c7b2a98b37c"
   integrity sha512-MUj2XlMB8kpe+8DJUGH/3UJm4XpI8XEgZQ+CiHDeyrGoKPdW/8FJv6ku+3UiYm5Fz3CWaL+iXmD8Q4Ap6aC1Jw==
 
+jquery@2.2.4:
+  version "2.2.4"
+  resolved "https://registry.yarnpkg.com/jquery/-/jquery-2.2.4.tgz#2c89d6889b5eac522a7eea32c14521559c6cbf02"
+  integrity sha1-LInWiJterFIqfuoywUUhVZxsvwI=
+
 "jquery@>=2.0.0 <4.0.0":
   version "3.4.1"
   resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.4.1.tgz#714f1f8d9dde4bdfa55764ba37ef214630d80ef2"
@@ -6124,6 +6129,11 @@ pngjs@^3.3.3:
   resolved "https://registry.yarnpkg.com/pngjs/-/pngjs-3.4.0.tgz#99ca7d725965fb655814eaf65f38f12bbdbf555f"
   integrity sha512-NCrCHhWmnQklfH4MtJMRjZ2a8c80qXeMlQMv2uVp9ISJMTt562SbGd6n2oq0PaPgKm7Z6pL9E2UlLIhC+SHL3w==
 
+popper.js@^1.16.0:
+  version "1.16.1"
+  resolved "https://registry.yarnpkg.com/popper.js/-/popper.js-1.16.1.tgz#2a223cb3dc7b6213d740e40372be40de43e65b1b"
+  integrity sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ==
+
 posix-character-classes@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"