unchecked when load

pull/5370/head
lianahus 3 years ago committed by yann300
parent 910977aa5b
commit f2bdb6da7b
  1. 2
      apps/solidity-compiler/src/app/compiler.ts
  2. 15
      libs/remix-ui/solidity-compiler/src/lib/compiler-container.tsx
  3. 12
      libs/remix-ui/solidity-compiler/src/lib/solidity-compiler.tsx
  4. 3
      libs/remix-ui/solidity-compiler/tsconfig.json

@ -45,7 +45,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',
useFileConfiguration: localStorage.getItem('useFileConfiguration') === 'true',
configFilePath: localStorage.getItem('configFilePath') || defaultCompilerParameters.configFilePath
}
return params

@ -11,6 +11,7 @@ import { getValidLanguage } from '@remix-project/remix-solidity'
import { CopyToClipboard } from '@remix-ui/clipboard'
// eslint-disable-next-line @nrwl/nx/enforce-module-boundaries
import * as json_config from '../../../../../apps/remix-ide/contracts/solidity_compiler_config.json'
import { readFileSync } from 'fs'
import './css/style.css'
@ -92,7 +93,7 @@ export const CompilerContainer = (props: CompilerContainerProps) => {
const autocompile = await api.getAppParameter('autoCompile') as boolean || false
const hideWarnings = await api.getAppParameter('hideWarnings') as boolean || false
const includeNightlies = await api.getAppParameter('includeNightlies') as boolean || false
const useFileConfiguration = await api.getAppParameter('useFileConfiguration') as boolean || true
const useFileConfiguration = await api.getAppParameter('useFileConfiguration') as boolean || false
let configFilePath = await api.getAppParameter('configFilePath')
console.log("in useeff init ", configFilePath)
if (!configFilePath || configFilePath == '') configFilePath = "/compiler_config.json"
@ -187,7 +188,19 @@ export const CompilerContainer = (props: CompilerContainerProps) => {
}
const createNewConfigFile = async () => {
if (json_config.default) json_config.default = null
const configFileContent = JSON.stringify(json_config, null, '\t')
console.log("file content as string -> ", json_config)
console.log("file content as json -> ", configFileContent)
try {
const contentContent: string = readFileSync('../../../../../apps/remix-ide/contracts/solidity_compiler_config.json', 'utf8')
console.log("content is ", contentContent)
} catch (err) {
console.log(err);
return;
}
const filePath = configFilePathInput.current && configFilePathInput.current.value !== '' ? configFilePathInput.current.value : state.configFilePath
await api.writeFile(filePath, configFileContent)
console.log("createNewConfigFile ", filePath)

@ -68,11 +68,7 @@ export const SolidityCompiler = (props: SolidityCompilerProps) => {
const isHardhat = isLocalhost && await compileTabLogic.isHardhatProject()
const isTruffle = await compileTabLogic.isTruffleProject()
setState(prevState => {
<<<<<<< HEAD
return { ...prevState, currentFile, isHardhatProject: isHardhat, isTruffleProject: isTruffle }
=======
return { ...prevState, currentFile, isHardhatProject: isHardhat, workspaceName: workspaceName }
>>>>>>> bc1405382... new file on workspace change.
return { ...prevState, currentFile, isHardhatProject: isHardhat, workspaceName: workspaceName, isTruffleProject: isTruffle }
})
}
@ -155,11 +151,7 @@ export const SolidityCompiler = (props: SolidityCompilerProps) => {
return (
<>
<div id="compileTabView">
<<<<<<< HEAD
<CompilerContainer api={api} isHardhatProject={state.isHardhatProject} isTruffleProject={state.isTruffleProject} compileTabLogic={compileTabLogic} tooltip={toast} modal={modal} compiledFileName={currentFile} updateCurrentVersion={updateCurrentVersion} configurationSettings={configurationSettings} />
=======
<CompilerContainer api={api} isHardhatProject={state.isHardhatProject} workspaceName={state.workspaceName} compileTabLogic={compileTabLogic} tooltip={toast} modal={modal} compiledFileName={currentFile} updateCurrentVersion={updateCurrentVersion} configurationSettings={configurationSettings} />
>>>>>>> bc1405382... new file on workspace change.
<CompilerContainer api={api} isHardhatProject={state.isHardhatProject} workspaceName={state.workspaceName} isTruffleProject={state.isTruffleProject} compileTabLogic={compileTabLogic} tooltip={toast} modal={modal} compiledFileName={currentFile} updateCurrentVersion={updateCurrentVersion} configurationSettings={configurationSettings} />
{ contractsFile[currentFile] && contractsFile[currentFile].contractsDetails && <ContractSelection api={api} contractsDetails={contractsFile[currentFile].contractsDetails} contractList={contractsFile[currentFile].contractList} modal={modal} /> }
{ compileErrors[currentFile] &&
<div className="remixui_errorBlobs p-4" data-id="compiledErrors">

@ -4,7 +4,8 @@
"jsx": "react",
"allowJs": true,
"esModuleInterop": true,
"allowSyntheticDefaultImports": true
"allowSyntheticDefaultImports": true,
"resolveJsonModule": true
},
"files": [],
"include": [],

Loading…
Cancel
Save