From 20d31b878b4e03b0e19f15de4e6517bdc39998c7 Mon Sep 17 00:00:00 2001 From: yann300 Date: Mon, 31 May 2021 13:50:46 +0200 Subject: [PATCH] fix loading local compiler --- apps/remix-ide/src/app/tabs/compileTab/compilerContainer.js | 3 ++- package.json | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/apps/remix-ide/src/app/tabs/compileTab/compilerContainer.js b/apps/remix-ide/src/app/tabs/compileTab/compilerContainer.js index bbdfdc1314..dfb0cfc5a4 100644 --- a/apps/remix-ide/src/app/tabs/compileTab/compilerContainer.js +++ b/apps/remix-ide/src/app/tabs/compileTab/compilerContainer.js @@ -170,6 +170,7 @@ class CompilerContainer { _retrieveVersion (version) { if (!version) version = this._view.versionSelector.value + if (version === 'builtin') version = this.data.defaultVersion return semver.coerce(version) ? semver.coerce(version).version : '' } @@ -500,7 +501,7 @@ class CompilerContainer { // Workers cannot load js on "file:"-URLs and we get a // "Uncaught RangeError: Maximum call stack size exceeded" error on Chromium, // resort to non-worker version in that case. - if (this.data.selectedVersion !== 'builtin' && canUseWorker(this.data.selectedVersion)) { + if (canUseWorker(this._retrieveVersion())) { this.compileTabLogic.compiler.loadVersion(true, url) this.setVersionText('(loading using worker)') } else { diff --git a/package.json b/package.json index 403e253716..ccafdfdadf 100644 --- a/package.json +++ b/package.json @@ -50,7 +50,7 @@ "bumpVersion:libs": "gulp & gulp syncLibVersions;", "browsertest": "sleep 5 && npm run nightwatch_local", "csslint": "csslint --ignore=order-alphabetical --errors='errors,duplicate-properties,empty-rules' --exclude-list='apps/remix-ide/src/assets/css/font-awesome.min.css' apps/remix-ide/src/assets/css/", - "downloadsolc_assets": "wget --no-check-certificate https://binaries.soliditylang.org/bin/soljson-v0.8.4+commit.c7e474f2.js -O ./apps/remix-ide/src/assets/js/soljson.js", + "downloadsolc_assets": "wget --no-check-certificate https://binaries.soliditylang.org/wasm/soljson-v0.8.4+commit.c7e474f2.js -O ./apps/remix-ide/src/assets/js/soljson.js", "make-mock-compiler": "node apps/remix-ide/ci/makeMockCompiler.js", "minify": "uglifyjs --in-source-map inline --source-map-inline -c warnings=false", "nightwatch_parallel": "npm run build:e2e && nightwatch --config dist/apps/remix-ide-e2e/nightwatch.js --env=chrome,firefox",