fix loading compiler in unit testing

pull/1539/head
yann300 3 years ago
parent 3c35257e7d
commit e90747a135
  1. 18
      libs/remix-solidity/src/compiler/compiler-utils.ts
  2. 18
      libs/remix-ui/solidity-compiler/src/lib/compiler-container.tsx

@ -12,9 +12,21 @@ export const pathToURL = {}
* @param version is the version of compiler with or without 'soljson-v' prefix and .js postfix * @param version is the version of compiler with or without 'soljson-v' prefix and .js postfix
*/ */
export function urlFromVersion (version) { export function urlFromVersion (version) {
if (!version.startsWith('soljson-v')) version = 'soljson-v' + version let url
if (!version.endsWith('.js')) version = version + '.js' if (version === 'builtin') {
return `${pathToURL[version]}/${version}` let location: string | Location = window.document.location
let path = location.pathname
if (!path.startsWith('/')) path = '/' + path
location = `${location.protocol}//${location.host}${path}assets/js`
if (location.endsWith('index.html')) location = location.substring(0, location.length - 10)
if (!location.endsWith('/')) location += '/'
url = `${location}soljson.js`
} else {
if (!version.startsWith('soljson-v')) version = 'soljson-v' + version
if (!version.endsWith('.js')) version = version + '.js'
url = `${pathToURL[version]}/${version}`
}
return url
} }
/** /**

@ -333,19 +333,15 @@ export const CompilerContainer = (props: CompilerContainerProps) => {
updateCurrentVersion(selectedVersion) updateCurrentVersion(selectedVersion)
url = customUrl url = customUrl
api.setParameters({ version: selectedVersion }) api.setParameters({ version: selectedVersion })
} else if (selectedVersion === 'builtin') {
let location: string | Location = window.document.location
let path = location.pathname
if (!path.startsWith('/')) path = '/' + path
location = `${location.protocol}//${location.host}${path}assets/js`
if (location.endsWith('index.html')) location = location.substring(0, location.length - 10)
if (!location.endsWith('/')) location += '/'
url = location + 'soljson.js'
} else { } else {
if (selectedVersion.indexOf('soljson') !== 0 || helper.checkSpecialChars(selectedVersion)) { if (helper.checkSpecialChars(selectedVersion)) {
return console.log('loading ' + selectedVersion + ' not allowed') return console.log('loading ' + selectedVersion + ' not allowed, special chars not allowed.')
}
if (selectedVersion === 'builtin' || selectedVersion.indexOf('soljson') === 0) {
url = urlFromVersion(selectedVersion)
} else {
return console.log('loading ' + selectedVersion + ' not allowed, version should start with "soljson"')
} }
url = `${urlFromVersion(selectedVersion)}`
} }
// Workers cannot load js on "file:"-URLs and we get a // Workers cannot load js on "file:"-URLs and we get a

Loading…
Cancel
Save