Skip to content

Commit 42a6d20

Browse files
committed
Merge branch 'master' into dev
2 parents f906883 + 5b72bf4 commit 42a6d20

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ All changes to G-Code Language Extension will be documented here.
1616

1717
- Updated dependencies
1818
- Updated copyright to 2022
19+
- Removed eslint from `ForkTsCheckerWebpackPlugin` in `webpack.config.js` ( [Remove ESLint Support](https://github.com/TypeStrong/fork-ts-checker-webpack-plugin/issues/601) )
1920

2021
## v0.7.0 [#](https://github.com/appliedengesign/vscode-gcode-syntax/releases/tag/v0.7.0)
2122

webpack.config.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ function getExtensionConfig(mode, env) {
1717
plugins.push(
1818
new ForkTsCheckerWebpackPlugin({
1919
async: false,
20-
eslint: { enabled: true, files: 'src/**/*.ts', options: { cache: true } },
20+
// eslint: { enabled: true, files: 'src/**/*.ts', options: { cache: true } },
2121
formatter: 'basic',
2222
}),
2323
);
@@ -54,7 +54,7 @@ function getExtensionConfig(mode, env) {
5454
module: {
5555
rules: [
5656
{
57-
test: /\.ts$/,
57+
test: /\.tsx?$/,
5858
exclude: /node_modules/,
5959
include: path.join(__dirname, 'src'),
6060
use: [

0 commit comments

Comments
 (0)