Skip to content

Commit

Permalink
replace tsx with ts-blank-space (#10605)
Browse files Browse the repository at this point in the history 
incidental

## Description
Remove `tsx` now that we can use `ts-blank-space` throughout. It aligns better with future `.ts` support in Node.

### Security Considerations
none
### Scaling Considerations
none

### Documentation Considerations
fewer cases, fewer deps

### Testing Considerations
CI

### Upgrade Considerations
none
  • Loading branch information
@mergify
mergify[bot] authored Dec 3, 2024
2 parents 3154854 + ecd8939 commit e37a322
Show file tree
Hide file tree
Showing 18 changed files with 149 additions and 1,310 deletions.
0 ...ion/proposals/z:acceptance/lib/vaults.mts → ...tion/proposals/z:acceptance/lib/vaults.ts
View file
File renamed without changes.
3 changes: 1 addition & 2 deletions a3p-integration/proposals/z:acceptance/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,7 @@
"@endo/marshal": "^1.6.1",
"agoric": "dev",
"ava": "^6.1.2",
"execa": "9.1.0",
"tsx": "^4.17.0"
"execa": "9.1.0"
},
"$comment": "UNTIL https://github.com/Agoric/agoric-sdk/issues/10259",
"resolutions": {
Expand Down
4 changes: 2 additions & 2 deletions ...sals/z:acceptance/scripts/test-vaults.mts → ...osals/z:acceptance/scripts/test-vaults.ts
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env tsx
#!/usr/bin/env -S node --import ts-blank-space/register
/* eslint-disable @jessie.js/safe-await-separator */

import {
Expand All @@ -13,7 +13,7 @@ import {
ISTunit,
provisionWallet,
setDebtLimit,
} from '../lib/vaults.mjs';
} from '../lib/vaults.ts';

const START_FREQUENCY = 600; // StartFrequency: 600s (auction runs every 10m)
const CLOCK_STEP = 20; // ClockStep: 20s (ensures auction completes in time)
Expand Down
3 changes: 1 addition & 2 deletions a3p-integration/proposals/z:acceptance/test.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,7 @@ yarn ava initial.test.js
# XXX some of these tests have path dependencies so no globs
yarn ava core-eval.test.js

npm install -g tsx
scripts/test-vaults.mts
scripts/test-vaults.ts

echo ACCEPTANCE TESTING kread
yarn ava kread.test.js
Expand Down
7 changes: 6 additions & 1 deletion a3p-integration/proposals/z:acceptance/tsconfig.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,16 @@
"moduleResolution": "bundler",
"allowJs": true,
"checkJs": true,
"allowImportingTsExtensions": true,
"strict": false,
"strictNullChecks": true,
"noImplicitThis": true,
// XXX synthetic-chain has some errors
"skipLibCheck": true
},
"exclude": ["restart-valueVow", "start-valueVow", "localchaintest-submission"]
"exclude": [
"restart-valueVow",
"start-valueVow",
"localchaintest-submission"
]
}
288 changes: 2 additions & 286 deletions a3p-integration/proposals/z:acceptance/yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1084,174 +1084,6 @@ __metadata:
languageName: node
linkType: hard

"@esbuild/aix-ppc64@npm:0.23.1":
version: 0.23.1
resolution: "@esbuild/aix-ppc64@npm:0.23.1"
conditions: os=aix & cpu=ppc64
languageName: node
linkType: hard

"@esbuild/android-arm64@npm:0.23.1":
version: 0.23.1
resolution: "@esbuild/android-arm64@npm:0.23.1"
conditions: os=android & cpu=arm64
languageName: node
linkType: hard

"@esbuild/android-arm@npm:0.23.1":
version: 0.23.1
resolution: "@esbuild/android-arm@npm:0.23.1"
conditions: os=android & cpu=arm
languageName: node
linkType: hard

"@esbuild/android-x64@npm:0.23.1":
version: 0.23.1
resolution: "@esbuild/android-x64@npm:0.23.1"
conditions: os=android & cpu=x64
languageName: node
linkType: hard

