diff --git a/modules/ui.py b/modules/ui.py
index ef85d43cc..b372d29cb 100644
--- a/modules/ui.py
+++ b/modules/ui.py
@@ -1919,47 +1919,41 @@ def create_ui():
def reload_javascript():
- javascript_files = OrderedDict()
- with open(os.path.join(script_path, "script.js"), "r", encoding="utf8") as jsfile:
- contents = jsfile.read()
- javascript_files["script.js"] = [contents]
-
scripts_list = modules.scripts.list_scripts("javascript", ".js")
-
+ js_files = []
for basedir, filename, path in scripts_list:
- with open(path, "r", encoding="utf8") as jsfile:
- contents = jsfile.read()
- javascript_files[filename] = [contents]
+ path = path[len(script_path) + 1:]
+ js_files.append(path)
+ inline = [f"{localization.localization_js(shared.opts.localization)};"]
if cmd_opts.theme is not None:
- javascript_files["theme.js"] = [f"set_theme('{cmd_opts.theme}');"]
+ inline.append(f"set_theme('{cmd_opts.theme}');", )
- javascript_files["localization.js"] = [f"{localization.localization_js(shared.opts.localization)}"]
-
- compiled_name = "webui-compiled.js"
- head = f"""
-
- """
+ t = int(time.time())
+ head = [
+ f"""
+
+ """.strip()
+ ]
+ inline_code = "\n".join(inline)
+ head.append(f"""
+
+ """.strip())
+ for file in js_files:
+ head.append(f"""
+
+ """.strip())
def template_response(*args, **kwargs):
res = shared.GradioTemplateResponseOriginal(*args, **kwargs)
+ head_inject = "\n".join(head)
res.body = res.body.replace(
- b'', f'{head}'.encode("utf8"))
+ b'', f'{head_inject}'.encode("utf8"))
res.init_headers()
return res
- for k in javascript_files:
- javascript_files[k] = "\n".join(javascript_files[k])
-
- # make static_path if not exists
- statica_path = os.path.join(script_path, 'statica')
- if not os.path.exists(statica_path):
- os.mkdir(statica_path)
-
- javascript_out = "\n\n\n".join([f"// \n\n{v}" for k, v in javascript_files.items()])
- with open(os.path.join(script_path, "statica", compiled_name), "w", encoding="utf8") as jsfile:
- jsfile.write(javascript_out)
-
gradio.routes.templates.TemplateResponse = template_response
diff --git a/statica/put-static-files-here.txt b/statica/put-static-files-here.txt
deleted file mode 100644
index 7cfaaa868..000000000
--- a/statica/put-static-files-here.txt
+++ /dev/null
@@ -1 +0,0 @@
-ayo
\ No newline at end of file
diff --git a/webui.py b/webui.py
index 50dee700a..d235da74b 100644
--- a/webui.py
+++ b/webui.py
@@ -8,7 +8,6 @@ import re
from fastapi import FastAPI
from fastapi.middleware.cors import CORSMiddleware
from fastapi.middleware.gzip import GZipMiddleware
-from starlette.staticfiles import StaticFiles
from modules import import_hook, errors, extra_networks
from modules import extra_networks_hypernet, ui_extra_networks_hypernets, ui_extra_networks_textual_inversion
@@ -196,7 +195,6 @@ def webui():
setup_cors(app)
app.add_middleware(GZipMiddleware, minimum_size=1000)
- app.mount("/statica", StaticFiles(directory=os.path.join(script_path, 'statica')), name="statica")
modules.progress.setup_progress_api(app)