instead of choosing the subresources method, use both of them

Author: deniak

action.yml

@@ -32,9 +32,6 @@ inputs:
   VALIDATE_PUBRULES:
     description: Validate against W3C Publication Rules
     default: "false"
-  SUBRESOURCES_METHOD:
-    description: Method to use to find subresources. Possible values - 'dom', 'network'
-    default: "dom"
   GH_PAGES_BRANCH:
     description: Provide a branch name to deploy to GitHub pages.
   GH_PAGES_BUILD_OVERRIDE:

docs/options.md

@@ -144,14 +144,6 @@ Whether or not to validate compliance with [W3C Publication Rules](https://www.w
 
 **Default:** false
 
-## `SUBRESOURCES_METHOD`
-
-Method to use to find the subresources of the spec.
-
-**Possible values:** dom, network
-
-**Default:** dom
-
 ## `GH_PAGES_BRANCH`
 
 Whether or not to deploy to GitHub pages. Set to a Falsy value to not deploy, or provide a Git branch name to push to. You would need to enable GitHub pages publish source in repository settings manually.

src/build.ts

@@ -10,7 +10,7 @@ import { deepEqual, StaticServer } from "./utils.ts";
 import { PUPPETEER_ENV } from "./constants.ts";
 
 import type { BasicBuildOptions as BasicBuildOptions_ } from "./prepare-build.ts";
-import type { Inputs, ProcessedInput } from "./prepare.ts";
+import type { ProcessedInput } from "./prepare.ts";
 type BasicBuildOptions = Omit<BasicBuildOptions_, "artifactName">;
 type Input = ProcessedInput["build"];
 type ConfigOverride = Input["configOverride"]["gh" | "w3c"];
@@ -170,7 +170,7 @@ async function copyRelevantAssets(
 	};
 }
 
-async function findAssetsToCopy(source: Input["source"], method: Inputs["SUBRESOURCES_METHOD"]) {
+async function findAssetsToCopy(source: Input["source"]) {
 	console.groupCollapsed(`[INFO] Finding relevant assets…`);
 	let localAssets: string[] = [];
 	let remoteAssets: URL[] = [];
@@ -204,7 +204,12 @@ async function findAssetsToCopy(source: Input["source"], method: Inputs["SUBRESO
 				args: ["--no-sandbox"],
 			}
 		};
-		const allSubResources = method === "dom" ? domSubResources(rootUrl, options) : networkSubResources(rootUrl, options);
+		// Merge results from both DOM- and network-based collectors
+		// so we don't miss anything.
+		const allSubResources = mergeAsyncIterables(
+			domSubResources(rootUrl, options),
+			networkSubResources(rootUrl, options),
+		);
 		for await (const res of allSubResources) {
 			const url = new URL(res.url);
 			if (isLocalAsset(url) && res.type === "link") {
@@ -311,3 +316,12 @@ function trimList(list: string[], len = 8) {
 function urlToPage(url: URL) {
 	return new URL(url.pathname, url.origin).href;
 }
+
+// merge multiple async iterables into a single async iterable.
+async function* mergeAsyncIterables<T>(...iters: AsyncIterable<T>[]) {
+	for (const it of iters) {
+		for await (const v of it) {
+			yield v;
+		}
+	}
+}

src/prepare.ts

@@ -17,7 +17,6 @@ export interface Inputs {
 	VALIDATE_MARKUP: string;
 	VALIDATE_PUBRULES: string;
 	VALIDATE_WEBIDL: string;
-	SUBRESOURCES_METHOD: "dom" | "network" | string;
 	GH_PAGES_BRANCH: string;
 	GH_PAGES_TOKEN: string;
 	GH_PAGES_BUILD_OVERRIDE: string;