From 017a882f9051bf4099a213ab1fd09dcf144d5ea8 Mon Sep 17 00:00:00 2001
From: marination <maricadsouza221197@gmail.com>
Date: Thu, 3 Feb 2022 21:34:48 +0530
Subject: [PATCH] fix: Remove `cart.js` from erpnext-web bundle

- Due to it being in the bundle, controls bundle was required for Dialogs used in cart
- But this is exclusively used in `cart.html`
- It has no reason to load and break the login page
- Moved it back to where the html is, it is now back to being tightly coupled with its html
---
 erpnext/public/js/erpnext-web.bundle.js        | 1 -
 erpnext/templates/pages/cart.html              | 2 ++
 erpnext/{public/js => templates/pages}/cart.js | 5 +----
 3 files changed, 3 insertions(+), 5 deletions(-)
 rename erpnext/{public/js => templates/pages}/cart.js (98%)

diff --git a/erpnext/public/js/erpnext-web.bundle.js b/erpnext/public/js/erpnext-web.bundle.js
index 576abd2686f..cbe899dc060 100644
--- a/erpnext/public/js/erpnext-web.bundle.js
+++ b/erpnext/public/js/erpnext-web.bundle.js
@@ -1,7 +1,6 @@
 import "./website_utils";
 import "./wishlist";
 import "./shopping_cart";
-import "./cart";
 import "./customer_reviews";
 import "../../e_commerce/product_ui/list";
 import "../../e_commerce/product_ui/views";
diff --git a/erpnext/templates/pages/cart.html b/erpnext/templates/pages/cart.html
index 89bc2993b78..2b7d9e35239 100644
--- a/erpnext/templates/pages/cart.html
+++ b/erpnext/templates/pages/cart.html
@@ -127,4 +127,6 @@
 {% block base_scripts %}
 <!-- js should be loaded in body! -->
 {{ include_script("frappe-web.bundle.js") }}
+{{ include_script("controls.bundle.js") }}
+{{ include_script("dialog.bundle.js") }}
 {% endblock %}
diff --git a/erpnext/public/js/cart.js b/erpnext/templates/pages/cart.js
similarity index 98%
rename from erpnext/public/js/cart.js
rename to erpnext/templates/pages/cart.js
index 14a5ac3a4ca..fb2d159dcf9 100644
--- a/erpnext/public/js/cart.js
+++ b/erpnext/templates/pages/cart.js
@@ -1,10 +1,7 @@
 // Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
 // License: GNU General Public License v3. See license.txt
-import "../../../../frappe/frappe/public/js/controls.bundle";
-import "../../../../frappe/frappe/public/js/dialog.bundle";
-// js inside blog page
 
-// shopping cart
+// JS exclusive to /cart page
 frappe.provide("erpnext.e_commerce.shopping_cart");
 var shopping_cart = erpnext.e_commerce.shopping_cart;