fix references & wrong rebasing

pull/5370/head
yann300 3 years ago
parent b4d0b5eb21
commit ae97092466
  1. 1
      apps/solidity-compiler/src/app/compiler.ts
  2. 2
      apps/solidity-compiler/tsconfig.json
  3. 2
      libs/remix-solidity/src/compiler/compiler-utils.ts
  4. 1
      libs/remix-ui/solidity-compiler/src/lib/compiler-container.tsx
  5. 1
      tsconfig.base.json

@ -2,6 +2,7 @@ import { PluginClient } from "@remixproject/plugin";
import { createClient } from "@remixproject/plugin-webview";
import { CompilerApiMixin } from './compiler-api'
import { ICompilerApi } from '@remix-project/remix-lib-ts'
import { CompileTabLogic } from '@remix-ui/solidity-compiler'
const profile = {
name: 'solidity',

@ -1,5 +1,5 @@
{
"extends": "../../tsconfig.json",
"extends": "../../tsconfig.base.json",
"compilerOptions": {
"jsx": "react",
"allowJs": true,

@ -12,7 +12,7 @@ export const pathToURL = {}
* @param version is the version of compiler with or without 'soljson-v' prefix and .js postfix
*/
export function urlFromVersion (version) {
let url
let url
if (version === 'builtin') {
let location: string | Location = window.document.location
let path = location.pathname

@ -70,7 +70,6 @@ export const CompilerContainer = (props: CompilerContainerProps) => {
const optimize = params.optimize
const runs = params.runs as string
const evmVersion = params.evmVersion
const autoCompile = params.autoCompile === 'false' ? false : params.autoCompile === 'true' ? true : null
return {
...prevState,

@ -32,6 +32,7 @@
"@remix-ui/utils": ["libs/remix-ui/utils/src/index.ts"],
"@remix-ui/clipboard": ["libs/remix-ui/clipboard/src/index.ts"],
"@remix-project/remix-solidity-ts": ["libs/remix-solidity/src/index.ts"],
"@remix-project/remix-lib-ts": ["libs/remix-lib/src/index.ts"],
"@remix-ui/modal-dialog": ["libs/remix-ui/modal-dialog/src/index.ts"],
"@remix-ui/toaster": ["libs/remix-ui/toaster/src/index.ts"],
"@remix-ui/file-explorer": ["libs/remix-ui/file-explorer/src/index.ts"],

Loading…
Cancel
Save