Merge branch 'react-plugin-manager' of https://github.com/ethereum/remix-project into react-plugin-manager

apps/debugger/tsconfig.json

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

apps/remix-ide-e2e/tsconfig.json

@@ -1,5 +1,5 @@
 {
-    "extends": "../../tsconfig.json",
+    "extends": "../../tsconfig.base.json",
     "compilerOptions": {
       "types": ["node", "nightwatch"],
       "esModuleInterop": true

apps/remix-ide/src/blockchain/blockchain.js

@@ -501,7 +501,7 @@ class Blockchain extends Plugin {
       if (isVM) {
         const hhlogs = await this.web3().eth.getHHLogsForTx(txResult.transactionHash)
         if (hhlogs && hhlogs.length) {
-          let finalLogs = 'console.log:\n'
+          let finalLogs = '<b>console.log:</b>\n'
           for (const log of hhlogs) {
             let formattedLog
             // Hardhat implements the same formatting options that can be found in Node.js' console.log,
@@ -513,7 +513,7 @@ class Blockchain extends Plugin {
             } else {
               formattedLog = log.join(' ')
             }
-            finalLogs = finalLogs + formattedLog + '\n'
+            finalLogs = finalLogs + '&emsp;' + formattedLog + '\n'
           }
           this.call('terminal', 'log', { type: 'info', value: finalLogs })
         }

apps/remix-ide/tsconfig.json

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

libs/remix-analyzer/tsconfig.json

@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig.json",
+  "extends": "../../tsconfig.base.json",
   "compilerOptions": {
     "types": ["node"], 
     "module": "commonjs", 

libs/remix-astwalker/tsconfig.json

@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig.json",
+  "extends": "../../tsconfig.base.json",
   "compilerOptions": {
     "types": ["node"],
     "module": "commonjs",

libs/remix-core-plugin/tsconfig.json

@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig.json",
+  "extends": "../../tsconfig.base.json",
   "files": [],
   "include": [],
   "references": [

libs/remix-debug/tsconfig.json

@@ -1,5 +1,5 @@
 {
-    "extends": "../../tsconfig.json",
+    "extends": "../../tsconfig.base.json",
     "compilerOptions": {
       "types": ["node", "tape"],
       "esModuleInterop": true

libs/remix-lib/tsconfig.json

@@ -1,5 +1,5 @@
 {
-    "extends": "../../tsconfig.json",
+    "extends": "../../tsconfig.base.json",
     "compilerOptions": {
       "types": ["node", "tape"],
       "esModuleInterop": true

libs/remix-simulator/tsconfig.json

@@ -1,5 +1,5 @@
 {
-    "extends": "../../tsconfig.json",
+    "extends": "../../tsconfig.base.json",
     "compilerOptions": {
       "types": ["node", "mocha"],
       "esModuleInterop": true

libs/remix-solidity/tsconfig.json

@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig.json",
+  "extends": "../../tsconfig.base.json",
   "compilerOptions": {
     "types": ["node"]
   },

libs/remix-tests/tsconfig.json

@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig.json",
+  "extends": "../../tsconfig.base.json",
   "compilerOptions": {
     "types": ["node", "jest"],
     "module": "commonjs",

libs/remix-ui/README.md

@@ -0,0 +1,35 @@
+# remix-ui
+
+This library was generated with [Nx](https://nx.dev).
+
+## Pre-requisite
+-	Install **NxConsole** vscose extension
+## Steps To Generate React App
+-	Open **NxConsole** extension
+-	Click generate option
+-	Select **@nrwl/react - application**
+- Enter the name of the application
+- Set **e2eTestRunner** to **none**. (This is because we run e2e tests with nightwatch)
+- Set **unitTestRunner** to **none**.
+- Click the run button in the top right corner of the generate page.
+- Your react application should be created in **{root}/apps** directory.
+## Steps To Generate React Lib
+-	Open **NxConsole** extension
+-	Click generate option
+-	Select **@nrwl/react - library**
+- Enter the name of the library
+- Set **directory** to **remix-ui**
+- Set **importPath** to **@remix-ui/{library-name}**
+- Set **unitTestRunner** to **none**.
+- Click the run button in the top right corner of the generate page.
+- Your react library should be created on **{root}/libs/remix-ui** directory.
+
+## Steps To Generate React Component
+-	Open **NxConsole** extension
+-	Click generate option
+-	Select **@nrwl/react - component**
+- Enter the name of the component
+- Select the name of the project/library that uses the component. (e.g TreeView library)
+- Set component directory if needed.
+- Click the run button in the top right corner of the generate page.
+- Your react component should be created with the project/library name specified.

libs/remix-ui/checkbox/tsconfig.json

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

libs/remix-ui/clipboard/tsconfig.json

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

libs/remix-ui/debugger-ui/tsconfig.json

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

libs/remix-ui/file-explorer/tsconfig.json

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

libs/remix-ui/modal-dialog/tsconfig.json

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

libs/remix-ui/publish-to-storage/tsconfig.json

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

libs/remix-ui/renderer/tsconfig.json

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

libs/remix-ui/settings/tsconfig.json

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

libs/remix-ui/solidity-compiler/tsconfig.json

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

libs/remix-ui/static-analyser/tsconfig.json

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

libs/remix-ui/toaster/tsconfig.json

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

libs/remix-ui/tree-view/tsconfig.json

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

libs/remix-ui/utils/tsconfig.json

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

libs/remix-ui/workspace/tsconfig.json

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

libs/remix-url-resolver/tsconfig.json

@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig.json",
+  "extends": "../../tsconfig.base.json",
   "compilerOptions": {
     "types": ["node", "mocha"],
     "module": "commonjs",

libs/remixd/tsconfig.json

@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig.json",
+  "extends": "../../tsconfig.base.json",
   "files": [],
   "include": [],
   "references": [

nx.json

@@ -6,8 +6,9 @@
       "dependencies": "*",
       "devDependencies": "*"
     },
-    "tsconfig.json": "*",
+    "tsconfig.base.json": "*",
     "tslint.json": "*",
+    ".eslintrc": "*",
     "nx.json": "*"
   },
   "tasksRunnerOptions": {

tsconfig.base.json

@@ -0,0 +1,48 @@
+{
+  "compileOnSave": false,
+  "compilerOptions": {
+    "rootDir": ".",
+    "sourceMap": true,
+    "declaration": false,
+    "moduleResolution": "node",
+    "emitDecoratorMetadata": true,
+    "experimentalDecorators": true,
+    "importHelpers": true,
+    "target": "es2015",
+    "module": "commonjs",
+    "typeRoots": ["node_modules/@types"],
+    "lib": ["es2017", "es2019", "dom"],
+    "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/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"]
+    }
+  },
+  "exclude": ["node_modules", "tmp"]
+}

tsconfig.json

@@ -10,8 +10,7 @@
     "importHelpers": true,
     "target": "es2015",
     "module": "commonjs",
-    "typeRoots": ["node_modules/@types"],
+    "lib": ["es2017", "dom"],
-    "lib": ["es2017", "es2019", "dom"],
     "skipLibCheck": true,
     "skipDefaultLibCheck": true,
     "baseUrl": ".",
@@ -43,7 +42,8 @@
       "@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"]
-    }
+    },
+    "allowSyntheticDefaultImports": true
   },
   "exclude": ["node_modules", "tmp"]
 }