Skip to content

Commit 24e6ee6

Browse files
authored
Merge branch 'master' into literary-squid
2 parents 73ef2dc + ec1a72d commit 24e6ee6

14 files changed

+182
-62
lines changed

.github/workflows/CI.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,8 @@ 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
69+
build.prebuild
6970
node_version: 18
7071
node_arch: x64
7172
ARCH: x64
@@ -133,7 +134,7 @@ jobs:
133134

134135
- name: Prebuild
135136
if: ${{ !matrix.docker }}
136-
run: pnpm run prebuild
137+
run: pnpm run build.prebuild
137138

138139
- name: Prebuild Docker
139140
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: 12 additions & 11 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",
@@ -78,27 +79,27 @@
7879
"prebuilds",
7980
"tsconfig.json"
8081
],
81-
"scripts": {
82+
"scripts":
8283
"preinstall": "run-s build.script",
83-
"install": "node-gyp-build",
8484
"prepare": "run-s build.library",
8585
"clean": "shx rm -rf ./build ./lib/ ./prebuilds",
8686
"clean.temp": "shx rm -rf ./tmp && shx mkdir -p ./tmp && shx touch ./tmp/.gitkeep",
87-
"build.library.compat": "shx rm -rf ./lib/ts3.7 && downlevel-dts ./lib ./lib/ts3.7 --to=3.7",
88-
"build.library": "tsc -p ./src/tsconfig.json && run-s build.library.compat",
89-
"build.script": "tsc -p ./script/tsconfig.json",
90-
"build.js": "run-p build.script build.library",
87+
"deploy.doc": "run-s build.doc && gh-pages --dist \"./docs\"",
88+
"install": "aminya-node-gyp-build",
89+
"clean": "shx rm -rf ./build ./lib/ ./prebuilds",
90+
"build.library": "tsc -p ./src/tsconfig.json",
91+
"build.script": "tsc -p ./script/tsconfig.json && tsc -p ./script/tsconfig.esm.json",
9192
"build.doc": "typedoc --options ./typedoc.json && minify-all -s docs-raw -d docs --jsCompressor terser",
9293
"deploy.doc": "run-s build.doc && gh-pages --dist \"./docs\"",
93-
"prebuild": "node ./script/prebuild.js",
94+
"build.prebuild": "node ./script/prebuild.mjs",
9495
"build.native": "node-gyp configure --release && node-gyp configure --release -- -f compile_commands_json && node-gyp build --release",
9596
"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",
9697
"build": "run-s build.native",
9798
"build.debug": "run-s build.native.debug",
9899
"test.deps": "cd test && pnpm install && cd ..",
99-
"test": "run-s test.deps build && mocha --exit",
100-
"test.skip_gc_tests": "run-s test.deps build.debug && cross-env SKIP_GC_TESTS=true mocha --exit",
101-
"test.electron.main": "run-s test.deps build && electron-mocha",
100+
"test": "run-s clean.temp test.deps build && mocha",
101+
"test.skip_gc_tests": "run-s clean.temp test.deps build.debug && cross-env SKIP_GC_TESTS=true mocha",
102+
"test.electron.main": "run-s clean.temp test.deps build && electron-mocha",
102103
"format": "prettier --write .",
103104
"test.electron.renderer": "run-s build && electron-mocha --renderer",
104105
"lint.clang-format": "clang-format -i -style=file ./src/*.cc ./src/*.h ./src/util/*.h",

0 commit comments

Comments
 (0)