Remove custom config file for solidity compiler

Author: ioedeveloper

.gitignore

@@ -77,4 +77,7 @@ apps/remixdesktop/circom-download
 apps/remixdesktop/log_input_signals.txt
 apps/remixdesktop/log_input_signals_new.txt
 logs
-apps/remix-ide-e2e/src/extensions/chrome/metamask
+apps/remix-ide-e2e/src/extensions/chrome/metamask
+
+# IDE - Cursor
+.cursor/

apps/remix-ide/src/app/plugins/script-runner-bridge.tsx

@@ -74,6 +74,23 @@ export class ScriptRunnerBridgePlugin extends Plugin {
           dependencies: [],
         },
       }
+      const oldConfigExists = await this.plugin.call('fileManager', 'exists', oldConfigFileName)
+      const configExists = await this.plugin.call('fileManager', 'exists', configFileName)
+
+      if (oldConfigExists) {
+        const oldConfigContent = await this.plugin.call('fileManager', 'readFile', oldConfigFileName)
+        const oldConfig = JSON.parse(oldConfigContent)
+
+        if (configExists) {
+          const configContent = await this.plugin.call('fileManager', 'readFile', configFileName)
+          const config = JSON.parse(configContent)
+          config['script-runner'] = oldConfig
+          await this.plugin.call('fileManager', 'writeFile', configFileName, JSON.stringify(config, null, 2))
+        } else {
+          await this.plugin.call('fileManager', 'writeFile', configFileName, JSON.stringify({ 'script-runner': oldConfig }, null, 2))
+        }
+        await this.plugin.call('fileManager', 'remove', '.remix')
+      }
       await this.loadCustomConfig()
       await this.loadConfigurations()
       this.renderComponent()

apps/remix-ide/src/app/tabs/compile-tab.js

@@ -10,6 +10,8 @@ import * as packageJson from '../../../../../package.json'
 import { compilerConfigChangedToastMsg, compileToastMsg } from '@remix-ui/helper'
 import { isNative } from '../../remixAppManager'
 import { Registry } from '@remix-project/remix-lib'
+
+const remixConfigPath = 'remix.config.json'
 const profile = {
   name: 'solidity',
   displayName: 'Solidity compiler',
@@ -139,12 +141,12 @@ export default class CompileTab extends CompilerApiMixin(ViewPlugin) { // implem
         group: 6
       })
       this.on('fileManager', 'fileSaved', async (file) => {
-        if(await this.getAppParameter('configFilePath') === file) {
+        if(file === remixConfigPath) {
           this.emit('configFileChanged', file)
         }
       })
       this.on('fileManager', 'fileAdded', async (file) => {
-        if(await this.getAppParameter('configFilePath') === file) {
+        if(file === remixConfigPath) {
           this.emit('configFileChanged', file)
         }
       })

apps/solidity-compiler/src/app/compiler.ts

@@ -13,7 +13,6 @@ const defaultCompilerParameters = {
   evmVersion: null, // compiler default
   language: 'Solidity',
   useFileConfiguration: false,
-  configFilePath: "compiler_config.json"
 }
 export class CompilerClientApi extends CompilerApiMixin(PluginClient) implements ICompilerApi {
   constructor () {
@@ -32,8 +31,7 @@ export class CompilerClientApi extends CompilerApiMixin(PluginClient) implements
       version: localStorage.getItem('version') || defaultCompilerParameters.version,
       evmVersion: localStorage.getItem('evmVersion') || defaultCompilerParameters.evmVersion, // default
       language: localStorage.getItem('language') || defaultCompilerParameters.language,
-      useFileConfiguration: localStorage.getItem('useFileConfiguration') === 'true',
-      configFilePath: localStorage.getItem('configFilePath') || defaultCompilerParameters.configFilePath
+      useFileConfiguration: localStorage.getItem('useFileConfiguration') === 'true'
     }
     return params
   }

libs/remix-solidity/src/compiler/compiler.ts

@@ -37,7 +37,7 @@ export class Compiler {
       compilationStartTime: null,
       target: null,
       useFileConfiguration: false,
-      configFileContent: '',
+      configFileContent: {},
       compilerRetriggerMode: CompilerRetriggerMode.none,
       lastCompilationResult: {
         data: null,
@@ -138,7 +138,7 @@ export class Compiler {
             const { optimize, runs, evmVersion, language, useFileConfiguration, configFileContent, remappings, viaIR } = this.state
 
             if (useFileConfiguration) {
-              input = compilerInputForConfigFile(source.sources, JSON.parse(configFileContent))
+              input = compilerInputForConfigFile(source.sources, configFileContent)
             } else {
               input = compilerInput(source.sources, { optimize, runs, evmVersion, language, remappings, viaIR })
             }
@@ -216,7 +216,7 @@ export class Compiler {
             if (source && source.sources) {
               const { optimize, runs, evmVersion, language, remappings, useFileConfiguration, configFileContent, viaIR } = this.state
               if (useFileConfiguration) {
-                input = compilerInputForConfigFile(source.sources, JSON.parse(configFileContent))
+                input = compilerInputForConfigFile(source.sources, configFileContent)
               } else {
                 input = compilerInput(source.sources, { optimize, runs, evmVersion, language, remappings, viaIR })
               }
@@ -337,7 +337,7 @@ export class Compiler {
 
         try {
           if (useFileConfiguration) {
-            const compilerInput = JSON.parse(configFileContent)
+            const compilerInput = configFileContent
             if (compilerInput.settings.remappings?.length) compilerInput.settings.remappings.push(...remappings)
             else compilerInput.settings.remappings = remappings
             input = compilerInputForConfigFile(source.sources, compilerInput)

libs/remix-solidity/src/compiler/types.ts

@@ -180,7 +180,7 @@ export interface CompilerState {
     compilationStartTime: number| null,
     target: string | null,
     useFileConfiguration: boolean,
-    configFileContent: string,
+    configFileContent: Record<string, any>,
     compilerRetriggerMode: CompilerRetriggerMode,
     lastCompilationResult: {
       data: CompilationResult | null,