update runner to not rely on TLA

tapjs · Feb 10, 2025 · f38b2fa · f38b2fa
1 parent ccfea67
commit f38b2fa
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 10 deletions.
diff --git a/package.json b/package.json
@@ -85,7 +85,7 @@
     "string-length": "^6.0.0",
     "strip-ansi-cjs": "npm:strip-ansi@^6.0.1",
     "sync-content": "^2.0.1",
-    "tap": "^18.0.0-0",
+    "tap": "^21.0.0-0",
     "trivial-deferred": "^2.0.0",
     "tshy": "^3.0.2",
     "tsx": "^4.16.2",

diff --git a/src/tap/src/run.mts b/src/tap/src/run.mts
@@ -15,13 +15,9 @@ import { pathToFileURL } from 'node:url'
 
 import { resolveImport } from 'resolve-import'
 // import('@tapjs/run')
-await import(
-  String(
-    await resolveImport(
-      '@tapjs/run',
-      await resolveImport('tap', pathToFileURL(resolve('x'))).catch(
-        () => import.meta.url,
-      ),
-    ),
+// this is nicer with TLA, but that has some unfortunate side effects
+resolveImport('tap', pathToFileURL(resolve('x')))
+  .then(tap =>
+    resolveImport('@tapjs/run', tap).catch(() => import.meta.url),
   )
-)
+  .then(i => import(String(i)))