From 7e0dd24bc3229623ce6bb4847817080caf1adc16 Mon Sep 17 00:00:00 2001
From: waiting <1661926154@qq.com>
Date: Wed, 27 May 2020 17:35:59 +0800
Subject: [PATCH] fix: lerna nohoist config for eslint-midway-contrib (#499)

* fix: lerna nohoist config for eslint-midway-contrib

* chore(devDeps): upgrade eslint and typescript

- typescript to ^3.9.3
- eslint to 7

* chore(eslint-midway-contrib): update rules

- @typescript-eslint/comma-spacing
- no-process-exit, migrate into eslint-plugin-node
---
 lerna.json                                    | 4 ++++
 package.json                                  | 2 +-
 packages/eslint-midway-contrib/recommended.js | 6 ++++++
 packages/midway-bin/package.json              | 2 +-
 packages/midway-init/package.json             | 2 +-
 5 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/lerna.json b/lerna.json
index ba986b688eea..1a4b468ecc68 100644
--- a/lerna.json
+++ b/lerna.json
@@ -6,6 +6,10 @@
     "bootstrap": {
       "hoist": true,
       "noCi": true,
+      "nohoist": [
+        "@typescript-eslint/eslint-plugin",
+        "@typescript-eslint/parser"
+      ],
       "npmClientArgs": [
         "--no-package-lock"
       ]
diff --git a/package.json b/package.json
index 3d43990f9143..58a59bf67bc9 100644
--- a/package.json
+++ b/package.json
@@ -21,7 +21,7 @@
     "tree-kill": "^1.2.0",
     "tslint": "^5.17.0",
     "tslint-no-unused-expression-chai": "^0.1.4",
-    "typescript": "^3.5.1",
+    "typescript": "^3.9.3",
     "vuepress": "^0.14.11"
   },
   "scripts": {
diff --git a/packages/eslint-midway-contrib/recommended.js b/packages/eslint-midway-contrib/recommended.js
index 75855b010ba9..9dc285dc4a51 100644
--- a/packages/eslint-midway-contrib/recommended.js
+++ b/packages/eslint-midway-contrib/recommended.js
@@ -15,6 +15,8 @@ module.exports = {
     '@typescript-eslint/ban-ts-comment': [0],
     'brace-style': 0,
     '@typescript-eslint/brace-style': [1, 'stroustrup', { allowSingleLine: true } ],
+    'comma-spacing': 0,
+    '@typescript-eslint/comma-spacing': 1,
     '@typescript-eslint/consistent-type-definitions': [2, 'interface'],
     'default-param-last': 0,
     '@typescript-eslint/default-param-last': 2,
@@ -163,6 +165,10 @@ module.exports = {
     'no-useless-rename': 1,
     'no-var': 2,
     'object-shorthand': [1, 'always'],
+
+    // https://eslint.org/docs/rules/#deprecated
+    // deprecated off
+    'no-process-exit': 0,
   },
 };
 
diff --git a/packages/midway-bin/package.json b/packages/midway-bin/package.json
index 89350a2a899f..05074b7d0076 100644
--- a/packages/midway-bin/package.json
+++ b/packages/midway-bin/package.json
@@ -36,7 +36,7 @@
   "devDependencies": {
     "co-mocha": "^1.2.2",
     "coffee": "^5.2.1",
-    "eslint": "^6.1.0",
+    "eslint": "7",
     "eslint-config-egg": "^7.0.0",
     "mm": "^2.5.0"
   },
diff --git a/packages/midway-init/package.json b/packages/midway-init/package.json
index 08d7f40572ca..5c1ab7bb772a 100644
--- a/packages/midway-init/package.json
+++ b/packages/midway-init/package.json
@@ -9,7 +9,7 @@
   },
   "main": "lib/command.js",
   "devDependencies": {
-    "eslint": "^6.1.0",
+    "eslint": "7",
     "eslint-config-egg": "^7.0.0",
     "midway-bin": "^1.18.6",
     "mz-modules": "^2.1.0",