diff --git a/libs/remix-ui/debugger-ui/src/lib/debugger-ui.tsx b/libs/remix-ui/debugger-ui/src/lib/debugger-ui.tsx index a6c6cc1738..2fadf6de62 100644 --- a/libs/remix-ui/debugger-ui/src/lib/debugger-ui.tsx +++ b/libs/remix-ui/debugger-ui/src/lib/debugger-ui.tsx @@ -24,7 +24,9 @@ const DebuggerUI = ({ debuggerModule, component, fetchContractAndCompile }) => { currentReceipt: { contractAddress: null, to: null - } + }, + blockNumber: null, + txNumber: null }) useEffect(() => { @@ -103,6 +105,19 @@ const DebuggerUI = ({ debuggerModule, component, fetchContractAndCompile }) => { }) } + const unLoad = async () => { + // yo.update(this.debuggerHeadPanelsView, yo`
`) + // yo.update(this.debuggerPanelsView, yo`
`) + // yo.update(this.stepManagerView, yo`
`) + if (this.vmDebugger) this.vmDebugger.remove() + if (this.stepManager) this.stepManager.remove() + if (this.txBrowser) this.txBrowser.setState({debugging: false}) + this.vmDebugger = null + this.stepManager = null + if (this.debugger) delete this.debugger + this.event.trigger('traceUnloaded') + } + const startDebugging = async (blockNumber, txNumber, tx) => { if (state.debugger) unLoad() @@ -125,13 +140,20 @@ const DebuggerUI = ({ debuggerModule, component, fetchContractAndCompile }) => { }) listenToEvents() state.debugger.debug(blockNumber, txNumber, tx, () => { - this.stepManager = new StepManagerUI(this.debugger.step_manager) - this.vmDebugger = new VmDebugger(this.debugger.vmDebuggerLogic) - this.txBrowser.setState({ blockNumber, txNumber, debugging: true }) + // this.stepManager = new StepManagerUI(this.debugger.step_manager) + // this.vmDebugger = new VmDebugger(this.debugger.vmDebuggerLogic) + setState(prevState => { + return { + ...prevState, + blockNumber, + txNumber, + debugging: true + } + }) this.renderDebugger() }).catch((error) => { - toaster(error) - this.unLoad() + toaster(error, null, null) + unLoad() }) } diff --git a/libs/remix-ui/debugger-ui/src/lib/tx-browser/tx-browser.tsx b/libs/remix-ui/debugger-ui/src/lib/tx-browser/tx-browser.tsx index a84161c3f1..7ee2d571f0 100644 --- a/libs/remix-ui/debugger-ui/src/lib/tx-browser/tx-browser.tsx +++ b/libs/remix-ui/debugger-ui/src/lib/tx-browser/tx-browser.tsx @@ -1,6 +1,6 @@ import React, { useState } from 'react' import './tx-browser.css' -import EventManager from '../../../../../apps/remix-ide/src/lib/events' +import EventManager from '../../../../../../apps/remix-ide/src/lib/events' export const TxBrowser = () => { const event = new EventManager() diff --git a/libs/remix-ui/utils/.babelrc b/libs/remix-ui/utils/.babelrc new file mode 100644 index 0000000000..09d67939cc --- /dev/null +++ b/libs/remix-ui/utils/.babelrc @@ -0,0 +1,4 @@ +{ + "presets": ["@nrwl/react/babel"], + "plugins": [] +} diff --git a/libs/remix-ui/utils/.eslintrc b/libs/remix-ui/utils/.eslintrc new file mode 100644 index 0000000000..977f139a09 --- /dev/null +++ b/libs/remix-ui/utils/.eslintrc @@ -0,0 +1,248 @@ +{ + "rules": { + "array-callback-return": "warn", + "dot-location": ["warn", "property"], + "eqeqeq": ["warn", "smart"], + "new-parens": "warn", + "no-caller": "warn", + "no-cond-assign": ["warn", "except-parens"], + "no-const-assign": "warn", + "no-control-regex": "warn", + "no-delete-var": "warn", + "no-dupe-args": "warn", + "no-dupe-keys": "warn", + "no-duplicate-case": "warn", + "no-empty-character-class": "warn", + "no-empty-pattern": "warn", + "no-eval": "warn", + "no-ex-assign": "warn", + "no-extend-native": "warn", + "no-extra-bind": "warn", + "no-extra-label": "warn", + "no-fallthrough": "warn", + "no-func-assign": "warn", + "no-implied-eval": "warn", + "no-invalid-regexp": "warn", + "no-iterator": "warn", + "no-label-var": "warn", + "no-labels": ["warn", { "allowLoop": true, "allowSwitch": false }], + "no-lone-blocks": "warn", + "no-loop-func": "warn", + "no-mixed-operators": [ + "warn", + { + "groups": [ + ["&", "|", "^", "~", "<<", ">>", ">>>"], + ["==", "!=", "===", "!==", ">", ">=", "<", "<="], + ["&&", "||"], + ["in", "instanceof"] + ], + "allowSamePrecedence": false + } + ], + "no-multi-str": "warn", + "no-native-reassign": "warn", + "no-negated-in-lhs": "warn", + "no-new-func": "warn", + "no-new-object": "warn", + "no-new-symbol": "warn", + "no-new-wrappers": "warn", + "no-obj-calls": "warn", + "no-octal": "warn", + "no-octal-escape": "warn", + "no-redeclare": "warn", + "no-regex-spaces": "warn", + "no-restricted-syntax": ["warn", "WithStatement"], + "no-script-url": "warn", + "no-self-assign": "warn", + "no-self-compare": "warn", + "no-sequences": "warn", + "no-shadow-restricted-names": "warn", + "no-sparse-arrays": "warn", + "no-template-curly-in-string": "warn", + "no-this-before-super": "warn", + "no-throw-literal": "warn", + "no-restricted-globals": [ + "error", + "addEventListener", + "blur", + "close", + "closed", + "confirm", + "defaultStatus", + "defaultstatus", + "event", + "external", + "find", + "focus", + "frameElement", + "frames", + "history", + "innerHeight", + "innerWidth", + "length", + "location", + "locationbar", + "menubar", + "moveBy", + "moveTo", + "name", + "onblur", + "onerror", + "onfocus", + "onload", + "onresize", + "onunload", + "open", + "opener", + "opera", + "outerHeight", + "outerWidth", + "pageXOffset", + "pageYOffset", + "parent", + "print", + "removeEventListener", + "resizeBy", + "resizeTo", + "screen", + "screenLeft", + "screenTop", + "screenX", + "screenY", + "scroll", + "scrollbars", + "scrollBy", + "scrollTo", + "scrollX", + "scrollY", + "self", + "status", + "statusbar", + "stop", + "toolbar", + "top" + ], + "no-unexpected-multiline": "warn", + "no-unreachable": "warn", + "no-unused-expressions": [ + "error", + { + "allowShortCircuit": true, + "allowTernary": true, + "allowTaggedTemplates": true + } + ], + "no-unused-labels": "warn", + "no-useless-computed-key": "warn", + "no-useless-concat": "warn", + "no-useless-escape": "warn", + "no-useless-rename": [ + "warn", + { + "ignoreDestructuring": false, + "ignoreImport": false, + "ignoreExport": false + } + ], + "no-with": "warn", + "no-whitespace-before-property": "warn", + "react-hooks/exhaustive-deps": "warn", + "require-yield": "warn", + "rest-spread-spacing": ["warn", "never"], + "strict": ["warn", "never"], + "unicode-bom": ["warn", "never"], + "use-isnan": "warn", + "valid-typeof": "warn", + "no-restricted-properties": [ + "error", + { + "object": "require", + "property": "ensure", + "message": "Please use import() instead. More info: https://facebook.github.io/create-react-app/docs/code-splitting" + }, + { + "object": "System", + "property": "import", + "message": "Please use import() instead. More info: https://facebook.github.io/create-react-app/docs/code-splitting" + } + ], + "getter-return": "warn", + "import/first": "error", + "import/no-amd": "error", + "import/no-webpack-loader-syntax": "error", + "react/forbid-foreign-prop-types": ["warn", { "allowInPropTypes": true }], + "react/jsx-no-comment-textnodes": "warn", + "react/jsx-no-duplicate-props": "warn", + "react/jsx-no-target-blank": "warn", + "react/jsx-no-undef": "error", + "react/jsx-pascal-case": ["warn", { "allowAllCaps": true, "ignore": [] }], + "react/jsx-uses-react": "warn", + "react/jsx-uses-vars": "warn", + "react/no-danger-with-children": "warn", + "react/no-direct-mutation-state": "warn", + "react/no-is-mounted": "warn", + "react/no-typos": "error", + "react/react-in-jsx-scope": "error", + "react/require-render-return": "error", + "react/style-prop-object": "warn", + "react/jsx-no-useless-fragment": "warn", + "jsx-a11y/accessible-emoji": "warn", + "jsx-a11y/alt-text": "warn", + "jsx-a11y/anchor-has-content": "warn", + "jsx-a11y/anchor-is-valid": [ + "warn", + { "aspects": ["noHref", "invalidHref"] } + ], + "jsx-a11y/aria-activedescendant-has-tabindex": "warn", + "jsx-a11y/aria-props": "warn", + "jsx-a11y/aria-proptypes": "warn", + "jsx-a11y/aria-role": "warn", + "jsx-a11y/aria-unsupported-elements": "warn", + "jsx-a11y/heading-has-content": "warn", + "jsx-a11y/iframe-has-title": "warn", + "jsx-a11y/img-redundant-alt": "warn", + "jsx-a11y/no-access-key": "warn", + "jsx-a11y/no-distracting-elements": "warn", + "jsx-a11y/no-redundant-roles": "warn", + "jsx-a11y/role-has-required-aria-props": "warn", + "jsx-a11y/role-supports-aria-props": "warn", + "jsx-a11y/scope": "warn", + "react-hooks/rules-of-hooks": "error", + "default-case": "off", + "no-dupe-class-members": "off", + "no-undef": "off", + "@typescript-eslint/consistent-type-assertions": "warn", + "no-array-constructor": "off", + "@typescript-eslint/no-array-constructor": "warn", + "@typescript-eslint/no-namespace": "error", + "no-use-before-define": "off", + "@typescript-eslint/no-use-before-define": [ + "warn", + { + "functions": false, + "classes": false, + "variables": false, + "typedefs": false + } + ], + "no-unused-vars": "off", + "@typescript-eslint/no-unused-vars": [ + "warn", + { "args": "none", "ignoreRestSiblings": true } + ], + "no-useless-constructor": "off", + "@typescript-eslint/no-useless-constructor": "warn" + }, + "env": { + "browser": true, + "commonjs": true, + "es6": true, + "jest": true, + "node": true + }, + "settings": { "react": { "version": "detect" } }, + "plugins": ["import", "jsx-a11y", "react", "react-hooks"], + "extends": ["../../../.eslintrc"], + "ignorePatterns": ["!**/*"] +} diff --git a/libs/remix-ui/utils/README.md b/libs/remix-ui/utils/README.md new file mode 100644 index 0000000000..84a6ec18a6 --- /dev/null +++ b/libs/remix-ui/utils/README.md @@ -0,0 +1,7 @@ +# remix-ui-utils + +This library was generated with [Nx](https://nx.dev). + +## Running unit tests + +Run `nx test remix-ui-utils` to execute the unit tests via [Jest](https://jestjs.io). diff --git a/libs/remix-ui/utils/babel-jest.config.json b/libs/remix-ui/utils/babel-jest.config.json new file mode 100644 index 0000000000..bf04d5f81f --- /dev/null +++ b/libs/remix-ui/utils/babel-jest.config.json @@ -0,0 +1,14 @@ +{ + "presets": [ + [ + "@babel/preset-env", + { + "targets": { + "node": "current" + } + } + ], + "@babel/preset-typescript", + "@babel/preset-react" + ] +} diff --git a/libs/remix-ui/utils/jest.config.js b/libs/remix-ui/utils/jest.config.js new file mode 100644 index 0000000000..73ce6f9c5c --- /dev/null +++ b/libs/remix-ui/utils/jest.config.js @@ -0,0 +1,12 @@ +module.exports = { + name: 'remix-ui-utils', + preset: '../../../jest.config.js', + transform: { + '^.+\\.[tj]sx?$': [ + 'babel-jest', + { cwd: __dirname, configFile: './babel-jest.config.json' } + ] + }, + moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html'], + coverageDirectory: '../../../coverage/libs/remix-ui/utils' +}; diff --git a/libs/remix-ui/utils/src/index.ts b/libs/remix-ui/utils/src/index.ts new file mode 100644 index 0000000000..7a9332d560 --- /dev/null +++ b/libs/remix-ui/utils/src/index.ts @@ -0,0 +1 @@ +export * from './lib/should-render'; diff --git a/libs/remix-ui/utils/src/lib/should-render.css b/libs/remix-ui/utils/src/lib/should-render.css new file mode 100644 index 0000000000..e69de29bb2 diff --git a/libs/remix-ui/utils/src/lib/should-render.spec.tsx b/libs/remix-ui/utils/src/lib/should-render.spec.tsx new file mode 100644 index 0000000000..003c5b8800 --- /dev/null +++ b/libs/remix-ui/utils/src/lib/should-render.spec.tsx @@ -0,0 +1,11 @@ +import React from 'react'; +import { render } from '@testing-library/react'; + +import ShouldRender from './should-render'; + +describe(' ShouldRender', () => { + it('should render successfully', () => { + const { baseElement } = render(); + expect(baseElement).toBeTruthy(); + }); +}); diff --git a/libs/remix-ui/utils/src/lib/should-render.tsx b/libs/remix-ui/utils/src/lib/should-render.tsx new file mode 100644 index 0000000000..1ff403d31c --- /dev/null +++ b/libs/remix-ui/utils/src/lib/should-render.tsx @@ -0,0 +1,16 @@ +import React from 'react'; + +import './should-render.css'; + +/* eslint-disable-next-line */ +export interface ShouldRenderProps {} + +export const ShouldRender = (props: ShouldRenderProps) => { + return ( +
+

Welcome to shouldRender!

+
+ ); +}; + +export default ShouldRender; diff --git a/libs/remix-ui/utils/tsconfig.json b/libs/remix-ui/utils/tsconfig.json new file mode 100644 index 0000000000..42b7ee636f --- /dev/null +++ b/libs/remix-ui/utils/tsconfig.json @@ -0,0 +1,19 @@ +{ + "extends": "../../../tsconfig.json", + "compilerOptions": { + "jsx": "react", + "allowJs": true, + "esModuleInterop": true, + "allowSyntheticDefaultImports": true + }, + "files": [], + "include": [], + "references": [ + { + "path": "./tsconfig.lib.json" + }, + { + "path": "./tsconfig.spec.json" + } + ] +} diff --git a/libs/remix-ui/utils/tsconfig.lib.json b/libs/remix-ui/utils/tsconfig.lib.json new file mode 100644 index 0000000000..b560bc4dec --- /dev/null +++ b/libs/remix-ui/utils/tsconfig.lib.json @@ -0,0 +1,13 @@ +{ + "extends": "./tsconfig.json", + "compilerOptions": { + "outDir": "../../../dist/out-tsc", + "types": ["node"] + }, + "files": [ + "../../../node_modules/@nrwl/react/typings/cssmodule.d.ts", + "../../../node_modules/@nrwl/react/typings/image.d.ts" + ], + "exclude": ["**/*.spec.ts", "**/*.spec.tsx"], + "include": ["**/*.js", "**/*.jsx", "**/*.ts", "**/*.tsx"] +} diff --git a/libs/remix-ui/utils/tsconfig.spec.json b/libs/remix-ui/utils/tsconfig.spec.json new file mode 100644 index 0000000000..1798b378a9 --- /dev/null +++ b/libs/remix-ui/utils/tsconfig.spec.json @@ -0,0 +1,15 @@ +{ + "extends": "./tsconfig.json", + "compilerOptions": { + "outDir": "../../../dist/out-tsc", + "module": "commonjs", + "types": ["jest", "node"] + }, + "include": [ + "**/*.spec.ts", + "**/*.spec.tsx", + "**/*.spec.js", + "**/*.spec.jsx", + "**/*.d.ts" + ] +} diff --git a/nx.json b/nx.json index ed25cf3c37..3cff4f7184 100644 --- a/nx.json +++ b/nx.json @@ -75,6 +75,9 @@ }, "remix-ui-debugger-ui": { "tags": [] + }, + "remix-ui-utils": { + "tags": [] } } } diff --git a/tsconfig.json b/tsconfig.json index bcc80da5dd..3b31675e3b 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -24,10 +24,11 @@ "@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"], - "@remix-project/remixd": ["dist/libs/remixd/index.js"], + "@remix-project/remixd": ["dist/libs/remixd/index.js"], "@remix-project/debugger-ui": ["libs/debugger-ui/src/index.ts"], "@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/debugger-ui": ["libs/remix-ui/debugger-ui/src/index.ts"], + "@remix-ui/utils": ["libs/remix-ui/utils/src/index.ts"] } }, "exclude": ["node_modules", "tmp"] diff --git a/workspace.json b/workspace.json index 073950cfc8..e5086e3477 100644 --- a/workspace.json +++ b/workspace.json @@ -563,6 +563,33 @@ } } } + }, + "remix-ui-utils": { + "root": "libs/remix-ui/utils", + "sourceRoot": "libs/remix-ui/utils/src", + "projectType": "library", + "schematics": {}, + "architect": { + "lint": { + "builder": "@nrwl/linter:lint", + "options": { + "linter": "eslint", + "tsConfig": [ + "libs/remix-ui/utils/tsconfig.lib.json", + "libs/remix-ui/utils/tsconfig.spec.json" + ], + "exclude": ["**/node_modules/**", "!libs/remix-ui/utils/**/*"] + } + }, + "test": { + "builder": "@nrwl/jest:jest", + "options": { + "jestConfig": "libs/remix-ui/utils/jest.config.js", + "tsConfig": "libs/remix-ui/utils/tsconfig.spec.json", + "passWithNoTests": true + } + } + } } }, "cli": {