Skip to content

Commit

Permalink
WRO-231: Merge feature/webpack5 to develop (#48)
Browse files Browse the repository at this point in the history
* WRN-12124: Remove deprecated babel-eslint module (#44)

* use @babel/eslint-parser

* change index.js

* update CHANGELOG.md & README.md

* revert npm-shrinkwrap.json

* remove babel-eslint word

* Update index.md

* modify npm-shrinkwrap.json

* Update README.md

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

* Update docs/index.md

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

* Update package.json

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

* add plugins for enact style

* update dependencies

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

* update npm-shrinkwrap.json

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

* WRN-12748: Update eslint 8 related modules (#45)

* update eslint 8

* Update package.json

* Update package.json

* Update package.json

* restore index.js

* Update package.json

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

* Update package.json

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

* Update package.json

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

* Update package.json

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

* modify npm-shrinkwrap.json

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

* WRN-20224: [React18] Update react dependencies (#47)

* update react18 in eslint-config-enact

* remove react module dependencies

* Revert "remove react module dependencies"

This reverts commit df9ef4c.

* update change log

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

* update eslint-plugin-enact

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

* update travis

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 Apr 11, 2022
1 parent 20684c6 commit fa0d375
Show file tree
Hide file tree
Showing 7 changed files with 3,354 additions and 1,099 deletions.
5 changes: 0 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,7 @@ language: node_js
node_js:
- "node"
sudo: false
cache:
directories:
- $(npm config get cache)
install:
- npm config set prefer-offline true
- npm install

script:
- npm run lint
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@

The following is a curated list of changes in the Enact eslint config:

## [unreleased]

* Updated all dependencies including ESLint 8.
* Replaced deprecated `babel-eslint` with `@babel/eslint-parser`.

## [3.1.3] (February 17, 2022)

* Fixed `@typescript-eslint` peerDependency to support `4.x` version.
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ For more information (including editor/IDE setup), please see the [docs](docs/in
`eslint-config-enact` can be installed locally or globally. The following command will install the config and all its dependencies globally:

```bash
npm install -g eslint eslint-plugin-react eslint-plugin-react-hooks eslint-plugin-babel babel-eslint eslint-plugin-jest eslint-plugin-enact eslint-config-enact
npm install -g eslint eslint-plugin-react eslint-plugin-react-hooks eslint-plugin-babel eslint-plugin-jest eslint-plugin-enact eslint-config-enact @babel/eslint-parser
```

>**NOTE**: Using the [`cli` tools](https://github.com/enactjs/cli/) to create your projects eliminates the need to globally install these dependencies unless you wish editor integration.
Expand Down
2 changes: 1 addition & 1 deletion docs/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ npm install -g eslint
Then, you will need to uninstall any previous globally-installed Enact linting package (everything but eslint itself):

```sh
npm remove -g eslint-plugin-react eslint-plugin-react-hooks eslint-plugin-babel babel-eslint eslint-plugin-jest eslint-plugin-enact eslint-config-enact
npm remove -g eslint-plugin-react eslint-plugin-react-hooks eslint-plugin-babel @babel/eslint-parser eslint-plugin-jest eslint-plugin-enact eslint-config-enact
```

Each editor requires a slightly different setup. Jump to the section relevant to your editor.
Expand Down
13 changes: 9 additions & 4 deletions index.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,17 @@ module.exports = {
'/**/resources/',
'/**/resources/*'
],
parser: 'babel-eslint',
parser: '@babel/eslint-parser',
parserOptions: {
ecmaVersion: 2018,
sourceType: 'module',
ecmaFeatures: {
jsx: true
requireConfigFile: false,
babelOptions: {
presets: [require.resolve('babel-preset-react-app/prod')],
plugins: [
require('@babel/plugin-proposal-export-default-from').default,
require('@babel/plugin-proposal-export-namespace-from').default,
require('@babel/plugin-syntax-dynamic-import').default
]
}
},
plugins: ['babel', 'jsx-a11y', 'react', 'enact'],
Expand Down

0 comments on commit fa0d375

Please sign in to comment.