checkpoint

metapages · Oct 27, 2024 · 8a28544 · 8a28544
1 parent 27e8027
commit 8a28544
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 6 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -2,7 +2,7 @@
   "files.exclude": {
     "**/.cache": true,
     "**/.certs": true,
-    "**/deploy2": true,
+    "**/deploy": true,
     "**/dist": true,
     "**/node_modules": true,
     "**/static/metapage": true

diff --git a/app/worker/src/routes/test/metapage/compatibility/[version].tsx b/app/worker/src/routes/test/metapage/compatibility/[version].tsx
@@ -24,6 +24,7 @@ export default function MetaframePage(props: PageProps<VersionProps>) {
       <Head>
         <meta charset="UTF-8" />
         <title>Metapage test {testname} @ version: {displayVersion}</title>
+        <script src="https://unpkg.com/compare-versions/lib/umd/index.js"></script>
       </Head>
     <main>
       <p>Metapage test {testname} @ version: {displayVersion}</p>

diff --git a/app/worker/src/static/metapage-test-compatibility.js b/app/worker/src/static/metapage-test-compatibility.js
@@ -1,5 +1,6 @@
 // Download the specific metaPAGE library version
 // to make it easier to test all versions against all
+const { compareVersions } = window.compareVersions
 const url = new URL(window.location.href);
 console.log(`url: ${url}`);
 const urlPathElements = url.pathname.split("/").filter((e) =>
@@ -487,8 +488,13 @@ VERSIONS_METAFRAME.forEach((versionMetaframe, index) => {
 
 // set the Metapage class into the window object for easier manipulation later
 globalThis.Metapage = Metapage;
+let metapageInstance;
+if (version === "latest" || compareVersions(version, "1.0.0") >= 0) {
+    metapageInstance = await Metapage.from(metaPageDefinition);
+} else {
+    metapageInstance = Metapage.from(metaPageDefinition);
+}
 
-const metapageInstance = Metapage.from(metaPageDefinition);
 globalThis.metapageInstance = metapageInstance;
 
 if (debug) {

diff --git a/app/worker/test/src/run-tests-in-astral.ts b/app/worker/test/src/run-tests-in-astral.ts
@@ -13,9 +13,10 @@
  *
  */
 
-import { launch } from "jsr:@astral/astral";import { exists } from "https://deno.land/std/fs/mod.ts";
-import { parse } from "https://deno.land/std/flags/mod.ts";
-import { delay } from "https://deno.land/std/async/delay.ts";
+import { compareVersions } from 'compare-versions';
+import { delay } from 'https://deno.land/std/async/delay.ts';
+import { parse } from 'https://deno.land/std/flags/mod.ts';
+import { launch } from 'jsr:@astral/astral';
 
 const flags = parse(Deno.args);
 
@@ -161,7 +162,9 @@ const getMetapageTestUrl = (version: string) => {
 
 const getMetapageVersions = async () :Promise<string[]> => {
   const resp = await fetch(`${serverOrigin}/versions/metapages/metapage`);
-  const versions = await resp.json();
+  let versions = await resp.json();
+  // remove versions we know don't pass
+  versions = versions.filter((v: string) => compareVersions(v, "0.16.2") > 0);
   return versions;
 };