Merge branch 'master' into fix-hardhat-timeout

a1f0dc5d · yann300 · GitHub · 7680a852 · ea1f7539 · a1f0dc5d
Unverified Commit a1f0dc5d authored Sep 15, 2021 by yann300 Committed by GitHub Sep 15, 2021
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 9 deletions

fileManager.js apps/remix-ide/src/app/files/fileManager.js +0 -2

package-lock.json package-lock.json +0 -0

package.json package.json +7 -7

No files found.
--- a/apps/remix-ide/src/app/files/fileManager.js
+++ b/apps/remix-ide/src/app/files/fileManager.js
@@ -726,9 +726,7 @@ class FileManager extends Plugin {

  syncEditor (path) {
    var currentFile = this._deps.config.get('currentFile')
-    console.log(currentFile, path)
    if (path !== currentFile) return
-
    var provider = this.fileProviderOf(currentFile)
    if (provider) {
      provider.get(currentFile, (error, content) => {

--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -136,13 +136,13 @@
    "@ethereumjs/common": "^2.4.0",
    "@ethereumjs/tx": "^3.3.0",
    "@ethereumjs/vm": "^5.5.0",
-    "@remixproject/engine": "^0.3.20-alpha.2",
-    "@remixproject/engine-web": "^0.3.20-alpha.2",
-    "@remixproject/plugin": "^0.3.20-alpha.2",
-    "@remixproject/plugin-api": "^0.3.20-alpha.2",
-    "@remixproject/plugin-utils": "^0.3.20-alpha.2",
-    "@remixproject/plugin-webview": "^0.3.20-alpha.2",
-    "@remixproject/plugin-ws": "^0.3.20-alpha.2",
+    "@remixproject/engine": "^0.3.20",
+    "@remixproject/engine-web": "^0.3.20",
+    "@remixproject/plugin": "^0.3.20",
+    "@remixproject/plugin-api": "^0.3.20",
+    "@remixproject/plugin-utils": "^0.3.20",
+    "@remixproject/plugin-webview": "^0.3.20",
+    "@remixproject/plugin-ws": "^0.3.20",
    "ansi-gray": "^0.1.1",
    "async": "^2.6.2",
    "axios": ">=0.21.1",