From da937307db487295b617d99007be787ccaa70f17 Mon Sep 17 00:00:00 2001 From: j-mendez Date: Tue, 2 Jul 2024 14:06:11 -0400 Subject: [PATCH] 0.0.92 --- .github/workflows/CI.yml | 12 ++- .yarnrc.yml | 2 - Cargo.toml | 10 +- npm/android-arm-eabi/package.json | 2 +- npm/android-arm64/package.json | 2 +- npm/darwin-arm64/package.json | 2 +- npm/darwin-universal/package.json | 2 +- npm/darwin-x64/package.json | 2 +- npm/freebsd-x64/package.json | 2 +- npm/linux-arm-gnueabihf/package.json | 2 +- npm/linux-arm64-gnu/package.json | 2 +- npm/linux-arm64-musl/package.json | 2 +- npm/linux-x64-gnu/package.json | 2 +- npm/linux-x64-musl/package.json | 2 +- npm/win32-arm64-msvc/package.json | 2 +- npm/win32-ia32-msvc/package.json | 2 +- npm/win32-x64-msvc/package.json | 2 +- package.json | 149 +++++++++++++-------------- 18 files changed, 98 insertions(+), 103 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index ba7c5ea..67f1498 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -46,7 +46,7 @@ jobs: - host: ubuntu-latest target: x86_64-unknown-linux-musl docker: ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-alpine - build: yarn build --target x86_64-unknown-linux-musl + build: sudo apt-get install openssl && yarn build --target x86_64-unknown-linux-musl - host: macos-latest target: aarch64-apple-darwin build: yarn build --target aarch64-apple-darwin @@ -58,7 +58,7 @@ jobs: target: armv7-unknown-linux-gnueabihf setup: | sudo apt-get update - sudo apt-get install gcc-arm-linux-gnueabihf -y + sudo apt-get install openssl gcc-arm-linux-gnueabihf -y build: | yarn build --target armv7-unknown-linux-gnueabihf - host: ubuntu-latest @@ -72,7 +72,9 @@ jobs: docker: ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-alpine build: |- set -e && - rustup target add aarch64-unknown-linux-musl && + rustup target add aarch64-unknown-linux-musl && + apk add --update \ + build-base cmake make libc6-compat make pkgconfig openssl openssl-dev libffi-dev zlib-dev musl-dev && yarn build --target aarch64-unknown-linux-musl - host: windows-latest target: aarch64-pc-windows-msvc @@ -131,9 +133,13 @@ jobs: image: ${{ matrix.settings.docker }} options: '--user 0:0 -v ${{ github.workspace }}/.cargo-cache/git/db:/usr/local/cargo/git/db -v ${{ github.workspace }}/.cargo/registry/cache:/usr/local/cargo/registry/cache -v ${{ github.workspace }}/.cargo/registry/index:/usr/local/cargo/registry/index -v ${{ github.workspace }}:/build -w /build' run: ${{ matrix.settings.build }} + env: + CXXFLAGS: "--stdlib=libc++ -L/usr/lib/llvm-18/lib -static" - name: Build run: ${{ matrix.settings.build }} if: ${{ !matrix.settings.docker }} + env: + CXXFLAGS: "--stdlib=libc++ -L/usr/lib/llvm-18/lib -static" shell: bash - name: Upload artifact uses: actions/upload-artifact@v4 diff --git a/.yarnrc.yml b/.yarnrc.yml index 9240029..eb2eae6 100644 --- a/.yarnrc.yml +++ b/.yarnrc.yml @@ -1,5 +1,3 @@ nodeLinker: node-modules - npmAuditRegistry: "https://registry.npmjs.org" - yarnPath: .yarn/releases/yarn-4.3.1.cjs \ No newline at end of file diff --git a/Cargo.toml b/Cargo.toml index 2699603..115f2ab 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -19,15 +19,7 @@ serde = "1" serde_json = "1" spider = { version = "1.98.4", features = ["napi", "cron", "regex", "cookies", "socks", "chrome", "control", "chrome_intercept", "cache", "openai", "serde", "real_browser" ] } -[target.x86_64-unknown-linux-gnu.dependencies] -openssl-sys = { version = "0.9", features = ["vendored"] } -openssl = { version = "0.10", features = ["vendored"] } - -[target.x86_64-unknown-linux-musl.dependencies] -openssl-sys = { version = "0.9", features = ["vendored"] } -openssl = { version = "0.10", features = ["vendored"] } - -[target.arch64-linux-android.dependencies] +[target.'cfg(any(target_arch = "x86_64", target_arch = "aarch64", target_os = "linux", target_os = "android"))'.dependencies] openssl-sys = { version = "0.9", features = ["vendored"] } openssl = { version = "0.10", features = ["vendored"] } diff --git a/npm/android-arm-eabi/package.json b/npm/android-arm-eabi/package.json index 2f2be18..ef9c951 100644 --- a/npm/android-arm-eabi/package.json +++ b/npm/android-arm-eabi/package.json @@ -1,6 +1,6 @@ { "name": "@spider-rs/spider-rs-android-arm-eabi", - "version": "0.0.91", + "version": "0.0.92", "repository": "https://github.com/spider-rs/spider-nodejs", "os": [ "android" diff --git a/npm/android-arm64/package.json b/npm/android-arm64/package.json index 4e6b79d..eee8d51 100644 --- a/npm/android-arm64/package.json +++ b/npm/android-arm64/package.json @@ -1,6 +1,6 @@ { "name": "@spider-rs/spider-rs-android-arm64", - "version": "0.0.91", + "version": "0.0.92", "repository": "https://github.com/spider-rs/spider-nodejs", "os": [ "android" diff --git a/npm/darwin-arm64/package.json b/npm/darwin-arm64/package.json index 36ae75f..4a4e74e 100644 --- a/npm/darwin-arm64/package.json +++ b/npm/darwin-arm64/package.json @@ -1,6 +1,6 @@ { "name": "@spider-rs/spider-rs-darwin-arm64", - "version": "0.0.91", + "version": "0.0.92", "repository": "https://github.com/spider-rs/spider-nodejs", "os": [ "darwin" diff --git a/npm/darwin-universal/package.json b/npm/darwin-universal/package.json index 503560d..4fc0835 100644 --- a/npm/darwin-universal/package.json +++ b/npm/darwin-universal/package.json @@ -1,6 +1,6 @@ { "name": "@spider-rs/spider-rs-darwin-universal", - "version": "0.0.91", + "version": "0.0.92", "repository": "https://github.com/spider-rs/spider-nodejs", "os": [ "darwin" diff --git a/npm/darwin-x64/package.json b/npm/darwin-x64/package.json index 2b105a3..f7ea60c 100644 --- a/npm/darwin-x64/package.json +++ b/npm/darwin-x64/package.json @@ -1,6 +1,6 @@ { "name": "@spider-rs/spider-rs-darwin-x64", - "version": "0.0.91", + "version": "0.0.92", "repository": "https://github.com/spider-rs/spider-nodejs", "os": [ "darwin" diff --git a/npm/freebsd-x64/package.json b/npm/freebsd-x64/package.json index 2435fc3..52e8dbc 100644 --- a/npm/freebsd-x64/package.json +++ b/npm/freebsd-x64/package.json @@ -1,6 +1,6 @@ { "name": "@spider-rs/spider-rs-freebsd-x64", - "version": "0.0.91", + "version": "0.0.92", "repository": "https://github.com/spider-rs/spider-nodejs", "os": [ "freebsd" diff --git a/npm/linux-arm-gnueabihf/package.json b/npm/linux-arm-gnueabihf/package.json index fb898a7..4843f5a 100644 --- a/npm/linux-arm-gnueabihf/package.json +++ b/npm/linux-arm-gnueabihf/package.json @@ -1,6 +1,6 @@ { "name": "@spider-rs/spider-rs-linux-arm-gnueabihf", - "version": "0.0.91", + "version": "0.0.92", "repository": "https://github.com/spider-rs/spider-nodejs", "os": [ "linux" diff --git a/npm/linux-arm64-gnu/package.json b/npm/linux-arm64-gnu/package.json index da4eda8..7189f1a 100644 --- a/npm/linux-arm64-gnu/package.json +++ b/npm/linux-arm64-gnu/package.json @@ -1,6 +1,6 @@ { "name": "@spider-rs/spider-rs-linux-arm64-gnu", - "version": "0.0.91", + "version": "0.0.92", "repository": "https://github.com/spider-rs/spider-nodejs", "os": [ "linux" diff --git a/npm/linux-arm64-musl/package.json b/npm/linux-arm64-musl/package.json index 08c0fa6..943d205 100644 --- a/npm/linux-arm64-musl/package.json +++ b/npm/linux-arm64-musl/package.json @@ -1,6 +1,6 @@ { "name": "@spider-rs/spider-rs-linux-arm64-musl", - "version": "0.0.91", + "version": "0.0.92", "repository": "https://github.com/spider-rs/spider-nodejs", "os": [ "linux" diff --git a/npm/linux-x64-gnu/package.json b/npm/linux-x64-gnu/package.json index bddd0c5..8e5e716 100644 --- a/npm/linux-x64-gnu/package.json +++ b/npm/linux-x64-gnu/package.json @@ -1,6 +1,6 @@ { "name": "@spider-rs/spider-rs-linux-x64-gnu", - "version": "0.0.91", + "version": "0.0.92", "repository": "https://github.com/spider-rs/spider-nodejs", "os": [ "linux" diff --git a/npm/linux-x64-musl/package.json b/npm/linux-x64-musl/package.json index 0aba58d..af90e5a 100644 --- a/npm/linux-x64-musl/package.json +++ b/npm/linux-x64-musl/package.json @@ -1,6 +1,6 @@ { "name": "@spider-rs/spider-rs-linux-x64-musl", - "version": "0.0.91", + "version": "0.0.92", "repository": "https://github.com/spider-rs/spider-nodejs", "os": [ "linux" diff --git a/npm/win32-arm64-msvc/package.json b/npm/win32-arm64-msvc/package.json index 9d1518d..f8ac5e5 100644 --- a/npm/win32-arm64-msvc/package.json +++ b/npm/win32-arm64-msvc/package.json @@ -1,6 +1,6 @@ { "name": "@spider-rs/spider-rs-win32-arm64-msvc", - "version": "0.0.91", + "version": "0.0.92", "repository": "https://github.com/spider-rs/spider-nodejs", "os": [ "win32" diff --git a/npm/win32-ia32-msvc/package.json b/npm/win32-ia32-msvc/package.json index 0188e02..8a22d3d 100644 --- a/npm/win32-ia32-msvc/package.json +++ b/npm/win32-ia32-msvc/package.json @@ -1,6 +1,6 @@ { "name": "@spider-rs/spider-rs-win32-ia32-msvc", - "version": "0.0.91", + "version": "0.0.92", "repository": "https://github.com/spider-rs/spider-nodejs", "os": [ "win32" diff --git a/npm/win32-x64-msvc/package.json b/npm/win32-x64-msvc/package.json index 8f6dc85..e054f88 100644 --- a/npm/win32-x64-msvc/package.json +++ b/npm/win32-x64-msvc/package.json @@ -1,6 +1,6 @@ { "name": "@spider-rs/spider-rs-win32-x64-msvc", - "version": "0.0.91", + "version": "0.0.92", "repository": "https://github.com/spider-rs/spider-nodejs", "os": [ "win32" diff --git a/package.json b/package.json index 1c69dea..2d1f2c2 100644 --- a/package.json +++ b/package.json @@ -1,76 +1,75 @@ { - "name": "@spider-rs/spider-rs", - "version": "0.0.91", - "main": "index.js", - "types": "index.d.ts", - "napi": { - "name": "spider-rs", - "triples": { - "additional": [ - "aarch64-apple-darwin", - "aarch64-linux-android", - "aarch64-unknown-linux-gnu", - "aarch64-unknown-linux-musl", - "aarch64-pc-windows-msvc", - "armv7-unknown-linux-gnueabihf", - "x86_64-unknown-linux-musl", - "x86_64-unknown-freebsd", - "i686-pc-windows-msvc", - "armv7-linux-androideabi", - "universal-apple-darwin" - ] - } - }, - "license": "MIT", - "keywords": [ - "spider", - "crawler" - ], - "repository": "https://github.com/spider-rs/spider-nodejs", - "devDependencies": { - "@napi-rs/cli": "^2.18.4", - "@types/node": "^20.14.5", - "ava": "^6.1.3", - "typescript": "^5.4.5" - }, - "ava": { - "require": [ - "@swc-node/register" - ], - "extensions": [ - "ts" - ], - "timeout": "2m", - "workerThreads": false, - "environmentVariables": { - "TS_NODE_PROJECT": "./tsconfig.json" - } - }, - "engines": { - "node": ">= 10" - }, - "scripts": { - "artifacts": "napi artifacts", - "bench": "cd bench && npm run bench", - "bench:oss": "cd bench && npm run bench:oss", - "build": "napi build --platform --release --pipe \"prettier -w\"", - "build:debug": "napi build --platform --pipe \"prettier -w\"", - "format": "run-p format:prettier format:rs format:toml", - "format:prettier": "prettier . -w", - "format:toml": "taplo format", - "format:rs": "cargo fmt", - "lint": "eslint . -c ./.eslintrc.yml", - "prepublishOnly": "napi prepublish -t npm", - "test": "ava", - "version": "napi version" - }, - "prettier": { - "printWidth": 120, - "semi": false, - "trailingComma": "all", - "singleQuote": true, - "arrowParens": "always" - }, - "packageManager": "yarn@4.3.1" - } - \ No newline at end of file + "name": "@spider-rs/spider-rs", + "version": "0.0.92", + "main": "index.js", + "types": "index.d.ts", + "napi": { + "name": "spider-rs", + "triples": { + "additional": [ + "aarch64-apple-darwin", + "aarch64-linux-android", + "aarch64-unknown-linux-gnu", + "aarch64-unknown-linux-musl", + "aarch64-pc-windows-msvc", + "armv7-unknown-linux-gnueabihf", + "x86_64-unknown-linux-musl", + "x86_64-unknown-freebsd", + "i686-pc-windows-msvc", + "armv7-linux-androideabi", + "universal-apple-darwin" + ] + } + }, + "license": "MIT", + "keywords": [ + "spider", + "crawler" + ], + "repository": "https://github.com/spider-rs/spider-nodejs", + "devDependencies": { + "@napi-rs/cli": "^2.18.4", + "@types/node": "^20.14.5", + "ava": "^6.1.3", + "typescript": "^5.4.5" + }, + "ava": { + "require": [ + "@swc-node/register" + ], + "extensions": [ + "ts" + ], + "timeout": "2m", + "workerThreads": false, + "environmentVariables": { + "TS_NODE_PROJECT": "./tsconfig.json" + } + }, + "engines": { + "node": ">= 10" + }, + "scripts": { + "artifacts": "napi artifacts", + "bench": "cd bench && npm run bench", + "bench:oss": "cd bench && npm run bench:oss", + "build": "napi build --platform --release --pipe \"prettier -w\"", + "build:debug": "napi build --platform --pipe \"prettier -w\"", + "format": "run-p format:prettier format:rs format:toml", + "format:prettier": "prettier . -w", + "format:toml": "taplo format", + "format:rs": "cargo fmt", + "lint": "eslint . -c ./.eslintrc.yml", + "prepublishOnly": "napi prepublish -t npm", + "test": "ava", + "version": "napi version" + }, + "prettier": { + "printWidth": 120, + "semi": false, + "trailingComma": "all", + "singleQuote": true, + "arrowParens": "always" + }, + "packageManager": "yarn@4.3.1" +}