Skip to content

Commit

Permalink
Fix style
Browse files Browse the repository at this point in the history
  • Loading branch information
@hyf0
hyf0 committed Mar 11, 2024
1 parent 8e9a8c8 commit 2434ba5
Show file tree
Hide file tree
Showing 17 changed files with 40 additions and 51 deletions.
12 changes: 0 additions & 12 deletions crates/rolldown_binding/bak_package.json
View file

This file was deleted.

2 changes: 1 addition & 1 deletion packages/rolldown/build.config.ts
View file
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion packages/rolldown/npm/android-arm-eabi/package.json
View file
@@ -1,6 +1,6 @@
{
"name": "@rolldown/binding-android-arm-eabi",
"version": "0.0.5",
"version": "0.0.1",
"os": [
"android"
],
Expand Down
2 changes: 1 addition & 1 deletion packages/rolldown/npm/android-arm64/package.json
View file
@@ -1,6 +1,6 @@
{
"name": "@rolldown/binding-android-arm64",
"version": "0.0.5",
"version": "0.0.1",
"os": [
"android"
],
Expand Down
2 changes: 1 addition & 1 deletion packages/rolldown/npm/darwin-arm64/package.json
View file
@@ -1,6 +1,6 @@
{
"name": "@rolldown/binding-darwin-arm64",
"version": "0.0.5",
"version": "0.0.1",
"os": [
"darwin"
],
Expand Down
2 changes: 1 addition & 1 deletion packages/rolldown/npm/darwin-x64/package.json
View file
@@ -1,6 +1,6 @@
{
"name": "@rolldown/binding-darwin-x64",
"version": "0.0.5",
"version": "0.0.1",
"os": [
"darwin"
],
Expand Down
2 changes: 1 addition & 1 deletion packages/rolldown/npm/freebsd-x64/package.json
View file
@@ -1,6 +1,6 @@
{
"name": "@rolldown/binding-freebsd-x64",
"version": "0.0.5",
"version": "0.0.1",
"os": [
"freebsd"
],
Expand Down
2 changes: 1 addition & 1 deletion packages/rolldown/npm/linux-arm-gnueabihf/package.json
View file
@@ -1,6 +1,6 @@
{
"name": "@rolldown/binding-linux-arm-gnueabihf",
"version": "0.0.5",
"version": "0.0.1",
"os": [
"linux"
],
Expand Down
2 changes: 1 addition & 1 deletion packages/rolldown/npm/linux-arm64-gnu/package.json
View file
@@ -1,6 +1,6 @@
{
"name": "@rolldown/binding-linux-arm64-gnu",
"version": "0.0.5",
"version": "0.0.1",
"os": [
"linux"
],
Expand Down
2 changes: 1 addition & 1 deletion packages/rolldown/npm/linux-arm64-musl/package.json
View file
@@ -1,6 +1,6 @@
{
"name": "@rolldown/binding-linux-arm64-musl",
"version": "0.0.5",
"version": "0.0.1",
"os": [
"linux"
],
Expand Down
2 changes: 1 addition & 1 deletion packages/rolldown/npm/linux-x64-gnu/package.json
View file
@@ -1,6 +1,6 @@
{
"name": "@rolldown/binding-linux-x64-gnu",
"version": "0.0.5",
"version": "0.0.1",
"os": [
"linux"
],
Expand Down
2 changes: 1 addition & 1 deletion packages/rolldown/npm/linux-x64-musl/package.json
View file
@@ -1,6 +1,6 @@
{
"name": "@rolldown/binding-linux-x64-musl",
"version": "0.0.5",
"version": "0.0.1",
"os": [
"linux"
],
Expand Down
2 changes: 1 addition & 1 deletion packages/rolldown/npm/win32-arm64-msvc/package.json
View file
@@ -1,6 +1,6 @@
{
"name": "@rolldown/binding-win32-arm64-msvc",
"version": "0.0.5",
"version": "0.0.1",
"os": [
"win32"
],
Expand Down
2 changes: 1 addition & 1 deletion packages/rolldown/npm/win32-ia32-msvc/package.json
View file
@@ -1,6 +1,6 @@
{
"name": "@rolldown/binding-win32-ia32-msvc",
"version": "0.0.5",
"version": "0.0.1",
"os": [
"win32"
],
Expand Down
2 changes: 1 addition & 1 deletion packages/rolldown/npm/win32-x64-msvc/package.json
View file
@@ -1,6 +1,6 @@
{
"name": "@rolldown/binding-win32-x64-msvc",
"version": "0.0.5",
"version": "0.0.1",
"os": [
"win32"
],
Expand Down
13 changes: 7 additions & 6 deletions packages/rolldown/package.json
View file
Expand Up @@ -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": {
Expand All @@ -72,4 +73,4 @@
"unbuild": "^2.0.0",
"vitest": "^1.3.1"
}
}
}
38 changes: 19 additions & 19 deletions packages/rolldown/src/binding.js
View file
Expand Up @@ -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)
}
Expand All @@ -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)
}
Expand All @@ -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)
}
Expand All @@ -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)
}
Expand All @@ -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)
}
Expand All @@ -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)
}
Expand All @@ -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)
}
Expand All @@ -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)
}
Expand All @@ -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)
}
Expand All @@ -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)
}
Expand All @@ -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)
}
Expand All @@ -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)
}
Expand All @@ -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)
}
Expand All @@ -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)
}
Expand All @@ -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)
}
Expand All @@ -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)
}
Expand All @@ -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)
}
Expand All @@ -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)
}
Expand Down Expand Up @@ -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)
Expand Down

0 comments on commit 2434ba5

Please sign in to comment.