diff --git a/esbuild/frappe-vue-style.js b/esbuild/frappe-vue-style.js index d8b4711e30..ae58c48e80 100644 --- a/esbuild/frappe-vue-style.js +++ b/esbuild/frappe-vue-style.js @@ -14,7 +14,7 @@ module.exports = { let dir = path.dirname(out.path); if (out.path.endsWith(".js") && keys.includes(asset_path)) { let bundle_css = files[asset_path]; - let include_css = '\nfrappe.require("' + bundle_css + '");\n'; + let include_css = '\nfrappe.require("' + bundle_css + '", null, true);\n'; let modified = include_css + out.text; out.contents = Buffer.from(modified); } diff --git a/frappe/public/js/frappe-web.bundle.js b/frappe/public/js/frappe-web.bundle.js index e2098dd56c..36064767fb 100644 --- a/frappe/public/js/frappe-web.bundle.js +++ b/frappe/public/js/frappe-web.bundle.js @@ -1,7 +1,6 @@ -import "./jquery-bootstrap"; +import "./libs.bundle.js"; import "./frappe/class.js"; import "./frappe/polyfill.js"; -import "./lib/moment.js"; import "./frappe/provide.js"; import "./frappe/translate.js"; import "./frappe/form/formatters.js"; diff --git a/frappe/website/js/website.js b/frappe/website/js/website.js index 7fdfa79635..e40f5d9ed1 100644 --- a/frappe/website/js/website.js +++ b/frappe/website/js/website.js @@ -13,11 +13,22 @@ $.extend(frappe, { lang: "en", }, _assets_loaded: [], - require: async function (links, callback) { + require: async function (links, callback, from_assets_json = false) { if (typeof links === "string") { links = [links]; } for (let link of links) { + if (from_assets_json) { + if (frappe.boot.assets_json) { + link = frappe.boot.assets_json[link]; + } else { + let r = await frappe.call("frappe.sessions.get_boot_assets_json"); + if (r.message) { + frappe.boot.assets_json = r.message; + link = frappe.boot.assets_json[link]; + } + } + } await this.add_asset_to_head(link); } callback && callback();