Skip to content

Commit 6e28b5f

Browse files
julien-moreaujulien-moreau
committed
chore: update electron to v37.6.0
1 parent 7203b8d commit 6e28b5f

File tree

5 files changed

+39
-34
lines changed

5 files changed

+39
-34
lines changed

‎editor/package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
"babel-plugin-transform-class-properties": "^6.24.1",
3535
"babel-plugin-transform-decorators-legacy": "^1.3.5",
3636
"concurrently": "9.2.0",
37-
"electron": "35.7.5",
37+
"electron": "37.6.0",
3838
"electron-builder": "26.0.12",
3939
"electron-reloader": "1.2.3",
4040
"jest": "^29.7.0",
@@ -71,7 +71,7 @@
7171
"@radix-ui/react-tooltip": "^1.0.7",
7272
"@radix-ui/react-radio-group": "^1.1.3",
7373
"@xterm/addon-fit": "^0.10.0",
74-
"@xterm/xterm": "^5.5.0",
74+
"@xterm/xterm": "^5.6.0-beta.119",
7575
"assimpjs": "0.0.10",
7676
"axios": "^1.12.0",
7777
"babylonjs": "8.30.2",
@@ -102,7 +102,7 @@
102102
"math-expression-evaluator": "^2.0.6",
103103
"md5": "^2.3.0",
104104
"next-themes": "^0.3.0",
105-
"node-pty": "1.1.0-beta33",
105+
"node-pty": "1.1.0-beta35",
106106
"pngjs": "^7.0.0",
107107
"react": "18.2.0",
108108
"react-awesome-reveal": "4.2.14",

‎editor/src/dashboard/main.tsx‎

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import { Toaster } from "../ui/shadcn/ui/sonner";
1111
import { Separator } from "../ui/shadcn/ui/separator";
1212
import { showConfirm, showAlert } from "../ui/dialog";
1313

14+
import { wait } from "../tools/tools";
1415
import { openSingleFileDialog } from "../tools/dialog";
1516
import { ProjectType, projectsKey } from "../tools/project";
1617
import { checkNodeJSAvailable, nodeJSAvailable } from "../tools/process";
@@ -133,21 +134,19 @@ export class Dashboard extends Component<IDashboardProps, IDashboardState> {
133134
}
134135

135136
public async componentDidMount(): Promise<void> {
136-
ipcRenderer.send("dashboard:ready");
137-
138137
ipcRenderer.on("dashboard:import-project", () => this._handleImportProject());
139138
ipcRenderer.on("dashboard:new-project", () => this.setState({ createProject: true }));
140139

141140
ipcRenderer.on("dashboard:opened-projects", (_, openedProjects) => this.setState({ openedProjects }));
142141
ipcRenderer.on("dashboard:update-projects", () => this.setState({ projects: tryGetProjectsFromLocalStorage() }));
143142

144-
this._checkSystemAvailabilities();
143+
try {
144+
this._checkSystemAvailabilities();
145145

146-
// Update list of projects to remove those that were deleted from the hard drive
147-
const projects = this.state.projects.slice();
146+
// Update list of projects to remove those that were deleted from the hard drive
147+
const projects = this.state.projects.slice();
148148

149-
await Promise.all(
150-
projects.map(async (project) => {
149+
projects.forEach(async (project) => {
151150
const exists = await pathExists(project.absolutePath);
152151
if (exists) {
153152
return;
@@ -162,8 +161,14 @@ export class Dashboard extends Component<IDashboardProps, IDashboardState> {
162161
projects,
163162
});
164163
}
165-
})
166-
);
164+
});
165+
} catch (e) {
166+
console.error(e);
167+
}
168+
169+
await wait(150);
170+
171+
ipcRenderer.send("dashboard:ready");
167172
}
168173

169174
private async _checkSystemAvailabilities(): Promise<void> {

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
"dependencies": {},
6868
"resolutions": {
6969
"braces": "3.0.3",
70-
"node-abi": "4.2.0",
70+
"node-abi": "4.14.0",
7171
"wrap-ansi": "7.0.0"
7272
}
7373
}

‎quixel/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@
1212
"license": "(Apache-2.0)",
1313
"devDependencies": {
1414
"@types/node": "^22",
15+
"babylonjs-editor": "link:../editor",
1516
"typescript": "5.8.3"
1617
},
1718
"dependencies": {
1819
"babylonjs": "8.30.2",
19-
"babylonjs-editor": "link:../editor",
2020
"fs-extra": "^11.2.0",
2121
"sharp": "0.34.3"
2222
}

‎yarn.lock‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -4121,10 +4121,10 @@
41214121
resolved "https://registry.yarnpkg.com/@xterm/addon-fit/-/addon-fit-0.10.0.tgz#bebf87fadd74e3af30fdcdeef47030e2592c6f55"
41224122
integrity sha512-UFYkDm4HUahf2lnEyHvio51TNGiLK66mqP2JoATy7hRZeXaGMRDr00JiSF7m63vR5WKATF605yEggJKsw0JpMQ==
41234123

4124-
"@xterm/xterm@^5.5.0":
4125-
version "5.5.0"
4126-
resolved "https://registry.yarnpkg.com/@xterm/xterm/-/xterm-5.5.0.tgz#275fb8f6e14afa6e8a0c05d4ebc94523ff775396"
4127-
integrity sha512-hqJHYaQb5OptNunnyAnkHyM8aCjZ1MEIDTQu1iIbbTD/xops91NB5yq1ZK/dC2JDbVWtF23zUtl9JE2NqwT87A==
4124+
"@xterm/xterm@^5.6.0-beta.119":
4125+
version "5.6.0-beta.129"
4126+
resolved "https://registry.yarnpkg.com/@xterm/xterm/-/xterm-5.6.0-beta.129.tgz#b8d8133396b4ce763e8bc27d312957eca210c1cb"
4127+
integrity sha512-KXbEh9a/K83G0Kk77Ol6hisa39oigaqwi3ZrQY5FK5X7mqaNvmMstS/yDmYUG6URz0PMXjEuZ1Y5DWl0JuIxlQ==
41284128

