Merge branch 'git4' of https://github.com/ethereum/remix-project into git4

.eslintrc.json

@@ -54,7 +54,13 @@
         "react-hooks/exhaustive-deps": "off",
         "array-callback-return": "off",
         "prefer-spread": "off",
-        "indent": ["error", 2]
+        "indent": ["error", 2],
+        "keyword-spacing": ["error", { "after": true, "before": true }],
+        "array-bracket-spacing": ["error", "never"],
+        "object-curly-spacing": ["error", "always", { "arraysInObjects": false }],
+        "no-trailing-spaces": "error",
+        "no-multi-spaces": "error",
+        "no-multiple-empty-lines": ["error" , { "max": 1}]
       }
     },
     {

apps/circuit-compiler/project.json

@@ -35,6 +35,14 @@
           }
         }
       },
+      "lint": {
+        "executor": "@nrwl/linter:eslint",
+        "outputs": ["{options.outputFile}"],
+        "options": {
+          "lintFilePatterns": ["apps/circuit-compiler/**/*.ts"],
+          "eslintConfig": "apps/circuit-compiler/.eslintrc"
+        }
+      },
       "serve": {
         "executor": "@nrwl/webpack:dev-server",
         "defaultConfiguration": "development",

apps/debugger/project.json

@@ -40,6 +40,14 @@
         }
       }
     },
+    "lint": {
+      "executor": "@nrwl/linter:eslint",
+      "outputs": ["{options.outputFile}"],
+      "options": {
+        "lintFilePatterns": ["apps/debugger/**/*.ts"],
+        "eslintConfig": "apps/debugger/.eslintrc"
+      }
+    },
     "serve": {
       "executor": "@nrwl/webpack:dev-server",
       "defaultConfiguration": "development",

apps/doc-gen/project.json

@@ -38,6 +38,14 @@
         }
       }
     },
+    "lint": {
+      "executor": "@nrwl/linter:eslint",
+      "outputs": ["{options.outputFile}"],
+      "options": {
+        "lintFilePatterns": ["apps/doc-gen/**/*.ts"],
+        "eslintConfig": "apps/doc-gen/.eslintrc"
+      }
+    },
     "serve": {
       "executor": "@nrwl/webpack:dev-server",
       "defaultConfiguration": "development",

apps/doc-viewer/project.json

@@ -38,6 +38,14 @@
         }
       }
     },
+    "lint": {
+      "executor": "@nrwl/linter:eslint",
+      "outputs": ["{options.outputFile}"],
+      "options": {
+        "lintFilePatterns": ["apps/doc-viewer/**/*.ts"],
+        "eslintConfig": "apps/doc-viewer/.eslintrc"
+      }
+    },
     "serve": {
       "executor": "@nrwl/webpack:dev-server",
       "defaultConfiguration": "development",

apps/etherscan/project.json

@@ -38,6 +38,14 @@
         }
       }
     },
+    "lint": {
+      "executor": "@nrwl/linter:eslint",
+      "outputs": ["{options.outputFile}"],
+      "options": {
+        "lintFilePatterns": ["apps/etherscan/**/*.ts"],
+        "eslintConfig": "apps/etherscan/.eslintrc"
+      }
+    },
     "serve": {
       "executor": "@nrwl/webpack:dev-server",
       "defaultConfiguration": "development",

apps/learneth/project.json

@@ -35,6 +35,14 @@
         }
       }
     },
+    "lint": {
+      "executor": "@nrwl/linter:eslint",
+      "outputs": ["{options.outputFile}"],
+      "options": {
+        "lintFilePatterns": ["apps/learneth/**/*.ts"],
+        "eslintConfig": "apps/learneth/.eslintrc"
+      }
+    },
     "serve": {
       "executor": "@nrwl/webpack:dev-server",
       "defaultConfiguration": "development",

apps/solhint/project.json

@@ -47,6 +47,14 @@
         "parallel": false
       }
     },
+    "lint": {
+      "executor": "@nrwl/linter:eslint",
+      "outputs": ["{options.outputFile}"],
+      "options": {
+        "lintFilePatterns": ["apps/solhint/**/*.ts"],
+        "eslintConfig": "apps/solhint/.eslintrc"
+      }
+    },
     "serve": {
       "executor": "@nrwl/webpack:dev-server",
       "defaultConfiguration": "development",

apps/solidity-compiler/project.json

@@ -41,6 +41,14 @@
         }
       }
     },
+    "lint": {
+      "executor": "@nrwl/linter:eslint",
+      "outputs": ["{options.outputFile}"],
+      "options": {
+        "lintFilePatterns": ["apps/solidity-compiler/**/*.ts"],
+        "eslintConfig": "apps/solidity-compiler/.eslintrc"
+      }
+    },
     "serve": {
       "executor": "@nrwl/webpack:dev-server",
       "defaultConfiguration": "development",

apps/vyper/project.json

@@ -38,6 +38,14 @@
         }
       }
     },
+    "lint": {
+      "executor": "@nrwl/linter:eslint",
+      "outputs": ["{options.outputFile}"],
+      "options": {
+        "lintFilePatterns": ["apps/vyper/**/*.ts"],
+        "eslintConfig": "apps/vyper/.eslintrc"
+      }
+    },
     "serve": {
       "executor": "@nrwl/webpack:dev-server",
       "defaultConfiguration": "development",

apps/walletconnect/project.json

@@ -35,6 +35,14 @@
           }
         }
       },
