From 8941e81f806dde4cf8a94789b7c8e862d5095294 Mon Sep 17 00:00:00 2001 From: hocine BENKHADRA Date: Sat, 14 Sep 2024 08:54:02 +0200 Subject: [PATCH 1/2] chore(*): Update deps. --- Cargo.toml | 6 +++--- Dockerfile | 24 ++++++++++++++++++++++++ package.json | 2 +- x-win-rs/Cargo.toml | 16 ++++++++-------- yarn.lock | 10 +++++----- 5 files changed, 41 insertions(+), 17 deletions(-) create mode 100644 Dockerfile diff --git a/Cargo.toml b/Cargo.toml index 20fa225..ba3d30e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -12,12 +12,12 @@ crate-type = ["cdylib"] [dependencies] # Default enable napi4 feature, see https://nodejs.org/api/n-api.html#node-api-version-matrix -napi = { version = "2.16.8", default-features = false, features = [ +napi = { version = "2.16.10", default-features = false, features = [ "napi4", "async", ] } -napi-derive = "2.16.10" -once_cell = "1.19.0" +napi-derive = "2.16.12" +once_cell = "1.20.0" base64 = "0.22.1" x-win = { path = "./x-win-rs" } diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..14bb7de --- /dev/null +++ b/Dockerfile @@ -0,0 +1,24 @@ +FROM ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-debian-aarch64 + +WORKDIR /var/x-win + +# RUN echo "deb [arch=arm64] http://ports.ubuntu.com/ jammy main" > /etc/apt/sources.list.d/arm64-ports.list && \ +# apt-get update && \ +# apt-get upgrade -y --fix-missing +# RUN apt-get install -y --fix-missing --no-install-recommends gcc make gcc-aarch64-linux-gnu binutils-aarch64-linux-gnu aptitude +RUN apt-get install -y --fix-missing --no-install-recommends libx11-dev libx11-dev libxcb-ewmh-dev libxcb-randr0-dev librust-xcb-dev librust-xcb+xlib-xcb-dev +RUN apt-get install -y --fix-missing --no-install-recommends pkg-config libasound2-dev libssl-dev cmake libfreetype6-dev libexpat1-dev libxcb-composite0-dev + +# RUN aptitude install -y librust-xcb-dev:arm64 librust-xcb+xlib-xcb-dev:arm64 + +#libx11-xcb-dev libxkbcommon-dev libxcb1-dev libxcb-ewmh-dev libxcb-randr0-dev libxcb-shape0-dev libxcb-xfixes0-dev libxkbcommon-dev + +COPY . . + +RUN yarn install && \ +yarn build --target aarch64-unknown-linux-gnu && \ +aarch64-unknown-linux-gnu-strip *.node + +RUN echo "#!bin/bash\neval \"$@\"" > /var/bin/entrypoint + +ENTRYPOINT [ "/var/bin/entrypoint" ] diff --git a/package.json b/package.json index 8d4c3af..43ef36e 100644 --- a/package.json +++ b/package.json @@ -44,7 +44,7 @@ "devDependencies": { "@napi-rs/cli": "^2.18.4", "ava": "^6.1.3", - "husky": "^9.1.4" + "husky": "^9.1.6" }, "ava": { "timeout": "3m", diff --git a/x-win-rs/Cargo.toml b/x-win-rs/Cargo.toml index f00f4eb..9c44d43 100644 --- a/x-win-rs/Cargo.toml +++ b/x-win-rs/Cargo.toml @@ -13,7 +13,7 @@ name = "x_win" path = "src/lib.rs" [dependencies] -once_cell = "1.19.0" +once_cell = "1.20.0" base64 = "0.22.1" [target.'cfg(target_os = "windows")'.dependencies] @@ -42,14 +42,14 @@ png = "0.17.13" xcb = { version = "1.4.0" } x11 = { version = "2.21.0", features = ["xlib"], optional = true } zbus = { version = "1.9.2" } -serde_json = { version = "1.0.122" } +serde_json = { version = "1.0.128" } image = "0.25.2" [target.'cfg(target_os = "macos")'.dependencies] -cocoa = "0.25.0" -libc = "0.2.155" -cocoa-foundation = "0.1.2" -core-foundation = "0.9.4" -core-foundation-sys = "0.8.6" -core-graphics = "0.23.2" +cocoa = "0.26.0" +libc = "0.2.158" +cocoa-foundation = "0.2.0" +core-foundation = "0.10.0" +core-foundation-sys = "0.8.7" +core-graphics = "0.24.0" objc = "0.2.7" diff --git a/yarn.lock b/yarn.lock index e5fed77..dc60471 100644 --- a/yarn.lock +++ b/yarn.lock @@ -30,7 +30,7 @@ __metadata: dependencies: "@napi-rs/cli": "npm:^2.18.4" ava: "npm:^6.1.3" - husky: "npm:^9.1.4" + husky: "npm:^9.1.6" languageName: unknown linkType: soft @@ -760,12 +760,12 @@ __metadata: languageName: node linkType: hard -"husky@npm:^9.1.4": - version: 9.1.4 - resolution: "husky@npm:9.1.4" +"husky@npm:^9.1.6": + version: 9.1.6 + resolution: "husky@npm:9.1.6" bin: husky: bin.js - checksum: 10c0/f5185003bef9ad9ec3f40e821963e4c12409b993fdcab89e3d660bed7d8c9d8bfd399f05222e27e0ead6589601fb1bb08d1a589c51751a4ab0547ead3429b8de + checksum: 10c0/705673db4a247c1febd9c5df5f6a3519106cf0335845027bb50a15fba9b1f542cb2610932ede96fd08008f6d9f49db0f15560509861808b0031cdc0e7c798bac languageName: node linkType: hard From 910deaa9cbad4684f0288e1ef677b10d359c757f Mon Sep 17 00:00:00 2001 From: hocine BENKHADRA Date: Sat, 14 Sep 2024 12:09:02 +0200 Subject: [PATCH 2/2] fix(.dockerignore, Dockerfile): Remove unused files --- .dockerignore | 1 - Dockerfile | 24 ------------------------ 2 files changed, 25 deletions(-) delete mode 100644 .dockerignore delete mode 100644 Dockerfile diff --git a/.dockerignore b/.dockerignore deleted file mode 100644 index f59ec20..0000000 --- a/.dockerignore +++ /dev/null @@ -1 +0,0 @@ -* \ No newline at end of file diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index 14bb7de..0000000 --- a/Dockerfile +++ /dev/null @@ -1,24 +0,0 @@ -FROM ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-debian-aarch64 - -WORKDIR /var/x-win - -# RUN echo "deb [arch=arm64] http://ports.ubuntu.com/ jammy main" > /etc/apt/sources.list.d/arm64-ports.list && \ -# apt-get update && \ -# apt-get upgrade -y --fix-missing -# RUN apt-get install -y --fix-missing --no-install-recommends gcc make gcc-aarch64-linux-gnu binutils-aarch64-linux-gnu aptitude -RUN apt-get install -y --fix-missing --no-install-recommends libx11-dev libx11-dev libxcb-ewmh-dev libxcb-randr0-dev librust-xcb-dev librust-xcb+xlib-xcb-dev -RUN apt-get install -y --fix-missing --no-install-recommends pkg-config libasound2-dev libssl-dev cmake libfreetype6-dev libexpat1-dev libxcb-composite0-dev - -# RUN aptitude install -y librust-xcb-dev:arm64 librust-xcb+xlib-xcb-dev:arm64 - -#libx11-xcb-dev libxkbcommon-dev libxcb1-dev libxcb-ewmh-dev libxcb-randr0-dev libxcb-shape0-dev libxcb-xfixes0-dev libxkbcommon-dev - -COPY . . - -RUN yarn install && \ -yarn build --target aarch64-unknown-linux-gnu && \ -aarch64-unknown-linux-gnu-strip *.node - -RUN echo "#!bin/bash\neval \"$@\"" > /var/bin/entrypoint - -ENTRYPOINT [ "/var/bin/entrypoint" ]