Skip to content

Commit 835137f

Browse files
nhatchernhatcher
committed
UPDATE: Update nodejs dependencies
1 parent fad8bc7 commit 835137f

File tree

25 files changed

+694
-5504
lines changed

25 files changed

+694
-5504
lines changed

‎.github/workflows/npm.yml‎

Lines changed: 54 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -31,38 +31,82 @@ jobs:
3131
- host: ubuntu-latest
3232
target: x86_64-unknown-linux-gnu
3333
docker: ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-debian
34-
build: yarn build --target x86_64-unknown-linux-gnu
34+
build: |
35+
set -e &&
36+
rustup toolchain install 1.90.0 &&
37+
rustup default 1.90.0 &&
38+
yarn build --target x86_64-unknown-linux-gnu
3539
- host: ubuntu-latest
3640
target: x86_64-unknown-linux-musl
3741
docker: ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-alpine
38-
build: yarn build --target x86_64-unknown-linux-musl
42+
build: |
43+
set -e &&
44+
rustup toolchain install 1.90.0 &&
45+
rustup default 1.90.0 &&
46+
yarn build --target x86_64-unknown-linux-musl
3947
- host: macos-latest
4048
target: aarch64-apple-darwin
41-
build: yarn build --target aarch64-apple-darwin
49+
build: |
50+
set -e &&
51+
rustup toolchain install 1.90.0 &&
52+
rustup default 1.90.0 &&
53+
yarn build --target aarch64-apple-darwin
4254
- host: ubuntu-latest
4355
target: aarch64-unknown-linux-gnu
4456
docker: ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-debian-aarch64
45-
build: yarn build --target aarch64-unknown-linux-gnu
57+
build: |
58+
set -e &&
59+
rustup toolchain install 1.90.0 &&
60+
rustup default 1.90.0 &&
61+
rustup target add aarch64-unknown-linux-gnu &&
62+
yarn build --target aarch64-unknown-linux-gnu
4663
- host: ubuntu-latest
4764
target: armv7-unknown-linux-gnueabihf
4865
setup: |
4966
sudo apt-get update
50-
sudo apt-get install gcc-arm-linux-gnueabihf -y
51-
build: yarn build --target armv7-unknown-linux-gnueabihf
67+
sudo apt-get install -y gcc-arm-linux-gnueabihf libc6-dev-armhf-cross
68+
build: |
69+
set -e
70+
rustup toolchain install 1.90.0
71+
rustup default 1.90.0
72+
export CC_armv7_unknown_linux_gnueabihf=arm-linux-gnueabihf-gcc
73+
export AR_armv7_unknown_linux_gnueabihf=arm-linux-gnueabihf-ar
74+
export CARGO_TARGET_ARMV7_UNKNOWN_LINUX_GNUEABIHF_LINKER=arm-linux-gnueabihf-gcc
75+
export PKG_CONFIG_ALLOW_CROSS=1
76+
yarn build --target armv7-unknown-linux-gnueabihf
5277
- host: ubuntu-latest
5378
target: armv7-unknown-linux-musleabihf
54-
build: yarn build --target armv7-unknown-linux-musleabihf
79+
build: |
80+
set -e
81+
rustup toolchain install 1.90.0
82+
rustup default 1.90.0
83+
# Use Zig as the MUSL cross C toolchain
84+
export CC_armv7_unknown_linux_musleabihf="zig cc -target armv7-linux-musleabihf -mfpu=vfpv3-d16 -mfloat-abi=hard"
85+
export CARGO_TARGET_ARMV7_UNKNOWN_LINUX_MUSLEABIHF_LINKER="zig cc -target armv7-linux-musleabihf -mfpu=vfpv3-d16 -mfloat-abi=hard"
86+
export AR_armv7_unknown_linux_musleabihf="zig ar"
87+
export PKG_CONFIG_ALLOW_CROSS=1
88+
yarn build --target armv7-unknown-linux-musleabihf
5589
- host: ubuntu-latest
5690
target: aarch64-linux-android
57-
build: yarn build --target aarch64-linux-android
91+
build: |
92+
set -e &&
93+
rustup toolchain install 1.90.0 &&
94+
rustup default 1.90.0 &&
95+
yarn build --target aarch64-linux-android
5896
- host: ubuntu-latest
5997
target: armv7-linux-androideabi
60-
build: yarn build --target armv7-linux-androideabi
98+
build: |
99+
set -e &&
100+
rustup toolchain install 1.90.0 &&
101+
rustup default 1.90.0 &&
102+
yarn build --target armv7-linux-androideabi
61103
- host: ubuntu-latest
62104
target: aarch64-unknown-linux-musl
63105
docker: ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-alpine
64106
build: |-
65107
set -e &&
108+
rustup toolchain install 1.90.0 &&
109+
rustup default 1.90.0 &&
66110
rustup target add aarch64-unknown-linux-musl &&
67111
yarn build --target aarch64-unknown-linux-musl
68112
- host: windows-latest
@@ -92,7 +136,7 @@ jobs:
92136
uses: dtolnay/rust-toolchain@stable
93137
if: ${{ !matrix.settings.docker }}
94138
with:
95-
toolchain: stable
139+
toolchain: 1.90.0
96140
targets: ${{ matrix.settings.target }}
97141
- name: Cache cargo
98142
uses: actions/cache@v4

