Skip to content

Commit

Permalink
Remove duplicate Babel version (#6723)
Browse files Browse the repository at this point in the history
<!-- Raise an issue to propose your change
(https://github.com/opencv/cvat/issues).
It helps to avoid duplication of efforts from multiple independent
contributors.
Discuss your ideas with maintainers to be sure that changes will be
approved and merged.
Read the [Contribution
guide](https://opencv.github.io/cvat/docs/contributing/). -->

<!-- Provide a general summary of your changes in the Title above -->

### Motivation and context
<!-- Why is this change required? What problem does it solve? If it
fixes an open
issue, please link to the issue here. Describe your changes in detail,
add
screenshots. -->
`@istanbuljs/nyc-config-babel` 1.2.3 has a peer dependency on
`babel-register`, which depends on Babel 6. We're using Babel 7, so that
one dependency pulls in a duplicate copy of Babel.

To fix this, upgrade `@istanbuljs/nyc-config-babel`. Now it has a peer
dependency on `@babel/register` instead, which (peer) depends on Babel
7.

Beyond simple cleanup, this also removes the dependency on a vulnerable
version of `json5` (0.5.1).

### How has this been tested?
<!-- Please describe in detail how you tested your changes.
Include details of your testing environment, and the tests you ran to
see how your change affects other areas of the code, etc. -->

### Checklist
<!-- Go over all the following points, and put an `x` in all the boxes
that apply.
If an item isn't applicable for some reason, then ~~explicitly
strikethrough~~ the whole
line. If you don't do that, GitHub will show incorrect progress for the
pull request.
If you're unsure about any of these, don't hesitate to ask. We're here
to help! -->
- [x] I submit my changes into the `develop` branch
- ~~[ ] I have added a description of my changes into the
[CHANGELOG](https://github.com/opencv/cvat/blob/develop/CHANGELOG.md)
file~~
- ~~[ ] I have updated the documentation accordingly~~
- ~~[ ] I have added tests to cover my changes~~
- ~~[ ] I have linked related issues (see [GitHub docs](

https://help.github.com/en/github/managing-your-work-on-github/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword))~~
- ~~[ ] I have increased versions of npm packages if it is necessary

([cvat-canvas](https://github.com/opencv/cvat/tree/develop/cvat-canvas#versioning),

[cvat-core](https://github.com/opencv/cvat/tree/develop/cvat-core#versioning),

[cvat-data](https://github.com/opencv/cvat/tree/develop/cvat-data#versioning)
and

[cvat-ui](https://github.com/opencv/cvat/tree/develop/cvat-ui#versioning))~~

### License

- [x] I submit _my code changes_ under the same [MIT License](
https://github.com/opencv/cvat/blob/develop/LICENSE) that covers the
project.
  Feel free to contact the maintainers if that's a concern.
  • Loading branch information
SpecLad authored Aug 22, 2023
1 parent 3b2f73e commit 3e47064
Show file tree
Hide file tree
Showing 2 changed files with 58 additions and 299 deletions.
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@
"@babel/preset-env": "^7.6.0",
"@babel/preset-react": "^7.0.0",
"@babel/preset-typescript": "^7.6.0",
"@istanbuljs/nyc-config-babel": "^1.0.1",
"@babel/register": "^7.22.5",
"@istanbuljs/nyc-config-babel": "^3.0.0",
"@types/mousetrap": "^1.6.5",
"@types/node": "^18.0.3",
"@typescript-eslint/eslint-plugin": "^5.30.5",
Expand All @@ -32,7 +33,6 @@
"babel-loader": "^8.0.6",
"babel-plugin-import": "^1.12.2",
"babel-plugin-istanbul": "^6.0.0",
"babel-register": "^6.26.0",
"bundle-declarations-webpack-plugin": "^3.1.0",
"copy-webpack-plugin": "^11.0.0",
"css-loader": "^6.8.1",
Expand Down
Loading

0 comments on commit 3e47064

Please sign in to comment.