nx build working fine

pull/1342/head
davidzagi93@gmail.com 3 years ago
parent e4e40c72a8
commit d2badf141f
  1. 11
      libs/remix-ui/terminal/src/lib/commands.ts
  2. 3
      libs/remix-ui/terminal/src/lib/remix-ui-terminal.css
  3. 37
      libs/remix-ui/terminal/src/lib/remix-ui-terminal.tsx
  4. 2
      libs/remix-ui/terminal/src/lib/terminalWelcome.tsx
  5. 2
      nx.json
  6. 30
      tsconfig.json

@ -1,7 +1,7 @@
export const allPrograms = [
{ ethers: 'The ethers.js library is a compact and complete JavaScript library for Ethereum.' },
{ remix: 'Ethereum IDE and tools for the web.' },
{ web3: 'The web3.js library is a collection of modules which contain specific functionality for the ethereum ecosystem.' },
{ web3: 'The web3.js library is a collection of modules which contain specific functionality for the ethereum ecosystem.' }
// { swarmgw: 'This library can be used to upload/download files to Swarm via https://swarm-gateways.net/.' }
]
@ -9,7 +9,7 @@ export const allCommands = [
// { 'remix.execute(filepath)': 'Run the script specified by file path. If filepath is empty, script currently displayed in the editor is executed.' },
{ 'remix.exeCurrent()': 'Run the script currently displayed in the editor.' },
// { 'remix.help()': 'Display this help message.' },
{ 'remix.loadgist(id)': 'Load a gist in the file explorer.' },
{ 'remix.loadgist(id)': 'Load a gist in the file explorer.' },
// { 'remix.loadurl(url)': 'Load the given url in the file explorer. The url can be of type github, swarm or ipfs.' },
// { 'swarmgw.get(url, cb)': 'Download files from Swarm via https://swarm-gateways.net/' },
@ -28,7 +28,7 @@ export const allCommands = [
{ 'web3.eth': 'Eth module for interacting with the Ethereum network.' },
{ 'web3.eth.accounts': 'The web3.eth.accounts contains functions to generate Ethereum accounts and sign transactions and data.' },
//TODO: need to break down the object return from abi response
// TODO: need to break down the object return from abi response
// { 'web3.eth.abi': 'The web3.eth.abi functions let you de- and encode parameters to ABI (Application Binary Interface) for function calls to the EVM (Ethereum Virtual Machine).' },
{ 'web3.eth.ens': 'The web3.eth.ens functions let you interacting with ENS.' },
{ 'web3.eth.Iban': 'The web3.eth.Iban function lets convert Ethereum addresses from and to IBAN and BBAN.' },
@ -42,7 +42,7 @@ export const allCommands = [
{ 'web3.utils': 'This package provides utility functions for Ethereum dapps and other web3.js packages.' },
{ 'web3.version': 'Contains the version of the web3 container object.' },
{ 'web3.eth.clearSubscriptions();': 'Resets subscriptions.' },
{ 'web3.eth.clearSubscriptions();': 'Resets subscriptions.' }
// { 'web3.eth.Contract(jsonInterface[, address][, options])': 'The web3.eth.Contract object makes it easy to interact with smart contracts on the ethereum blockchain.' },
// { 'web3.eth.accounts.create([entropy]);': 'The web3.eth.accounts contains functions to generate Ethereum accounts and sign transactions and data.' },
// { 'web3.eth.getAccounts();': 'Retrieve the list of accounts' },
@ -51,6 +51,3 @@ export const allCommands = [
// { 'web3.eth.accounts.recoverTransaction(rawTransaction);': 'Sign Transaction' },
// { 'web3.eth.accounts.hashMessage(message);': 'Hash message' }
]

@ -287,11 +287,8 @@ element.style {
.failed {
color: var(--danger);
}
<<<<<<< HEAD
.notavailable {
}
=======
>>>>>>> 627341f6a5ea4905e5a0330bcb41dc9aed7b420b
.call {
font-size: 7px;
border-radius: 50%;

@ -1,13 +1,8 @@
import React, { useState, useEffect, useReducer, useRef, SyntheticEvent, MouseEvent } from 'react' // eslint-disable-line
import { useKeyPress } from './custom-hooks/useKeyPress' // eslint-disable-line
import { useWindowResize } from 'beautiful-react-hooks'
<<<<<<< HEAD
import { registerCommandAction, registerLogScriptRunnerAction, registerInfoScriptRunnerAction, registerErrorScriptRunnerAction, registerWarnScriptRunnerAction, registerRemixWelcomeTextAction, listenOnNetworkAction, initListeningOnNetwork } from './actions/terminalAction'
import { initialState, registerCommandReducer, registerFilterReducer, addCommandHistoryReducer, registerScriptRunnerReducer, remixWelcomeTextReducer } from './reducers/terminalReducer'
=======
import { registerCommandAction, registerLogScriptRunnerAction, registerInfoScriptRunnerAction, registerErrorScriptRunnerAction, registerWarnScriptRunnerAction, listenOnNetworkAction, initListeningOnNetwork } from './actions/terminalAction'
import { initialState, registerCommandReducer, addCommandHistoryReducer, registerScriptRunnerReducer, remixWelcomeTextReducer } from './reducers/terminalReducer'
>>>>>>> 627341f6a5ea4905e5a0330bcb41dc9aed7b420b
import { initialState, registerCommandReducer, addCommandHistoryReducer, registerScriptRunnerReducer } from './reducers/terminalReducer'
import { remixWelcome } from './reducers/remixWelcom' // eslint-disable-line
import { getKeyOf, getValueOf, Objectfilter, matched } from './utils/utils'
import {allCommands, allPrograms} from './commands' // eslint-disable-line
@ -49,12 +44,8 @@ export interface RemixUiTerminalProps {
registry: any,
commands: any,
txListener: any,
<<<<<<< HEAD
eventsDecoder: any,
logHtml: any
=======
eventsDecoder: any
>>>>>>> 627341f6a5ea4905e5a0330bcb41dc9aed7b420b
}
export interface ClipboardEvent<T = Element> extends SyntheticEvent<T, any> {
@ -124,10 +115,6 @@ export const RemixUiTerminal = (props: RemixUiTerminalProps) => {
registerInfoScriptRunnerAction(props.thisState, 'info', newstate.commands, scriptRunnerDispatch)
registerWarnScriptRunnerAction(props.thisState, 'warn', newstate.commands, scriptRunnerDispatch)
registerErrorScriptRunnerAction(props.thisState, 'error', newstate.commands, scriptRunnerDispatch)
<<<<<<< HEAD
=======
>>>>>>> 627341f6a5ea4905e5a0330bcb41dc9aed7b420b
registerCommandAction('html', _blocksRenderer('html'), { activate: true }, dispatch)
registerCommandAction('log', _blocksRenderer('log'), { activate: true }, dispatch)
registerCommandAction('info', _blocksRenderer('info'), { activate: true }, dispatch)
@ -136,20 +123,13 @@ export const RemixUiTerminal = (props: RemixUiTerminalProps) => {
registerCommandAction('script', function execute (args, scopedCommands, append) {
var script = String(args[0])
<<<<<<< HEAD
console.log({ script }, 'script')
=======
>>>>>>> 627341f6a5ea4905e5a0330bcb41dc9aed7b420b
_shell(script, scopedCommands, function (error, output) {
if (error) scriptRunnerDispatch({ type: 'error', payload: { message: error } })
if (output) scriptRunnerDispatch({ type: 'script', payload: { message: '5' } })
})
}, { activate: true }, dispatch)
<<<<<<< HEAD
}, [props.thisState.autoCompletePopup, autoCompletState.text, props.logHtml])
=======
}, [props.thisState.autoCompletePopup, autoCompletState.text])
>>>>>>> 627341f6a5ea4905e5a0330bcb41dc9aed7b420b
useEffect(() => {
scrollToBottom()
@ -840,11 +820,7 @@ export const RemixUiTerminal = (props: RemixUiTerminalProps) => {
const handlePaste = () => {
setPaste(true)
<<<<<<< HEAD
setAutoCompleteState(prevState => ({ ...prevState, activeSuggestion: 0, showSuggestions: false}))
=======
setAutoCompleteState(prevState => ({ ...prevState, activeSuggestion: 0, showSuggestions: false }))
>>>>>>> 627341f6a5ea4905e5a0330bcb41dc9aed7b420b
}
return (
@ -900,26 +876,15 @@ export const RemixUiTerminal = (props: RemixUiTerminalProps) => {
{
handleAutoComplete()
}
<<<<<<< HEAD
<div data-id='terminalContainerDisplay' style = {{
position: 'absolute',
height: '100%',
width: '100%',
=======
<div data-id="terminalContainerDisplay" style = {{
position: 'absolute',
height: '100',
width: '100',
>>>>>>> 627341f6a5ea4905e5a0330bcb41dc9aed7b420b
opacity: '0.1',
zIndex: -1
}}></div>
<div className="terminal">
<<<<<<< HEAD
<div id='journal' className='journal' data-id='terminalJournal'>
=======
<div id="journal" className="journal" data-id="terminalJournal">
>>>>>>> 627341f6a5ea4905e5a0330bcb41dc9aed7b420b
{!clearConsole && <TerminalWelcomeMessage packageJson={props.version}/>}
{newstate.journalBlocks && newstate.journalBlocks.map((x, index) => {
if (x.name === 'emptyBlock') {

@ -1,4 +1,4 @@
import React from 'react'
import React from 'react' // eslint-disable-line
const TerminalWelcomeMessage = ({ packageJson }) => {
return (

@ -106,8 +106,6 @@
"remix-ui-checkbox": {
"tags": []
},
"remix-ui-terminal": {
},
"remix-core-plugin": {
"tags": []
},

@ -14,35 +14,7 @@
"skipLibCheck": true,
"skipDefaultLibCheck": true,
"baseUrl": ".",
"paths": {
"@remix-project/remix-analyzer": ["dist/libs/remix-analyzer/index.js"],
"@remix-project/remix-astwalker": ["dist/libs/remix-astwalker/index.js"],
"@remix-project/remix-debug": ["dist/libs/remix-debug/src/index.js"],
"@remix-project/remix-lib": ["dist/libs/remix-lib/src/index.js"],
"@remix-project/remix-simulator": ["dist/libs/remix-simulator/src/index.js"],
"@remix-project/remix-solidity": ["dist/libs/remix-solidity/index.js"],
"@remix-project/remix-tests": ["dist/libs/remix-tests/src/index.js"],
"@remix-project/remix-url-resolver": ["dist/libs/remix-url-resolver/index.js"],
"@remixproject/debugger-plugin": ["apps/debugger/src/index.ts"],
"@remix-project/remixd": ["dist/libs/remixd/index.js"],
"@remix-ui/tree-view": ["libs/remix-ui/tree-view/src/index.ts"],
"@remix-ui/debugger-ui": ["libs/remix-ui/debugger-ui/src/index.ts"],
"@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-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"],
"@remix-ui/workspace": ["libs/remix-ui/workspace/src/index.ts"],
"@remix-ui/static-analyser": ["libs/remix-ui/static-analyser/src/index.ts"],
"@remix-ui/checkbox": ["libs/remix-ui/checkbox/src/index.ts"],
"@remix-ui/terminal": ["libs/remix-ui/terminal/src/index.ts"],
"@remix-ui/settings": ["libs/remix-ui/settings/src/index.ts"],
"@remix-project/core-plugin": ["libs/remix-core-plugin/src/index.ts"],
"@remix-ui/solidity-compiler": ["libs/remix-ui/solidity-compiler/src/index.ts"],
"@remix-ui/publish-to-storage": ["libs/remix-ui/publish-to-storage/src/index.ts"],
"@remix-ui/renderer": ["libs/remix-ui/renderer/src/index.ts"]
}
"paths": {}
},
"exclude": ["node_modules", "tmp"]
}

Loading…
Cancel
Save