upgrade deps

for electron v20 support
neneka · Aug 13, 2022 · 29df4d7 · 29df4d7
1 parent 1566bdb
commit 29df4d7
Show file tree

Hide file tree

Showing 13 changed files with 660 additions and 192 deletions.
diff --git a/.travis.yml b/.travis.yml
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.1)
 
 project(WebChimera.js)
 
-set(CMAKE_CXX_STANDARD 14)
+set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 if(MSVC)

diff --git a/appveyor.yml b/appveyor.yml
diff --git a/appveyor_prepare_full_archive.cmd b/appveyor_prepare_full_archive.cmd
diff --git a/build_electron.cmd b/build_electron.cmd
diff --git a/build_electron.ps1 b/build_electron.ps1
@@ -0,0 +1,9 @@
+$ELECTRON_VERSION = "20.0.2"
+
+$Env:YARN_ENABLE_IMMUTABLE_INSTALLS = "false"
+$Env:npm_config_wcjs_runtime = "electron"
+$Env:npm_config_wcjs_runtime_version = $ELECTRON_VERSION.Replace("v", "") -replace "`t|`n|`r",""
+$Env:npm_config_wcjs_arch = "x64"
+
+yarn install
+node rebuild.js
diff --git a/build_electron.sh b/build_electron.sh
diff --git a/build_mac.sh b/build_mac.sh
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+set -eu
+export ELECTRON_VER="20.0.2"
+export BUILD_DIR="./build/Release"
+export npm_config_wcjs_runtime=electron
+export npm_config_wcjs_runtime_version=$ELECTRON_VER
+npm_config_wcjs_arch=${npm_config_wcjs_arch:-}
+if [[ -z "${npm_config_wcjs_arch}" ]]; then
+  export npm_config_wcjs_arch="$(arch | sed -e "s/i386/x64/")"
+fi
+node rebuild.js
diff --git a/package.json b/package.json
@@ -16,10 +16,10 @@
     "url": "https://github.com/RSATom/WebChimera.js"
   },
   "dependencies": {
-    "bindings": "~1.2.1",
-    "cmake-js": "*"
+    "bindings": "~1.2.1"
   },
-  "scripts": {
-    "install": "node rebuild.js"
-  }
+  "devDependencies": {
+    "cmake-js": "^6.3.2"
+  },
+  "packageManager": "yarn@1.22.17"
 }
diff --git a/rebuild.js b/rebuild.js
@@ -1,9 +1,9 @@
 function build() {
     var cmakeJS = require("cmake-js");
 
-    var defaultRuntime = "nw";
-    var defaultRuntimeVersion = "0.12.3";
-    var defaultWinArch = "ia32";
+    var defaultRuntime = "electron";
+    var defaultRuntimeVersion = "20.0.2";
+    var defaultWinArch = "x64";
 
     var options = {
         runtime: process.env.npm_config_wcjs_runtime || undefined,

diff --git a/travis_before_deploy.sh b/travis_before_deploy.sh
diff --git a/travis_before_install.sh b/travis_before_install.sh