diff --git a/libs/remix-ui/publish-to-storage/.eslintrc b/libs/remix-ui/publish-to-storage/.eslintrc index 6b65264565..b8666066e9 100644 --- a/libs/remix-ui/publish-to-storage/.eslintrc +++ b/libs/remix-ui/publish-to-storage/.eslintrc @@ -1,16 +1,18 @@ { - "extends": "../../../tsconfig.json", - "compilerOptions": { - "jsx": "react", - "allowJs": true, - "esModuleInterop": true, - "allowSyntheticDefaultImports": true + "env": { + "browser": true, + "es6": true }, - "files": [], - "include": [], - "references": [ - { - "path": "./tsconfig.lib.json" - } - ] -} + "extends": "../../../.eslintrc", + "globals": { + "Atomics": "readonly", + "SharedArrayBuffer": "readonly" + }, + "parserOptions": { + "ecmaVersion": 11, + "sourceType": "module" + }, + "rules": { + "standard/no-callback-literal": "off" + } +} diff --git a/libs/remix-ui/publish-to-storage/src/lib/publish-to-storage.tsx b/libs/remix-ui/publish-to-storage/src/lib/publish-to-storage.tsx index c07e43ab70..de14a65a2f 100644 --- a/libs/remix-ui/publish-to-storage/src/lib/publish-to-storage.tsx +++ b/libs/remix-ui/publish-to-storage/src/lib/publish-to-storage.tsx @@ -1,6 +1,6 @@ import React, { useEffect, useState } from 'react' // eslint-disable-line import { ModalDialog } from '@remix-ui/modal-dialog' // eslint-disable-line -import { RemixUiPublishToStorageProps } from './types' +import { RemixUiPublishToStorageProps } from './types' // eslint-disable-line import { publishToIPFS } from './publishToIPFS' import { publishToSwarm } from './publishOnSwarm' @@ -31,10 +31,11 @@ export const PublishToStorage = (props: RemixUiPublishToStorageProps) => { // triggered each time there's a new verified publish (means hash correspond) fileProvider.addExternal('swarm/' + result.item.hash, result.item.content) } catch (err) { + let parseError = err try { - err = JSON.stringify(err) + parseError = JSON.stringify(err) } catch (e) {} - modal(`Swarm Publish Failed`, publishMessageFailed(storage, err)) + modal('Swarm Publish Failed', publishMessageFailed(storage, parseError)) } } else { try { @@ -44,7 +45,7 @@ export const PublishToStorage = (props: RemixUiPublishToStorageProps) => { // triggered each time there's a new verified publish (means hash correspond) fileProvider.addExternal('ipfs/' + result.item.hash, result.item.content) } catch (err) { - modal(`IPFS Publish Failed`, publishMessageFailed(storage, err)) + modal('IPFS Publish Failed', publishMessageFailed(storage, err)) } } } @@ -67,7 +68,7 @@ export const PublishToStorage = (props: RemixUiPublishToStorageProps) => { const publishMessageFailed = (storage, err) => ( Failed to publish metadata file to { storage }, please check the { storage } gateways is available.
- {err} + {err}
) @@ -86,23 +87,23 @@ export const PublishToStorage = (props: RemixUiPublishToStorageProps) => { ...prevState.modal, hide: false, message, - title, + title } } }) } return ( - {}} - handleHide={ handleHideModal }> - { (typeof state.modal.message !== 'string') && state.modal.message } - + {}} + handleHide={ handleHideModal }> + { (typeof state.modal.message !== 'string') && state.modal.message } + ) } diff --git a/libs/remix-ui/publish-to-storage/src/lib/publishOnSwarm.tsx b/libs/remix-ui/publish-to-storage/src/lib/publishOnSwarm.tsx index 81be4e1662..785d00b895 100644 --- a/libs/remix-ui/publish-to-storage/src/lib/publishOnSwarm.tsx +++ b/libs/remix-ui/publish-to-storage/src/lib/publishOnSwarm.tsx @@ -6,7 +6,7 @@ export const publishToSwarm = async (contract, fileManager) => { // gather list of files to publish const sources = [] let metadata - let item = { content: null, hash: null } + const item = { content: null, hash: null } const uploaded = [] try { diff --git a/libs/remix-ui/publish-to-storage/src/lib/publishToIPFS.tsx b/libs/remix-ui/publish-to-storage/src/lib/publishToIPFS.tsx index 4d5e53c098..60fbb830b5 100644 --- a/libs/remix-ui/publish-to-storage/src/lib/publishToIPFS.tsx +++ b/libs/remix-ui/publish-to-storage/src/lib/publishToIPFS.tsx @@ -10,7 +10,7 @@ export const publishToIPFS = async (contract, fileManager) => { // gather list of files to publish const sources = [] let metadata - let item = { content: null, hash: null } + const item = { content: null, hash: null } const uploaded = [] try { diff --git a/libs/remix-ui/solidity-compiler/.eslintrc b/libs/remix-ui/solidity-compiler/.eslintrc index 6b65264565..dae5c6feeb 100644 --- a/libs/remix-ui/solidity-compiler/.eslintrc +++ b/libs/remix-ui/solidity-compiler/.eslintrc @@ -1,16 +1,19 @@ { - "extends": "../../../tsconfig.json", - "compilerOptions": { - "jsx": "react", - "allowJs": true, - "esModuleInterop": true, - "allowSyntheticDefaultImports": true + "env": { + "browser": true, + "es6": true }, - "files": [], - "include": [], - "references": [ - { - "path": "./tsconfig.lib.json" - } - ] -} + "extends": "../../../.eslintrc", + "globals": { + "Atomics": "readonly", + "SharedArrayBuffer": "readonly" + }, + "parserOptions": { + "ecmaVersion": 11, + "sourceType": "module" + }, + "rules": { + "no-unused-vars": "off", + "@typescript-eslint/no-unused-vars": "error" + } +} diff --git a/libs/remix-ui/solidity-compiler/src/lib/compiler-container.tsx b/libs/remix-ui/solidity-compiler/src/lib/compiler-container.tsx index 37444dce22..9bd0fcb4e4 100644 --- a/libs/remix-ui/solidity-compiler/src/lib/compiler-container.tsx +++ b/libs/remix-ui/solidity-compiler/src/lib/compiler-container.tsx @@ -60,13 +60,13 @@ export const CompilerContainer = (props: CompilerContainerProps) => { const optimize = params.optimize === 'false' ? false : params.optimize === 'true' ? true : null const runs = params.runs const evmVersion = params.evmVersion - + return { ...prevState, hideWarnings: config.get('hideWarnings') || false, autoCompile: config.get('autoCompile') || false, includeNightlies: config.get('includeNightlies') || false, - optimise: (optimize !== null) && (optimize !== undefined) ? optimize : config.get('optimise') || false, + optimise: (optimize !== null) && (optimize !== undefined) ? optimize : config.get('optimise') || false, runs: (runs !== null) && (runs !== 'null') && (runs !== undefined) && (runs !== 'undefined') ? runs : 200, evmVersion: (evmVersion !== null) && (evmVersion !== 'null') && (evmVersion !== undefined) && (evmVersion !== 'undefined') ? evmVersion : 'default' } @@ -100,7 +100,7 @@ export const CompilerContainer = (props: CompilerContainerProps) => { resetCompilerMode()(dispatch) break case 'compilationFinished': - compilationFinished(compilerContainer.compiler.args) + compilationFinished() resetCompilerMode()(dispatch) break } @@ -274,11 +274,11 @@ export const CompilerContainer = (props: CompilerContainerProps) => { if (state.autoCompile) compile() } - const compilationFinished = ({ success, data, source }) => { - if (!compileIcon.current) return - compileIcon.current.setAttribute('title', 'idle') - compileIcon.current.classList.remove('remixui_spinningIcon') - compileIcon.current.classList.remove('remixui_bouncingIcon') + const compilationFinished = () => { + if (!compileIcon.current) return + compileIcon.current.setAttribute('title', 'idle') + compileIcon.current.classList.remove('remixui_spinningIcon') + compileIcon.current.classList.remove('remixui_bouncingIcon') } const scheduleCompilation = () => { @@ -490,7 +490,7 @@ export const CompilerContainer = (props: CompilerContainerProps) => { setHardHatCompilation(checked) } - /* + /* The following functions map with the above event handlers. They are an external API for modifying the compiler configuration. */ @@ -514,7 +514,7 @@ export const CompilerContainer = (props: CompilerContainerProps) => {
- diff --git a/libs/remix-ui/solidity-compiler/src/lib/logic/compiler-helpers.ts b/libs/remix-ui/solidity-compiler/src/lib/logic/compiler-helpers.ts index c052f19cbe..64c56bd7a5 100644 --- a/libs/remix-ui/solidity-compiler/src/lib/logic/compiler-helpers.ts +++ b/libs/remix-ui/solidity-compiler/src/lib/logic/compiler-helpers.ts @@ -4,7 +4,7 @@ import { Compiler } from '@remix-project/remix-solidity' import { CompilerAbstract } from './compiler-abstract' export const compile = async (compilationTargets, settings, contentResolverCallback) => { - return new Promise((resolve, reject) => { + return new Promise((resolve) => { const compiler = new Compiler(contentResolverCallback) compiler.set('evmVersion', settings.evmVersion) compiler.set('optimize', settings.optimize) @@ -14,6 +14,6 @@ export const compile = async (compilationTargets, settings, contentResolverCallb compiler.event.register('compilationFinished', (success, compilationData, source) => { resolve(new CompilerAbstract(settings.version, compilationData, source)) }) - compiler.event.register('compilerLoaded', _ => compiler.compile(compilationTargets, '')) + compiler.event.register('compilerLoaded', () => compiler.compile(compilationTargets, '')) }) } diff --git a/libs/remix-ui/solidity-compiler/src/lib/logic/compiler-utils.ts b/libs/remix-ui/solidity-compiler/src/lib/logic/compiler-utils.ts index bd3fc3a016..fe26765ac1 100644 --- a/libs/remix-ui/solidity-compiler/src/lib/logic/compiler-utils.ts +++ b/libs/remix-ui/solidity-compiler/src/lib/logic/compiler-utils.ts @@ -38,7 +38,7 @@ function browserSupportWorker () { // returns a promise for minixhr export function promisedMiniXhr (url) { - return new Promise((resolve, reject) => { + return new Promise((resolve) => { minixhr(url, (json, event) => { resolve({ json, event }) }) diff --git a/libs/remix-ui/solidity-compiler/src/lib/logic/index.ts b/libs/remix-ui/solidity-compiler/src/lib/logic/index.ts index 8e8fb31572..b67d648896 100644 --- a/libs/remix-ui/solidity-compiler/src/lib/logic/index.ts +++ b/libs/remix-ui/solidity-compiler/src/lib/logic/index.ts @@ -2,4 +2,4 @@ export * from './compileTabLogic' export * from './compiler-abstract' export * from './compiler-helpers' export * from './compiler-utils' -export * from './contract-parser' \ No newline at end of file +export * from './contract-parser' diff --git a/libs/remix-ui/solidity-compiler/src/lib/reducers/compiler.ts b/libs/remix-ui/solidity-compiler/src/lib/reducers/compiler.ts index 6507d84b7b..f705c0f3cc 100644 --- a/libs/remix-ui/solidity-compiler/src/lib/reducers/compiler.ts +++ b/libs/remix-ui/solidity-compiler/src/lib/reducers/compiler.ts @@ -56,8 +56,8 @@ export const compilerReducer = (state = compilerInitialState, action: Action) => } } } - + default: throw new Error() } -} \ No newline at end of file +} diff --git a/libs/remix-ui/solidity-compiler/src/lib/solidity-compiler.tsx b/libs/remix-ui/solidity-compiler/src/lib/solidity-compiler.tsx index 3d62ffdf3b..3fd3f800fb 100644 --- a/libs/remix-ui/solidity-compiler/src/lib/solidity-compiler.tsx +++ b/libs/remix-ui/solidity-compiler/src/lib/solidity-compiler.tsx @@ -1,15 +1,15 @@ import React, { useState } from 'react' // eslint-disable-line import { SolidityCompilerProps } from './types' import { CompilerContainer } from './compiler-container' // eslint-disable-line -import { ContractSelection } from './contract-selection' +import { ContractSelection } from './contract-selection' // eslint-disable-line import { Toaster } from '@remix-ui/toaster' // eslint-disable-line import { ModalDialog } from '@remix-ui/modal-dialog' // eslint-disable-line -import { Renderer } from '@remix-ui/renderer' +import { Renderer } from '@remix-ui/renderer' // eslint-disable-line import './css/style.css' export const SolidityCompiler = (props: SolidityCompilerProps) => { - const { plugin, plugin : { editor, config, queryParams, compileTabLogic, currentFile, fileProvider, fileManager, contractsDetails, contractMap, compileErrors, isHardHatProject, setHardHatCompilation, configurationSettings } } = props + const { plugin, plugin: { editor, config, queryParams, compileTabLogic, currentFile, fileProvider, fileManager, contractsDetails, contractMap, compileErrors, isHardHatProject, setHardHatCompilation, configurationSettings } } = props const [state, setState] = useState({ contractsDetails: {}, eventHandlers: {}, @@ -28,7 +28,7 @@ export const SolidityCompiler = (props: SolidityCompilerProps) => { handleHide: null } }) - const [currentVersion, setCurrentVersion] = useState('') + const [currentVersion, setCurrentVersion] = useState('') const toast = (message: string) => { setState(prevState => { @@ -36,10 +36,6 @@ export const SolidityCompiler = (props: SolidityCompilerProps) => { }) } - const clearAnnotations = () => { - plugin.call('editor', 'clearAnnotations') - } - const updateCurrentVersion = (value) => { setCurrentVersion(value) plugin.setSelectedVersion(value) diff --git a/package.json b/package.json index 9d0ff5be06..781ee00078 100644 --- a/package.json +++ b/package.json @@ -41,8 +41,8 @@ "workspace-schematic": "nx workspace-schematic", "dep-graph": "nx dep-graph", "help": "nx help", - "lint:libs": "nx run-many --target=lint --projects=remix-analyzer,remix-astwalker,remix-debug,remix-lib,remix-simulator,remix-solidity,remix-tests,remix-url-resolver,remixd,remix-ui-tree-view,remix-ui-modal-dialog,remix-ui-toaster,remix-ui-file-explorer,remix-ui-debugger-ui,remix-ui-workspace,remix-ui-static-analyser,remix-ui-checkbox,remix-ui-settings,remix-core-plugin", - "build:libs": "nx run-many --target=build --parallel=false --with-deps=true --projects=remix-analyzer,remix-astwalker,remix-debug,remix-lib,remix-simulator,remix-solidity,remix-tests,remix-url-resolver,remixd,remix-core-plugin", + "lint:libs": "nx run-many --target=lint --projects=remix-analyzer,remix-astwalker,remix-debug,remix-lib,remix-simulator,remix-solidity,remix-tests,remix-url-resolver,remixd,remix-ui-tree-view,remix-ui-modal-dialog,remix-ui-toaster,remix-ui-file-explorer,remix-ui-debugger-ui,remix-ui-workspace,remix-ui-static-analyser,remix-ui-checkbox,remix-ui-settings,remix-core-plugin,remix-ui-renderer,remix-ui-publish-to-storage,remix-ui-solidity-compiler", + "build:libs": "nx run-many --target=build --parallel=false --with-deps=true --projects=remix-analyzer,remix-astwalker,remix-debug,remix-lib,remix-simulator,remix-solidity,remix-tests,remix-url-resolver,remixd", "test:libs": "nx run-many --target=test --projects=remix-analyzer,remix-astwalker,remix-debug,remix-lib,remix-simulator,remix-solidity,remix-tests,remix-url-resolver,remixd", "publish:libs": "npm run build:libs && lerna publish --skip-git && npm run bumpVersion:libs", "build:e2e": "tsc -p apps/remix-ide-e2e/tsconfig.e2e.json",