@@ -651,7 +651,6 @@ imported/w3c/web-platform-tests/html/semantics/scripting-1/the-script-element/mo
 imported/w3c/web-platform-tests/html/semantics/scripting-1/the-script-element/module/referrer-origin.sub.html [ Skip ]
 imported/w3c/web-platform-tests/html/semantics/scripting-1/the-script-element/module/referrer-same-origin.sub.html [ Skip ]
 imported/w3c/web-platform-tests/html/semantics/scripting-1/the-script-element/module/referrer-unsafe-url.sub.html [ Skip ]
-imported/w3c/web-platform-tests/html/semantics/scripting-1/the-script-element/module/import-meta/import-meta-resolve-importmap.html [ Skip ]
 imported/w3c/web-platform-tests/html/user-activation/activation-trigger-keyboard-enter.html [ Skip ]
 imported/w3c/web-platform-tests/html/user-activation/activation-trigger-keyboard-escape.html [ Skip ]
 imported/w3c/web-platform-tests/html/user-activation/activation-trigger-mouse-left.html [ Skip ]
@@ -6057,3 +6056,9 @@ js/ShadowRealm-worker.html [ Pass Failure ]
 imported/w3c/web-platform-tests/svg/import/color-prop-05-t-manual.svg [ Skip ]
 svg/W3C-SVG-1.1-SE/color-prop-05-t.svg [ Skip ]
 
