From def92d1b8e9d373e2f6f27c366d578d97d8960c6 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Wed, 15 May 2024 05:34:50 +0200
Subject: Merging upstream version 126.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 .../test/jsmodules/importmaps/classic_script.js    |  1 +
 dom/base/test/jsmodules/importmaps/mochitest.toml  |  7 ++
 .../test/jsmodules/importmaps/module_chain_1.mjs   |  2 +
 .../test/jsmodules/importmaps/module_chain_2.mjs   |  1 +
 .../module_importMap_with_nonexisting_module.mjs   |  4 ++
 .../test_dynamic_importMap_load_completes.html     | 33 +++++++++
 ...est_dynamic_importMap_with_external_script.html | 81 ++++++++++++++++++++++
 .../test_importMap_with_nonexisting_module.html    | 25 +++++++
 8 files changed, 154 insertions(+)
 create mode 100644 dom/base/test/jsmodules/importmaps/classic_script.js
 create mode 100644 dom/base/test/jsmodules/importmaps/module_chain_1.mjs
 create mode 100644 dom/base/test/jsmodules/importmaps/module_chain_2.mjs
 create mode 100644 dom/base/test/jsmodules/importmaps/module_importMap_with_nonexisting_module.mjs
 create mode 100644 dom/base/test/jsmodules/importmaps/test_dynamic_importMap_load_completes.html
 create mode 100644 dom/base/test/jsmodules/importmaps/test_dynamic_importMap_with_external_script.html
 create mode 100644 dom/base/test/jsmodules/importmaps/test_importMap_with_nonexisting_module.html

(limited to 'dom/base/test/jsmodules/importmaps')

