From 2434ba56f1030c9052e0576ae4c8d1473995d8bf Mon Sep 17 00:00:00 2001 From: Yunfei Date: Tue, 12 Mar 2024 00:06:43 +0800 Subject: [PATCH] Fix style --- crates/rolldown_binding/bak_package.json | 12 ------ packages/rolldown/build.config.ts | 2 +- .../npm/android-arm-eabi/package.json | 2 +- .../rolldown/npm/android-arm64/package.json | 2 +- .../rolldown/npm/darwin-arm64/package.json | 2 +- packages/rolldown/npm/darwin-x64/package.json | 2 +- .../rolldown/npm/freebsd-x64/package.json | 2 +- .../npm/linux-arm-gnueabihf/package.json | 2 +- .../rolldown/npm/linux-arm64-gnu/package.json | 2 +- .../npm/linux-arm64-musl/package.json | 2 +- .../rolldown/npm/linux-x64-gnu/package.json | 2 +- .../rolldown/npm/linux-x64-musl/package.json | 2 +- .../npm/win32-arm64-msvc/package.json | 2 +- .../rolldown/npm/win32-ia32-msvc/package.json | 2 +- .../rolldown/npm/win32-x64-msvc/package.json | 2 +- packages/rolldown/package.json | 13 ++++--- packages/rolldown/src/binding.js | 38 +++++++++---------- 17 files changed, 40 insertions(+), 51 deletions(-) delete mode 100644 crates/rolldown_binding/bak_package.json diff --git a/crates/rolldown_binding/bak_package.json b/crates/rolldown_binding/bak_package.json deleted file mode 100644 index 41516e0d50..0000000000 --- a/crates/rolldown_binding/bak_package.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "scripts": { - "artifacts": "napi artifacts", - "build": "napi build --platform --cargo-name rolldown_binding --cargo-cwd ../.. --pipe \"prettier -w\"", - "build:release": "napi build --platform --cargo-name rolldown_binding --cargo-cwd ../.. --release --pipe \"prettier -w\"", - "prepublishOnly": "napi prepublish -t lerna", - "version": "napi version" - }, - "devDependencies": { - "@napi-rs/cli": "^2.18.0" - } -} \ No newline at end of file diff --git a/packages/rolldown/build.config.ts b/packages/rolldown/build.config.ts index 5745de89e3..0eb9d2df03 100644 --- a/packages/rolldown/build.config.ts +++ b/packages/rolldown/build.config.ts @@ -8,7 +8,7 @@ export default defineBuildConfig({ entries: ['./src/index'], clean: true, declaration: true, // generate .d.ts files - externals: [/rolldown-binding\..*\.node/], + externals: [/rolldown-binding\..*\.node/, /@rolldown\/binding-.*/], rollup: { emitCJS: true, cjsBridge: true, diff --git a/packages/rolldown/npm/android-arm-eabi/package.json b/packages/rolldown/npm/android-arm-eabi/package.json index b0e4e18d08..affc2a316d 100644 --- a/packages/rolldown/npm/android-arm-eabi/package.json +++ b/packages/rolldown/npm/android-arm-eabi/package.json @@ -1,6 +1,6 @@ { "name": "@rolldown/binding-android-arm-eabi", - "version": "0.0.5", + "version": "0.0.1", "os": [ "android" ], diff --git a/packages/rolldown/npm/android-arm64/package.json b/packages/rolldown/npm/android-arm64/package.json index 7591a8a3a3..9086a24fdc 100644 --- a/packages/rolldown/npm/android-arm64/package.json +++ b/packages/rolldown/npm/android-arm64/package.json @@ -1,6 +1,6 @@ { "name": "@rolldown/binding-android-arm64", - "version": "0.0.5", + "version": "0.0.1", "os": [ "android" ], diff --git a/packages/rolldown/npm/darwin-arm64/package.json b/packages/rolldown/npm/darwin-arm64/package.json index ddedbfd1ea..ce5bbf685c 100644 --- a/packages/rolldown/npm/darwin-arm64/package.json +++ b/packages/rolldown/npm/darwin-arm64/package.json @@ -1,6 +1,6 @@ { "name": "@rolldown/binding-darwin-arm64", - "version": "0.0.5", + "version": "0.0.1", "os": [ "darwin" ], diff --git a/packages/rolldown/npm/darwin-x64/package.json b/packages/rolldown/npm/darwin-x64/package.json index 1948e20128..423b22ed9d 100644 --- a/packages/rolldown/npm/darwin-x64/package.json +++ b/packages/rolldown/npm/darwin-x64/package.json @@ -1,6 +1,6 @@ { "name": "@rolldown/binding-darwin-x64", - "version": "0.0.5", + "version": "0.0.1", "os": [ "darwin" ], diff --git a/packages/rolldown/npm/freebsd-x64/package.json b/packages/rolldown/npm/freebsd-x64/package.json index 0295877a68..0040c2cef5 100644 --- a/packages/rolldown/npm/freebsd-x64/package.json +++ b/packages/rolldown/npm/freebsd-x64/package.json @@ -1,6 +1,6 @@ { "name": "@rolldown/binding-freebsd-x64", - "version": "0.0.5", + "version": "0.0.1", "os": [ "freebsd" ], diff --git a/packages/rolldown/npm/linux-arm-gnueabihf/package.json b/packages/rolldown/npm/linux-arm-gnueabihf/package.json index 162b777c14..fd625a43a0 100644 --- a/packages/rolldown/npm/linux-arm-gnueabihf/package.json +++ b/packages/rolldown/npm/linux-arm-gnueabihf/package.json @@ -1,6 +1,6 @@ { "name": "@rolldown/binding-linux-arm-gnueabihf", - "version": "0.0.5", + "version": "0.0.1", "os": [ "linux" ], diff --git a/packages/rolldown/npm/linux-arm64-gnu/package.json b/packages/rolldown/npm/linux-arm64-gnu/package.json index bcf0004b61..431c2b09c6 100644 --- a/packages/rolldown/npm/linux-arm64-gnu/package.json +++ b/packages/rolldown/npm/linux-arm64-gnu/package.json @@ -1,6 +1,6 @@ { "name": "@rolldown/binding-linux-arm64-gnu", - "version": "0.0.5", + "version": "0.0.1", "os": [ "linux" ], diff --git a/packages/rolldown/npm/linux-arm64-musl/package.json b/packages/rolldown/npm/linux-arm64-musl/package.json index ceda6db65b..f8e376eced 100644 --- a/packages/rolldown/npm/linux-arm64-musl/package.json +++ b/packages/rolldown/npm/linux-arm64-musl/package.json @@ -1,6 +1,6 @@ { "name": "@rolldown/binding-linux-arm64-musl", - "version": "0.0.5", + "version": "0.0.1", "os": [ "linux" ], diff --git a/packages/rolldown/npm/linux-x64-gnu/package.json b/packages/rolldown/npm/linux-x64-gnu/package.json index 85ec48f7a7..ce3c613761 100644 --- a/packages/rolldown/npm/linux-x64-gnu/package.json +++ b/packages/rolldown/npm/linux-x64-gnu/package.json @@ -1,6 +1,6 @@ { "name": "@rolldown/binding-linux-x64-gnu", - "version": "0.0.5", + "version": "0.0.1", "os": [ "linux" ], diff --git a/packages/rolldown/npm/linux-x64-musl/package.json b/packages/rolldown/npm/linux-x64-musl/package.json index 5ba69d7bc6..afe160e554 100644 --- a/packages/rolldown/npm/linux-x64-musl/package.json +++ b/packages/rolldown/npm/linux-x64-musl/package.json @@ -1,6 +1,6 @@ { "name": "@rolldown/binding-linux-x64-musl", - "version": "0.0.5", + "version": "0.0.1", "os": [ "linux" ], diff --git a/packages/rolldown/npm/win32-arm64-msvc/package.json b/packages/rolldown/npm/win32-arm64-msvc/package.json index 3a99a7ff95..e62d2dca61 100644 --- a/packages/rolldown/npm/win32-arm64-msvc/package.json +++ b/packages/rolldown/npm/win32-arm64-msvc/package.json @@ -1,6 +1,6 @@ { "name": "@rolldown/binding-win32-arm64-msvc", - "version": "0.0.5", + "version": "0.0.1", "os": [ "win32" ], diff --git a/packages/rolldown/npm/win32-ia32-msvc/package.json b/packages/rolldown/npm/win32-ia32-msvc/package.json index 6e1f5e8172..80fb7b0c8a 100644 --- a/packages/rolldown/npm/win32-ia32-msvc/package.json +++ b/packages/rolldown/npm/win32-ia32-msvc/package.json @@ -1,6 +1,6 @@ { "name": "@rolldown/binding-win32-ia32-msvc", - "version": "0.0.5", + "version": "0.0.1", "os": [ "win32" ], diff --git a/packages/rolldown/npm/win32-x64-msvc/package.json b/packages/rolldown/npm/win32-x64-msvc/package.json index fb1858f90d..02a4180b89 100644 --- a/packages/rolldown/npm/win32-x64-msvc/package.json +++ b/packages/rolldown/npm/win32-x64-msvc/package.json @@ -1,6 +1,6 @@ { "name": "@rolldown/binding-win32-x64-msvc", - "version": "0.0.5", + "version": "0.0.1", "os": [ "win32" ], diff --git a/packages/rolldown/package.json b/packages/rolldown/package.json index 22dcdc2a1a..b24b93ba1e 100644 --- a/packages/rolldown/package.json +++ b/packages/rolldown/package.json @@ -47,17 +47,18 @@ }, "napi": { "binaryName": "rolldown-binding", + "packageName": "@rolldown/binding", "targets": [ - "x86_64-apple-darwin", - "x86_64-pc-windows-msvc", - "x86_64-unknown-linux-gnu", "x86_64-unknown-linux-musl", + "aarch64-unknown-linux-gnu", "i686-pc-windows-msvc", "armv7-unknown-linux-gnueabihf", - "aarch64-unknown-linux-gnu", "aarch64-apple-darwin", + "aarch64-linux-android", + "x86_64-unknown-freebsd", "aarch64-unknown-linux-musl", - "aarch64-pc-windows-msvc" + "aarch64-pc-windows-msvc", + "armv7-linux-androideabi" ] }, "dependencies": { @@ -72,4 +73,4 @@ "unbuild": "^2.0.0", "vitest": "^1.3.1" } -} \ No newline at end of file +} diff --git a/packages/rolldown/src/binding.js b/packages/rolldown/src/binding.js index aa08671553..9d532a6221 100644 --- a/packages/rolldown/src/binding.js +++ b/packages/rolldown/src/binding.js @@ -70,7 +70,7 @@ function requireNative() { loadErrors.push(e) } try { - return require('rolldown-android-arm64') + return require('@rolldown/binding-android-arm64') } catch (e) { loadErrors.push(e) } @@ -81,7 +81,7 @@ function requireNative() { loadErrors.push(e) } try { - return require('rolldown-android-arm-eabi') + return require('@rolldown/binding-android-arm-eabi') } catch (e) { loadErrors.push(e) } @@ -98,7 +98,7 @@ function requireNative() { loadErrors.push(e) } try { - return require('rolldown-win32-x64-msvc') + return require('@rolldown/binding-win32-x64-msvc') } catch (e) { loadErrors.push(e) } @@ -109,7 +109,7 @@ function requireNative() { loadErrors.push(e) } try { - return require('rolldown-win32-ia32-msvc') + return require('@rolldown/binding-win32-ia32-msvc') } catch (e) { loadErrors.push(e) } @@ -120,7 +120,7 @@ function requireNative() { loadErrors.push(e) } try { - return require('rolldown-win32-arm64-msvc') + return require('@rolldown/binding-win32-arm64-msvc') } catch (e) { loadErrors.push(e) } @@ -136,7 +136,7 @@ function requireNative() { loadErrors.push(e) } try { - return require('rolldown-darwin-universal') + return require('@rolldown/binding-darwin-universal') } catch (e) { loadErrors.push(e) } @@ -148,7 +148,7 @@ function requireNative() { loadErrors.push(e) } try { - return require('rolldown-darwin-x64') + return require('@rolldown/binding-darwin-x64') } catch (e) { loadErrors.push(e) } @@ -159,7 +159,7 @@ function requireNative() { loadErrors.push(e) } try { - return require('rolldown-darwin-arm64') + return require('@rolldown/binding-darwin-arm64') } catch (e) { loadErrors.push(e) } @@ -176,7 +176,7 @@ function requireNative() { loadErrors.push(e) } try { - return require('rolldown-freebsd-x64') + return require('@rolldown/binding-freebsd-x64') } catch (e) { loadErrors.push(e) } @@ -187,7 +187,7 @@ function requireNative() { loadErrors.push(e) } try { - return require('rolldown-freebsd-arm64') + return require('@rolldown/binding-freebsd-arm64') } catch (e) { loadErrors.push(e) } @@ -205,7 +205,7 @@ function requireNative() { loadErrors.push(e) } try { - return require('rolldown-linux-x64-musl') + return require('@rolldown/binding-linux-x64-musl') } catch (e) { loadErrors.push(e) } @@ -216,7 +216,7 @@ function requireNative() { loadErrors.push(e) } try { - return require('rolldown-linux-x64-gnu') + return require('@rolldown/binding-linux-x64-gnu') } catch (e) { loadErrors.push(e) } @@ -229,7 +229,7 @@ function requireNative() { loadErrors.push(e) } try { - return require('rolldown-linux-arm64-musl') + return require('@rolldown/binding-linux-arm64-musl') } catch (e) { loadErrors.push(e) } @@ -240,7 +240,7 @@ function requireNative() { loadErrors.push(e) } try { - return require('rolldown-linux-arm64-gnu') + return require('@rolldown/binding-linux-arm64-gnu') } catch (e) { loadErrors.push(e) } @@ -252,7 +252,7 @@ function requireNative() { loadErrors.push(e) } try { - return require('rolldown-linux-arm-gnueabihf') + return require('@rolldown/binding-linux-arm-gnueabihf') } catch (e) { loadErrors.push(e) } @@ -264,7 +264,7 @@ function requireNative() { loadErrors.push(e) } try { - return require('rolldown-linux-riscv64-musl') + return require('@rolldown/binding-linux-riscv64-musl') } catch (e) { loadErrors.push(e) } @@ -275,7 +275,7 @@ function requireNative() { loadErrors.push(e) } try { - return require('rolldown-linux-riscv64-gnu') + return require('@rolldown/binding-linux-riscv64-gnu') } catch (e) { loadErrors.push(e) } @@ -287,7 +287,7 @@ function requireNative() { loadErrors.push(e) } try { - return require('rolldown-linux-s390x-gnu') + return require('@rolldown/binding-linux-s390x-gnu') } catch (e) { loadErrors.push(e) } @@ -317,7 +317,7 @@ if (!nativeBinding || process.env.NAPI_RS_FORCE_WASI) { } if (!nativeBinding) { try { - nativeBinding = require('rolldown-wasm32-wasi') + nativeBinding = require('@rolldown/binding-wasm32-wasi') } catch (err) { if (process.env.NAPI_RS_FORCE_WASI) { console.error(err)