Skip to content

Commit 5bdc643

Browse files
authored
refactor(dependency): update babel-code-frame to @babel/code-frame (#409)
Update code-frame dependency from v6 to v7 so that we can drop the chalk v1 dependency. Closes #408
1 parent 07c31ef commit 5bdc643

File tree

4 files changed

+38
-13
lines changed

4 files changed

+38
-13
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ new ForkTsCheckerWebpackPlugin({
147147
(see `src/issue/` and `src/formatter/` for API reference).
148148

149149
- **formatterOptions** `object`:
150-
Options passed to formatters (currently only `codeframe` - see [available options](https://www.npmjs.com/package/babel-code-frame#options))
150+
Options passed to formatters (currently only `codeframe` - see [available options](https://babeljs.io/docs/en/next/babel-code-frame.html#options))
151151

152152
- **silent** `boolean`:
153153
If `true`, logger will not be used. Default: `false`.

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
}
7575
},
7676
"dependencies": {
77-
"babel-code-frame": "^6.22.0",
77+
"@babel/code-frame": "^7.5.5",
7878
"chalk": "^2.4.1",
7979
"micromatch": "^3.1.10",
8080
"minimatch": "^3.0.4",
@@ -84,7 +84,7 @@
8484
},
8585
"devDependencies": {
8686
"@commitlint/config-conventional": "^7.5.0",
87-
"@types/babel-code-frame": "^6.20.1",
87+
"@types/babel__code-frame": "^7.0.1",
8888
"@types/jest": "^24.0.11",
8989
"@types/lodash": "^4.14.134",
9090
"@types/micromatch": "^3.1.0",

src/formatter/CodeframeFormatter.ts

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import { fileExistsSync } from '../FsHelper';
66
import { IssueSeverity, IssueOrigin } from '../issue';
77
import { Formatter } from './Formatter';
88
import { createInternalFormatter } from './InternalFormatter';
9-
import codeFrame from 'babel-code-frame';
9+
import { codeFrameColumns } from '@babel/code-frame';
1010

1111
interface CodeFrameFormatterOptions {
1212
/** Syntax highlight the code as JavaScript for terminals. default: false */
@@ -45,12 +45,15 @@ function createCodeframeFormatter(
4545
let frame = '';
4646

4747
if (source) {
48-
frame = codeFrame(
48+
frame = codeFrameColumns(
4949
source,
50-
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
51-
issue.line!, // Assertion: `codeFrame` allows passing undefined, typings are incorrect
52-
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
53-
issue.character!,
50+
{
51+
start: {
52+
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
53+
line: issue.line!, // Assertion: `codeFrame` allows passing undefined, typings are incorrect
54+
column: issue.character
55+
}
56+
},
5457
{
5558
highlightCode: true,
5659
...(options || {})

yarn.lock

Lines changed: 26 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,13 @@
88
dependencies:
99
"@babel/highlight" "^7.0.0"
1010

11+
"@babel/code-frame@^7.5.5":
12+
version "7.8.3"
13+
resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.8.3.tgz#33e25903d7481181534e12ec0a25f16b6fcf419e"
14+
integrity sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==
15+
dependencies:
16+
"@babel/highlight" "^7.8.3"
17+
1118
"@babel/core@^7.1.0":
1219
version "7.4.4"
1320
resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.4.4.tgz#84055750b05fcd50f9915a826b44fa347a825250"
@@ -67,6 +74,11 @@
6774
dependencies:
6875
"@babel/types" "^7.4.4"
6976

77+
"@babel/helper-validator-identifier@^7.9.0":
78+
version "7.9.5"
79+
resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.9.5.tgz#90977a8e6fbf6b431a7dc31752eee233bf052d80"
80+
integrity sha512-/8arLKUFq882w4tWGj9JYzRpAlZgiWUJ+dtteNTDqrRBz9Iguck9Rn3ykuBDoUwh2TO4tSAJlrxDUOXWklJe4g==
81+
7082
"@babel/helpers@^7.4.4":
7183
version "7.4.4"
7284
resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.4.4.tgz#868b0ef59c1dd4e78744562d5ce1b59c89f2f2a5"
@@ -84,6 +96,15 @@
8496
esutils "^2.0.2"
8597
js-tokens "^4.0.0"
8698

99+
"@babel/highlight@^7.8.3":
100+
version "7.9.0"
101+
resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.9.0.tgz#4e9b45ccb82b79607271b2979ad82c7b68163079"
102+
integrity sha512-lJZPilxX7Op3Nv/2cvFdnlepPXDxi29wxteT57Q965oc5R9v86ztx0jfxVrTcBk8C2kcPkkDa2Z4T3ZsPPVWsQ==
103+
dependencies:
104+
"@babel/helper-validator-identifier" "^7.9.0"
105+
chalk "^2.0.0"
106+
js-tokens "^4.0.0"
107+
87108
"@babel/parser@^7.0.0", "@babel/parser@^7.1.0", "@babel/parser@^7.4.4":
88109
version "7.4.4"
89110
resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.4.4.tgz#5977129431b8fe33471730d255ce8654ae1250b6"
@@ -444,9 +465,10 @@
444465
version "1.3.0"
445466
resolved "https://registry.yarnpkg.com/@types/anymatch/-/anymatch-1.3.0.tgz#d1d55958d1fccc5527d4aba29fc9c4b942f563ff"
446467

447-
"@types/babel-code-frame@^6.20.1":
448-
version "6.20.1"
449-
resolved "https://registry.yarnpkg.com/@types/babel-code-frame/-/babel-code-frame-6.20.1.tgz#e79a40ea81435034df7b46b5e32e8ed638aea4dd"
468+
"@types/babel__code-frame@^7.0.1":
469+
version "7.0.1"
470+
resolved "https://registry.yarnpkg.com/@types/babel__code-frame/-/babel__code-frame-7.0.1.tgz#baf2529c4abbfb5e4008c845efcfe39a187e2f99"
471+
integrity sha512-FFfbQozKxYmOnCKFYV+EQprjBI7u2yaNc2ly/K9AhzyC8MzXtCtSRqptpw+HUJxhwCOo5mLwf1ATmzyhOaVbDg==
450472

451473
"@types/babel__core@^7.1.0":
452474
version "7.1.1"
@@ -1137,7 +1159,7 @@ aws4@^1.8.0:
11371159
resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.8.0.tgz#f0e003d9ca9e7f59c7a508945d7b2ef9a04a542f"
11381160
integrity sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ==
11391161

1140-
babel-code-frame@^6.22.0, babel-code-frame@^6.26.0:
1162+
babel-code-frame@^6.26.0:
11411163
version "6.26.0"
11421164
resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b"
11431165
dependencies:

0 commit comments

Comments
 (0)