From e4eb31708f081fb3e48d64d24f7267c283141b15 Mon Sep 17 00:00:00 2001 From: bunsenstraat Date: Fri, 6 Sep 2024 07:35:34 +0200 Subject: [PATCH] backup yarn call --- .circleci/config.yml | 3 ++- apps/remix-ide/src/assets/js/loader.js | 2 +- apps/remix-ide/src/assets/list.json | 14 +++++++++++++- apps/remixdesktop/package.json | 2 +- .../src/lib/solidity-compiler.tsx | 4 ++-- 5 files changed, 19 insertions(+), 6 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index dd8feb6e08..4020c3f3ed 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -458,7 +458,8 @@ jobs: - run: command: | nvm use 20.0.0 - cd apps/remixdesktop && yarn + cd apps/remixdesktop + yarn || yarn yarn add @remix-project/remix-ws-templates - save_cache: key: remixdesktop-deps-mac-{{ checksum "apps/remixdesktop/yarn.lock" }} diff --git a/apps/remix-ide/src/assets/js/loader.js b/apps/remix-ide/src/assets/js/loader.js index fec4de246f..44a7687830 100644 --- a/apps/remix-ide/src/assets/js/loader.js +++ b/apps/remix-ide/src/assets/js/loader.js @@ -10,7 +10,7 @@ let domainToTrack = domains[window.location.hostname] function trackDomain(domainToTrack) { var _paq = window._paq = window._paq || [] - console.log('Tracking domain', domainToTrack, _paq) + /* tracker methods like "setCustomDimension" should be called before "trackPageView" */ _paq.push(["setExcludedQueryParams", ["code", "gist"]]); _paq.push(["setExcludedReferrers", ["etherscan.io"]]); diff --git a/apps/remix-ide/src/assets/list.json b/apps/remix-ide/src/assets/list.json index 6a55fff4f7..82f8fe17bb 100644 --- a/apps/remix-ide/src/assets/list.json +++ b/apps/remix-ide/src/assets/list.json @@ -1022,9 +1022,21 @@ "urls": [ "dweb:/ipfs/QmS5JdeXtYhGBvdgNTLWuBNHupyP623X4sf43fRbrgiTaA" ] + }, + { + "path": "soljson-v0.8.27+commit.40a35a09.js", + "version": "0.8.27", + "build": "commit.40a35a09", + "longVersion": "0.8.27+commit.40a35a09", + "keccak256": "0x68c7a06651a847fc9a60886a6ba590a2b20d87f2d4f9570bf70fbb2b901e7713", + "sha256": "0xd91c08277f801321af4e80958015aea18b41c01d2c6a38310a23014485b0e51c", + "urls": [ + "dweb:/ipfs/QmVTALD1WUQwRvEL19jgwrEFyBJMQmy9z32zvT6TAtYPY1" + ] } ], "releases": { + "0.8.27": "soljson-v0.8.27+commit.40a35a09.js", "0.8.26": "soljson-v0.8.26+commit.8a97fa7a.js", "0.8.25": "soljson-v0.8.25+commit.b61c2a91.js", "0.8.24": "soljson-v0.8.24+commit.e11b9ed9.js", @@ -1119,5 +1131,5 @@ "0.4.0": "soljson-v0.4.0+commit.acd334c9.js", "0.3.6": "soljson-v0.3.6+commit.3fc68da5.js" }, - "latestRelease": "0.8.26" + "latestRelease": "0.8.27" } \ No newline at end of file diff --git a/apps/remixdesktop/package.json b/apps/remixdesktop/package.json index 1f1fe2d264..76a2f112e0 100644 --- a/apps/remixdesktop/package.json +++ b/apps/remixdesktop/package.json @@ -38,7 +38,7 @@ "@types/byline": "^4.2.35", "@types/express": "^4.17.21", "@types/nightwatch": "^2.3.23", - "chromedriver": "116", + "chromedriver": "^116", "cross-env": "^7.0.3", "deep-equal": "^2.2.3", "electron": "^26.0.0", diff --git a/libs/remix-ui/solidity-compiler/src/lib/solidity-compiler.tsx b/libs/remix-ui/solidity-compiler/src/lib/solidity-compiler.tsx index 04908c35ec..4d6f5773d6 100644 --- a/libs/remix-ui/solidity-compiler/src/lib/solidity-compiler.tsx +++ b/libs/remix-ui/solidity-compiler/src/lib/solidity-compiler.tsx @@ -80,11 +80,11 @@ export const SolidityCompiler = (props: SolidityCompilerProps) => { api.onSetWorkspace = async (isLocalhost: boolean, workspaceName: string) => { const isDesktop = platform === appPlatformTypes.desktop - console.log('onSetWorkspace', workspaceName, isLocalhost, isDesktop, workspaceName) + const isHardhat = (isLocalhost || isDesktop) && (await compileTabLogic.isHardhatProject()) const isTruffle = (isLocalhost || isDesktop) && (await compileTabLogic.isTruffleProject()) const isFoundry = (isLocalhost || isDesktop) && (await compileTabLogic.isFoundryProject()) - console.log(isFoundry, isHardhat, isTruffle) + setState((prevState) => { return { ...prevState,