Skip to content

Commit 7822d2e

Browse files
authored
Merge pull request #1811 from TriliumNext/renovate/electron-rebuild-4.x
chore(deps): update dependency @electron/rebuild to v4
2 parents 64fa4cd + 0bbfaff commit 7822d2e

File tree

7 files changed

+283
-16
lines changed

7 files changed

+283
-16
lines changed

apps/desktop/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"@triliumnext/server": "workspace:*",
1919
"copy-webpack-plugin": "13.0.0",
2020
"electron": "35.1.5",
21-
"@electron/rebuild": "3.7.2",
21+
"@electron/rebuild": "4.0.1",
2222
"@electron-forge/cli": "7.8.0",
2323
"@electron-forge/maker-deb": "7.8.0",
2424
"@electron-forge/maker-dmg": "7.8.0",
@@ -53,7 +53,7 @@
5353
"cache": true,
5454
"configurations": {
5555
"default": {
56-
"command": "cross-env DEBUG=* tsx scripts/rebuild.ts",
56+
"command": "cross-env DEBUG=* tsx scripts/rebuild.mts",
5757
"cwd": "{projectRoot}"
5858
},
5959
"nixos": {

apps/desktop/scripts/rebuild.ts renamed to apps/desktop/scripts/rebuild.mts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
import { fileURLToPath } from "url";
1010
import { dirname, join } from "path";
11-
import rebuild from "@electron/rebuild"
11+
import { rebuild } from "@electron/rebuild"
1212
import { readFileSync } from "fs";
1313

1414
const scriptDir = dirname(fileURLToPath(import.meta.url));

apps/edit-docs/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"version": "0.0.1",
44
"private": true,
55
"devDependencies": {
6-
"@electron/rebuild": "3.7.2",
6+
"@electron/rebuild": "4.0.1",
77
"@triliumnext/client": "workspace:*",
88
"@triliumnext/desktop": "workspace:*",
99
"@types/fs-extra": "11.0.4",
@@ -21,7 +21,7 @@
2121
"cache": true,
2222
"configurations": {
2323
"default": {
24-
"command": "cross-env DEBUG=* tsx scripts/rebuild.ts",
24+
"command": "cross-env DEBUG=* tsx scripts/rebuild.mts",
2525
"cwd": "{projectRoot}"
2626
},
2727
"nixos": {

apps/edit-docs/scripts/rebuild.ts renamed to apps/edit-docs/scripts/rebuild.mts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
import { fileURLToPath } from "url";
1212
import { dirname, join } from "path";
13-
import rebuild from "@electron/rebuild"
13+
import { rebuild } from "@electron/rebuild"
1414
import { readFileSync } from "fs";
1515

1616
const scriptDir = dirname(fileURLToPath(import.meta.url));

apps/edit-docs/tsconfig.app.json

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,6 @@
1818
"eslint.config.mjs"
1919
],
2020
"references": [
21-
{
22-
"path": "../server/tsconfig.app.json"
23-
},
2421
{
2522
"path": "../desktop/tsconfig.app.json"
2623
},

apps/edit-docs/tsconfig.json

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,6 @@
33
"files": [],
44
"include": [],
55
"references": [
6-
{
7-
"path": "../server"
8-
},
96
{
107
"path": "../desktop"
118
},

0 commit comments

Comments
 (0)