41294129
abbrev@^1.0.0:
41304130
version "1.1.1"
@@ -4727,10 +4727,10 @@ babylonjs-editor-tools@latest:
47274727
integrity sha512-AREjL0WjtjyOvud0EMG/II3zH73KlSif/u0HV965tPWmUZHrxr+g/4iX6eU0mIYlIjOuepfRAopaF04IYJOaHA==
47284728

47294729
"babylonjs-editor-tools@link:tools":
4730-
version "5.1.9"
4730+
version "5.1.10"
47314731

47324732
"babylonjs-editor@link:editor":
4733-
version "5.1.9"
4733+
version "5.1.10"
47344734
dependencies:
47354735
"@babylonjs/core" "8.30.2"
47364736
"@babylonjs/havok" "1.3.10"
@@ -4760,7 +4760,7 @@ babylonjs-editor-tools@latest:
47604760
"@radix-ui/react-toggle" "^1.1.1"
47614761
"@radix-ui/react-tooltip" "^1.0.7"
47624762
"@xterm/addon-fit" "^0.10.0"
4763-
"@xterm/xterm" "^5.5.0"
4763+
"@xterm/xterm" "^5.6.0-beta.119"
47644764
assimpjs "0.0.10"
47654765
axios "^1.12.0"
47664766
babylonjs "8.30.2"
@@ -4791,7 +4791,7 @@ babylonjs-editor-tools@latest:
47914791
math-expression-evaluator "^2.0.6"
47924792
md5 "^2.3.0"
47934793
next-themes "^0.3.0"
4794-
node-pty "1.1.0-beta33"
4794+
node-pty "1.1.0-beta35"
47954795
pngjs "^7.0.0"
47964796
react "18.2.0"
47974797
react-awesome-reveal "4.2.14"
@@ -5972,10 +5972,10 @@ electron-updater@^6.6.2:
59725972
semver "^7.6.3"
59735973
tiny-typed-emitter "^2.1.0"
59745974

5975-
electron@35.7.5:
5976-
version "35.7.5"
5977-
resolved "https://registry.yarnpkg.com/electron/-/electron-35.7.5.tgz#294a4aebb2ad2a884de730c410f2358d061e8d53"
5978-
integrity sha512-dnL+JvLraKZl7iusXTVTGYs10TKfzUi30uEDTqsmTm0guN9V2tbOjTzyIZbh9n3ygUjgEYyo+igAwMRXIi3IPw==
5975+
electron@37.6.0:
5976+
version "37.6.0"
5977+
resolved "https://registry.yarnpkg.com/electron/-/electron-37.6.0.tgz#4f13cd6fe57c9577d11385ffecea5edb4fbf24bd"
5978+
integrity sha512-8AANcn6irYQ7cTAJRY7r0CovWckcGCHUniQecyGhw/jJ25vWwitVhF97skF+EyDztiEI6YBoF0G6tx1s37bO3g==
59795979
dependencies:
59805980
"@electron/get" "^2.0.0"
59815981
"@types/node" "^22.7.7"
@@ -8978,10 +8978,10 @@ no-case@^3.0.4:
89788978
lower-case "^2.0.2"
89798979
tslib "^2.0.3"
89808980

8981-
node-abi@4.2.0, node-abi@^3.45.0:
8982-
version "4.2.0"
8983-
resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-4.2.0.tgz#cf74fb14584a420091723bbb3bb59b6bc4ea639c"
8984-
integrity sha512-admQxilhDcmFJbUl4LQzGu+QyEijW9rctKRH2P7LNavAvln1bdK9OcujM3yi2KysKI41dxTrDtp6QfGEZeCbkg==
8981+
node-abi@4.14.0, node-abi@^3.45.0:
8982+
version "4.14.0"
8983+
resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-4.14.0.tgz#7846b36a732f1afa221be3ca0e6248448bc111ef"
8984+
integrity sha512-E4n91K4Nk1Rch2KzD+edU2bfZTP4W42GypAUDXU4vu1A+4u9PvUNDkGI0dXbsy8ZeF3WGj0SD/uHxnXD/sW+3w==
89858985
dependencies:
89868986
semver "^7.6.3"
89878987

@@ -9007,10 +9007,10 @@ node-int64@^0.4.0:
90079007
resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b"
90089008
integrity sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw==
90099009

9010-
[email protected]beta33:
9011-
version "1.1.0-beta33"
9012-
resolved "https://registry.yarnpkg.com/node-pty/-/node-pty-1.1.0-beta33.tgz#9262e19712e7f42c84c14b11a864fb292de139d4"
9013-
integrity sha512-+BN2bT/KqO+fmCHnpFS99VMVJr7VUBCUa2VIBEw0oEvszkR7ri0kwD1lF91OeQToUJ2dXKA8j6scPjbO4eRWOQ==
9010+
[email protected]beta35:
9011+
version "1.1.0-beta35"
9012+
resolved "https://registry.yarnpkg.com/node-pty/-/node-pty-1.1.0-beta35.tgz#a25a74acc1b6c40bc27bc37c1e8ae2b9cec1a0ea"
9013+
integrity sha512-dGKw3PtLj/+uiFWUODNjr3QMyNjxRB2JY372AN4uzonfb6ri23d4PMr4s6UoibiqsXOQ3elXRCdq1qDLd86J8Q==
90149014
dependencies:
90159015
node-addon-api "^7.1.0"
90169016

0 commit comments

Comments
 (0)