Merge pull request #62 from unjs/instance-resources

fix: load shared resource instances

generator/shared/test.ts

@@ -7,7 +7,15 @@ declare global {
  // eslint-disable-next-line no-var
  var bcd: {
  addTest: (ident: string, tests: any, exposure: string[]) => void;
- go: (callback: (done: TestResult[]) => void) => void;
+ addInstance: (
+ resource: string,
+ code: string,
+ options?: { callback: boolean },
+ ) => void;
+ go: (
+ callback: (done: TestResult[]) => void,
+ resourceCount?: number,
+ ) => void;
  };
 }
 
@@ -23,11 +31,35 @@ export function runTests(
  setup(globalThis);
  // The incoming types are problematic
  const testCases = new Tests({ tests: tests as any, httpOnly: false });
+
+ const resourcesNeeded = new Set<string>();
+
  for (const test of testCases.getTests("javascript.builtins")) {
  globalThis.bcd.addTest(test.ident, test.tests, test.exposure);
  }
  for (const test of testCases.getTests("api", "Window", ignoreApis)) {
  globalThis.bcd.addTest(test.ident, test.tests, test.exposure);
+ for (const resource of test.resources) {
+ resourcesNeeded.add(resource);
+ }
  }
- return new Promise((resolve) => globalThis.bcd.go(resolve));
+
+ for (const resource of resourcesNeeded) {
+ const instance = testCases.resources[resource];
+ if (instance.type === "instance") {
+ if (
+ instance.dependencies &&
+ !instance.dependencies.every((dep: string) => resourcesNeeded.has(dep))
+ ) {
+ console.log("missing dependencies", instance.dependencies);
+ }
+ globalThis.bcd.addInstance(resource, instance.src, {
+ callback: instance.callback,
+ });
+ }
+ }
+
+ return new Promise((resolve) =>
+ globalThis.bcd.go(resolve, resourcesNeeded.size),
+ );
 }

vendor/harness.js

@@ -1230,25 +1230,7 @@ export default function (global) {
 
  // Load resources
  try {
- // Load audio and video
- var i;
- var resourceMedia = document.querySelectorAll(
- "#resources audio, #resources video",
- );
- for (i = 0; i < resourceMedia.length; i++) {
- resourceMedia[i].load();
- resourceMedia[i].onloadeddata = resourceLoaded;
- }
-
- // Load images
- var resourceImages = document.querySelectorAll("#resources img");
- for (i = 0; i < resourceImages.length; i++) {
- if (resourceImages[i].complete) {
- resourceLoaded();
- } else {
- resourceImages[i].onload = resourceLoaded;
- }
- }
+ // We don't load audio and video
 
  // Load resources
  var instanceKeys = Object.keys(reusableInstances);

vendor/types.d.ts

@@ -16,6 +16,8 @@ export type Resource =
  | {
  type: "instance";
  src: string;
+ callback: boolean;
+ dependencies?: string[];
  }
  | {
  type: "audio" | "video";