pull/1342/head
yann300 3 years ago committed by davidzagi93@gmail.com
parent 9df935f2a4
commit 9e970f6eee
  1. 6
      apps/remix-ide/src/app/tabs/compile-tab.js
  2. 2
      libs/remix-lib/src/index.ts
  3. 10
      libs/remix-lib/src/types/ICompilerApi.ts
  4. 2
      libs/remix-ui/solidity-compiler/src/index.ts
  5. 2
      libs/remix-ui/solidity-compiler/src/lib/actions/compiler.ts
  6. 2
      libs/remix-ui/solidity-compiler/src/lib/types/index.ts

@ -4,15 +4,11 @@ import ReactDOM from 'react-dom'
import { SolidityCompiler, CompileTab as CompileTabLogic, parseContracts } from '@remix-ui/solidity-compiler' // eslint-disable-line import { SolidityCompiler, CompileTab as CompileTabLogic, parseContracts } from '@remix-ui/solidity-compiler' // eslint-disable-line
import { CompilerApiMixin } from '@remixproject/solidity-compiler-plugin' import { CompilerApiMixin } from '@remixproject/solidity-compiler-plugin'
import { ViewPlugin } from '@remixproject/engine-web' import { ViewPlugin } from '@remixproject/engine-web'
import { ICompilerApi } from '@remix-project/remix-lib-ts' // import { ICompilerApi } from '@remix-project/remix-lib-ts'
import * as packageJson from '../../../../../package.json' import * as packageJson from '../../../../../package.json'
const EventEmitter = require('events')
const $ = require('jquery')
const yo = require('yo-yo') const yo = require('yo-yo')
var QueryParams = require('../../lib/query-params')
const addTooltip = require('../ui/tooltip') const addTooltip = require('../ui/tooltip')
const globalRegistry = require('../../global/registry')
const css = require('./styles/compile-tab-styles') const css = require('./styles/compile-tab-styles')

@ -18,7 +18,7 @@ import * as typeConversion from './execution/typeConversion'
import { TxRunnerVM } from './execution/txRunnerVM' import { TxRunnerVM } from './execution/txRunnerVM'
import { TxRunnerWeb3 } from './execution/txRunnerWeb3' import { TxRunnerWeb3 } from './execution/txRunnerWeb3'
import * as txResultHelper from './helpers/txResultHelper' import * as txResultHelper from './helpers/txResultHelper'
export { ICompilerApi, ConfigurationSettings} from './types/ICompilerApi' export { ICompilerApi, ConfigurationSettings } from './types/ICompilerApi'
const helpers = { const helpers = {
ui: uiHelper, ui: uiHelper,

@ -7,7 +7,7 @@ export interface ICompilerApi {
compileTabLogic: any compileTabLogic: any
contractsDetails: Record<string, any> contractsDetails: Record<string, any>
configurationSettings: ConfigurationSettings configurationSettings: ConfigurationSettings
setHardHatCompilation: (value: boolean) => void setHardHatCompilation: (value: boolean) => void
getParameters: () => any getParameters: () => any
setParameters: (params) => void setParameters: (params) => void
@ -15,9 +15,9 @@ export interface ICompilerApi {
setConfiguration: (name: string, value: string) => void setConfiguration: (name: string, value: string) => void
getFileManagerMode: () => string getFileManagerMode: () => string
setCompilerConfig: (settings: any) => void setCompilerConfig: (settings: any) => void
getCompilationResult: () => any getCompilationResult: () => any
onCurrentFileChanged: (fileName: string) => void onCurrentFileChanged: (fileName: string) => void
onResetResults: () => void, onResetResults: () => void,
onSetWorkspace: (workspace: any) => void onSetWorkspace: (workspace: any) => void
@ -25,7 +25,7 @@ export interface ICompilerApi {
onCompilationFinished: (contractsDetails: any, contractMap: any) => void onCompilationFinished: (contractsDetails: any, contractMap: any) => void
onSessionSwitched: () => void onSessionSwitched: () => void
onContentChanged: () => void onContentChanged: () => void
fileExists: (file: string) => Promise<boolean> fileExists: (file: string) => Promise<boolean>
writeFile: (file: string, content: string) => Promise<void> writeFile: (file: string, content: string) => Promise<void>
readFile: (file: string) => Promise<string> readFile: (file: string) => Promise<string>
@ -38,4 +38,4 @@ export interface ConfigurationSettings {
language: string, language: string,
optimize: boolean, optimize: boolean,
runs: string runs: string
} }

@ -1,2 +1,2 @@
export * from './lib/solidity-compiler' export * from './lib/solidity-compiler'
export * from './lib/logic' export * from './lib/logic'

@ -42,7 +42,7 @@ export const listenToEvents = (compileTabLogic, api) => (dispatch: React.Dispatc
api.onContentChanged = () => { api.onContentChanged = () => {
dispatch(setEditorMode('contentChanged')) dispatch(setEditorMode('contentChanged'))
} }
compileTabLogic.compiler.event.register('loadingCompiler', () => { compileTabLogic.compiler.event.register('loadingCompiler', () => {
dispatch(setCompilerMode('loadingCompiler')) dispatch(setCompilerMode('loadingCompiler'))
}) })

@ -22,4 +22,4 @@ export interface ContractSelectionProps {
} | Record<string, any>, } | Record<string, any>,
modal: (title: string, message: string | JSX.Element, okLabel: string, okFn: () => void, cancelLabel?: string, cancelFn?: () => void) => void, modal: (title: string, message: string | JSX.Element, okLabel: string, okFn: () => void, cancelLabel?: string, cancelFn?: () => void) => void,
contractsDetails: Record<string, any> contractsDetails: Record<string, any>
} }

Loading…
Cancel
Save