Skip to content

Fix a couple of issues with JS output caching #25946

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sbc100 merged 1 commit into from
Dec 15, 2025
+5 −1
Merged

Fix a couple of issues with JS output caching #25946

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion tools/emscripten.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,8 @@ def generate_js_compiler_input_hash(symbols_only=False):
if not symbols_only:
files += settings.PRE_JS_FILES
files += settings.POST_JS_FILES
# Also include other .js files that could be included in the output.
files += glob.glob(utils.path_from_root('src/*.js'))

for file in sorted(files):
file_contents.append(utils.read_file(file))
Expand Down Expand Up @@ -340,7 +342,9 @@ def get_cached_file(filetype, filename, generator, cache_limit):
def compile_javascript_cached():
# Avoiding using the cache when generating struct info since
# this step is performed while the cache is locked.
if DEBUG or settings.BOOTSTRAPPING_STRUCT_INFO or config.FROZEN_CACHE:
# Sadly we have to skip the caching whenwhere we have user JS libraries. This is because
# these libraries can import arbirary other JS files (either vis node's `import` or via #include)
if DEBUG or settings.BOOTSTRAPPING_STRUCT_INFO or config.FROZEN_CACHE or settings.JS_LIBRARIES:
return compile_javascript()

content_hash = generate_js_compiler_input_hash()
Expand Down