Skip to content

Commit 99bbdbe

Browse files
committed
fix: use typescript and execa for pack-exe
1 parent 3d99f05 commit 99bbdbe

File tree

5 files changed

+120
-19
lines changed

5 files changed

+120
-19
lines changed

dev/scripts/pack-exe.js renamed to dev/scripts/pack-exe.ts

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
const { exec } = require("@actions/exec")
1+
import { node } from "execa"
22

33
function getPlatformName() {
44
switch (process.platform) {
@@ -26,13 +26,19 @@ function main() {
2626

2727
return Promise.all(
2828
exes.map((exe) =>
29-
exec(
30-
`./node_modules/.bin/caxa --input ./dist/node16 --output ./exe/setup_cpp_${getPlatformName()}${exe} -- "{{caxa}}/node_modules/.bin/node${exe}" "{{caxa}}/setup_cpp.js"`
31-
)
29+
node("./node_modules/caxa/build/index.mjs", [
30+
"--input",
31+
"./dist/node16",
32+
"--output",
33+
`./exe/setup_cpp_${getPlatformName()}${exe}`,
34+
"--",
35+
`{{caxa}}/node_modules/.bin/node${exe}`,
36+
`{{caxa}}/setup_cpp.js`,
37+
])
3238
)
3339
)
3440
}
3541

36-
main().then((exit) => {
37-
process.exit(exit)
42+
main().catch((err) => {
43+
throw err
3844
})

dev/scripts/package.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"type": "module"
3+
}

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
"lint.eslint": "eslint **/*.{ts,tsx,js,jsx,cjs,mjs,json,yaml} --no-error-on-unmatched-pattern --cache --cache-location ./.cache/eslint/ --fix",
3434
"lint.prettier": "prettier --write .",
3535
"lint.tsc": "tsc --noEmit | loose-ts-check",
36-
"pack.exe": "shx rm -rf ./dist/tsconfig.tsbuildinfo && node ./dev/scripts/pack-exe.js",
36+
"pack.exe": "shx rm -rf ./dist/tsconfig.tsbuildinfo && ts-node --esm ./dev/scripts/pack-exe.ts",
3737
"prepare": "pnpm run -r build && pnpm run -w build",
3838
"start.docker": "docker run -t setup_cpp .",
3939
"start.docker.arch": "docker run -t setup_cpp:arch .",
@@ -98,6 +98,7 @@
9898
"shx": "0.3.4",
9999
"terser-config-atomic": "^0.1.1",
100100
"ts-jest": "^29.0.3",
101+
"ts-node": "^10.9.1",
101102
"ts-readme": "^1.1.3",
102103
"typescript": "^4.8.4"
103104
},

pnpm-lock.yaml

Lines changed: 102 additions & 11 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tsconfig.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,5 +28,5 @@
2828
"outDir": "./dist"
2929
},
3030
"compileOnSave": false,
31-
"include": ["./src", "packages/untildify-user/untildify.ts"]
31+
"include": ["./src", "dev/scripts", "packages/untildify-user/untildify.ts"]
3232
}

0 commit comments

Comments
 (0)