From d94418cdd65e6cd12c944da0d226dcb879c14859 Mon Sep 17 00:00:00 2001 From: filip mertens Date: Tue, 12 Mar 2024 17:01:55 +0100 Subject: [PATCH] fix error fs --- apps/remixdesktop/package.json | 10 +-- apps/remixdesktop/src/plugins/fsPlugin.ts | 4 +- apps/remixdesktop/yarn.lock | 90 +++++++++++------------ 3 files changed, 53 insertions(+), 51 deletions(-) diff --git a/apps/remixdesktop/package.json b/apps/remixdesktop/package.json index 855777b5c4..fac6cd0512 100644 --- a/apps/remixdesktop/package.json +++ b/apps/remixdesktop/package.json @@ -42,11 +42,11 @@ }, "dependencies": { "@remix-project/remix-url-resolver": "^0.0.65", - "@remixproject/engine": "0.3.41", - "@remixproject/engine-electron": "0.3.41", - "@remixproject/plugin": "0.3.41", - "@remixproject/plugin-api": "^0.3.38", - "@remixproject/plugin-electron": "0.3.41", + "@remixproject/engine": "0.3.43", + "@remixproject/engine-electron": "0.3.43", + "@remixproject/plugin": "0.3.43", + "@remixproject/plugin-api": "^0.3.43", + "@remixproject/plugin-electron": "0.3.43", "@vscode/ripgrep": "^1.15.6", "add": "^2.0.6", "axios": "^1.6.1", diff --git a/apps/remixdesktop/src/plugins/fsPlugin.ts b/apps/remixdesktop/src/plugins/fsPlugin.ts index 0a416b52a1..bb0c30e00c 100644 --- a/apps/remixdesktop/src/plugins/fsPlugin.ts +++ b/apps/remixdesktop/src/plugins/fsPlugin.ts @@ -200,6 +200,7 @@ class FSPluginClient extends ElectronBasePluginClient { } async exists(path: string): Promise { + if (this.workingDir === '') return false return fs .access(this.fixPath(path)) .then(() => true) @@ -398,13 +399,14 @@ class FSPluginClient extends ElectronBasePluginClient { } async setWorkingDir(path: string): Promise { + console.log('setWorkingDir', path) this.workingDir = path await this.updateRecentFolders(path) await this.updateOpenedFolders(path) this.window.setTitle(getBaseName(this.workingDir)) this.watch() this.emit('workingDirChanged', path) - await this.call('fileManager', 'closeAllFiles') + return } async revealInExplorer(action: customAction, isAbsolutePath: boolean = false): Promise { diff --git a/apps/remixdesktop/yarn.lock b/apps/remixdesktop/yarn.lock index f2e3e6d284..8227411a60 100644 --- a/apps/remixdesktop/yarn.lock +++ b/apps/remixdesktop/yarn.lock @@ -556,68 +556,68 @@ ethers "^5.4.2" web3 "^1.5.1" -"@remixproject/engine-electron@0.3.41": - version "0.3.41" - resolved "https://registry.yarnpkg.com/@remixproject/engine-electron/-/engine-electron-0.3.41.tgz#a354d4a4dd43ade644ea27636cfc0aa63c5155b2" - integrity sha512-fF2l3LkDVK1KjkIHll7mOo6AkjUg4hgbHG2jDzHZW6m1jYr6SGxauVoYlOQvlfTe283dpsGxWEdU7TOC8Kne7w== +"@remixproject/engine-electron@0.3.43": + version "0.3.43" + resolved "https://registry.yarnpkg.com/@remixproject/engine-electron/-/engine-electron-0.3.43.tgz#37fe98c6ef2deb6de80db60882608714d6e25274" + integrity sha512-k1Lcg67tlPiBFJwKhBRT9bDMyZuYWDdUXZOHKX8BGPZ0lS1ZQDrH4uN2QE2EFGIiCxeArcNzQ7MZ5iEo763eUA== dependencies: - "@remixproject/engine" "0.3.41" - "@remixproject/plugin-api" "0.3.41" - "@remixproject/plugin-utils" "0.3.41" + "@remixproject/engine" "0.3.43" + "@remixproject/plugin-api" "0.3.43" + "@remixproject/plugin-utils" "0.3.43" -"@remixproject/engine@0.3.41": - version "0.3.41" - resolved "https://registry.yarnpkg.com/@remixproject/engine/-/engine-0.3.41.tgz#71b447d07dd52ec7645c6538f64caa638f3d9702" - integrity sha512-5ppAEana+I9FvSOjdNoLkLFbBTIpLoN5DAKsw+efyZ076i/67OsZ6oHXZqzGoHTOr4s4aS0wHmCBJPSla8GUBA== +"@remixproject/engine@0.3.43": + version "0.3.43" + resolved "https://registry.yarnpkg.com/@remixproject/engine/-/engine-0.3.43.tgz#deceb8398a034d33f741f9de38b233ab616720a4" + integrity sha512-BKmLVdtkPUQ56yZuRsU7CxS0TgJe4b7P9RoqdBW0Udy1w8oUJsWmlmKchCLXD+/t+12jPyk4sulRN8N9YOFBAw== dependencies: - "@remixproject/plugin-api" "0.3.41" - "@remixproject/plugin-utils" "0.3.41" + "@remixproject/plugin-api" "0.3.43" + "@remixproject/plugin-utils" "0.3.43" -"@remixproject/plugin-api@0.3.41": - version "0.3.41" - resolved "https://registry.yarnpkg.com/@remixproject/plugin-api/-/plugin-api-0.3.41.tgz#9a60d92332af608a871366bec6097bda2d2d1658" - integrity sha512-+gZOzJH4KUMVOEYFFW4LwwCWbojACqxvLM9FJRRkHehohue07Y7ojIbFoYk4EPWkdBtOXOsIR2zjdUIUlzzrTg== +"@remixproject/plugin-api@0.3.43": + version "0.3.43" + resolved "https://registry.yarnpkg.com/@remixproject/plugin-api/-/plugin-api-0.3.43.tgz#68ce6799a8e6e22961b82f46a7a52b1d7a4a765c" + integrity sha512-qgwq3UQAW9JKsFv47m0E7plNNEWL4CFbqoLGbfsfwuZTd/V7HhaMc1my5dxOObW+RKExyvFNFSEvEp7HoHFsWg== dependencies: - "@remixproject/plugin-utils" "0.3.41" + "@remixproject/plugin-utils" "0.3.43" -"@remixproject/plugin-api@^0.3.38": - version "0.3.38" - resolved "https://registry.yarnpkg.com/@remixproject/plugin-api/-/plugin-api-0.3.38.tgz#7dcff37483451b654fc51290157992fff3fbd8b7" - integrity sha512-GLXAnV7TMYV2KlXTml+W0H6s0m5EkVb5w610Jh9k4PLFVrocl9xDEG4VlZ8BF/uv+yjXRi4dn++8zWMRe5375Q== +"@remixproject/plugin-api@^0.3.43": + version "0.3.208" + resolved "https://registry.yarnpkg.com/@remixproject/plugin-api/-/plugin-api-0.3.208.tgz#28505b84ec06c84e04ca1bf7cfa51109c178c06b" + integrity sha512-11hFxABBrEzE4fgcDblWqxLAh5ARH2tBADgh9KNk+y7LUV7aQ7OZf4KiZ2US+uKiSC6497iu/uLHbWBTeRqlVA== dependencies: - "@remixproject/plugin-utils" "0.3.38" + "@remixproject/plugin-utils" "0.3.208" -"@remixproject/plugin-electron@0.3.41": - version "0.3.41" - resolved "https://registry.yarnpkg.com/@remixproject/plugin-electron/-/plugin-electron-0.3.41.tgz#6f736dfa5146bdf41fe0c452ab0b78e7f914fda1" - integrity sha512-E/rmKSbUa4rZKq02C+HD6WQDTS2CH6+Gqc6Z9p5wxQwbbJoMD/WVtWUvOFr1p2PSp0Nwpc4qWfOoQC6EmaugOg== +"@remixproject/plugin-electron@0.3.43": + version "0.3.43" + resolved "https://registry.yarnpkg.com/@remixproject/plugin-electron/-/plugin-electron-0.3.43.tgz#6c621c413745ce785f9973baea109debe3def00a" + integrity sha512-uv44xjmkTsC/o4xnMEBml6NxrMeq95aOR3FFY8MnZkKvnWOKC94SE5AYuHOAvt+FBrnar2f58+IYpBJAIkYyaQ== dependencies: - "@remixproject/engine" "0.3.41" - "@remixproject/plugin" "0.3.41" - "@remixproject/plugin-api" "0.3.41" - "@remixproject/plugin-utils" "0.3.41" + "@remixproject/engine" "0.3.43" + "@remixproject/plugin" "0.3.43" + "@remixproject/plugin-api" "0.3.43" + "@remixproject/plugin-utils" "0.3.43" -"@remixproject/plugin-utils@0.3.38": - version "0.3.38" - resolved "https://registry.yarnpkg.com/@remixproject/plugin-utils/-/plugin-utils-0.3.38.tgz#402adbef700a9392fbeae7d536ba020b7cfbdfaa" - integrity sha512-DpbB+BFfWvZ/pKWlXY0Ms3mqp/ajWxBI+TUiJor2AkLtCSBS1+Uk7BWG++jNSqgjdvVKxxWa4kJygFwUPtUYXA== +"@remixproject/plugin-utils@0.3.208": + version "0.3.208" + resolved "https://registry.yarnpkg.com/@remixproject/plugin-utils/-/plugin-utils-0.3.208.tgz#8ec1339af9177358c09a7dd7a39396f52c4cad27" + integrity sha512-PjEK+ty6X14ud3h2U/XH8BBbqwLF3CwduOxHCXfCG0KarR4FwuSfocWQfGlASeDFmPzyV1aMGn//U6xZ03O42Q== dependencies: tslib "2.0.1" -"@remixproject/plugin-utils@0.3.41": - version "0.3.41" - resolved "https://registry.yarnpkg.com/@remixproject/plugin-utils/-/plugin-utils-0.3.41.tgz#6de4d016084cf54fbf710ed717c9c1efc0a990de" - integrity sha512-pyqewxfQwr35YkFoZItH5E9qiIZRlpwxLuGBCMXzo6fmPm2YybhpblLaefppsdbqY1yEVsqakQa6U6d6vJRSNQ== +"@remixproject/plugin-utils@0.3.43": + version "0.3.43" + resolved "https://registry.yarnpkg.com/@remixproject/plugin-utils/-/plugin-utils-0.3.43.tgz#53206666135a360c88bfde11568c31341c9d961f" + integrity sha512-FB2Dz0/+TQ+D9AdINfsu38qHEsUVIDpaDCaXY76suDkSUudoHcGrC5TbpaV/xMUbMMma2dcLp629vBNnA5Cd0w== dependencies: tslib "2.0.1" -"@remixproject/plugin@0.3.41": - version "0.3.41" - resolved "https://registry.yarnpkg.com/@remixproject/plugin/-/plugin-0.3.41.tgz#fc82d0afd08ba659d09ee7714fa91af92cdb8e72" - integrity sha512-GqBaxExtNGQHNHwPwx/2RKX7vinEBJe9KzxzkzR2BGuBZD963+il2WsMu+QYyHjTxJ8kHZF9exqUSYJd9jZ+Yw== +"@remixproject/plugin@0.3.43": + version "0.3.43" + resolved "https://registry.yarnpkg.com/@remixproject/plugin/-/plugin-0.3.43.tgz#c7397b8e44ab6627a290c3716985439482eb4f4a" + integrity sha512-uO0wQ9kP982QTJIlGUXXeOjLG1qG64UN5kDopTcMbplzT5vXlMRV64FY8zEqSXtl+sdqKBFLXrwmb+AUNU0MTA== dependencies: - "@remixproject/plugin-api" "0.3.41" - "@remixproject/plugin-utils" "0.3.41" + "@remixproject/plugin-api" "0.3.43" + "@remixproject/plugin-utils" "0.3.43" events "3.2.0" "@scure/base@~1.1.0":