Skip to content

esm: use import attributes instead of import assertions #50140

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 13 commits into from
Oct 14, 2023
Merged

esm: use import attributes instead of import assertions #50140

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
db6a12b
esm: use import attributes instead of import assertions
aduh95 Oct 11, 2023
7d0bf1f
fixup! esm: use import attributes instead of import assertions
aduh95 Oct 11, 2023
0af4c20
fixup! esm: use import attributes instead of import assertions
aduh95 Oct 11, 2023
0246cda
fixup! esm: use import attributes instead of import assertions
aduh95 Oct 11, 2023
03b2beb
fixup! esm: use import attributes instead of import assertions
aduh95 Oct 11, 2023
2eb3dba
fixup! esm: use import attributes instead of import assertions
aduh95 Oct 11, 2023
3b9173b
fixup! esm: use import attributes instead of import assertions
aduh95 Oct 11, 2023
5c34f15
fixup! esm: use import attributes instead of import assertions
aduh95 Oct 11, 2023
97597fb
esm: emit a `TypeError` when using an unknown import attribute
aduh95 Oct 11, 2023
d26517a
fixup! esm: use import attributes instead of import assertions
aduh95 Oct 11, 2023
1806268
fixup! esm: use import attributes instead of import assertions
aduh95 Oct 11, 2023
9eb17c8
fixup! esm: use import attributes instead of import assertions
aduh95 Oct 12, 2023
7159264
fixup! esm: use import attributes instead of import assertions
aduh95 Oct 12, 2023
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
fixup! esm: use import attributes instead of import assertions
  • Loading branch information
@aduh95
aduh95 committed Oct 11, 2023
commit 0246cdaf051d55ebd80ebc2979e0fc12aa7d5bb3
16 changes: 8 additions & 8 deletions src/module_wrap.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,13 +252,13 @@ void ModuleWrap::New(const FunctionCallbackInfo<Value>& args) {
static Local<Object> createImportAttributesContainer(Environment* env,
Isolate* isolate, Local<FixedArray> raw_attributes) {
Local<Object> attributes =
Object::New(isolate, v8::Null(env->isolate()), nullptr, nullptr, 0);
Object::New(isolate, v8::Null(env->isolate()), nullptr, nullptr, 0);
for (int i = 0; i < raw_attributes->Length(); i += 3) {
attributes
->Set(env->context(),
raw_attributes->Get(env->context(), i).As<String>(),
raw_attributes->Get(env->context(), i + 1).As<Value>())
.ToChecked();
attributes
->Set(env->context(),
raw_attributes->Get(env->context(), i).As<String>(),
raw_attributes->Get(env->context(), i + 1).As<Value>())
.ToChecked();
}

return attributes;
Expand Down Expand Up @@ -299,7 +299,7 @@ void ModuleWrap::Link(const FunctionCallbackInfo<Value>& args) {

Local<FixedArray> raw_attributes = module_request->GetImportAssertions();
Local<Object> attributes =
createImportAttributesContainer(env, isolate, raw_attributes);
createImportAttributesContainer(env, isolate, raw_attributes);

Local<Value> argv[] = {
specifier,
Expand Down Expand Up @@ -581,7 +581,7 @@ static MaybeLocal<Promise> ImportModuleDynamically(
options->Get(context, HostDefinedOptions::kID).As<Symbol>();

Local<Object> attributes =
createImportAttributesContainer(env, isolate, import_attributes);
createImportAttributesContainer(env, isolate, import_attributes);

Local<Value> import_args[] = {
id,
Expand Down
3 changes: 2 additions & 1 deletion src/node.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -755,7 +755,8 @@ static ExitCode ProcessGlobalArgsInternal(std::vector<std::string>* args,
}
// TODO(aduh95): remove this when the harmony-import-attributes flag
// is removed in V8.
if (std::find(v8_args.begin(), v8_args.end(),
if (std::find(v8_args.begin(),
v8_args.end(),
"--no-harmony-import-attributes") == v8_args.end()) {
v8_args.emplace_back("--harmony-import-attributes");
}
Expand Down