"@esbuild/darwin-arm64@npm:0.23.1":
version: 0.23.1
resolution: "@esbuild/darwin-arm64@npm:0.23.1"
conditions: os=darwin & cpu=arm64
languageName: node
linkType: hard

"@esbuild/darwin-x64@npm:0.23.1":
version: 0.23.1
resolution: "@esbuild/darwin-x64@npm:0.23.1"
conditions: os=darwin & cpu=x64
languageName: node
linkType: hard

"@esbuild/freebsd-arm64@npm:0.23.1":
version: 0.23.1
resolution: "@esbuild/freebsd-arm64@npm:0.23.1"
conditions: os=freebsd & cpu=arm64
languageName: node
linkType: hard

"@esbuild/freebsd-x64@npm:0.23.1":
version: 0.23.1
resolution: "@esbuild/freebsd-x64@npm:0.23.1"
conditions: os=freebsd & cpu=x64
languageName: node
linkType: hard

"@esbuild/linux-arm64@npm:0.23.1":
version: 0.23.1
resolution: "@esbuild/linux-arm64@npm:0.23.1"
conditions: os=linux & cpu=arm64
languageName: node
linkType: hard

"@esbuild/linux-arm@npm:0.23.1":
version: 0.23.1
resolution: "@esbuild/linux-arm@npm:0.23.1"
conditions: os=linux & cpu=arm
languageName: node
linkType: hard

"@esbuild/linux-ia32@npm:0.23.1":
version: 0.23.1
resolution: "@esbuild/linux-ia32@npm:0.23.1"
conditions: os=linux & cpu=ia32
languageName: node
linkType: hard

"@esbuild/linux-loong64@npm:0.23.1":
version: 0.23.1
resolution: "@esbuild/linux-loong64@npm:0.23.1"
conditions: os=linux & cpu=loong64
languageName: node
linkType: hard

"@esbuild/linux-mips64el@npm:0.23.1":
version: 0.23.1
resolution: "@esbuild/linux-mips64el@npm:0.23.1"
conditions: os=linux & cpu=mips64el
languageName: node
linkType: hard

"@esbuild/linux-ppc64@npm:0.23.1":
version: 0.23.1
resolution: "@esbuild/linux-ppc64@npm:0.23.1"
conditions: os=linux & cpu=ppc64
languageName: node
linkType: hard

"@esbuild/linux-riscv64@npm:0.23.1":
version: 0.23.1
resolution: "@esbuild/linux-riscv64@npm:0.23.1"
conditions: os=linux & cpu=riscv64
languageName: node
linkType: hard

"@esbuild/linux-s390x@npm:0.23.1":
version: 0.23.1
resolution: "@esbuild/linux-s390x@npm:0.23.1"
conditions: os=linux & cpu=s390x
languageName: node
linkType: hard

"@esbuild/linux-x64@npm:0.23.1":
version: 0.23.1
resolution: "@esbuild/linux-x64@npm:0.23.1"
conditions: os=linux & cpu=x64
languageName: node
linkType: hard

"@esbuild/netbsd-x64@npm:0.23.1":
version: 0.23.1
resolution: "@esbuild/netbsd-x64@npm:0.23.1"
conditions: os=netbsd & cpu=x64
languageName: node
linkType: hard

"@esbuild/openbsd-arm64@npm:0.23.1":
version: 0.23.1
resolution: "@esbuild/openbsd-arm64@npm:0.23.1"
conditions: os=openbsd & cpu=arm64
languageName: node
linkType: hard

"@esbuild/openbsd-x64@npm:0.23.1":
version: 0.23.1
resolution: "@esbuild/openbsd-x64@npm:0.23.1"
conditions: os=openbsd & cpu=x64
languageName: node
linkType: hard

"@esbuild/sunos-x64@npm:0.23.1":
version: 0.23.1
resolution: "@esbuild/sunos-x64@npm:0.23.1"
conditions: os=sunos & cpu=x64
languageName: node
linkType: hard

