pull/4346/head
filip mertens 1 year ago
parent c9f137087d
commit a9ebb42786
  1. 1
      libs/remix-lib/src/types/ICompilerApi.ts
  2. 14
      libs/remix-ui/solidity-compiler/src/lib/api/compiler-api.ts
  3. 1
      libs/remix-ui/solidity-compiler/src/lib/compiler-container.tsx
  4. 8
      libs/remix-ui/solidity-compiler/src/lib/solidity-compiler.tsx
  5. 1
      libs/remix-ui/solidity-compiler/src/lib/types/index.ts
  6. 1
      libs/remix-url-resolver/src/resolve.ts

@ -47,7 +47,6 @@ export interface ICompilerApi {
statusChanged: (data: { key: string, title?: string, type?: string }) => void,
emit?: (key: string, ...payload: any) => void
compilersDownloaded: (list: string[]) => void
setSolJsonBinData: (binData: iSolJsonBinData) => void
}

@ -28,7 +28,6 @@ export const CompilerApiMixin = (Base) => class extends Base {
onFileClosed: (name: string) => void
statusChanged: (data: { key: string, title?: string, type?: string }) => void
compilersDownloaded: (list: string[]) => void
setSolJsonBinData: (urls: iSolJsonBinData) => void
initCompilerApi () {
@ -281,19 +280,6 @@ export const CompilerApiMixin = (Base) => class extends Base {
this.on('fileManager', 'fileClosed', this.data.eventHandlers.onFileClosed)
this.on('compilerloader', 'downloadFinished', (path, url) => {
console.log('downloadFinished', path, url)
})
this.on('compilerloader', 'downloadStarted', (url) => {
console.log('downloadStarted', url)
})
this.on('compilerloader', 'compilersDownloaded', (list: string[]) => {
console.log('compilersDownloaded', list)
this.compilersDownloaded(list)
})
this.on('compilerloader', 'jsonBinDataLoaded', (urls: iSolJsonBinData) => {
this.setSolJsonBinData(urls)
})

@ -43,7 +43,6 @@ export const CompilerContainer = (props: CompilerContainerProps) => {
workspaceName,
configFilePath,
setConfigFilePath,
compilersDownloaded,
solJsonBinData,
//@ts-ignore
pluginProps

@ -38,7 +38,6 @@ export const SolidityCompiler = (props: SolidityCompilerProps) => {
cancelFn: () => { },
handleHide: null
},
compilersDownloaded: [],
solJsonBinData: {
baseURLBin,
baseURLWasm,
@ -146,12 +145,6 @@ export const SolidityCompiler = (props: SolidityCompilerProps) => {
setBadgeStatus({ ...badgeStatus, [currentFile]: data })
}
api.compilersDownloaded = (list: string[]) => {
setState((prevState) => {
return { ...prevState, compilersDownloaded: list }
})
}
api.setSolJsonBinData = (data: iSolJsonBinData) => {
const builtin: iSolJsonBinDataBuild =
@ -278,7 +271,6 @@ export const SolidityCompiler = (props: SolidityCompilerProps) => {
configurationSettings={configurationSettings}
configFilePath={state.configFilePath}
setConfigFilePath={setConfigFilePath}
compilersDownloaded={state.compilersDownloaded}
solJsonBinData={state.solJsonBinData}
/>

@ -21,7 +21,6 @@ export interface CompilerContainerProps {
configurationSettings: ConfigurationSettings,
configFilePath: string,
setConfigFilePath: (path: string) => void,
compilersDownloaded: string[]
solJsonBinData: iSolJsonBinData
}

@ -246,7 +246,6 @@ export class RemixURLResolver {
const builtinHandlers: Handler[] = this.getHandlers()
const handlers: Handler[] = customHandlers ? [...builtinHandlers, ...customHandlers] : [...builtinHandlers]
const matchedHandler = handlers.filter(handler => handler.match(filePath))
console.log('matchedHandler', matchedHandler)
const handler: Handler = matchedHandler[0]
const match = handler.match(filePath)
const { content, cleanUrl } = await handler.handle(match)

Loading…
Cancel
Save