vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

refactor: fetch logic

Browse source 
- Use _version_number which indicates when assets.json was generated.
  Files are evicted roughly at same time. metadata_version changes with
  other changes too.
- use `includes` instead of index check
- camelCase -> snake_case
- dont force caching. doesn't seem to be required. Caches without this
  header too.
This commit is contained in:
Ankush Menat 2023-09-23 15:04:31 +05:30
parent 1e19a2e4f1
commit b5d0169ca7
1 changed files with 8 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
frappe/public/js/frappe/assets.js
View file

@ -129,27 +129,24 @@ frappe.assets = {
return;
}
const versionString = frappe.boot.developer_mode
? Date.now()
: frappe.boot.metadata_version;
const version_string =
frappe.boot.developer_mode || window.dev_server ? Date.now() : window._version_number;
async function fetchItem(item) {
async function fetch_item(item) {
// Add the version to the URL to bust the cache for non-bundled assets
let url = new URL(item, window.location.origin);
if (item.indexOf(".bundle.") === -1 && !url.searchParams.get("v")) {
url.searchParams.append("v", versionString);
if (!item.includes(".bundle.") && !url.searchParams.get("v")) {
url.searchParams.append("v", version_string);
}
// Force use cache because we are already busting the cache with the version
const headers = { cache: "force-cache" };
const response = await fetch(url.toString(), headers);
const response = await fetch(url.toString());
const body = await response.text();
frappe.assets.add(item, body);
}
frappe.dom.freeze();
const fetchPromises = items.map(fetchItem);
Promise.all(fetchPromises).then(() => {
const fetch_promises = items.map(fetch_item);
Promise.all(fetch_promises).then(() => {
frappe.dom.unfreeze();
callback();
});