Skip to content

update packages #215

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
turso wants to merge 3 commits into
base: develop
Choose a base branch
from
Open

update packages #215

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
15327c4
update packages
turso-otus Jun 3, 2022
2aa5b56
Update setupProxy.js
turso-otus Jun 7, 2022
edbdfce
fixed merge conflict
vade5g Aug 3, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion frontend/.eslintrc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"react/prop-types": 0,
"no-console": 1,
"react-hooks/rules-of-hooks": 2,
"react-hooks/exhaustive-deps": 1,
"react-hooks/exhaustive-deps": 0,
"no-unused-vars": ["error", { "varsIgnorePattern": "React" }],
"no-irregular-whitespace": 1
},
Expand All @@ -34,6 +34,11 @@
"settings": {
"react": {
"version": "detect"
},
"import/resolver": {
"node": {
"extensions": [".js", ".jsx", ".ts", ".tsx"]
}
}
}
}
5 changes: 2 additions & 3 deletions frontend/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,9 @@
"react-i18next": "^11.4.0",
"react-router": "^5.1.2",
"react-router-dom": "^5.1.2",
"react-scripts": "^3.4.3",
"react-scripts": "5.0.1",
"react-vega": "^7.3.0",
"sift": "^13.5.4",
"styled-components": "^5.1.1",
"styled-components": "^5.3.5",
"uuid": "^3.4.0",
"vega": "^5.13.0",
"vega-lite": "^4.13.0"
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/App.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import Suite from './pages/Suite';
import Comparison from './pages/Comparison';
import Series from './pages/Series';
import Build from './pages/Build';
import Search from './pages/Search.jsx';
import Search from './pages/Search';
import './utils/i118n';
import 'normalize.css';
import './index.css';
Expand Down
1 change: 1 addition & 0 deletions frontend/src/serviceWorker.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/* eslint-disable no-console */
// This optional code is used to register a service worker.
// register() is not called by default.

Expand Down
14 changes: 7 additions & 7 deletions frontend/src/setupProxy.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ let server_url = process.env.REACT_APP_SERVER_URL || 'localhost';
let server_port = process.env.REACT_APP_FRONT_END_PORT || '5000';

module.exports = function(app) {
app.use(
'/data',
proxy({
target: 'http://' + server_url + ':' + server_port,
changeOrigin: true
})
);
app.use(
'/data',
proxy({
target: 'http://' + server_url + ':' + server_port,
changeOrigin: true,
})
);
};