From 808f797633ba82c0e9198481ddd742284a03cb9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bartek=20Iwa=C5=84czuk?= Date: Fri, 11 Mar 2022 02:33:02 +0100 Subject: fix(compat): cjs/esm interop for dynamic imports (#13792) This commit fixes CJS/ESM interop in compat mode for dynamically imported modules. "ProcState::prepare_module_load" was changed to accept a list of "graph roots" without associated "module kind". That module kind was always hardcoded to "ESM" which is not true for CJS/ESM interop - a CommonJs module might be imported using "import()" function. In such case the root of the graph should have "CommonJs" module kind instead of "ESM". --- cli/tests/testdata/compat/import_cjs_from_esm/main_dynamic.mjs | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 cli/tests/testdata/compat/import_cjs_from_esm/main_dynamic.mjs (limited to 'cli/tests/testdata') diff --git a/cli/tests/testdata/compat/import_cjs_from_esm/main_dynamic.mjs b/cli/tests/testdata/compat/import_cjs_from_esm/main_dynamic.mjs new file mode 100644 index 000000000..e94af67a4 --- /dev/null +++ b/cli/tests/testdata/compat/import_cjs_from_esm/main_dynamic.mjs @@ -0,0 +1,2 @@ +const url = new URL("./imported.js", import.meta.url); +await import(url.href); -- cgit v1.2.3