From 628556dc6321b40124fe2795397c410d1f50d352 Mon Sep 17 00:00:00 2001 From: yann300 Date: Mon, 23 Aug 2021 18:36:19 +0200 Subject: [PATCH] fix iframe plugin api --- libs/remix-ui/solidity-compiler/src/index.ts | 3 +-- .../src/lib/actions/compiler.ts | 8 ++++++ .../src/lib/icompiler-api.ts | 27 ------------------- 3 files changed, 9 insertions(+), 29 deletions(-) delete mode 100644 libs/remix-ui/solidity-compiler/src/lib/icompiler-api.ts diff --git a/libs/remix-ui/solidity-compiler/src/index.ts b/libs/remix-ui/solidity-compiler/src/index.ts index 073b7eeacc..30a13c42f4 100644 --- a/libs/remix-ui/solidity-compiler/src/index.ts +++ b/libs/remix-ui/solidity-compiler/src/index.ts @@ -1,3 +1,2 @@ export * from './lib/solidity-compiler' -export * from './lib/logic' -export * from './lib/icompiler-api' +export * from './lib/logic' \ No newline at end of file diff --git a/libs/remix-ui/solidity-compiler/src/lib/actions/compiler.ts b/libs/remix-ui/solidity-compiler/src/lib/actions/compiler.ts index 17e58a0052..afdcb09795 100644 --- a/libs/remix-ui/solidity-compiler/src/lib/actions/compiler.ts +++ b/libs/remix-ui/solidity-compiler/src/lib/actions/compiler.ts @@ -26,7 +26,11 @@ export const resetCompilerMode = () => (dispatch: React.Dispatch) => { }) } +<<<<<<< HEAD export const listenToEvents = (compileTabLogic: CompileTabLogic, api) => (dispatch: React.Dispatch) => { +======= +export const listenToEvents = (compileTabLogic, api) => (dispatch: React.Dispatch) => { +>>>>>>> 5a22644c4 (fix iframe plugin api) api.onSessionSwitched = () => { dispatch(setEditorMode('sessionSwitched')) } @@ -42,7 +46,11 @@ export const listenToEvents = (compileTabLogic: CompileTabLogic, api) => (dispat api.onContentChanged = () => { dispatch(setEditorMode('contentChanged')) } +<<<<<<< HEAD +======= + +>>>>>>> 5a22644c4 (fix iframe plugin api) compileTabLogic.compiler.event.register('loadingCompiler', () => { dispatch(setCompilerMode('loadingCompiler')) }) diff --git a/libs/remix-ui/solidity-compiler/src/lib/icompiler-api.ts b/libs/remix-ui/solidity-compiler/src/lib/icompiler-api.ts deleted file mode 100644 index 7bac190abe..0000000000 --- a/libs/remix-ui/solidity-compiler/src/lib/icompiler-api.ts +++ /dev/null @@ -1,27 +0,0 @@ -export type onCurrentFileChanged = (fileName: string) => void - -export interface ICompilerApi { - contractMap: { - file: string - } | Record - - compileErrors:any - - currentFile: string - configurationSettings: any - setHardHatCompilation(value: boolean): void - setSelectedVersion(version: string): void - getCompilationResult(): any - setCompilerConfig: (settings: any) => void - getParameters: () => any - setParameters: (params) => void - getConfiguration: (name: string) => string - setConfiguration: (name: string, value: string) => void - fileProviderOf: (file: string) => string - getFileManagerMode: () => string - fileExists: (file: string) => Promise - writeFile: (file: string, content: string) => Promise - readFile: (file: string) => Promise - open: (file: string) => void - onCurrentFileChanged: (listener: onCurrentFileChanged) => void -}