Fix: node-zstd not have native dependencies in arm64 build (Linux and…

… macOS)

CHANGELOG.md

@@ -4,6 +4,14 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## v1.1.1 (dd-mm-yyyy)
+
+##### 🚀 New Features
+
+##### 🐛 Bug Fixes
+
+- node-zstd not have native dependencies in arm64 build (Linux and macOS)
+
 ## [v1.1.0](https://github.com/ollm/OpenComic/releases/tag/v1.1.0) (13-01-2024)
 
 ##### 🚀 New Features

build/node-zstd-native-dependencies/package.json

@@ -0,0 +1,13 @@
+{
+	"name": "node-zstd-force-native-dependencies",
+	"version": "1.0.0",
+	"license": "MIT",
+	"dependencies": {
+		"@toondepauw/node-zstd-linux-arm64-gnu": "*",
+		"@toondepauw/node-zstd-linux-arm64-musl": "*",
+		"@toondepauw/node-zstd-linux-x64-gnu": "*",
+		"@toondepauw/node-zstd-linux-x64-musl": "*",
+		"@toondepauw/node-zstd-darwin-arm64": "*",
+		"@toondepauw/node-zstd-darwin-x64": "*"
+	}
+}

languages/zh-hans.json

@@ -381,4 +381,4 @@
 			}
 		]
 	}
-}
+}

package.json

@@ -1,7 +1,7 @@
 {
 	"name": "opencomic",
 	"productName": "OpenComic",
-	"version": "1.1.0",
+	"version": "1.1.1",
 	"main": "scripts/main.js",
 	"type": "commonjs",
 	"keywords": [
@@ -63,7 +63,7 @@
 		"build-7z-arm": "npm run prebuild && electron-builder --arm64 --linux 7z",
 		"snapcraft": "npm run prebuild && node ./scripts/snapcraft.js && cd dist/__snap-amd64/ && snapcraft",
 		"snapcraft-arm": "npm run prebuild && node ./scripts/snapcraft.js && cd dist/__snap-arm64/ && snapcraft --target-arch=arm64",
-		"postinstall": "electron-builder install-app-deps"
+		"postinstall": "electron-builder install-app-deps && node scripts/zstd-copy-native.js"
 	},
 	"dependencies": {
 		"@electron/remote": "^2.1.0",
@@ -116,6 +116,8 @@
 			"!themes/*/templates",
 			"!templates",
 			"!images",
+			"!node_modules/cpu-features/build/node_gyp_bins",
+			"!node_modules/ssh2/lib/protocol/crypto/build/node_gyp_bins",
 			"images/logo.png",
 			"images/logo.svg",
 			"templates/index.html",
@@ -124,9 +126,11 @@
 		],
 		"asarUnpack": [
 			"node_modules/sharp",
+			"node_modules/@img",
 			"node_modules/node-7z",
 			"node_modules/7zip-bin",
 			"node_modules/shosho",
+			"node_modules/@toondepauw",
 			"Pepper & Carrot"
 		],
 		"win": {

scripts/zstd-copy-native.js

@@ -0,0 +1,14 @@
+const fs = require('fs');
+
+if(process.platform == 'darwin')
+{
+	fs.cpSync('./build/node-zstd-native-dependencies/node_modules/@toondepauw/node-zstd-darwin-x64', './node_modules/@toondepauw/node-zstd-darwin-x64', {recursive: true});
+	fs.cpSync('./build/node-zstd-native-dependencies/node_modules/@toondepauw/node-zstd-darwin-arm64', './node_modules/@toondepauw/node-zstd-darwin-arm64', {recursive: true});
+}
+else if(process.platform == 'linux')
+{
+	fs.cpSync('./build/node-zstd-native-dependencies/node_modules/@toondepauw/node-zstd-linux-x64-musl', './node_modules/@toondepauw/node-zstd-linux-x64-musl', {recursive: true});
+	fs.cpSync('./build/node-zstd-native-dependencies/node_modules/@toondepauw/node-zstd-linux-x64-gnu', './node_modules/@toondepauw/node-zstd-linux-x64-gnu', {recursive: true});
+	fs.cpSync('./build/node-zstd-native-dependencies/node_modules/@toondepauw/node-zstd-linux-arm64-musl', './node_modules/@toondepauw/node-zstd-linux-arm64-musl', {recursive: true});
+	fs.cpSync('./build/node-zstd-native-dependencies/node_modules/@toondepauw/node-zstd-linux-arm64-gnu', './node_modules/@toondepauw/node-zstd-linux-arm64-gnu', {recursive: true});
+}