From 8a71efdb7e8b38b70b0f3b930d8734cbbc5b0ea2 Mon Sep 17 00:00:00 2001 From: aniket-engg Date: Mon, 4 Dec 2023 13:33:27 +0530 Subject: [PATCH 1/4] remove empty lines from remappings --- .../solidity-compiler/src/lib/logic/compileTabLogic.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/remix-ui/solidity-compiler/src/lib/logic/compileTabLogic.ts b/libs/remix-ui/solidity-compiler/src/lib/logic/compileTabLogic.ts index 941296597ed..437e929a55c 100644 --- a/libs/remix-ui/solidity-compiler/src/lib/logic/compileTabLogic.ts +++ b/libs/remix-ui/solidity-compiler/src/lib/logic/compileTabLogic.ts @@ -111,8 +111,8 @@ export class CompileTabLogic { this.event.emit('removeAnnotations') this.event.emit('startingCompilation') if(await this.api.fileExists('remappings.txt')) { - this.api.readFile('remappings.txt').then( remappings => { - this.compiler.set('remappings', remappings.split('\n')) + this.api.readFile('remappings.txt').then(remappings => { + this.compiler.set('remappings', remappings.split('\n').filter(Boolean)) }) } if (this.configFilePath) { From a3d35e241ab9ad3c2160fdbde90966039c028f4c Mon Sep 17 00:00:00 2001 From: aniket-engg Date: Mon, 4 Dec 2023 14:02:55 +0530 Subject: [PATCH 2/4] reset remappings in case of file deletion --- .../solidity-compiler/src/lib/logic/compileTabLogic.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/remix-ui/solidity-compiler/src/lib/logic/compileTabLogic.ts b/libs/remix-ui/solidity-compiler/src/lib/logic/compileTabLogic.ts index 437e929a55c..ba55cbb7525 100644 --- a/libs/remix-ui/solidity-compiler/src/lib/logic/compileTabLogic.ts +++ b/libs/remix-ui/solidity-compiler/src/lib/logic/compileTabLogic.ts @@ -112,9 +112,9 @@ export class CompileTabLogic { this.event.emit('startingCompilation') if(await this.api.fileExists('remappings.txt')) { this.api.readFile('remappings.txt').then(remappings => { - this.compiler.set('remappings', remappings.split('\n').filter(Boolean)) + this.compiler.set('remappings', remappings.split('\n')) }) - } + } else this.compiler.set('remappings', []) if (this.configFilePath) { this.api.readFile(this.configFilePath).then( contentConfig => { this.compiler.set('configFileContent', contentConfig) From 7df7a4cfd837838bd41861508a0e0a5181a26257 Mon Sep 17 00:00:00 2001 From: aniket-engg Date: Mon, 4 Dec 2023 18:12:19 +0530 Subject: [PATCH 3/4] add filter again --- .../remix-ui/solidity-compiler/src/lib/logic/compileTabLogic.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/remix-ui/solidity-compiler/src/lib/logic/compileTabLogic.ts b/libs/remix-ui/solidity-compiler/src/lib/logic/compileTabLogic.ts index ba55cbb7525..958ef3a06ad 100644 --- a/libs/remix-ui/solidity-compiler/src/lib/logic/compileTabLogic.ts +++ b/libs/remix-ui/solidity-compiler/src/lib/logic/compileTabLogic.ts @@ -112,7 +112,7 @@ export class CompileTabLogic { this.event.emit('startingCompilation') if(await this.api.fileExists('remappings.txt')) { this.api.readFile('remappings.txt').then(remappings => { - this.compiler.set('remappings', remappings.split('\n')) + this.compiler.set('remappings', remappings.split('\n').filter(Boolean)) }) } else this.compiler.set('remappings', []) if (this.configFilePath) { From 6632cf782a4742546e70d5e81add1f5f8a25bd3a Mon Sep 17 00:00:00 2001 From: lianahus Date: Mon, 4 Dec 2023 10:44:50 +0100 Subject: [PATCH 4/4] adding matomo tracking for recentWorkspaces --- libs/remix-ui/home-tab/src/lib/components/homeTabFile.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/libs/remix-ui/home-tab/src/lib/components/homeTabFile.tsx b/libs/remix-ui/home-tab/src/lib/components/homeTabFile.tsx index 483de9ed54f..422405dc9ad 100644 --- a/libs/remix-ui/home-tab/src/lib/components/homeTabFile.tsx +++ b/libs/remix-ui/home-tab/src/lib/components/homeTabFile.tsx @@ -201,6 +201,7 @@ contract HelloWorld { const handleSwichToRecentWorkspace = async (e, workspaceName) => { e.preventDefault() + _paq.push(['trackEvent', 'hometab', 'filesSection', 'loadRecentWorkspace']) await plugin.call('filePanel', 'switchToWorkspace', { name: workspaceName, isLocalhost: false }) }