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

Webpack workaround #22605

Merged
merged 10 commits into from
Sep 24, 2024
Merged

Webpack workaround #22605

Changes from 9 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
ba0799f
Wrapping new URL(./, import.meta.url) to prevent webpack bug.
seanmorris Sep 22, 2024
206c3e1
Merge branch 'main' into sm-webpack-workaround
seanmorris Sep 22, 2024
b6de4a8
Adding comment for future maintainers.
seanmorris Sep 23, 2024
c2b4e9f
Merge branch 'main' into sm-webpack-workaround
seanmorris Sep 23, 2024
f61411d
Notation.
seanmorris Sep 24, 2024
a0dc243
Merge branch 'sm-webpack-workaround' of github.com:seanmorris/emscrip…
seanmorris Sep 24, 2024
ab5c225
Notation.
seanmorris Sep 24, 2024
dd53f0b
Ensure scriptDirectory ends in a "/"
seanmorris Sep 24, 2024
8a29ec7
Ensure scriptDirectory ends in a "/"
seanmorris Sep 24, 2024
1151162
Moving slash.
seanmorris Sep 24, 2024
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: 4 additions & 2 deletions src/shell.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,11 +235,13 @@ if (ENVIRONMENT_IS_NODE) {
// EXPORT_ES6 + ENVIRONMENT_IS_NODE always requires use of import.meta.url,
// since there's no way getting the current absolute path of the module when
// support for that is not available.
scriptDirectory = require('url').fileURLToPath(new URL('./', import.meta.url)); // includes trailing slash
scriptDirectory = nodePath.dirname(require('url').fileURLToPath(import.meta.url));
#else
scriptDirectory = __dirname + '/';
scriptDirectory = __dirname;
#endif

scriptDirectory += '/' // scriptDirectory is expected to end in a "/"
seanmorris marked this conversation as resolved.
Show resolved Hide resolved

#include "node_shell_read.js"

if (!Module['thisProgram'] && process.argv.length > 1) {
Expand Down
Loading