"@esbuild/win32-arm64@npm:0.23.1":
version: 0.23.1
resolution: "@esbuild/win32-arm64@npm:0.23.1"
conditions: os=win32 & cpu=arm64
languageName: node
linkType: hard

"@esbuild/win32-ia32@npm:0.23.1":
version: 0.23.1
resolution: "@esbuild/win32-ia32@npm:0.23.1"
conditions: os=win32 & cpu=ia32
languageName: node
linkType: hard

"@esbuild/win32-x64@npm:0.23.1":
version: 0.23.1
resolution: "@esbuild/win32-x64@npm:0.23.1"
conditions: os=win32 & cpu=x64
languageName: node
linkType: hard

"@eslint-community/eslint-utils@npm:^4.2.0":
version: 4.4.1
resolution: "@eslint-community/eslint-utils@npm:4.4.1"
Expand Down Expand Up @@ -3010,89 +2842,6 @@ __metadata:
languageName: node
linkType: hard

"esbuild@npm:~0.23.0":
version: 0.23.1
resolution: "esbuild@npm:0.23.1"
dependencies:
"@esbuild/aix-ppc64": "npm:0.23.1"
"@esbuild/android-arm": "npm:0.23.1"
"@esbuild/android-arm64": "npm:0.23.1"
"@esbuild/android-x64": "npm:0.23.1"
"@esbuild/darwin-arm64": "npm:0.23.1"
"@esbuild/darwin-x64": "npm:0.23.1"
"@esbuild/freebsd-arm64": "npm:0.23.1"
"@esbuild/freebsd-x64": "npm:0.23.1"
"@esbuild/linux-arm": "npm:0.23.1"
"@esbuild/linux-arm64": "npm:0.23.1"
"@esbuild/linux-ia32": "npm:0.23.1"
"@esbuild/linux-loong64": "npm:0.23.1"
"@esbuild/linux-mips64el": "npm:0.23.1"
"@esbuild/linux-ppc64": "npm:0.23.1"
"@esbuild/linux-riscv64": "npm:0.23.1"
"@esbuild/linux-s390x": "npm:0.23.1"
"@esbuild/linux-x64": "npm:0.23.1"
"@esbuild/netbsd-x64": "npm:0.23.1"
"@esbuild/openbsd-arm64": "npm:0.23.1"
"@esbuild/openbsd-x64": "npm:0.23.1"
"@esbuild/sunos-x64": "npm:0.23.1"
"@esbuild/win32-arm64": "npm:0.23.1"
"@esbuild/win32-ia32": "npm:0.23.1"
"@esbuild/win32-x64": "npm:0.23.1"
dependenciesMeta:
"@esbuild/aix-ppc64":
optional: true
"@esbuild/android-arm":
optional: true
"@esbuild/android-arm64":
optional: true
"@esbuild/android-x64":
optional: true
"@esbuild/darwin-arm64":
optional: true
"@esbuild/darwin-x64":
optional: true
"@esbuild/freebsd-arm64":
optional: true
"@esbuild/freebsd-x64":
optional: true
"@esbuild/linux-arm":
optional: true
"@esbuild/linux-arm64":
optional: true
"@esbuild/linux-ia32":
optional: true
"@esbuild/linux-loong64":
optional: true
"@esbuild/linux-mips64el":
optional: true
"@esbuild/linux-ppc64":
optional: true
"@esbuild/linux-riscv64":
optional: true
"@esbuild/linux-s390x":
optional: true
"@esbuild/linux-x64":
optional: true
"@esbuild/netbsd-x64":
optional: true
"@esbuild/openbsd-arm64":
optional: true
"@esbuild/openbsd-x64":
optional: true
"@esbuild/sunos-x64":
optional: true
"@esbuild/win32-arm64":
optional: true
"@esbuild/win32-ia32":
optional: true
"@esbuild/win32-x64":
optional: true
bin:
esbuild: bin/esbuild
checksum: 10c0/08c2ed1105cc3c5e3a24a771e35532fe6089dd24a39c10097899072cef4a99f20860e41e9294e000d86380f353b04d8c50af482483d7f69f5208481cce61eec7
languageName: node
linkType: hard

