From 23406d031a7b6f849424f12203cf20537d94ff2e Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Thu, 27 May 2021 11:50:56 +0530 Subject: [PATCH] fix: Store assets.json directly in assets folder assets.json stores assets of all apps, so doesn't make sense to put it in frappe folder --- esbuild/esbuild.js | 7 +------ frappe/build.py | 2 +- frappe/utils/__init__.py | 2 +- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/esbuild/esbuild.js b/esbuild/esbuild.js index ecf0d49511..5154adb634 100644 --- a/esbuild/esbuild.js +++ b/esbuild/esbuild.js @@ -343,12 +343,7 @@ async function write_assets_json(metafile) { } } - let assets_json_path = path.resolve( - assets_path, - "frappe", - "dist", - "assets.json" - ); + let assets_json_path = path.resolve(assets_path, "assets.json"); let assets_json; try { assets_json = await fs.promises.readFile(assets_json_path, "utf-8"); diff --git a/frappe/build.py b/frappe/build.py index c970ae3a28..1df42ca2e6 100644 --- a/frappe/build.py +++ b/frappe/build.py @@ -50,7 +50,7 @@ def build_missing_files(): development = frappe.local.conf.developer_mode or frappe.local.dev_server build_mode = "development" if development else "production" - assets_json = frappe.read_file(frappe.get_app_path('frappe', 'public', 'dist', 'assets.json')) + assets_json = frappe.read_file("assets/assets.json") if assets_json: assets_json = frappe.parse_json(assets_json) diff --git a/frappe/utils/__init__.py b/frappe/utils/__init__.py index 436dcba028..1470616ca9 100644 --- a/frappe/utils/__init__.py +++ b/frappe/utils/__init__.py @@ -809,7 +809,7 @@ def get_assets_json(): assets_json = None if not assets_json: - assets_json = frappe.read_file("assets/frappe/dist/assets.json") + assets_json = frappe.read_file("assets/assets.json") cache.set_value("assets_json", assets_json, shared=True) frappe.local.assets_json = frappe.safe_decode(assets_json)