From c3f0508dbb5124219c5c985d17bc2f91d32a3a3d Mon Sep 17 00:00:00 2001 From: LongYinan Date: Mon, 22 Jul 2024 12:06:39 +0800 Subject: [PATCH] chore: upgrade deps --- .../workflows/pure-rust-build-on-linux.yml | 20 ++- 01-pure-rust/__test__/index.spec.mjs | 1 - 01-pure-rust/index.js | 64 ++++++++- 01-pure-rust/package.json | 3 +- Cargo.toml | 2 + yarn.lock | 133 ++++++++---------- 6 files changed, 139 insertions(+), 84 deletions(-) diff --git a/.github/workflows/pure-rust-build-on-linux.yml b/.github/workflows/pure-rust-build-on-linux.yml index 0578e7a..b15ff36 100644 --- a/.github/workflows/pure-rust-build-on-linux.yml +++ b/.github/workflows/pure-rust-build-on-linux.yml @@ -32,6 +32,15 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 + - name: Cache cargo registry + uses: actions/cache@v4 + with: + path: | + ~/.cargo + ${{ github.workspace }}/.xwin + ~/.napi-rs + ./target + key: ${{ matrix.targets }}-cargo-cache - name: Install uses: dtolnay/rust-toolchain@stable with: @@ -45,9 +54,16 @@ jobs: uses: goto-bus-stop/setup-zig@v1 with: version: 0.13.0 - - run: cargo install cargo-xwin + - name: Install cargo toolchains + uses: taiki-e/install-action@v2 + env: + GITHUB_TOKEN: ${{ github.token }} + with: + tool: cargo-zigbuild,cargo-xwin - run: yarn install - run: yarn workspace @napi-cross-build/01-pure-rust build --target ${{ matrix.targets }} + env: + XWIN_CACHE_DIR: ${{ github.workspace }}/.xwin - uses: actions/upload-artifact@v4 with: name: bindings-${{ matrix.targets }} @@ -131,7 +147,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-node@v4 with: - node-version: 18 + node-version: 20 cache: 'yarn' - name: Install dependencies run: yarn install diff --git a/01-pure-rust/__test__/index.spec.mjs b/01-pure-rust/__test__/index.spec.mjs index 3cdb3a6..7b1b1b7 100644 --- a/01-pure-rust/__test__/index.spec.mjs +++ b/01-pure-rust/__test__/index.spec.mjs @@ -1,5 +1,4 @@ import test from 'ava' -import lz from 'lz-string' import { compressToBase64 } from '../index.js' diff --git a/01-pure-rust/index.js b/01-pure-rust/index.js index 96af84a..9a0949f 100644 --- a/01-pure-rust/index.js +++ b/01-pure-rust/index.js @@ -224,14 +224,72 @@ switch (platform) { } break case 'arm': + if (isMusl()) { + localFileExisted = existsSync( + join(__dirname, '01-pure-rust.linux-arm-musleabihf.node') + ) + try { + if (localFileExisted) { + nativeBinding = require('./01-pure-rust.linux-arm-musleabihf.node') + } else { + nativeBinding = require('@napi-cross-build/01-pure-rust-linux-arm-musleabihf') + } + } catch (e) { + loadError = e + } + } else { + localFileExisted = existsSync( + join(__dirname, '01-pure-rust.linux-arm-gnueabihf.node') + ) + try { + if (localFileExisted) { + nativeBinding = require('./01-pure-rust.linux-arm-gnueabihf.node') + } else { + nativeBinding = require('@napi-cross-build/01-pure-rust-linux-arm-gnueabihf') + } + } catch (e) { + loadError = e + } + } + break + case 'riscv64': + if (isMusl()) { + localFileExisted = existsSync( + join(__dirname, '01-pure-rust.linux-riscv64-musl.node') + ) + try { + if (localFileExisted) { + nativeBinding = require('./01-pure-rust.linux-riscv64-musl.node') + } else { + nativeBinding = require('@napi-cross-build/01-pure-rust-linux-riscv64-musl') + } + } catch (e) { + loadError = e + } + } else { + localFileExisted = existsSync( + join(__dirname, '01-pure-rust.linux-riscv64-gnu.node') + ) + try { + if (localFileExisted) { + nativeBinding = require('./01-pure-rust.linux-riscv64-gnu.node') + } else { + nativeBinding = require('@napi-cross-build/01-pure-rust-linux-riscv64-gnu') + } + } catch (e) { + loadError = e + } + } + break + case 's390x': localFileExisted = existsSync( - join(__dirname, '01-pure-rust.linux-arm-gnueabihf.node') + join(__dirname, '01-pure-rust.linux-s390x-gnu.node') ) try { if (localFileExisted) { - nativeBinding = require('./01-pure-rust.linux-arm-gnueabihf.node') + nativeBinding = require('./01-pure-rust.linux-s390x-gnu.node') } else { - nativeBinding = require('@napi-cross-build/01-pure-rust-linux-arm-gnueabihf') + nativeBinding = require('@napi-cross-build/01-pure-rust-linux-s390x-gnu') } } catch (e) { loadError = e diff --git a/01-pure-rust/package.json b/01-pure-rust/package.json index 2db2148..a67535e 100644 --- a/01-pure-rust/package.json +++ b/01-pure-rust/package.json @@ -22,8 +22,7 @@ "license": "MIT", "devDependencies": { "@napi-rs/cli": "2.18.4", - "ava": "^6.0.0", - "lz-string": "^1.5.0" + "ava": "^6.1.3" }, "ava": { "timeout": "3m" diff --git a/Cargo.toml b/Cargo.toml index 4e19d86..2df14ea 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,5 +1,7 @@ [workspace] members = ["01-pure-rust"] +resolver = "2" [profile.release] lto = true +strip = "symbols" \ No newline at end of file diff --git a/yarn.lock b/yarn.lock index 33cb46a..6841294 100644 --- a/yarn.lock +++ b/yarn.lock @@ -29,8 +29,7 @@ __metadata: resolution: "@napi-cross-build/01-pure-rust@workspace:01-pure-rust" dependencies: "@napi-rs/cli": "npm:2.18.4" - ava: "npm:^6.0.0" - lz-string: "npm:^1.5.0" + ava: "npm:^6.1.3" languageName: unknown linkType: soft @@ -88,8 +87,8 @@ __metadata: linkType: hard "@vercel/nft@npm:^0.26.2": - version: 0.26.4 - resolution: "@vercel/nft@npm:0.26.4" + version: 0.26.5 + resolution: "@vercel/nft@npm:0.26.5" dependencies: "@mapbox/node-pre-gyp": "npm:^1.0.5" "@rollup/pluginutils": "npm:^4.0.0" @@ -105,7 +104,7 @@ __metadata: resolve-from: "npm:^5.0.0" bin: nft: out/cli.js - checksum: 10/2d1c55ab84801206a94532edd1a24627bd3309d26837b8c6a301b0b8228ff8a166e63dbd479b1e349313776ae87abd267f27b5e7b4be2691cae843ce045f7e31 + checksum: 10/7571af955e3633109b92fbba705c036cbf0225b8f7a990aad444917ea3a7cb9c4e201bc086837d9c7a3650da9e1b5741e3b6dd6159485cf686ae4b228078db86 languageName: node linkType: hard @@ -117,27 +116,29 @@ __metadata: linkType: hard "acorn-import-attributes@npm:^1.9.2": - version: 1.9.2 - resolution: "acorn-import-attributes@npm:1.9.2" + version: 1.9.5 + resolution: "acorn-import-attributes@npm:1.9.5" peerDependencies: acorn: ^8 - checksum: 10/fdaef65435e1f05ad18de6d9c328de562a1a4afaadaf9b40df37bdd6b6975409acc14d2fbda249ac092112f11d13bea35e56ba2322c5febb7808b28c45ded1fd + checksum: 10/8bfbfbb6e2467b9b47abb4d095df717ab64fce2525da65eabee073e85e7975fb3a176b6c8bba17c99a7d8ede283a10a590272304eb54a93c4aa1af9790d47a8b languageName: node linkType: hard "acorn-walk@npm:^8.3.2": - version: 8.3.2 - resolution: "acorn-walk@npm:8.3.2" - checksum: 10/57dbe2fd8cf744f562431775741c5c087196cd7a65ce4ccb3f3981cdfad25cd24ad2bad404997b88464ac01e789a0a61e5e355b2a84876f13deef39fb39686ca + version: 8.3.3 + resolution: "acorn-walk@npm:8.3.3" + dependencies: + acorn: "npm:^8.11.0" + checksum: 10/59701dcb7070679622ba8e9c7f37577b4935565747ca0fd7c1c3ad30b3f1b1b008276282664e323b5495eb49f77fa12d3816fd06dc68e18f90fbebe759f71450 languageName: node linkType: hard -"acorn@npm:^8.11.3, acorn@npm:^8.6.0": - version: 8.11.3 - resolution: "acorn@npm:8.11.3" +"acorn@npm:^8.11.0, acorn@npm:^8.11.3, acorn@npm:^8.6.0": + version: 8.12.1 + resolution: "acorn@npm:8.12.1" bin: acorn: bin/acorn - checksum: 10/b688e7e3c64d9bfb17b596e1b35e4da9d50553713b3b3630cf5690f2b023a84eac90c56851e6912b483fe60e8b4ea28b254c07e92f17ef83d72d78745a8352dd + checksum: 10/d08c2d122bba32d0861e0aa840b2ee25946c286d5dc5990abca991baf8cdbfbe199b05aacb221b979411a2fea36f83e26b5ac4f6b4e0ce49038c62316c1848f0 languageName: node linkType: hard @@ -234,9 +235,9 @@ __metadata: languageName: node linkType: hard -"ava@npm:^6.0.0": - version: 6.1.2 - resolution: "ava@npm:6.1.2" +"ava@npm:^6.1.3": + version: 6.1.3 + resolution: "ava@npm:6.1.3" dependencies: "@vercel/nft": "npm:^0.26.2" acorn: "npm:^8.11.3" @@ -285,7 +286,7 @@ __metadata: optional: true bin: ava: entrypoints/cli.mjs - checksum: 10/57800d0a94e4e5e379d90120ded619188534d2b075a9557d05f44f50f685a3cf346bdd2247b1fdcf850526d3e1c0ade06cabc56ca16108bb77f0d26223025215 + checksum: 10/89d2ba8b3b6f60e1c12094d84f0087455e43a4a4c7191ae33b462c653ec7343efc5475ffb9c93f1e27effd1fbd9e0e5b1392f7b70693246d0ba726c554bff830 languageName: node linkType: hard @@ -322,19 +323,19 @@ __metadata: languageName: node linkType: hard -"braces@npm:^3.0.2": - version: 3.0.2 - resolution: "braces@npm:3.0.2" +"braces@npm:^3.0.3": + version: 3.0.3 + resolution: "braces@npm:3.0.3" dependencies: - fill-range: "npm:^7.0.1" - checksum: 10/966b1fb48d193b9d155f810e5efd1790962f2c4e0829f8440b8ad236ba009222c501f70185ef732fef17a4c490bb33a03b90dab0631feafbdf447da91e8165b1 + fill-range: "npm:^7.1.1" + checksum: 10/fad11a0d4697a27162840b02b1fad249c1683cbc510cd5bf1a471f2f8085c046d41094308c577a50a03a579dd99d5a6b3724c4b5e8b14df2c4443844cfcda2c6 languageName: node linkType: hard "callsites@npm:^4.1.0": - version: 4.1.0 - resolution: "callsites@npm:4.1.0" - checksum: 10/4ad31de7b7615fa25bdab9c2373865209d2d5190f895cdf2e2f518bd1dafa7ebcda2e6e9cc9640f2dfde6b3893d82fa4359a78ffc27baad2503227553c6882fa + version: 4.2.0 + resolution: "callsites@npm:4.2.0" + checksum: 10/9a740675712076a38208967d7f80b525c9c7f4524c2af5d3936c5e278a601af0423a07e91f79679fec0546f3a52514d56969c6fe65f84d794e64a36b1f5eda8a languageName: node linkType: hard @@ -506,14 +507,14 @@ __metadata: linkType: hard "debug@npm:4, debug@npm:^4.3.4": - version: 4.3.4 - resolution: "debug@npm:4.3.4" + version: 4.3.5 + resolution: "debug@npm:4.3.5" dependencies: ms: "npm:2.1.2" peerDependenciesMeta: supports-color: optional: true - checksum: 10/0073c3bcbd9cb7d71dd5f6b55be8701af42df3e56e911186dfa46fac3a5b9eb7ce7f377dd1d3be6db8977221f8eb333d945216f645cf56f6b688cd484837d255 + checksum: 10/cb6eab424c410e07813ca1392888589972ce9a32b8829c6508f5e1f25f3c3e70a76731610ae55b4bbe58d1a2fffa1424b30e97fa8d394e49cd2656a9643aedd2 languageName: node linkType: hard @@ -642,12 +643,12 @@ __metadata: languageName: node linkType: hard -"fill-range@npm:^7.0.1": - version: 7.0.1 - resolution: "fill-range@npm:7.0.1" +"fill-range@npm:^7.1.1": + version: 7.1.1 + resolution: "fill-range@npm:7.1.1" dependencies: to-regex-range: "npm:^5.0.1" - checksum: 10/e260f7592fd196b4421504d3597cc76f4a1ca7a9488260d533b611fc3cefd61e9a9be1417cb82d3b01ad9f9c0ff2dbf258e1026d2445e26b0cf5148ff4250429 + checksum: 10/a7095cb39e5bc32fada2aa7c7249d3f6b01bd1ce461a61b0adabacccabd9198500c6fb1f68a7c851a657e273fce2233ba869638897f3d7ed2e87a2d89b4436ea languageName: node linkType: hard @@ -729,8 +730,8 @@ __metadata: linkType: hard "globby@npm:^14.0.0": - version: 14.0.1 - resolution: "globby@npm:14.0.1" + version: 14.0.2 + resolution: "globby@npm:14.0.2" dependencies: "@sindresorhus/merge-streams": "npm:^2.1.0" fast-glob: "npm:^3.3.2" @@ -738,7 +739,7 @@ __metadata: path-type: "npm:^5.0.0" slash: "npm:^5.1.0" unicorn-magic: "npm:^0.1.0" - checksum: 10/b36f57afc45a857a884d82657603c7e1663b1e6f3f9afbeb53d12e42230469fc5b26a7e14a01e51086f3f25c138f58a7002036fcc8f3ca054097b6dd7c71d639 + checksum: 10/67660da70fc1223f7170c1a62ba6c373385e9e39765d952b6518606dec15ed8c7958e9dae6ba5752a31dbc1e9126f146938b830ad680fe794141734ffc3fbb75 languageName: node linkType: hard @@ -909,24 +910,6 @@ __metadata: languageName: node linkType: hard -"lru-cache@npm:^6.0.0": - version: 6.0.0 - resolution: "lru-cache@npm:6.0.0" - dependencies: - yallist: "npm:^4.0.0" - checksum: 10/fc1fe2ee205f7c8855fa0f34c1ab0bcf14b6229e35579ec1fd1079f31d6fc8ef8eb6fd17f2f4d99788d7e339f50e047555551ebd5e434dda503696e7c6591825 - languageName: node - linkType: hard - -"lz-string@npm:^1.5.0": - version: 1.5.0 - resolution: "lz-string@npm:1.5.0" - bin: - lz-string: bin/bin.js - checksum: 10/e86f0280e99a8d8cd4eef24d8601ddae15ce54e43ac9990dfcb79e1e081c255ad24424a30d78d2ad8e51a8ce82a66a930047fed4b4aa38c6f0b392ff9300edfc - languageName: node - linkType: hard - "make-dir@npm:^3.1.0": version: 3.1.0 resolution: "make-dir@npm:3.1.0" @@ -971,12 +954,12 @@ __metadata: linkType: hard "micromatch@npm:^4.0.2, micromatch@npm:^4.0.4": - version: 4.0.5 - resolution: "micromatch@npm:4.0.5" + version: 4.0.7 + resolution: "micromatch@npm:4.0.7" dependencies: - braces: "npm:^3.0.2" + braces: "npm:^3.0.3" picomatch: "npm:^2.3.1" - checksum: 10/a749888789fc15cac0e03273844dbd749f9f8e8d64e70c564bcf06a033129554c789bb9e30d7566d7ff6596611a08e58ac12cf2a05f6e3c9c47c50c4c7e12fa2 + checksum: 10/a11ed1cb67dcbbe9a5fc02c4062cf8bb0157d73bf86956003af8dcfdf9b287f9e15ec0f6d6925ff6b8b5b496202335e497b01de4d95ef6cf06411bc5e5c474a0 languageName: node linkType: hard @@ -1060,13 +1043,13 @@ __metadata: linkType: hard "node-gyp-build@npm:^4.2.2": - version: 4.8.0 - resolution: "node-gyp-build@npm:4.8.0" + version: 4.8.1 + resolution: "node-gyp-build@npm:4.8.1" bin: node-gyp-build: bin.js node-gyp-build-optional: optional.js node-gyp-build-test: build-test.js - checksum: 10/80f410ab412df38e84171d3634a5716b6c6f14ecfa4eb971424d289381fb76f8bcbe1b666419ceb2c81060e558fd7c6d70cc0f60832bcca6a1559098925d9657 + checksum: 10/b9297770f96a92e5f2b854f3fd5e4bd418df81d7785a81ab60cec5cf2e5e72dc2c3319808978adc572cfa3885e6b12338cb5f4034bed2cab35f0d76a4b75ccdf languageName: node linkType: hard @@ -1117,9 +1100,9 @@ __metadata: linkType: hard "p-map@npm:^7.0.1": - version: 7.0.1 - resolution: "p-map@npm:7.0.1" - checksum: 10/df984b759764ebb268887ac0dec9f4b9c29c89dffb66cb001f31cab8a204db26e0f044783bc39ae1c225e2c0ad0b9c4d70a0ef8219dbb2588dc715d11cec433b + version: 7.0.2 + resolution: "p-map@npm:7.0.2" + checksum: 10/b4a590038b991c17b9c1484aa8c24cb9d3aa8a6167d02b9f9459c9200c7d392202a860c95b6dcd190d51f5f083ed256b32f9cb5976785022b0111bab853ec58b languageName: node linkType: hard @@ -1271,13 +1254,11 @@ __metadata: linkType: hard "semver@npm:^7.3.2, semver@npm:^7.3.5": - version: 7.6.0 - resolution: "semver@npm:7.6.0" - dependencies: - lru-cache: "npm:^6.0.0" + version: 7.6.3 + resolution: "semver@npm:7.6.3" bin: semver: bin/semver.js - checksum: 10/1b41018df2d8aca5a1db4729985e8e20428c650daea60fcd16e926e9383217d00f574fab92d79612771884a98d2ee2a1973f49d630829a8d54d6570defe62535 + checksum: 10/36b1fbe1a2b6f873559cd57b238f1094a053dbfd997ceeb8757d79d1d2089c56d1321b9f1069ce263dc64cfa922fa1d2ad566b39426fe1ac6c723c1487589e10 languageName: node linkType: hard @@ -1356,13 +1337,13 @@ __metadata: linkType: hard "string-width@npm:^7.0.0": - version: 7.1.0 - resolution: "string-width@npm:7.1.0" + version: 7.2.0 + resolution: "string-width@npm:7.2.0" dependencies: emoji-regex: "npm:^10.3.0" get-east-asian-width: "npm:^1.0.0" strip-ansi: "npm:^7.1.0" - checksum: 10/a183573fe7209e0d294f661846d33f8caf72aa86d983e5b48a0ed45ab15bcccb02c6f0344b58b571988871105457137b8207855ea536827dbc4a376a0f31bf8f + checksum: 10/42f9e82f61314904a81393f6ef75b832c39f39761797250de68c041d8ba4df2ef80db49ab6cd3a292923a6f0f409b8c9980d120f7d32c820b4a8a84a2598a295 languageName: node linkType: hard @@ -1406,8 +1387,8 @@ __metadata: linkType: hard "tar@npm:^6.1.11": - version: 6.2.0 - resolution: "tar@npm:6.2.0" + version: 6.2.1 + resolution: "tar@npm:6.2.1" dependencies: chownr: "npm:^2.0.0" fs-minipass: "npm:^2.0.0" @@ -1415,7 +1396,7 @@ __metadata: minizlib: "npm:^2.1.1" mkdirp: "npm:^1.0.3" yallist: "npm:^4.0.0" - checksum: 10/2042bbb14830b5cd0d584007db0eb0a7e933e66d1397e72a4293768d2332449bc3e312c266a0887ec20156dea388d8965e53b4fc5097f42d78593549016da089 + checksum: 10/bfbfbb2861888077fc1130b84029cdc2721efb93d1d1fb80f22a7ac3a98ec6f8972f29e564103bbebf5e97be67ebc356d37fa48dbc4960600a1eb7230fbd1ea0 languageName: node linkType: hard