From c887ac4b4bc8fe8bafc5489daa1bd034c3e722d6 Mon Sep 17 00:00:00 2001 From: Nikita Poltorapavlo Date: Fri, 22 Nov 2019 21:11:19 +0200 Subject: [PATCH 1/3] fix dynamic import --- examples/pxScene2d/src/rcvrcore/ESMLoader.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/pxScene2d/src/rcvrcore/ESMLoader.js b/examples/pxScene2d/src/rcvrcore/ESMLoader.js index 8c642bfcd8..6efdd64d3b 100644 --- a/examples/pxScene2d/src/rcvrcore/ESMLoader.js +++ b/examples/pxScene2d/src/rcvrcore/ESMLoader.js @@ -433,8 +433,8 @@ var linker = async function (specifier, referencingModule) { } } -var importModuleDynamically = async function (specifier, { url }) { - var mod = await getModule(specifier,{ url }); +var importModuleDynamically = async function (specifier, referencingModule) { + var mod = await getModule(specifier,referencingModule); mod.instantiate(); await mod.evaluate(); return mod; From 3077650f396f2b0f583eb9f9c5139ab372515062 Mon Sep 17 00:00:00 2001 From: Nikita Poltorapavlo Date: Fri, 22 Nov 2019 21:16:09 +0200 Subject: [PATCH 2/3] remove some strange code --- examples/pxScene2d/src/rcvrcore/ESMLoader.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/pxScene2d/src/rcvrcore/ESMLoader.js b/examples/pxScene2d/src/rcvrcore/ESMLoader.js index 6efdd64d3b..3827773c49 100644 --- a/examples/pxScene2d/src/rcvrcore/ESMLoader.js +++ b/examples/pxScene2d/src/rcvrcore/ESMLoader.js @@ -310,7 +310,7 @@ var getModule = async function (specifier, referencingModule) { } else { - specifier = "http://" + baseString.substring(0, baseString.lastIndexOf("/")+1) + specifier; + //specifier = "http://" + baseString.substring(0, baseString.lastIndexOf("/")+1) + specifier; // WTF?? let result = await loadHttpFile(referencingModule.context.global.sparkscene, specifier); mod = loadJavaScriptModule(result, specifier, referencingModule.context); } From b2c372f70d9579882c2ef466371683ba082555a1 Mon Sep 17 00:00:00 2001 From: Michael Fiess <10201495+mfiess@users.noreply.github.com> Date: Wed, 4 Dec 2019 12:14:41 -0500 Subject: [PATCH 3/3] Update ESMLoader.js --- examples/pxScene2d/src/rcvrcore/ESMLoader.js | 1 - 1 file changed, 1 deletion(-) diff --git a/examples/pxScene2d/src/rcvrcore/ESMLoader.js b/examples/pxScene2d/src/rcvrcore/ESMLoader.js index 3827773c49..6955b252fe 100644 --- a/examples/pxScene2d/src/rcvrcore/ESMLoader.js +++ b/examples/pxScene2d/src/rcvrcore/ESMLoader.js @@ -310,7 +310,6 @@ var getModule = async function (specifier, referencingModule) { } else { - //specifier = "http://" + baseString.substring(0, baseString.lastIndexOf("/")+1) + specifier; // WTF?? let result = await loadHttpFile(referencingModule.context.global.sparkscene, specifier); mod = loadJavaScriptModule(result, specifier, referencingModule.context); }