Skip to content
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

Jump to bottom

Fix build failures when any parent directory is {"type": "module"} #17451

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Fix build failures when any parent directory is {"type": "module"} #17451

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4a83cfb
fix build failures when any parent directory is {"type": "module"}
shamrin Jul 15, 2022
c87888a
write js executable to .cjs file, with a shell wrapper
shamrin Jul 17, 2022
d87fd15
Delete commonjs-loader.mjs
shamrin Jul 17, 2022
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
22 changes: 15 additions & 7 deletions emcc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -620,15 +620,23 @@ def make_js_executable(script):
cmd = config.JS_ENGINE
if settings.WASM_BIGINT:
cmd.append('--experimental-wasm-bigint')

# Write script file with .cjs extension to force Node to commonjs mode.
# This prevents build failures when any parent directory has
# package.json with {"type": "module"}. In addition, write a shell
# wrapper that calls node with this .cjs script, because autoconf
# does not expect its conftest binary to have an extension.
# See https://github.com/emscripten-core/emscripten/issues/17431
cjs_script = script + '.cjs'
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we only want to do this if the name of the output file does not have an extension already. e.g. conftest. If the user does -o out.js it would be a little odd to have out.js be shell script that runs out.cjs.

So I think maybe we need both old and new methods. You can do if not shared.suffix(script): to check this.

cmd.append(cjs_script)
cmd = shared.shlex_join(cmd)
if not os.path.isabs(config.JS_ENGINE[0]):
# TODO: use whereis etc. And how about non-*NIX?
cmd = '/usr/bin/env -S ' + cmd
logger.debug('adding `#!` to JavaScript file: %s' % cmd)
# add shebang
with open(script, 'w') as f:
f.write('#!%s\n' % cmd)
logger.debug('writing %s JavaScript file' % cjs_script)
with open(cjs_script, 'w') as f:
f.write(src)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you just to shutil.rename(script, cjs_script).. this avoid the need for the read_file above.

logger.debug('writing a %s shell wrapper for %s JavaScript file: %s' % (script, cjs_script, cmd))
with open(script, 'w') as f:
f.write('#!/bin/sh\n')
f.write(cmd)
try:
os.chmod(script, stat.S_IMODE(os.stat(script).st_mode) | stat.S_IXUSR) # make executable
except OSError:
Expand Down