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

Revert "fix: Don't re-copy node_modules if public already has it"

Browse source 
This reverts commit 548eb079c8.

Seems to break UI components. Learnt this from Cypress UI tests
ref: https://github.com/frappe/frappe/pull/13145/checks?check_run_id=2567366717
This commit is contained in:
Gavin D'souza 2021-05-12 21:00:07 +05:30
parent 098f1564f3
commit 6581ed886a
1 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
frappe/build.py
View file

@ -268,17 +268,14 @@ def generate_assets_map():
for app_name in frappe.get_all_apps():
app_doc_path = None
pymodule = frappe.get_module(app_name)
app_base_path = os.path.abspath(os.path.dirname(pymodule.__file__))
app_public_path = os.path.join(app_base_path, "public")
app_node_modules_path = os.path.join(app_base_path, "..", "node_modules")
internal_app_node_modules_path = os.path.join(app_base_path, "..", "node_modules")
node_modules_required = (
os.path.realpath(app_node_modules_path) != os.path.realpath(internal_app_node_modules_path)
)
app_docs_path = os.path.join(app_base_path, "docs")
app_www_docs_path = os.path.join(app_base_path, "www", "docs")
app_assets = os.path.abspath(app_public_path)
app_node_modules = os.path.abspath(app_node_modules_path)
@ -287,8 +284,7 @@ def generate_assets_map():
symlinks[app_assets] = os.path.join(assets_path, app_name)
# {app}/node_modules > assets/{app}/node_modules
# node_modules_required is set if its not already a path of {app}/public
if os.path.isdir(app_node_modules) and node_modules_required:
if os.path.isdir(app_node_modules):
symlinks[app_node_modules] = os.path.join(assets_path, app_name, "node_modules")
# {app}/docs > assets/{app}_docs