Skip to content

module: unflag import assertions #39921

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

Closed
aduh95 wants to merge 13 commits into from
Closed

module: unflag import assertions #39921

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
8475f0e
vm: add support for import assertions in dynamic imports
aduh95 Sep 5, 2021
ece7a7d
module: unflag import assertions
aduh95 Aug 27, 2021
8754a41
fixup! module: unflag import assertions
aduh95 Sep 12, 2021
debc47f
fixup! module: unflag import assertions
aduh95 Sep 12, 2021
733deb8
fixup! fixup! module: unflag import assertions
aduh95 Sep 12, 2021
4fa6f58
fixup! module: unflag import assertions
aduh95 Sep 13, 2021
1e6330a
fixup! module: unflag import assertions
aduh95 Sep 13, 2021
1ecb35a
fixup! module: unflag import assertions
aduh95 Sep 13, 2021
180099e
fixup! module: unflag import assertions
aduh95 Sep 13, 2021
83ff00e
fixup! module: unflag import assertions
aduh95 Sep 13, 2021
b5ad8b0
fixup! module: unflag import assertions
aduh95 Sep 13, 2021
d364844
fixup! module: unflag import assertions
aduh95 Sep 14, 2021
d19ecc4
fixup! module: unflag import assertions
aduh95 Sep 21, 2021
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! fixup! module: unflag import assertions
  • Loading branch information
@aduh95
aduh95 committed Sep 12, 2021
commit 733deb87a9b07c5267f30c93e30bb8f76fa6a5ad
7 changes: 3 additions & 4 deletions lib/internal/modules/esm/loader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ const {
PromiseAll,
RegExpPrototypeExec,
SafeArrayIterator,
SafeMap,
SafeWeakMap,
globalThis,
} = primordials;
Expand Down Expand Up @@ -46,7 +45,7 @@ const { translators } = require(
'internal/modules/esm/translators');
const { getOptionValue } = require('internal/options');

const finalFormatCache = new SafeMap();
const finalFormatCache = new SafeWeakMap();

/**
* An ESMLoader instance is used as the main entry point for loading ES modules.
Expand Down Expand Up @@ -235,7 +234,7 @@ class ESMLoader {
// fulfill first.
await job.modulePromise;
Comment thread
aduh95 marked this conversation as resolved.

const finalFormat = finalFormatCache.get(url);
const finalFormat = finalFormatCache.get(job);
if (import_assertions.type === 'json' && finalFormat !== 'json') {
throw new ERR_FAILED_IMPORT_ASSERTION(
url, 'type', import_assertions.type, finalFormat);
Expand All @@ -259,7 +258,7 @@ class ESMLoader {
throw new ERR_FAILED_IMPORT_ASSERTION(
url, 'type', import_assertions.type, finalFormat);
} else if (import_assertions.type == null) {
finalFormatCache.set(url, finalFormat);
finalFormatCache.set(job, finalFormat);
}

const translator = translators.get(finalFormat);
Expand Down