+# modulepreload is not supported
+imported/w3c/web-platform-tests/import-maps/acquiring/modulepreload.html [ Skip ]
+imported/w3c/web-platform-tests/import-maps/acquiring/modulepreload-link-header.html [ Skip ]
+
+# WPT meta name="variant" is not supported. And iframe 'load' event has a bug.
+imported/w3c/web-platform-tests/import-maps/data-driven/resolving.html [ Skip ]
@@ -0,0 +1,87 @@
+# Data-driven import maps tests
+
+In this directory, test inputs and expectations are expressed as JSON files.
+This is in order to share the same JSON files between WPT tests and other
+implementations that might not run the full WPT suite, e.g. server-side
+JavaScript runtimes or the [JavaScript reference implementation](https://github.com/WICG/import-maps/tree/master/reference-implementation).
+
+## Basics
+
+A **test object** describes a set of parameters (import maps and base URLs) and test expectations.
+Test expectations consist of the expected resulting URLs for specifiers.
+
+Each JSON file under [resources/](resources/) directory consists of a test object.
+A minimum test object would be:
+
+```json
+{
+  "name": "Main test name",
+  "importMapBaseURL": "https://example.com/import-map-base-url/index.html",
+  "importMap": {
+    "imports": {
+      "a": "/mapped-a.mjs"
+    }
+  },
+  "baseURL": "https://example.com/base-url/app.mjs",
+  "expectedResults": {
+    "a": "https://example.com/mapped-a.mjs",
+    "b": null
+  }
+}
+```
+
+Required fields:
+
+- `name`: Test name.
+    - In WPT tests, this is used for the test name of `promise_test()` together with specifier to be resolved, like `"Main test name: a"`.
+- `importMap` (object or string): the import map to be attached.
+- `importMapBaseURL` (string): the base URL used for [parsing the import map](https://wicg.github.io/import-maps/#parse-an-import-map-string).
+- `expectedResults` (object; string to (string or null)): resolution test cases.
+    - The keys are specifiers to be resolved.
+    - The values are expected resolved URLs. If `null`, resolution should fail.
+- `baseURL` (string): the base URL used in [resolving a specifier](https://wicg.github.io/import-maps/#resolve-a-module-specifier) for each specifiers.
+
+Optional fields:
+
+- `link` and `details` can be used for e.g. linking to specs or adding more detailed descriptions.
+    - Currently they are simply ignored by the WPT test helper.
+
+## Nesting and inheritance
+
+We can organize tests by nesting test objects.
+A test object can contain child test objects (*subtests*) using `tests` field.
+The Keys of the `tests` value are the names of subtests, and values are test objects.
+
+For example:
+
+```json
+{
+  "name": "Main test name",
+  "importMapBaseURL": "https://example.com/import-map-base-url/index.html",
+  "importMap": {
+    "imports": {
+      "a": "/mapped-a.mjs"
+    }
+  },
+  "tests": {
+    "Subtest1": {
+      "baseURL": "https://example.com/base-url1/app.mjs",
+      "expectedResults": { "a": "https://example.com/mapped-a.mjs" }
+    },
+    "Subtest2": {
+      "baseURL": "https://example.com/base-url2/app.mjs",
+      "expectedResults": { "b": null }
+    }
+  }
+}
+```
+
+The top-level test object contains two sub test objects, named as `Subtest1` and `Subtest2`, respectively.
+
+Child test objects inherit fields from their parent test object.
+In the example above, the child test objects specifies `baseURL` fields, while they inherits other fields (e.g. `importMapBaseURL`) from the top-level test object.
+
+## TODO
+
+The `parsing-*.json` files are not currently used by the WPT harness. We should
+convert them to resolution tests.
@@ -0,0 +1,5 @@
+
+
+PASS Test helper: fetching and sanity checking test JSON: data-url-prefix.json
+PASS data: URL prefix: should not resolve since you can't resolve relative to a data: URL: foo/bar
+
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<body>
+<script type="module">
+import { runTestsFromJSON } from "./resources/test-helper.js";
+
+const filename = "data-url-prefix.json";
+promise_test(
+  () => runTestsFromJSON('resources/' + filename),
+  "Test helper: fetching and sanity checking test JSON: " + filename);
+</script>
@@ -0,0 +1,34 @@
+
+
+PASS Test helper: fetching and sanity checking test JSON: empty-import-map.json
+PASS valid relative specifiers: ./foo
+PASS valid relative specifiers: ./foo/bar
+PASS valid relative specifiers: ./foo/../bar
+PASS valid relative specifiers: ./foo/../../bar
+PASS valid relative specifiers: ../foo
+PASS valid relative specifiers: ../foo/bar
+PASS valid relative specifiers: ../../../foo/bar
+PASS valid relative specifiers: /foo
+PASS valid relative specifiers: /foo/bar
+PASS valid relative specifiers: /../../foo/bar
+PASS valid relative specifiers: /../foo/../bar
+PASS HTTPS scheme absolute URLs: https://fetch-scheme.net
+PASS HTTPS scheme absolute URLs: https:fetch-scheme.org
+PASS HTTPS scheme absolute URLs: https://fetch%2Dscheme.com/
+PASS HTTPS scheme absolute URLs: https://///fetch-scheme.com///
+PASS valid relative URLs that are invalid as specifiers should fail: invalid-specifier
+PASS valid relative URLs that are invalid as specifiers should fail: \invalid-specifier
+PASS valid relative URLs that are invalid as specifiers should fail: :invalid-specifier
+PASS valid relative URLs that are invalid as specifiers should fail: @invalid-specifier
+PASS valid relative URLs that are invalid as specifiers should fail: %2E/invalid-specifier
+PASS valid relative URLs that are invalid as specifiers should fail: %2E%2E/invalid-specifier
+PASS valid relative URLs that are invalid as specifiers should fail: .%2Finvalid-specifier
+PASS invalid absolute URLs should fail: https://invalid-url.com:demo
+PASS invalid absolute URLs should fail: http://[invalid-url.com]/
+PASS non-HTTPS fetch scheme absolute URLs: about:fetch-scheme
+PASS non-fetch scheme absolute URLs: about:fetch-scheme
+PASS non-fetch scheme absolute URLs: mailto:non-fetch-scheme
+PASS non-fetch scheme absolute URLs: import:non-fetch-scheme
+PASS non-fetch scheme absolute URLs: javascript:non-fetch-scheme
+PASS non-fetch scheme absolute URLs: wss:non-fetch-scheme
+
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<body>
+<script type="module">
+import { runTestsFromJSON } from "./resources/test-helper.js";
+
+const filename = "empty-import-map.json";
+promise_test(
+  () => runTestsFromJSON('resources/' + filename),
+  "Test helper: fetching and sanity checking test JSON: " + filename);
+</script>
@@ -0,0 +1,10 @@
+
+
+PASS Test helper: fetching and sanity checking test JSON: overlapping-entries.json
+PASS should favor the most-specific key: Overlapping entries with trailing slashes: a
+PASS should favor the most-specific key: Overlapping entries with trailing slashes: a/
+PASS should favor the most-specific key: Overlapping entries with trailing slashes: a/x
+PASS should favor the most-specific key: Overlapping entries with trailing slashes: a/b
+PASS should favor the most-specific key: Overlapping entries with trailing slashes: a/b/
+PASS should favor the most-specific key: Overlapping entries with trailing slashes: a/b/c
+
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<body>
+<script type="module">
+import { runTestsFromJSON } from "./resources/test-helper.js";
+
+const filename = "overlapping-entries.json";
+promise_test(
+  () => runTestsFromJSON('resources/' + filename),
+  "Test helper: fetching and sanity checking test JSON: " + filename);
+</script>
@@ -0,0 +1,36 @@
+
+
+PASS Test helper: fetching and sanity checking test JSON: packages-via-trailing-slashes.json
+PASS Package-like scenarios: package main modules: moment
+PASS Package-like scenarios: package main modules: lodash-dot
+PASS Package-like scenarios: package main modules: lodash-dotdot
+PASS Package-like scenarios: package submodules: moment/foo
+PASS Package-like scenarios: package submodules: moment/foo?query
+PASS Package-like scenarios: package submodules: moment/foo#fragment
+PASS Package-like scenarios: package submodules: moment/foo?query#fragment
+PASS Package-like scenarios: package submodules: lodash-dot/foo
+PASS Package-like scenarios: package submodules: lodash-dotdot/foo
+PASS Package-like scenarios: package names that end in a slash should just pass through: moment/
+PASS Package-like scenarios: package modules that are not declared should fail: underscore/
+PASS Package-like scenarios: package modules that are not declared should fail: underscore/foo
+PASS Package-like scenarios: backtracking via ..: mapped/path
+PASS Package-like scenarios: backtracking via ..: mapped/path/
+PASS Package-like scenarios: backtracking via ..: mapped/path/..
+PASS Package-like scenarios: backtracking via ..: mapped/path/../path/
+PASS Package-like scenarios: backtracking via ..: mapped/path/../207
+PASS Package-like scenarios: backtracking via ..: mapped/path/../207/
+PASS Package-like scenarios: backtracking via ..: mapped/path//
+PASS Package-like scenarios: backtracking via ..: mapped/path/WICG/import-maps/issues/207/
+PASS Package-like scenarios: backtracking via ..: mapped/path//WICG/import-maps/issues/207/
+PASS Package-like scenarios: backtracking via ..: mapped/path/../backtrack
+PASS Package-like scenarios: backtracking via ..: mapped/path/../../backtrack
+PASS Package-like scenarios: backtracking via ..: mapped/path/../../../backtrack
+PASS Package-like scenarios: backtracking via ..: moment/../backtrack
+PASS Package-like scenarios: backtracking via ..: moment/..
+PASS Package-like scenarios: backtracking via ..: mapped/non-ascii-1/
+PASS Package-like scenarios: backtracking via ..: mapped/non-ascii-1/../%E3%81%8D%E3%81%A4%E3%81%AD/
+PASS Package-like scenarios: backtracking via ..: mapped/non-ascii-1/../きつね/
+PASS Package-like scenarios: backtracking via ..: mapped/non-ascii-2/
+PASS Package-like scenarios: backtracking via ..: mapped/non-ascii-2/../%E3%81%8D%E3%81%A4%E3%81%AD/
+PASS Package-like scenarios: backtracking via ..: mapped/non-ascii-2/../きつね/
+
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<body>
+<script type="module">
+import { runTestsFromJSON } from "./resources/test-helper.js";
+
+const filename = "packages-via-trailing-slashes.json";
+promise_test(
+  () => runTestsFromJSON('resources/' + filename),
+  "Test helper: fetching and sanity checking test JSON: " + filename);
+</script>
-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
++
++
 +PASS Test helper: fetching and sanity checking test JSON: data-url-prefix.json
 +PASS data: URL prefix: should not resolve since you can't resolve relative to a data: URL: foo/bar
++