+      "lint": {
+        "executor": "@nrwl/linter:eslint",
+        "outputs": ["{options.outputFile}"],
+        "options": {
+          "lintFilePatterns": ["apps/walletconnect/**/*.ts"],
+          "eslintConfig": "apps/walletconnect/.eslintrc"
+        }
+      },
       "serve": {
         "executor": "@nrwl/webpack:dev-server",
         "defaultConfiguration": "development",

libs/ghaction-helper/project.json

@@ -22,7 +22,8 @@
         "executor": "@nrwl/linter:eslint",
         "outputs": ["{options.outputFile}"],
         "options": {
-          "lintFilePatterns": ["libs/ghaction-helper/**/*.ts"]
+          "lintFilePatterns": ["libs/ghaction-helper/**/*.ts"],
+          "eslintConfig": "libs/ghaction-helper/.eslintrc"
         }
       }
     },

libs/remix-analyzer/project.json

@@ -25,7 +25,8 @@
         "executor": "@nrwl/linter:eslint",
         "outputs": ["{options.outputFile}"],
         "options": {
-          "lintFilePatterns": ["libs/remix-analyzer/**/*.ts"]
+          "lintFilePatterns": ["libs/remix-analyzer/**/*.ts"],
+          "eslintConfig": "libs/remix-analyzer/.eslintrc"
         }
       }
     },

libs/remix-astwalker/project.json

@@ -24,7 +24,8 @@
         "executor": "@nrwl/linter:eslint",
         "outputs": ["{options.outputFile}"],
         "options": {
-          "lintFilePatterns": ["libs/remix-astwalker/**/*.ts"]
+          "lintFilePatterns": ["libs/remix-astwalker/**/*.ts"],
+          "eslintConfig": "libs/remix-astwalker/.eslintrc"
         }
       }
     },

libs/remix-core-plugin/project.json

@@ -19,7 +19,8 @@
         "executor": "@nrwl/linter:eslint",
         "outputs": ["{options.outputFile}"],
         "options": {
-          "lintFilePatterns": ["libs/remix-core-plugin/**/*.ts"]
+          "lintFilePatterns": ["libs/remix-core-plugin/**/*.ts"],
+          "eslintConfig": "libs/remix-core-plugin/.eslintrc"
         }
       }
     },

libs/remix-debug/project.json

@@ -34,7 +34,8 @@
         "executor": "@nrwl/linter:eslint",
         "outputs": ["{options.outputFile}"],
         "options": {
-          "lintFilePatterns": ["libs/remix-debug/**/*.ts"]
+          "lintFilePatterns": ["libs/remix-debug/**/*.ts"],
+          "eslintConfig": "libs/remix-debug/.eslintrc"
         }
       }
     },

libs/remix-lib/project.json

@@ -21,7 +21,8 @@
         "executor": "@nrwl/linter:eslint",
         "outputs": ["{options.outputFile}"],
         "options": {
-          "lintFilePatterns": ["libs/remix-lib/**/*.ts"]
+          "lintFilePatterns": ["libs/remix-lib/**/*.ts"],
+          "eslintConfig": "libs/remix-lib/.eslintrc"
         }
       }
     },

libs/remix-simulator/project.json

@@ -33,7 +33,8 @@
         "executor": "@nrwl/linter:eslint",
         "outputs": ["{options.outputFile}"],
         "options": {
-          "lintFilePatterns": ["libs/remix-simulator/**/*.ts"]
+          "lintFilePatterns": ["libs/remix-simulator/**/*.ts"],
+          "eslintConfig": "libs/remix-simulator/.eslintrc"
         }
       }
     },

libs/remix-solidity/project.json

@@ -24,7 +24,8 @@
         "executor": "@nrwl/linter:eslint",
         "outputs": ["{options.outputFile}"],
         "options": {
-          "lintFilePatterns": ["libs/remix-solidity/**/*.ts"]
+          "lintFilePatterns": ["libs/remix-solidity/**/*.ts"],
+          "eslintConfig": "libs/remix-solidity/.eslintrc"
         }
       }
     },

libs/remix-tests/project.json

@@ -41,7 +41,8 @@
       "options": {
         "lintFilePatterns": [
           "libs/remix-tests/**/*.ts"
-        ]
+        ],
+        "eslintConfig": "libs/remix-tests/.eslintrc"
       }
     }
   },

libs/remix-url-resolver/project.json

@@ -23,7 +23,8 @@
         "executor": "@nrwl/linter:eslint",
         "outputs": ["{options.outputFile}"],
         "options": {
-          "lintFilePatterns": ["libs/remix-url-resolver/**/*.ts"]
+          "lintFilePatterns": ["libs/remix-url-resolver/**/*.ts"],
+          "eslintConfig": "libs/remix-url-resolver/.eslintrc"
         }
       }
     },

libs/remix-ws-templates/project.json

@@ -40,7 +40,8 @@
         "executor": "@nrwl/linter:eslint",
         "outputs": ["{options.outputFile}"],
         "options": {
-          "lintFilePatterns": ["libs/remix-ws-templates/**/*.ts"]
+          "lintFilePatterns": ["libs/remix-ws-templates/**/*.ts"],
+          "eslintConfig": "libs/remix-ws-templates/.eslintrc"
         }
       }
     },

libs/remixd/project.json

@@ -24,7 +24,8 @@
       "executor": "@nrwl/linter:eslint",
       "outputs": ["{options.outputFile}"],
       "options": {
-        "lintFilePatterns": ["libs/remixd/**/*.ts"]
+        "lintFilePatterns": ["libs/remixd/**/*.ts"],
+        "eslintConfig": "libs/remixd/.eslintrc"
       }
     }
   },

lintpr.sh

@@ -0,0 +1,14 @@
+#!/bin/bash
+
+# Find all project.json files in subdirectories
+find . -type d -name 'node_modules' -prune -o -name '.eslintrc' -print | while read -r file; do
+    # Extract the directory path of the file
+    dir=$(dirname "$file")
+
+
+
+    echo $file
+
+    git checkout master -- $file
+ 
+done