Skip to content

Commit b675b0a

Browse files
authored
Merge pull request #618 from zeromq/spawn-windows
fix: fix the Windows prebuilds + fix some of the test failures
2 parents 8fdf3cb + 3701e9d commit b675b0a

File tree

10 files changed

+155
-46
lines changed

10 files changed

+155
-46
lines changed

.github/workflows/CI.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ jobs:
6565
docker: node:18-alpine
6666
docker_cmd:
6767
apk add --no-cache pkgconfig curl tar python3 make gcc g++ cmake
68-
musl-dev && npm i -g pnpm && pnpm install && pnpm run prebuild
68+
musl-dev && npm i -g pnpm && pnpm install && pnpm run build.prebuild
6969
node_version: 18
7070
node_arch: x64
7171
ARCH: x64
@@ -133,7 +133,7 @@ jobs:
133133

134134
- name: Prebuild
135135
if: ${{ !matrix.docker }}
136-
run: pnpm run prebuild
136+
run: pnpm run build.prebuild
137137

138138
- name: Prebuild Docker
139139
if: ${{ matrix.docker }}

.gitignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,17 @@ test.js
1414
.cache/
1515
test/typings-compatibility/
1616
/script/*.js
17+
/script/*.mjs
1718
/script/*.d.ts
19+
/script/*.d.mts
1820
/script/*.js.map
21+
/script/*.mjs.map
1922
/script/*/*.js
23+
/script/*/*.mjs
2024
/script/*/*.d.ts
2125
/script/*/*.js.map
2226
tsconfig.tsbuildinfo
27+
tsconfig.esm.tsbuildinfo
2328
/docs-raw
2429
.DS_Store
2530
.idea

package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,14 @@
4040
"eslint": "^8",
4141
"eslint-config-atomic": "^1.22.0",
4242
"eslint-plugin-prettier": "^4.2.1",
43+
"execa": "^9.2.0",
4344
"fs-extra": "^10.1.0",
4445
"gh-pages": "^4.0.0",
4546
"minify-all-cli": "^1.0.13",
4647
"mocha": "^10.4.0",
4748
"node-gyp": "^10.1.0",
4849
"npm-run-all2": "^6.2.0",
49-
"prebuildify": "^5.0.1",
50+
"prebuildify": "^6.0.1",
5051
"prettier": "^2.8.8",
5152
"rocha": "^2.5.10",
5253
"semver": "^7.6.2",
@@ -82,13 +83,12 @@
8283
"install": "(shx test -f ./script/build.js || run-s build.js) && cross-env npm_config_build_from_source=true aminya-node-gyp-build",
8384
"clean": "shx rm -rf ./build ./lib/ ./prebuilds ./script/*.js ./script/*.js.map ./script/*.d.ts ./script/*.tsbuildinfo",
8485
"clean.temp": "shx rm -rf ./tmp && shx mkdir -p ./tmp && shx touch ./tmp/.gitkeep",
85-
"build.library.compat": "shx rm -rf ./lib/ts3.7 && downlevel-dts ./lib ./lib/ts3.7 --to=3.7",
86-
"build.library": "tsc -p ./src/tsconfig.json && run-s build.library.compat",
87-
"build.script": "tsc -p ./script/tsconfig.json",
86+
"build.library": "tsc -p ./src/tsconfig.json",
87+
"build.script": "tsc -p ./script/tsconfig.json && tsc -p ./script/tsconfig.esm.json",
8888
"build.js": "run-p build.script build.library",
8989
"build.doc": "typedoc --options ./typedoc.json && minify-all -s docs-raw -d docs --jsCompressor terser",
9090
"deploy.doc": "run-s build.doc && gh-pages --dist \"./docs\"",
91-
"prebuild": "run-s build.js && node ./script/prebuild.js",
91+
"build.prebuild": "run-s build.js && node ./script/prebuild.mjs",
9292
"build.native": "node-gyp configure --release && node-gyp configure --release -- -f compile_commands_json && node-gyp build --release",
9393
"build.native.debug": "node-gyp configure --debug && node-gyp configure --debug -- -f compile_commands_json && cross-env CMAKE_BUILD_TYPE=Debug node-gyp build --debug",
9494
"build": "run-s build.js build.native",

0 commit comments

Comments
 (0)