"escalade@npm:^3.1.1":
version: 3.2.0
resolution: "escalade@npm:3.2.0"
Expand Down Expand Up @@ -3569,7 +3318,7 @@ __metadata:
languageName: node
linkType: hard

"fsevents@npm:~2.3.2, fsevents@npm:~2.3.3":
"fsevents@npm:~2.3.2":
version: 2.3.3
resolution: "fsevents@npm:2.3.3"
dependencies:
Expand All @@ -3579,7 +3328,7 @@ __metadata:
languageName: node
linkType: hard

"fsevents@patch:fsevents@npm%3A~2.3.2#optional!builtin<compat/fsevents>, fsevents@patch:fsevents@npm%3A~2.3.3#optional!builtin<compat/fsevents>":
"fsevents@patch:fsevents@npm%3A~2.3.2#optional!builtin<compat/fsevents>":
version: 2.3.3
resolution: "fsevents@patch:fsevents@npm%3A2.3.3#optional!builtin<compat/fsevents>::version=2.3.3&hash=df0bf1"
dependencies:
Expand Down Expand Up @@ -3679,15 +3428,6 @@ __metadata:
languageName: node
linkType: hard

"get-tsconfig@npm:^4.7.5":
version: 4.8.1
resolution: "get-tsconfig@npm:4.8.1"
dependencies:
resolve-pkg-maps: "npm:^1.0.0"
checksum: 10c0/536ee85d202f604f4b5fb6be81bcd6e6d9a96846811e83e9acc6de4a04fb49506edea0e1b8cf1d5ee7af33e469916ec2809d4c5445ab8ae015a7a51fbd1572f9
languageName: node
linkType: hard

"github-from-package@npm:0.0.0":
version: 0.0.0
resolution: "github-from-package@npm:0.0.0"
Expand Down Expand Up @@ -5716,13 +5456,6 @@ __metadata:
languageName: node
linkType: hard

"resolve-pkg-maps@npm:^1.0.0":
version: 1.0.0
resolution: "resolve-pkg-maps@npm:1.0.0"
checksum: 10c0/fb8f7bbe2ca281a73b7ef423a1cbc786fb244bd7a95cbe5c3fba25b27d327150beca8ba02f622baea65919a57e061eb5005204daa5f93ed590d9b77463a567ab
languageName: node
linkType: hard

"resolve@npm:^1.10.0, resolve@npm:^1.17.0, resolve@npm:^1.19.0":
version: 1.22.8
resolution: "resolve@npm:1.22.8"
Expand Down Expand Up @@ -5818,7 +5551,6 @@ __metadata:
eslint: "npm:^8.57.0"
execa: "npm:9.1.0"
npm-run-all: "npm:^4.1.5"
tsx: "npm:^4.17.0"
typescript: "npm:^5.6.3"
languageName: unknown
linkType: soft
Expand Down Expand Up @@ -6548,22 +6280,6 @@ __metadata:
languageName: node
linkType: hard

"tsx@npm:^4.17.0":
version: 4.19.2
resolution: "tsx@npm:4.19.2"
dependencies:
esbuild: "npm:~0.23.0"
fsevents: "npm:~2.3.3"
get-tsconfig: "npm:^4.7.5"
dependenciesMeta:
fsevents:
optional: true
bin:
tsx: dist/cli.mjs
checksum: 10c0/63164b889b1d170403e4d8753a6755dec371f220f5ce29a8e88f1f4d6085a784a12d8dc2ee669116611f2c72757ac9beaa3eea5c452796f541bdd2dc11753721
languageName: node
linkType: hard

"tunnel-agent@npm:^0.6.0":
version: 0.6.0
resolution: "tunnel-agent@npm:0.6.0"
Expand Down
Loading

0 comments on commit e37a322

Please sign in to comment.