From 4c64f04b88e4f94e726249f52f034eb3a51f8e4f Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Thu, 29 Apr 2021 13:57:16 +0530 Subject: [PATCH] fix: Support for bundled asset in frappe.require --- frappe/public/js/frappe/assets.js | 6 ++++++ frappe/sessions.py | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/assets.js b/frappe/public/js/frappe/assets.js index 850d7cc313..bc2f02bb0f 100644 --- a/frappe/public/js/frappe/assets.js +++ b/frappe/public/js/frappe/assets.js @@ -9,6 +9,12 @@ frappe.require = function(items, callback) { if(typeof items === "string") { items = [items]; } + items = items.map(item => { + if (!item.startsWith('/assets') && item.includes('.bundle.')) { + return frappe.boot.assets_json[item] || item; + } + return item; + }); return new Promise(resolve => { frappe.assets.execute(items, () => { diff --git a/frappe/sessions.py b/frappe/sessions.py index 5f13dfb7af..42c5bf0bfc 100644 --- a/frappe/sessions.py +++ b/frappe/sessions.py @@ -11,7 +11,7 @@ permission, homepage, default variables, system defaults etc import frappe, json from frappe import _ import frappe.utils -from frappe.utils import cint, cstr +from frappe.utils import cint, cstr, get_assets_json import frappe.model.meta import frappe.defaults import frappe.translate @@ -149,6 +149,7 @@ def get(): bootinfo["metadata_version"] = frappe.reset_metadata_version() bootinfo.notes = get_unseen_notes() + bootinfo.assets_json = get_assets_json() for hook in frappe.get_hooks("extend_bootinfo"): frappe.get_attr(hook)(bootinfo=bootinfo)