Skip to content

Commit e697ca0

Browse files
BrooooooklynBrooooooklyn
committed
feat(deno-lint): upgrade to deno_lint 0.32
1 parent 850b9fc commit e697ca0

File tree

12 files changed

+2527
-2556
lines changed

12 files changed

+2527
-2556
lines changed

‎.github/workflows/ci.yaml‎

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -78,20 +78,24 @@ jobs:
7878
- host: ubuntu-latest
7979
target: aarch64-linux-android
8080
build: |
81-
export CARGO_TARGET_AARCH64_LINUX_ANDROID_LINKER="${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android24-clang"
82-
export CC="${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android24-clang"
83-
export CXX="${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android24-clang++"
84-
export PATH="${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin:${PATH}"
81+
export CARGO_TARGET_AARCH64_LINUX_ANDROID_LINKER="${ANDROID_NDK_LATEST_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android24-clang"
82+
export CC="${ANDROID_NDK_LATEST_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android24-clang"
83+
export CXX="${ANDROID_NDK_LATEST_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android24-clang++"
84+
export AR="${ANDROID_NDK_LATEST_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-ar"
85+
export PATH="${ANDROID_NDK_LATEST_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin:${PATH}"
8586
yarn lerna exec "yarn build --target aarch64-linux-android" --concurrency 1 --stream --no-prefix
87+
${ANDROID_NDK_LATEST_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-strip packages/*/*.node
8688
- host: ubuntu-latest
8789
architecture: x64
8890
target: armv7-linux-androideabi
8991
build: |
90-
export CARGO_TARGET_ARMV7_LINUX_ANDROIDEABI_LINKER="${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin/armv7a-linux-androideabi24-clang"
91-
export CC="${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin/armv7a-linux-androideabi24-clang"
92-
export CXX="${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin/armv7a-linux-androideabi24-clang++"
93-
export PATH="${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin:${PATH}"
92+
export CARGO_TARGET_ARMV7_LINUX_ANDROIDEABI_LINKER="${ANDROID_NDK_LATEST_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin/armv7a-linux-androideabi24-clang"
93+
export CC="${ANDROID_NDK_LATEST_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin/armv7a-linux-androideabi24-clang"
94+
export CXX="${ANDROID_NDK_LATEST_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin/armv7a-linux-androideabi24-clang++"
95+
export PATH="${ANDROID_NDK_LATEST_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin:${PATH}"
96+
export AR="${ANDROID_NDK_LATEST_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-ar"
9497
yarn lerna exec "yarn build --target armv7-linux-androideabi" --concurrency 1 --stream --no-prefix
98+
${ANDROID_NDK_LATEST_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-strip packages/*/*.node
9599
- host: ubuntu-latest
96100
target: 'aarch64-unknown-linux-musl'
97101
downloadTarget: 'aarch64-unknown-linux-musl'
@@ -140,8 +144,7 @@ jobs:
140144
~/.cargo/registry
141145
~/.cargo/git
142146
target
143-
${{ env.RUNNER_TEMP }}/.cargo/registry
144-
${{ env.RUNNER_TEMP }}/.cargo/git
147+
.cargo-cache
145148
key: ${{ matrix.settings.target }}-cargo-registry
146149

147150
- name: Cache NPM dependencies
@@ -171,7 +174,7 @@ jobs:
171174
if: ${{ matrix.settings.docker }}
172175
with:
173176
image: ${{ matrix.settings.docker }}
174-
options: --user 0:0 -v ${{ env.RUNNER_TEMP }}/.cargo/git:/root/.cargo/git -v ${{ env.RUNNER_TEMP }}/.cargo/registry:/root/.cargo/registry -v ${{ github.workspace }}:/build -w /build
177+
options: --user 0:0 -v ${{ github.workspace }}/.cargo-cache/.cargo/git:/usr/local/cargo/git -v ${{ github.workspace }}/.cargo-cache/.cargo/registry:/usr/local/cargo/registry -v ${{ github.workspace }}:/build -w /build
175178
run: ${{ matrix.settings.build }}
176179

177180
- name: Setup node x86
@@ -196,13 +199,13 @@ jobs:
196199
if-no-files-found: error
197200

198201
build-freebsd:
199-
runs-on: macos-10.15
202+
runs-on: macos-12
200203
name: Build FreeBSD
201204
steps:
202205
- uses: actions/checkout@v3
203206
- name: Build
204207
id: build
205-
uses: vmactions/freebsd-vm@v0.1.6
208+
uses: vmactions/freebsd-vm@v0.2.3
206209
env:
207210
DEBUG: 'napi:*'
208211
RUSTUP_HOME: /usr/local/rustup

‎.yarn/releases/yarn-3.2.1.cjs‎

Lines changed: 0 additions & 786 deletions
This file was deleted.

‎.yarn/releases/yarn-3.2.2.cjs‎

Lines changed: 783 additions & 0 deletions
Large diffs are not rendered by default.

‎.yarnrc.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ nodeLinker: node-modules
22

33
npmRegistryServer: 'https://registry.npmjs.org/'
44

5-
yarnPath: .yarn/releases/yarn-3.2.1.cjs
5+
yarnPath: .yarn/releases/yarn-3.2.2.cjs

‎package.json‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "node-rs",
3-
"packageManager": "[email protected].1",
3+
"packageManager": "[email protected].2",
44
"version": "0.0.0",
55
"description": "Node & Rust bindings monorepo",
66
"author": "LongYinan <[email protected]>",
@@ -24,29 +24,29 @@
2424
"postinstall": "husky install"
2525
},
2626
"devDependencies": {
27-
"@napi-rs/cli": "2.9.0",
27+
"@napi-rs/cli": "2.10.3",
2828
"@swc-node/core": "^1.9.0",
2929
"@swc-node/register": "^1.5.1",
30-
"@taplo/cli": "^0.3.2",
31-
"@types/node": "^17.0.36",
32-
"@typescript-eslint/eslint-plugin": "^5.26.0",
33-
"@typescript-eslint/parser": "^5.26.0",
34-
"ava": "^4.2.0",
30+
"@taplo/cli": "^0.4.2",
31+
"@types/node": "^18.6.2",
32+
"@typescript-eslint/eslint-plugin": "^5.31.0",
33+
"@typescript-eslint/parser": "^5.31.0",
34+
"ava": "^4.3.1",
3535
"benchmark": "^2.1.4",
3636
"codecov": "^3.8.3",
3737
"cross-env": "^7.0.3",
38-
"eslint": "^8.16.0",
38+
"eslint": "^8.20.0",
3939
"eslint-config-prettier": "^8.5.0",
4040
"eslint-plugin-import": "^2.26.0",
41-
"eslint-plugin-prettier": "^4.0.0",
41+
"eslint-plugin-prettier": "^4.2.1",
4242
"husky": "^8.0.1",
43-
"lerna": "^5.0.0",
44-
"lint-staged": "^12.4.2",
43+
"lerna": "^5.3.0",
44+
"lint-staged": "^13.0.3",
4545
"npm-run-all": "^4.1.5",
46-
"prettier": "^2.6.2",
47-
"ts-node": "^10.8.0",
46+
"prettier": "^2.7.1",
47+
"ts-node": "^10.9.1",
4848
"tslib": "^2.4.0",
49-
"typescript": "^4.7.2"
49+
"typescript": "^4.7.4"
5050
},
5151
"lint-staged": {
5252
"*.@(js|ts|tsx)": [

‎packages/argon2/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,6 @@
5454
"version": "napi version"
5555
},
5656
"devDependencies": {
57-
"argon2": "^0.28.5"
57+
"argon2": "^0.28.7"
5858
}
5959
}

‎packages/crc32/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
"url": "https://github.com/napi-rs/node-rs/issues"
6262
},
6363
"devDependencies": {
64-
"@types/crc": "^3.4.0",
64+
"@types/crc": "^3.8.0",
6565
"buffer": "^6.0.3",
6666
"crc": "^4.1.1",
6767
"sse4_crc32": "^7.0.0"

‎packages/deno-lint/Cargo.toml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,13 @@ crate-type = ["cdylib"]
1010
[dependencies]
1111
annotate-snippets = { version = "0.9", features = ["color"] }
1212
anyhow = "1"
13-
deno_ast = "=0.14.0"
14-
deno_lint = "=0.29.0"
13+
deno_ast = "=0.17.0"
14+
deno_lint = "=0.32.0"
1515
env_logger = "0.9"
1616
global_alloc = { path = "../../crates/alloc" }
1717
globwalk = "0.8"
1818
ignore = "0.4"
19+
miette = { version = "5", features = ["fancy-no-backtrace"] }
1920
napi = { version = "2", default-features = false, features = ["napi3"] }
2021
napi-derive = { version = "2" }
2122
serde = "1"

0 commit comments

Comments
 (0)