Skip to content

module: do not set CJS variables for Worker eval #53050

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
nodejs-github-bot merged 5 commits into from
May 25, 2024
Merged

module: do not set CJS variables for Worker eval #53050

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4564644
module: do not set CJS variables for Worker eval
aduh95 May 18, 2024
e687acd
add test for `--eval`
aduh95 May 19, 2024
08c8705
Apply suggestions from code review
aduh95 May 19, 2024
8ed8f2f
lint
aduh95 May 19, 2024
8ef5902
Update test/es-module/test-esm-detect-ambiguous.mjs
aduh95 May 20, 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
Prev Previous commit
Next Next commit
Apply suggestions from code review 
Co-authored-by: Geoffrey Booth <webadmin@geoffreybooth.com>
  • Loading branch information
@aduh95 @GeoffreyBooth
aduh95 and GeoffreyBooth authored May 19, 2024
commit 08c8705ecf29127e6dc110f7c18537d7ada569ce
2 changes: 2 additions & 0 deletions src/node_contextify.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1708,6 +1708,8 @@ static void ContainsModuleSyntax(const FunctionCallbackInfo<Value>& args) {
resource_name = args[2].As<String>();
}
// Argument 4: flag to indicate if CJS variables should not be in scope
Comment thread
aduh95 marked this conversation as resolved.
// (they should be for normal CommonJS modules, but not for the
// CommonJS eval scope).
bool cjs_var = !args[3]->IsString();

bool cache_rejected = false;
Expand Down
2 changes: 1 addition & 1 deletion test/es-module/test-esm-detect-ambiguous.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -408,7 +408,7 @@ describe('Wrapping a `require` of an ES module while using `--abort-on-uncaught-
});

describe('when working with Worker threads', () => {
it('should work', async () => {
it('should evaluate a CommonJS worker as valid sloppy script where the CommonJS wrapper variables do not exist', async () => {
Comment thread
aduh95 marked this conversation as resolved.
Outdated
const { code, signal, stdout, stderr } = await spawnPromisified(process.execPath, [
'--experimental-detect-module',
'--eval',
Expand Down