From 394f5416b3972fd23cf293472fbd889d32386be8 Mon Sep 17 00:00:00 2001 From: Fedor Date: Wed, 25 Dec 2019 15:40:27 +0300 Subject: [PATCH] 1340865 - Handle non-parser-created module scripts. --- dom/base/nsScriptLoader.cpp | 2 +- .../create-module-script.html.ini | 2 ++ .../create-module-script.html | 25 +++++++++++++++++++ .../the-script-element/support/module.js | 2 ++ 4 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 testing/web-platform/mozilla/meta/html/semantics/scripting-1/the-script-element/create-module-script.html.ini create mode 100644 testing/web-platform/mozilla/tests/html/semantics/scripting-1/the-script-element/create-module-script.html create mode 100644 testing/web-platform/mozilla/tests/html/semantics/scripting-1/the-script-element/support/module.js diff --git a/dom/base/nsScriptLoader.cpp b/dom/base/nsScriptLoader.cpp index dc91718dd..c78b60085 100644 --- a/dom/base/nsScriptLoader.cpp +++ b/dom/base/nsScriptLoader.cpp @@ -1601,7 +1601,7 @@ nsScriptLoader::ProcessScriptElement(nsIScriptElement *aElement) } return false; } - if (!aElement->GetParserCreated() && !request->IsModuleRequest()) { + if (!aElement->GetParserCreated()) { // Violate the HTML5 spec in order to make LABjs and the "order" plug-in // for RequireJS work with their Gecko-sniffed code path. See // http://lists.w3.org/Archives/Public/public-html/2010Oct/0088.html diff --git a/testing/web-platform/mozilla/meta/html/semantics/scripting-1/the-script-element/create-module-script.html.ini b/testing/web-platform/mozilla/meta/html/semantics/scripting-1/the-script-element/create-module-script.html.ini new file mode 100644 index 000000000..007349f1a --- /dev/null +++ b/testing/web-platform/mozilla/meta/html/semantics/scripting-1/the-script-element/create-module-script.html.ini @@ -0,0 +1,2 @@ +[create-module-script.html] + prefs: [dom.moduleScripts.enabled:true] diff --git a/testing/web-platform/mozilla/tests/html/semantics/scripting-1/the-script-element/create-module-script.html b/testing/web-platform/mozilla/tests/html/semantics/scripting-1/the-script-element/create-module-script.html new file mode 100644 index 000000000..44337a021 --- /dev/null +++ b/testing/web-platform/mozilla/tests/html/semantics/scripting-1/the-script-element/create-module-script.html @@ -0,0 +1,25 @@ + + +Insert non-async module script + + + + diff --git a/testing/web-platform/mozilla/tests/html/semantics/scripting-1/the-script-element/support/module.js b/testing/web-platform/mozilla/tests/html/semantics/scripting-1/the-script-element/support/module.js new file mode 100644 index 000000000..e4d6289d5 --- /dev/null +++ b/testing/web-platform/mozilla/tests/html/semantics/scripting-1/the-script-element/support/module.js @@ -0,0 +1,2 @@ +export default 42; +moduleRan = true;