‎Cargo.lock‎

Lines changed: 53 additions & 21 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎bindings/nodejs/Cargo.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ crate-type = ["cdylib"]
88

99
[dependencies]
1010
# Default enable napi4 feature, see https://nodejs.org/api/n-api.html#node-api-version-matrix
11-
napi = { version = "2.12.2", default-features = false, features = ["napi4", "serde-json"] }
12-
napi-derive = "2.12.2"
11+
napi = { version = "3.3", default-features = false, features = ["napi4", "serde-json"] }
12+
napi-derive = "3.2"
1313
ironcalc = { path = "../../xlsx", version = "0.6.0" }
1414
serde = { version = "1.0", features = ["derive"] }
1515

‎bindings/nodejs/index.d.ts‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
1-
/* tslint:disable */
2-
/* eslint-disable */
3-
41
/* auto-generated by NAPI-RS */
5-
2+
/* eslint-disable */
63
export declare class Model {
74
constructor(name: string, locale: string, timezone: string)
85
static fromXlsx(filePath: string, locale: string, tz: string): Model
@@ -39,8 +36,10 @@ export declare class Model {
3936
newDefinedName(name: string, scope: number | undefined | null, formula: string): void
4037
updateDefinedName(name: string, scope: number | undefined | null, newName: string, newScope: number | undefined | null, newFormula: string): void
4138
deleteDefinedName(name: string, scope?: number | undefined | null): void
42-
testPanic(): void
39+
moveColumn(sheet: number, column: number, delta: number): void
40+
moveRow(sheet: number, row: number, delta: number): void
4341
}
42+
4443
export declare class UserModel {
4544
constructor(name: string, locale: string, timezone: string)
4645
static fromBytes(bytes: Uint8Array): UserModel
@@ -59,12 +58,13 @@ export declare class UserModel {
5958
setSheetColor(sheet: number, color: string): void
6059
rangeClearAll(sheet: number, startRow: number, startColumn: number, endRow: number, endColumn: number): void
6160
rangeClearContents(sheet: number, startRow: number, startColumn: number, endRow: number, endColumn: number): void
61+
rangeClearFormatting(sheet: number, startRow: number, startColumn: number, endRow: number, endColumn: number): void
6262
insertRows(sheet: number, row: number, rowCount: number): void
6363
insertColumns(sheet: number, column: number, columnCount: number): void
6464
deleteRows(sheet: number, row: number, rowCount: number): void
6565
deleteColumns(sheet: number, column: number, columnCount: number): void
66-
setRowHeight(sheet: number, row: number, height: number): void
67-
setColumnWidth(sheet: number, column: number, width: number): void
66+
setRowsHeight(sheet: number, rowStart: number, rowEnd: number, height: number): void
67+
setColumnsWidth(sheet: number, columnStart: number, columnEnd: number, width: number): void
6868
getRowHeight(sheet: number, row: number): number
6969
getColumnWidth(sheet: number, column: number): number
7070
setUserInput(sheet: number, row: number, column: number, input: string): void
@@ -112,4 +112,6 @@ export declare class UserModel {
112112
newDefinedName(name: string, scope: number | undefined | null, formula: string): void
113113
updateDefinedName(name: string, scope: number | undefined | null, newName: string, newScope: number | undefined | null, newFormula: string): void
114114
deleteDefinedName(name: string, scope?: number | undefined | null): void
115+
moveColumn(sheet: number, column: number, delta: number): void
116+
moveRow(sheet: number, row: number, delta: number): void
115117
}

0 commit comments

Comments
 (0)