diff --git a/package.json b/package.json index fa87d8bfe1a..b1cfc7b485f 100644 --- a/package.json +++ b/package.json @@ -175,7 +175,7 @@ "expect.js": "0.3.1", "expose-loader": "3.0.0", "file-loader": "6.2.0", - "fork-ts-checker-webpack-plugin": "6.3.4", + "fork-ts-checker-webpack-plugin": "6.4.0", "fs-extra": "10.0.0", "gaze": "1.1.3", "glob": "7.1.6", diff --git a/packages/grafana-toolkit/package.json b/packages/grafana-toolkit/package.json index 0661a12e082..277180e1337 100644 --- a/packages/grafana-toolkit/package.json +++ b/packages/grafana-toolkit/package.json @@ -62,7 +62,7 @@ "eslint": "7.21.0", "execa": "^5.1.1", "file-loader": "6.2.0", - "fork-ts-checker-webpack-plugin": "1.0.0", + "fork-ts-checker-webpack-plugin": "6.4.0", "fs-extra": "^10.0.0", "globby": "^10.0.1", "html-loader": "0.5.5", diff --git a/packages/grafana-toolkit/src/config/webpack.plugin.config.ts b/packages/grafana-toolkit/src/config/webpack.plugin.config.ts index 120f5a9c2fa..cf9c86ffcdf 100644 --- a/packages/grafana-toolkit/src/config/webpack.plugin.config.ts +++ b/packages/grafana-toolkit/src/config/webpack.plugin.config.ts @@ -129,9 +129,10 @@ const getCommonPlugins = (options: WebpackConfigurationOptions) => { }, ]), new ForkTsCheckerWebpackPlugin({ - tsconfig: path.join(process.cwd(), 'tsconfig.json'), - // Only report problems in detected in plugin's code - reportFiles: ['**/*.{ts,tsx}'], + typescript: { configFile: path.join(process.cwd(), 'tsconfig.json') }, + issue: { + include: [{ file: '**/*.{ts,tsx}' }], + }, }), ]; }; diff --git a/yarn.lock b/yarn.lock index b2a18cf8aaf..be21e8328f1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2623,7 +2623,7 @@ __metadata: eslint: 7.21.0 execa: ^5.1.1 file-loader: 6.2.0 - fork-ts-checker-webpack-plugin: 1.0.0 + fork-ts-checker-webpack-plugin: 6.4.0 fs-extra: ^10.0.0 globby: ^10.0.1 html-loader: 0.5.5 @@ -10579,17 +10579,6 @@ __metadata: languageName: node linkType: hard -"babel-code-frame@npm:^6.22.0": - version: 6.26.0 - resolution: "babel-code-frame@npm:6.26.0" - dependencies: - chalk: ^1.1.3 - esutils: ^2.0.2 - js-tokens: ^3.0.2 - checksum: 9410c3d5a921eb02fa409675d1a758e493323a49e7b9dddb7a2a24d47e61d39ab1129dd29f9175836eac9ce8b1d4c0a0718fcdc57ce0b865b529fd250dbab313 - languageName: node - linkType: hard - "babel-jest@npm:26.6.3, babel-jest@npm:^26.6.3": version: 26.6.3 resolution: "babel-jest@npm:26.6.3" @@ -11955,7 +11944,7 @@ __metadata: languageName: node linkType: hard -"chokidar@npm:^2.0.4, chokidar@npm:^2.1.8": +"chokidar@npm:^2.1.8": version: 2.1.8 resolution: "chokidar@npm:2.1.8" dependencies: @@ -16892,21 +16881,6 @@ __metadata: languageName: node linkType: hard -"fork-ts-checker-webpack-plugin@npm:1.0.0": - version: 1.0.0 - resolution: "fork-ts-checker-webpack-plugin@npm:1.0.0" - dependencies: - babel-code-frame: ^6.22.0 - chalk: ^2.4.1 - chokidar: ^2.0.4 - micromatch: ^3.1.10 - minimatch: ^3.0.4 - semver: ^5.6.0 - tapable: ^1.0.0 - checksum: 06b01379a736c555c7797409a6c97780149107b902f4cee1cb86eb43ccf109ff85c3a48e81b23e9ab0356749947111df16dd0d27dbc790378be8a4f317875545 - languageName: node - linkType: hard - "fork-ts-checker-webpack-plugin@npm:4.1.6, fork-ts-checker-webpack-plugin@npm:^4.1.6": version: 4.1.6 resolution: "fork-ts-checker-webpack-plugin@npm:4.1.6" @@ -16922,38 +16896,7 @@ __metadata: languageName: node linkType: hard -"fork-ts-checker-webpack-plugin@npm:6.3.4": - version: 6.3.4 - resolution: "fork-ts-checker-webpack-plugin@npm:6.3.4" - dependencies: - "@babel/code-frame": ^7.8.3 - "@types/json-schema": ^7.0.5 - chalk: ^4.1.0 - chokidar: ^3.4.2 - cosmiconfig: ^6.0.0 - deepmerge: ^4.2.2 - fs-extra: ^9.0.0 - glob: ^7.1.6 - memfs: ^3.1.2 - minimatch: ^3.0.4 - schema-utils: 2.7.0 - semver: ^7.3.2 - tapable: ^1.0.0 - peerDependencies: - eslint: ">= 6" - typescript: ">= 2.7" - vue-template-compiler: "*" - webpack: ">= 4" - peerDependenciesMeta: - eslint: - optional: true - vue-template-compiler: - optional: true - checksum: ad84ccbc990c086e86e988f556bd8a28f5a94e358f044889698d78b4d13d106f61da121081d2cdf58d84f972a2635826c035e5ef70138b92558cec7cf0c7f3a1 - languageName: node - linkType: hard - -"fork-ts-checker-webpack-plugin@npm:^6.0.4": +"fork-ts-checker-webpack-plugin@npm:6.4.0, fork-ts-checker-webpack-plugin@npm:^6.0.4": version: 6.4.0 resolution: "fork-ts-checker-webpack-plugin@npm:6.4.0" dependencies: @@ -18102,7 +18045,7 @@ __metadata: fast-text-encoding: ^1.0.0 file-loader: 6.2.0 file-saver: 2.0.2 - fork-ts-checker-webpack-plugin: 6.3.4 + fork-ts-checker-webpack-plugin: 6.4.0 fs-extra: 10.0.0 gaze: 1.1.3 glob: 7.1.6 @@ -21313,13 +21256,6 @@ __metadata: languageName: node linkType: hard -"js-tokens@npm:^3.0.2": - version: 3.0.2 - resolution: "js-tokens@npm:3.0.2" - checksum: ff24cf90e6e4ac446eba56e604781c1aaf3bdaf9b13a00596a0ebd972fa3b25dc83c0f0f67289c33252abb4111e0d14e952a5d9ffb61f5c22532d555ebd8d8a9 - languageName: node - linkType: hard - "js-yaml@npm:3.13.1, js-yaml@npm:~3.13.1": version: 3.13.1 resolution: "js-yaml@npm:3.13.1"