diff --git a/dom/base/test/jsmodules/importmaps/classic_script.js b/dom/base/test/jsmodules/importmaps/classic_script.js
new file mode 100644
index 0000000000..d7ae0be054
--- /dev/null
+++ b/dom/base/test/jsmodules/importmaps/classic_script.js
@@ -0,0 +1 @@
+// Empty script.
diff --git a/dom/base/test/jsmodules/importmaps/mochitest.toml b/dom/base/test/jsmodules/importmaps/mochitest.toml
index 4229455722..1f95b155ac 100644
--- a/dom/base/test/jsmodules/importmaps/mochitest.toml
+++ b/dom/base/test/jsmodules/importmaps/mochitest.toml
@@ -3,6 +3,9 @@ support-files = [
   "bug_1865410_module_a.mjs",
   "bug_1865410_module_b.mjs",
   "bug_1873417.mjs",
+  "classic_script.js",
+  "module_chain_1.mjs",
+  "module_chain_2.mjs",
   "module_importMap_with_external_script_0.mjs",
   "module_importMap_with_external_script_1.mjs",
   "module_importMap_with_external_script_2.mjs",
@@ -13,6 +16,7 @@ support-files = [
   "module_importMap_with_external_script_6.mjs",
   "module_importMap_with_external_script_6.mjs^headers^",
   "module_importMap_with_external_script_7.mjs",
+  "module_importMap_with_nonexisting_module.mjs",
   "bad/module_2.mjs",
   "bad/module_3.mjs",
   "bad/module_4.mjs",
@@ -31,3 +35,6 @@ support-files = [
 ["test_bug_1873417.html"]
 
 ["test_importMap_with_external_script.html"]
+["test_importMap_with_nonexisting_module.html"]
+["test_dynamic_importMap_with_external_script.html"]
+["test_dynamic_importMap_load_completes.html"]
diff --git a/dom/base/test/jsmodules/importmaps/module_chain_1.mjs b/dom/base/test/jsmodules/importmaps/module_chain_1.mjs
new file mode 100644
index 0000000000..d9515fab7f
--- /dev/null
+++ b/dom/base/test/jsmodules/importmaps/module_chain_1.mjs
@@ -0,0 +1,2 @@
+// eslint-disable-next-line import/no-unassigned-import
+import {} from "./module_chain_2.mjs";
diff --git a/dom/base/test/jsmodules/importmaps/module_chain_2.mjs b/dom/base/test/jsmodules/importmaps/module_chain_2.mjs
new file mode 100644
index 0000000000..ce12406a76
--- /dev/null
+++ b/dom/base/test/jsmodules/importmaps/module_chain_2.mjs
@@ -0,0 +1 @@
+loaded = true;
diff --git a/dom/base/test/jsmodules/importmaps/module_importMap_with_nonexisting_module.mjs b/dom/base/test/jsmodules/importmaps/module_importMap_with_nonexisting_module.mjs
new file mode 100644
index 0000000000..4f9981bbe3
--- /dev/null
+++ b/dom/base/test/jsmodules/importmaps/module_importMap_with_nonexisting_module.mjs
@@ -0,0 +1,4 @@
+/* eslint-disable import/no-unassigned-import, import/no-unresolved */
+// Bareword specifier should be mapped to ./good/module_0.mjs.
+import {} from "bare";
+import * as test from "nonexistingmodule";
diff --git a/dom/base/test/jsmodules/importmaps/test_dynamic_importMap_load_completes.html b/dom/base/test/jsmodules/importmaps/test_dynamic_importMap_load_completes.html
new file mode 100644
index 0000000000..da354c1ca0
--- /dev/null
+++ b/dom/base/test/jsmodules/importmaps/test_dynamic_importMap_load_completes.html
@@ -0,0 +1,33 @@
+<!DOCTYPE html>
+<meta charset=utf-8>
+<head>
+<title>Test script loading complets when there's a dynamicly inserted import map</title>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
+</head>
+
+<!--
+    This test case used to fail intermittently with some modules never
+    being loaded.
+-->
+
+<script>
+  let loaded = false;  // Set by module_chain_2.mjs.
+</script>
+
+<script src="classic_script.js"></script>
+
+<script>
+  const script = document.createElement('script');
+  script.type = 'importmap';
+  script.textContent = `{}`;
+  document.head.appendChild(script);
+</script>
+
+<script src="module_chain_1.mjs" type="module"></script>
+
+<script type="module">
+  ok(loaded, "Expected all modules loaded");
+</script>
+
+<body></body>
diff --git a/dom/base/test/jsmodules/importmaps/test_dynamic_importMap_with_external_script.html b/dom/base/test/jsmodules/importmaps/test_dynamic_importMap_with_external_script.html
new file mode 100644
index 0000000000..b78992fb87
--- /dev/null
+++ b/dom/base/test/jsmodules/importmaps/test_dynamic_importMap_with_external_script.html
@@ -0,0 +1,81 @@
+<!DOCTYPE html>
+<meta charset=utf-8>
+<head>
+<title>Test speculative preload of external script doesn't conflict with import map</title>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
+</head>
+
+<!--
+    These tests check that speculative preloading, which could happen before
+    the import map is installed, doesn't load the wrong modules. This version
+    dynamically inserts the import map script element after speculative
+    preloading has started.
+-->
+
+<script>
+  const script = document.createElement('script');
+  script.type = 'importmap';
+  script.textContent =
+  `{
+    "imports": {
+      "bare": "./good/module_0.mjs",
+      "./bad/module_1.mjs": "./good/module_1.mjs",
+      "./bad/module_2.mjs": "./good/module_2.mjs",
+      "./bad/module_3.mjs": "./good/module_3.mjs",
+      "./bad/module_4.mjs": "./good/module_4.mjs",
+      "./bad/module_7.mjs": "./good/module_7.mjs"
+    }
+  }`;
+  document.head.appendChild(script);
+</script>
+
+<!--
+Test bareword import (not supported before import map installed).
+-->
+<script type="module" src="module_importMap_with_external_script_0.mjs"></script>
+
+<!--
+Test mapping from missing resource to existing resource (not found before
+import map installed).
+-->
+<script type="module" src="module_importMap_with_external_script_1.mjs"></script>
+
+<!--
+Test mapping from one existing resource to another (would load wrong resource before
+import map installed).
+-->
+<script type="module" src="module_importMap_with_external_script_2.mjs"></script>
+
+<!--
+Test mapping from one existing resource to another with circular dependency.
+-->
+<script type="module" src="module_importMap_with_external_script_3.mjs"></script>
+
+<!--
+Test with redirect, script_6.mjs -> script_5.mjs -> script_4.mjs.
+We redirect twice here, as sometimes one redirect can't reproduce the crash
+from bug 1835468.
+-->
+<script type="module" src="module_importMap_with_external_script_6.mjs"></script>
+
+<!--
+Test with async attribute
+-->
+<script type="module" async src="module_importMap_with_external_script_7.mjs"></script>
+
+<script>
+  SimpleTest.waitForExplicitFinish();
+
+  let passCount = 0;
+  const expectedCount = 6;
+
+  function success(name) {
+    ok(true, "Test passed, loaded " + name);
+    passCount++;
+    if (passCount == expectedCount) {
+      SimpleTest.finish();
+    }
+  }
+</script>
+<body></body>
diff --git a/dom/base/test/jsmodules/importmaps/test_importMap_with_nonexisting_module.html b/dom/base/test/jsmodules/importmaps/test_importMap_with_nonexisting_module.html
new file mode 100644
index 0000000000..57cfd5e5a1
--- /dev/null
+++ b/dom/base/test/jsmodules/importmaps/test_importMap_with_nonexisting_module.html
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<meta charset=utf-8>
+<title>Test an import map with an nonexisting module specifier</title>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
+
+<script type="importmap">
+{
+  "imports": {
+   "bare": "./good/module_0.mjs"
+  }
+}
+</script>
+
+
+<script>
+  SimpleTest.waitForExplicitFinish();
+
+  window.onerror = (event, src, lineno, colno, error) => {
+    ok(error instanceof TypeError, "Should be a TypeError");
+    SimpleTest.finish();
+  };
+
+</script>
+<script type="module" src="module_importMap_with_nonexisting_module.mjs"></script>
-- 
cgit v1.2.3