Switches to fork-ts-checker eslint support

gitkraken · Jul 16, 2019 · c9edd13 · c9edd13
1 parent aa5b346
commit c9edd13
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 109 deletions.
diff --git a/.eslintignore b/.eslintignore
@@ -0,0 +1,2 @@
+dist/*
+emojis.json
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -17,8 +17,7 @@
         "ecmaVersion": 2018,
         "sourceType": "module",
         "ecmaFeatures": {
-            "impliedStrict": true,
-            "jsx": true
+            "impliedStrict": true
         }
     },
     "plugins": ["import", "prettiest", "@typescript-eslint"],

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -5330,18 +5330,17 @@
         "@types/lodash-es": "4.17.3",
         "@types/node": "10.11.7",
         "@types/vscode": "1.31.0",
-        "@typescript-eslint/eslint-plugin": "1.11.0",
-        "@typescript-eslint/parser": "1.11.0",
+        "@typescript-eslint/eslint-plugin": "1.12.0",
+        "@typescript-eslint/parser": "1.12.0",
         "clean-webpack-plugin": "3.0.0",
         "circular-dependency-plugin": "5.0.2",
         "css-loader": "3.0.0",
         "eslint": "6.0.1",
         "eslint-cli": "1.1.1",
         "eslint-config-prettier": "6.0.0",
-        "eslint-loader": "2.2.1",
         "eslint-plugin-import": "2.18.0",
         "eslint-plugin-prettiest": "0.0.2",
-        "fork-ts-checker-webpack-plugin": "1.3.7",
+        "fork-ts-checker-webpack-plugin": "1.4.2",
         "html-webpack-exclude-assets-plugin": "0.0.7",
         "html-webpack-inline-source-plugin": "0.0.10",
         "html-webpack-plugin": "3.2.0",
@@ -5354,9 +5353,9 @@
         "terser-webpack-plugin": "1.3.0",
         "ts-loader": "6.0.4",
         "typescript": "3.5.3",
-        "vsce": "1.64.0",
+        "vsce": "1.65.0",
         "webpack": "4.35.3",
-        "webpack-cli": "3.3.5",
+        "webpack-cli": "3.3.6",
         "webpack-bundle-analyzer": "3.3.2"
     }
 }
diff --git a/webpack.config.js b/webpack.config.js
@@ -37,6 +37,7 @@ function getExtensionConfig(env) {
         new CleanPlugin({ cleanOnceBeforeBuildPatterns: ['**/*', '!**/webviews/**'] }),
         new ForkTsCheckerPlugin({
             async: false,
+            eslint: true,
             useTypescriptIncrementalApi: true
         })
     ];
@@ -94,18 +95,6 @@ function getExtensionConfig(env) {
         },
         module: {
             rules: [
-                {
-                    enforce: 'pre',
-                    exclude: /node_modules|\.d\.ts$/,
-                    test: /\.tsx?$/,
-                    use: {
-                        loader: 'eslint-loader',
-                        options: {
-                            cache: true,
-                            failOnError: true
-                        }
-                    }
-                },
                 {
                     exclude: /node_modules|\.d\.ts$/,
                     test: /\.tsx?$/,
@@ -150,6 +139,7 @@ function getWebviewsConfig(env) {
         new ForkTsCheckerPlugin({
             tsconfig: path.resolve(__dirname, 'webviews.tsconfig.json'),
             async: false,
+            eslint: true,
             useTypescriptIncrementalApi: true
         }),
         new MiniCssExtractPlugin({
@@ -233,18 +223,6 @@ function getWebviewsConfig(env) {
         },
         module: {
             rules: [
-                {
-                    enforce: 'pre',
-                    exclude: /node_modules|\.d\.ts$/,
-                    test: /\.tsx?$/,
-                    use: {
-                        loader: 'eslint-loader',
-                        options: {
-                            cache: true,
-                            failOnError: true
-                        }
-                    }
-                },
                 {
                     exclude: /node_modules|\.d\.ts$/,
                     test: /\.tsx?$/,