Skip to content

Commit

Permalink
Bump react scripts to 5.0
Browse files Browse the repository at this point in the history
Bump react scripts to 5.0

See: #11543

Bump eslint

Bump eslint and related plugins

Add @babe/core

Add @babe/core remove babel/core.

Rename .eslintrc to .eslintrc.json

Rename .eslintrc to .eslintrc.json

Add extra plugin

Move babe-plugin-macro as dev dependencies

Move babe-plugin-macro as dev dependencies

Add preset-react

Add preset-react

Fixing lint errors

Fixing lint errors

Run eslint --fix

Run eslint --fix

Turn no-restricted-exports off

Turn no-restricted-exports off

Revert "Run eslint --fix"

This reverts commit e760885.

Run --fix

Run --fix

Fix lint errors

Also bump specificity of Select CSS border component to avoid bug of
missing borders.

Also update API tests related to lincenses.
  • Loading branch information
nixocio committed Feb 8, 2022
1 parent 54cbf13 commit 9703fb0
Show file tree
Hide file tree
Showing 97 changed files with 19,123 additions and 29,525 deletions.
Empty file added awx/ui/.babel.rc
Empty file.
3 changes: 2 additions & 1 deletion awx/ui/.eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,5 @@ build
node_modules
dist
images
instrumented
instrumented
*test*.js
18 changes: 13 additions & 5 deletions awx/ui/.eslintrc → awx/ui/.eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,19 @@
{
"parser": "babel-eslint",
"parser": "@babel/eslint-parser",
"ignorePatterns": ["./node_modules/"],
"parserOptions": {
"requireConfigFile": false,
"ecmaVersion": 6,
"sourceType": "module",
"ecmaFeatures": {
"jsx": true,
"modules": true
}
},
"babelOptions": {
"presets": ["@babel/preset-react"]
}
},
"plugins": ["react-hooks", "jsx-a11y", "i18next"],
"plugins": ["react-hooks", "jsx-a11y", "i18next", "@babel"],
"extends": [
"airbnb",
"prettier",
Expand All @@ -17,7 +22,7 @@
],
"settings": {
"react": {
"version": "16.5.2"
"version": "detect"
},
"import/resolver": {
"node": {
Expand Down Expand Up @@ -141,6 +146,9 @@
"jsx-a11y/label-has-associated-control": "off",
"react-hooks/rules-of-hooks": "error",
"react-hooks/exhaustive-deps": "warn",
"react/jsx-filename-extension": "off"
"react/jsx-filename-extension": "off",
"no-restricted-exports": "off",
"react/function-component-definition": "off",
"prefer-regex-literals": "off"
}
}
4 changes: 2 additions & 2 deletions awx/ui/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
FROM node:14
FROM node:14.18.3
ARG NPMRC_FILE=.npmrc
ENV NPMRC_FILE=${NPMRC_FILE}
ARG TARGET='https://awx:8043'
ENV TARGET=${TARGET}
ENV CI=true
WORKDIR /ui
ADD .eslintignore .eslintignore
ADD .eslintrc .eslintrc
ADD .eslintrc.json .eslintrc.json
ADD .linguirc .linguirc
ADD jsconfig.json jsconfig.json
ADD public public
Expand Down
2 changes: 1 addition & 1 deletion awx/ui/README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# AWX-UI

## Requirements
- node 14.x LTS, npm 7.x, make, git
- node 14.18.3, npm 7.24.2, make, git

## Development
The API development server will need to be running. See [CONTRIBUTING.md](../../CONTRIBUTING.md).
Expand Down

0 comments on commit 9703fb0

Please sign in to comment.