Skip to content

Commit 20d4929

Browse files
committed
Using latest node and electron
1 parent 069b7a2 commit 20d4929

File tree

6 files changed

+658
-1149
lines changed

6 files changed

+658
-1149
lines changed

.circleci/config.yml

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ aliases:
8585
- &common-electron-linux
8686
resource_class: large
8787
docker:
88-
- image: circleci/node:12.18.4-stretch
88+
- image: cimg/node:24.14.0
8989

9090
working_directory: ~/repo
9191

@@ -238,80 +238,80 @@ aliases:
238238
# ./node_modules/.bin/electron "test/support/createdb-electron.js"
239239
# ./node_modules/.bin/electron-mocha --timeout 480000
240240
jobs:
241-
build-20:
241+
build-24:
242242
<<: *common-build
243243
environment:
244244
PUBLISH: true
245-
ELECTRON_VERSION: "16.0.2"
245+
ELECTRON_VERSION: "41.0.0"
246246
docker:
247-
- image: cimg/node:20.19
247+
- image: cimg/node:24.14.0
248248

249249
# Node version should match electron's node version.
250250
# See https://github.com/mapbox/node-sqlite3/pull/1367
251-
build-electron-16:
251+
build-electron-41:
252252
<<: *common-electron-linux
253253
docker:
254-
- image: cimg/node:20.19
254+
- image: cimg/node:24.14.0
255255
environment:
256-
ELECTRON_VERSION: "16.0.2"
256+
ELECTRON_VERSION: "41.0.0"
257257

258258

259-
build-macos-20:
259+
build-macos-24:
260260
<<: *common-macos
261261
environment:
262262
PUBLISH: true
263-
NODE_VERSION: "20.19.6"
264-
ELECTRON_VERSION: "16.0.2"
263+
NODE_VERSION: "24.14.0"
264+
ELECTRON_VERSION: "41.0.0"
265265

266-
build-macos-20-arm64:
266+
build-macos-24-arm64:
267267
<<: *common-macos
268268
environment:
269269
PUBLISH: true
270-
NODE_VERSION: "20.19.6"
271-
ELECTRON_VERSION: "16.0.2"
270+
NODE_VERSION: "24.14.0"
271+
ELECTRON_VERSION: "41.0.0"
272272
BUILD_ARM64: true
273273
SKIP_TEST: true
274274

275275
# NODE_VERSION should match electron's node version.
276276
# See https://github.com/mapbox/node-sqlite3/pull/1367
277277

278278
# Build the published N-API 6 binaries
279-
windows-20_x86:
279+
windows-24_x86:
280280
<<: *common-windows
281281
environment:
282-
NODE_VERSION: "20.19.6"
282+
NODE_VERSION: "24.14.0"
283283
NODE_ARCH: x86
284284
PUBLISH: true
285-
ELECTRON_VERSION: "16.0.2"
285+
ELECTRON_VERSION: "41.0.0"
286286
BUILD_ARM64: false
287287

288-
windows-20_x64:
288+
windows-24_x64:
289289
<<: *common-windows
290290
environment:
291-
NODE_VERSION: "20.19.6"
291+
NODE_VERSION: "24.14.0"
292292
NODE_ARCH: x64
293293
PUBLISH: true
294-
ELECTRON_VERSION: "16.0.2"
294+
ELECTRON_VERSION: "41.0.0"
295295
BUILD_ARM64: false
296296

297-
windows-20_arm64:
297+
windows-24_arm64:
298298
<<: *common-windows
299299
environment:
300-
NODE_VERSION: "20.19.6"
300+
NODE_VERSION: "24.14.0"
301301
NODE_ARCH: x64
302302
PUBLISH: true
303-
ELECTRON_VERSION: "16.0.2"
303+
ELECTRON_VERSION: "41.0.0"
304304
BUILD_ARM64: true
305305
SKIP_TEST: true # We can build for arm64, but can't run arm64.
306306

307307
workflows:
308308
version: 2
309309
build_all:
310310
jobs:
311-
- build-20
312-
- build-electron-16
313-
- build-macos-20-arm64
314-
- build-macos-20
315-
- windows-20_x86
316-
- windows-20_x64
317-
- windows-20_arm64
311+
- build-24
312+
- build-electron-41
313+
- build-macos-24-arm64
314+
- build-macos-24
315+
- windows-24_x86
316+
- windows-24_x64
317+
- windows-24_arm64

.nvmrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
24.14.0

README.md

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,10 @@ pnpm add "@journeyapps/sqlcipher"
2121

2222
This repository uses `pnpm` for local development and CI.
2323

24+
The active CI matrix targets Node 24 and Electron 41.
25+
26+
Use `nvm use` to match the checked-in Node version from `.nvmrc` when working locally.
27+
2428
```sh
2529
pnpm install
2630
pnpm test
@@ -64,21 +68,21 @@ A copy of the source for SQLCipher 4.14.0 is bundled, which is based on SQLite 3
6468

6569
Building from source when installing the package is supported again.
6670

67-
The published tarball includes `binding.gyp`, `deps/`, and `src/` so that `pnpm install`, `npm install`, `node-gyp rebuild`, and rebuild tools such as `electron-rebuild` can compile the addon when needed.
71+
The published tarball includes `binding.gyp`, `deps/`, and `src/` so that `pnpm install`, `npm install`, `node-gyp rebuild`, and rebuild tools such as `@electron/rebuild` can compile the addon when needed.
6872

6973
Platform notes:
7074

7175
1. macOS uses SQLCipher's CommonCrypto provider via `Security.framework` and does not require Homebrew `openssl@1.1`.
7276
2. Linux links against the system `libcrypto`.
7377
3. Windows release binaries continue to use vendored static OpenSSL artifacts from `deps/`.
7478

75-
## Usage with electron-forge / electron-rebuild
79+
## Usage with electron-forge / @electron/rebuild
7680

77-
[electron-forge](https://www.electronforge.io/) uses [electron-rebuild](https://github.com/electron/electron-rebuild) and will rebuild native modules from source by default.
81+
[electron-forge](https://www.electronforge.io/) uses [@electron/rebuild](https://github.com/electron/rebuild) and will rebuild native modules from source by default.
7882

7983
That rebuild path is now supported by the published package. If a matching prebuilt binary exists you can still skip rebuilding this module to speed up install times, but it is no longer required as a workaround.
8084

81-
To skip rebuilding when a matching prebuilt binary is already present, disable rebuilding of this library using the `onlyModules` option of `electron-rebuild` in your `package.json`:
85+
To skip rebuilding when a matching prebuilt binary is already present, disable rebuilding of this library using the `onlyModules` option of `@electron/rebuild` in your `package.json`:
8286

8387
"config": {
8488
"forge": {

package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,12 @@
4747
},
4848
"devDependencies": {
4949
"aws-sdk": "^2.641.0",
50-
"electron": "^11.2.3",
51-
"electron-mocha": "^10.0.0",
52-
"electron-rebuild": "^1.11.0",
50+
"@electron/rebuild": "^4.0.1",
51+
"electron": "^41.0.0",
52+
"electron-mocha": "^13.1.0",
5353
"eslint": "3.5.0",
5454
"mocha": "^5.2.0",
55-
"node-abi": "^2.19.3",
55+
"node-abi": "^4.14.0",
5656
"node-gyp": "^10.3.1"
5757
},
5858
"scripts": {

0 commit comments

Comments
 (0)