Skip to content

Commit

Permalink
WRO-614: Merge feature/webpack5 branch (#30)
Browse files Browse the repository at this point in the history
* WRN-12124: Remove deprecated babel-eslint module (#24)

* use @babel/eslint-parser

* Revert "use @babel/eslint-parser"

This reverts commit dfc9555.

* babel-eslint -> @babel/eslint-parser

* modify changelog

* Update package.json

Co-authored-by: Mikyung Kim <mikyung27.kim@lge.com>

* remove unused package

Enact-DCO-1.0-Signed-off-by: Mikyung Kim (mikyung27.kim@lge.com)

* revert shrinkwrap

Enact-DCO-1.0-Signed-off-by: Mikyung Kim (mikyung27.kim@lge.com)

Co-authored-by: Mikyung Kim <mikyung27.kim@lge.com>

* WRN-12748: Update eslint 8 related modules in tool repos (#25)

* update eslint 8

* Update package.json

Co-authored-by: Mikyung Kim <mikyung27.kim@lge.com>

* Update package.json

Co-authored-by: Mikyung Kim <mikyung27.kim@lge.com>

Co-authored-by: Mikyung Kim <mikyung27.kim@lge.com>

* added a changelog

Enact-DCO-1.0-Signed-off-by: Mikyung Kim (mikyung27.kim@lge.com)

* typo

Enact-DCO-1.0-Signed-off-by: Mikyung Kim (mikyung27.kim@lge.com)

Co-authored-by: taeyoung.hong <35059065+hong6316@users.noreply.github.com>
  • Loading branch information
MikyungKim and hong6316 committed Jul 1, 2022
1 parent 93d5538 commit b818fe1
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ module.exports = {
env: {
node: true
},
extends: ['enact/strict', 'plugin:prettier/recommended', 'prettier/babel', 'prettier/react'],
extends: ['enact/strict', 'plugin:prettier/recommended', 'prettier'],
plugins: ['import'],
rules: {
'react/forbid-foreign-prop-types': 'off', // proptypes not removed in storybook config
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## unreleased

* Updated `eslint` related dependencies.

## 4.2.0 (June 7, 2022)

* Added `color` type control.
Expand Down
17 changes: 8 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,19 +53,18 @@
"devDependencies": {
"@storybook/react": "^6.3.12",
"@storybook/source-loader": "^6.3.12",
"babel-eslint": "^10.1.0",
"babel-loader": "^8.2.2",
"eslint": "^7.15.0",
"eslint": "^8.12.0",
"eslint-config-enact": "^3.0.0",
"eslint-config-prettier": "^6.15.0",
"eslint-config-prettier": "^8.5.0",
"eslint-plugin-babel": "^5.3.1",
"eslint-plugin-enact": "^0.2.0",
"eslint-plugin-import": "^2.22.1",
"eslint-plugin-jsx-a11y": "^6.4.1",
"eslint-plugin-prettier": "^3.3.0",
"eslint-plugin-react": "^7.21.5",
"eslint-plugin-react-hooks": "^4.2.0",
"prettier": "^2.2.1",
"eslint-plugin-import": "^2.25.4",
"eslint-plugin-jsx-a11y": "^6.5.1",
"eslint-plugin-prettier": "^4.0.0",
"eslint-plugin-react": "^7.29.4",
"eslint-plugin-react-hooks": "^4.3.0",
"prettier": "^2.5.1",
"webpack": "^4.44.2"
}
}

0 comments on commit b818fe1

Please sign in to comment.