explicitly depend on ts-node temp fork

Fix: #959
tapjs · Oct 15, 2023 · 7e12f1e · 7e12f1e
1 parent 264f9cf
commit 7e12f1e
Show file tree

Hide file tree

Showing 27 changed files with 99 additions and 104 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -82,7 +82,6 @@
     "sync-content": "^1.0.2",
     "tap": "^18.0.0-0",
     "trivial-deferred": "^2.0.0",
-    "ts-node": "npm:@isaacs/ts-node-temp-fork-for-pr-2009@^10.9.1",
     "tshy": "^1.2.2",
     "typedoc": "^0.25.1",
     "typescript": "5.2",
@@ -115,6 +114,7 @@
   "repository": "https://github.com/tapjs/tapjs",
   "license": "BlueOak-1.0.0",
   "dependencies": {
+    "@isaacs/ts-node-temp-fork-for-pr-2009": "^10.9.1",
     "glob": "^10.3.10",
     "semver": "^7.5.4",
     "signal-exit": "4.1"

diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh
@@ -48,7 +48,7 @@ nx run-many --target=prepare --exclude tap,@tapjs/run
 nx run-many --target=prepare -p @tapjs/run
 nx run-many --target=prepare -p tap
 node \
-  --loader=ts-node/esm \
+  --loader=@isaacs/ts-node-temp-fork-for-pr-2009/esm \
   --no-warnings \
   scripts/default-build.mts
 # lastly, run the actual install to do all the linking

diff --git a/scripts/default-build.mjs b/scripts/default-build.mjs
@@ -6,7 +6,7 @@ import { fileURLToPath } from 'node:url'
 const res = spawnSync(
   process.execPath,
   [
-    '--loader=ts-node/esm',
+    '--loader=@isaacs/ts-node-temp-fork-for-pr-2009/esm',
     '--no-warnings',
     resolve(dirname(fileURLToPath(import.meta.url)), './default-build.mts'),
   ],

diff --git a/scripts/default-build.mts b/scripts/default-build.mts
@@ -98,7 +98,12 @@ prepare('src/core', ...builtins)
 
 spawnSync(
   process.execPath,
-  ['--loader=ts-node/esm', '--no-warnings', build, ...builtins],
+  [
+    '--loader=@isaacs/ts-node-temp-fork-for-pr-2009/esm',
+    '--no-warnings',
+    build,
+    ...builtins,
+  ],
   {
     stdio: 'inherit',
   }

diff --git a/scripts/version.mjs b/scripts/version.mjs
@@ -6,7 +6,7 @@ import { fileURLToPath } from 'node:url'
 const res = spawnSync(
   process.execPath,
   [
-    '--loader=ts-node/esm',
+    '--loader=@isaacs/ts-node-temp-fork-for-pr-2009/esm',
     '--no-warnings',
     resolve(dirname(fileURLToPath(import.meta.url)), './version.mts'),
     ...process.argv.slice(2)

diff --git a/src/parser/test/cmd-flush-before-exit.ts b/src/parser/test/cmd-flush-before-exit.ts
@@ -9,7 +9,7 @@ const args = [
   '--no-warnings',
   '--enable-source-maps',
   '--loader',
-  'ts-node/esm',
+  '@isaacs/ts-node-temp-fork-for-pr-2009/esm',
   __filename,
 ]
 

diff --git a/src/reporter/tap-snapshots/test/json.ts.test.cjs b/src/reporter/tap-snapshots/test/json.ts.test.cjs
@@ -30,7 +30,7 @@ exports[`test/json.ts > TAP > json 1`] = `
         "command": "/usr/local/bin/node",
         "args": [
           "--import=file:///cwd/node_modules/@tapjs/mock/dist/esm/import.mjs",
-          "--loader=file:///cwd/node_modules/ts-node/esm.mjs",
+          "--loader=file:///cwd/node_modules/@isaacs/ts-node-temp-fork-for-pr-2009/esm.mjs",
           "--no-warnings",
           "--enable-source-maps",
           "--import=file:///cwd/node_modules/@tapjs/processinfo/dist/mjs/import.mjs",
@@ -472,7 +472,7 @@ exports[`test/json.ts > TAP > jsonstream 1`] = `
 ["start",{"name":"unfinished test","level":2}]
 ["pass",{"ok":true,"name":"going to fail","id":1,"fullname":"test/fixtures/example-tap.ts > unfinished test > going to fail"}]
 ["end",{"name":"unfinished test","level":2,"ok":false,"id":13,"diag":{"at":{"fileName":"test/fixtures/example-tap.ts","lineNumber":62,"columnNumber":3,"isToplevel":true},"source":"})\\n\\nt.test('unfinished test', t => {\\n--^\\n  t.plan(3)\\n  t.pass('going to fail')\\n"},"time":0.197,"fullname":"test/fixtures/example-tap.ts > unfinished test","closingTestPoint":true,"plan":{"start":1,"end":3},"tests":1,"failures":0,"assertions":1,"skipped":0}]
-["end",{"name":"test/fixtures/example-tap.ts","level":1,"ok":false,"id":1,"diag":{"stdio":"inherit","cwd":"/cwd/src/reporter","externalID":"test/fixtures/example-tap.ts","command":"/usr/local/bin/node","args":["--import=file:///cwd/node_modules/@tapjs/mock/dist/esm/import.mjs","--loader=file:///cwd/node_modules/ts-node/esm.mjs","--no-warnings","--enable-source-maps","--import=file:///cwd/node_modules/@tapjs/processinfo/dist/mjs/import.mjs","/cwd/src/reporter/test/fixtures/example-tap.ts"],"exitCode":1},"time":484.581,"fullname":"test/fixtures/example-tap.ts","closingTestPoint":true,"plan":{"start":1,"end":13},"tests":30,"failures":15,"assertions":21,"skipped":15}]
+["end",{"name":"test/fixtures/example-tap.ts","level":1,"ok":false,"id":1,"diag":{"stdio":"inherit","cwd":"/cwd/src/reporter","externalID":"test/fixtures/example-tap.ts","command":"/usr/local/bin/node","args":["--import=file:///cwd/node_modules/@tapjs/mock/dist/esm/import.mjs","--loader=file:///cwd/node_modules/@isaacs/ts-node-temp-fork-for-pr-2009/esm.mjs","--no-warnings","--enable-source-maps","--import=file:///cwd/node_modules/@tapjs/processinfo/dist/mjs/import.mjs","/cwd/src/reporter/test/fixtures/example-tap.ts"],"exitCode":1},"time":484.581,"fullname":"test/fixtures/example-tap.ts","closingTestPoint":true,"plan":{"start":1,"end":13},"tests":30,"failures":15,"assertions":21,"skipped":15}]
 ["end",{"name":"TAP Tests","level":0,"plan":{"start":1,"end":1},"tests":31,"failures":15,"assertions":21,"skipped":15}]
 
 `
diff --git a/src/reporter/tap-snapshots/test/markdown.ts.test.cjs b/src/reporter/tap-snapshots/test/markdown.ts.test.cjs
@@ -426,7 +426,7 @@ diag:
   command: /usr/local/bin/node
   args:
     - --import=file:///cwd/node_modules/@tapjs/mock/dist/esm/import.mjs
-    - --loader=file:///cwd/node_modules/ts-node/esm.mjs
+    - --loader=file:///cwd/node_modules/@isaacs/ts-node-temp-fork-for-pr-2009/esm.mjs
     - --no-warnings
     - --enable-source-maps
     - --import=file:///cwd/node_modules/@tapjs/processinfo/dist/mjs/import.mjs

diff --git a/src/reporter/test/fixtures/example-tap.tap b/src/reporter/test/fixtures/example-tap.tap
@@ -212,7 +212,7 @@ not ok 1 - test/fixtures/example-tap.ts # time=484.581ms
   command: /usr/local/bin/node
   args:
     - --import=file:///cwd/node_modules/@tapjs/mock/dist/esm/import.mjs
-    - --loader=file:///cwd/node_modules/ts-node/esm.mjs
+    - --loader=file:///cwd/node_modules/@isaacs/ts-node-temp-fork-for-pr-2009/esm.mjs
     - --no-warnings
     - --enable-source-maps
     - --import=file:///cwd/node_modules/@tapjs/processinfo/dist/mjs/import.mjs

diff --git a/src/run/src/build.ts b/src/run/src/build.ts
@@ -6,7 +6,6 @@ import { mainCommand } from './main-config.js'
 const tmbin = fileURLToPath(
   await resolveImport('@tapjs/test/generate-tap-test-class')
 )
-const execArgs = ['--loader=ts-node/esm', '--no-warnings']
 const node = process.execPath
 
 export const build = async (args: string[], config: LoadedConfig) => {
@@ -16,7 +15,7 @@ export const build = async (args: string[], config: LoadedConfig) => {
     )
   }
 
-  const argv = [...execArgs, tmbin, ...config.pluginList]
+  const argv = [tmbin, ...config.pluginList]
   return new Promise<void>((res, rej) => {
     foregroundChild(node, argv, {}, (code, signal) => {
       // if this is the main command, just terminate in the same way

diff --git a/src/run/test/build.ts b/src/run/test/build.ts
@@ -45,8 +45,6 @@ t.test('build success, main command, allow fg exit', async t => {
         t.equal(cmd, process.execPath)
         t.strictSame(options, {})
         t.strictSame(args, [
-          '--loader=ts-node/esm',
-          '--no-warnings',
           tmbin,
           'a',
           'b',
@@ -81,8 +79,6 @@ t.test('build failure, main command, allow fg exit', async t => {
         t.equal(cmd, process.execPath)
         t.strictSame(options, {})
         t.strictSame(args, [
-          '--loader=ts-node/esm',
-          '--no-warnings',
           tmbin,
           'a',
           'b',
@@ -117,8 +113,6 @@ t.test('build success, subcommand, cancel exit', async t => {
         t.equal(cmd, process.execPath)
         t.strictSame(options, {})
         t.strictSame(args, [
-          '--loader=ts-node/esm',
-          '--no-warnings',
           tmbin,
           'a',
           'b',
@@ -153,8 +147,6 @@ t.test('build fail, subcommand, fail with status', async t => {
         t.equal(cmd, process.execPath)
         t.strictSame(options, {})
         t.strictSame(args, [
-          '--loader=ts-node/esm',
-          '--no-warnings',
           tmbin,
           'a',
           'b',

diff --git a/src/run/test/fixtures/project/.tap/processinfo/uuid-bar.json b/src/run/test/fixtures/project/.tap/processinfo/uuid-bar.json
@@ -6,7 +6,7 @@
   ],
   "execArgv": [
     "--no-warnings",
-    "--loader=ts-node/esm",
+    "--loader=@isaacs/ts-node-temp-fork-for-pr-2009/esm",
     "--loader=@tapjs/mock/loader",
     "--enable-source-maps",
     "--loader=file:///Users/isaacs/dev/tapjs/tapjs/node_modules/@tapjs/processinfo/dist/esm/esm.mjs"

diff --git a/src/run/test/fixtures/project/.tap/processinfo/uuid-foo.json b/src/run/test/fixtures/project/.tap/processinfo/uuid-foo.json
@@ -6,7 +6,7 @@
   ],
   "execArgv": [
     "--no-warnings",
-    "--loader=ts-node/esm",
+    "--loader=@isaacs/ts-node-temp-fork-for-pr-2009/esm",
     "--loader=@tapjs/mock/loader",
     "--enable-source-maps",
     "--loader=file:///Users/isaacs/dev/tapjs/tapjs/node_modules/@tapjs/processinfo/dist/esm/esm.mjs"

diff --git a/src/stack/src/index.ts b/src/stack/src/index.ts
@@ -48,7 +48,7 @@ export const setFilterNodeInternals = (s: boolean) =>
 // from node_modules.
 const ignoredPackages: string[] = [
   '@tapjs',
-  'ts-node',
+  '@isaacs/ts-node-temp-fork-for-pr-2009',
   'pirates',
   'function-loop',
   '@cspotcode/source-map-support',

diff --git a/src/stack/test/index.ts b/src/stack/test/index.ts
@@ -296,7 +296,7 @@ for (const [dialect, mod] of Object.entries({ cjs, mjs })) {
       t.equal(getFilterIgnoredPackages(), true, 'filter by default')
       const defaultIgnored = [
         '@tapjs',
-        'ts-node',
+        '@isaacs/ts-node-temp-fork-for-pr-2009',
         'pirates',
         'function-loop',
         '@cspotcode/source-map-support',

diff --git a/src/tap/test/run.mts b/src/tap/test/run.mts
@@ -6,7 +6,7 @@ const bin = fileURLToPath(
 )
 t.test('runner just loads runner', t => {
   const proc = spawn(process.execPath, [
-    '--loader=ts-node/esm',
+    '--loader=@isaacs/ts-node-temp-fork-for-pr-2009/esm',
     '--no-warnings',
     bin,
     '-h',

diff --git a/src/test/package.json b/src/test/package.json
@@ -87,6 +87,7 @@
   "author": "Isaac Z. Schlueter <i@izs.me> (https://blog.izs.me)",
   "license": "BlueOak-1.0.0",
   "dependencies": {
+    "@isaacs/ts-node-temp-fork-for-pr-2009": "^10.9.1",
     "@tapjs/after": "1.1.11",
     "@tapjs/after-each": "1.1.11",
     "@tapjs/asserts": "1.1.11",
@@ -109,7 +110,6 @@
     "rimraf": "^5.0.5",
     "sync-content": "^1.0.1",
     "tap-parser": "15.3.0",
-    "ts-node": "npm:@isaacs/ts-node-temp-fork-for-pr-2009@^10.9.1",
     "tshy": "^1.2.2",
     "typescript": "5.2"
   },

diff --git a/src/test/scripts/build.mjs b/src/test/scripts/build.mjs
@@ -21,7 +21,7 @@ process.env.TS_NODE_PROJECT = tsconfig
 const res = spawnSync(
   process.execPath,
   [
-    '--loader=ts-node/esm',
+    '--loader=@isaacs/ts-node-temp-fork-for-pr-2009/esm',
     '--no-warnings',
     resolve(__dirname, './build.mts'),
     ...process.argv.slice(2),