Merge pull request #84 from dec0dOS/dev

chore: upgrade deps and misc small changes
This commit is contained in:
dec0dOS 2022-06-12 18:10:37 +03:00 committed by GitHub
commit 96667c39aa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 3094 additions and 2648 deletions

File diff suppressed because one or more lines are too long

786
.yarn/releases/yarn-3.2.1.cjs vendored Executable file

File diff suppressed because one or more lines are too long

View file

@ -4,4 +4,4 @@ plugins:
- path: .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs
spec: "@yarnpkg/plugin-interactive-tools"
yarnPath: .yarn/releases/yarn-3.2.0-rc.8.cjs
yarnPath: .yarn/releases/yarn-3.2.1.cjs

View file

@ -250,7 +250,7 @@ To set up a development environment, please follow these steps:
```
2. Install packages
```sh
yarn install && yarn installDeps
yarn install
```
3. Start the development server
```sh

View file

@ -5,16 +5,16 @@
"start": "node ./bin/www"
},
"dependencies": {
"axios": "^0.21.1",
"axios": "^0.27.2",
"compression": "^1.7.4",
"debug": "~4.3.1",
"dotenv": "^10.0.0",
"express": "~4.17.1",
"debug": "~4.3.4",
"dotenv": "^16.0.1",
"express": "~4.18.1",
"express-bearer-token": "^2.4.0",
"helmet": "^4.6.0",
"helmet": "^5.1.0",
"lodash": "^4.17.21",
"lowdb": "^1.0.0",
"morgan": "~1.10.0",
"pbkdf2-wrapper": "^1.3.2"
"pbkdf2-wrapper": "^1.3.4"
}
}

View file

@ -2,15 +2,15 @@
"name": "frontend",
"private": true,
"dependencies": {
"@fontsource/roboto": "^4.5.0",
"@material-ui/core": "^4.12.3",
"@material-ui/icons": "^4.11.2",
"@material-ui/styles": "^4.11.4",
"@fontsource/roboto": "^4.5.7",
"@material-ui/core": "^4.12.4",
"@material-ui/icons": "^4.11.3",
"@material-ui/styles": "^4.11.5",
"@uiw/react-codemirror": "^3.1.0",
"axios": "^0.21.1",
"axios": "^0.27.2",
"codemirror": "^5.62.3",
"eslint-config-react-app": "^6.0.0",
"history": "^5.0.1",
"history": "^5.3.0",
"ipaddr.js": "^2.0.1",
"lodash": "^4.17.21",
"react": "^17.0.2",
@ -19,7 +19,7 @@
"react-is": "^17.0.2",
"react-router-dom": "^5.2.0",
"react-scripts": "4.0.3",
"react-use": "^17.2.4",
"react-use": "^17.4.0",
"styled-components": "^5.3.1"
},
"devDependencies": {
@ -31,7 +31,7 @@
"analyze": "source-map-explorer 'build/static/js/*.js'"
},
"homepage": "/app",
"proxy": "http://localhost:4000",
"proxy": "http://127.0.0.1:4000",
"eslintConfig": {
"extends": "react-app"
},

View file

@ -7,7 +7,6 @@
],
"scripts": {
"postinstall": "husky install",
"installDeps": "cd frontend && yarn install && cd ../backend && yarn install",
"upgradeDeps": "yarn upgrade-interactive",
"cleanDeps": "cd frontend && rimraf node_modules && cd ../backend && rimraf node_modules && cd .. && rimraf node_modules",
"lint": "yarn prettier --write .",
@ -18,18 +17,18 @@
"commit": "yarn git-cz"
},
"devDependencies": {
"@commitlint/cli": "^15.0.0",
"@commitlint/config-conventional": "^15.0.0",
"@commitlint/cli": "^17.0.2",
"@commitlint/config-conventional": "^17.0.2",
"commitizen": "^4.2.4",
"concurrently": "^6.2.1",
"concurrently": "^7.2.1",
"cross-env": "^7.0.3",
"cz-conventional-changelog": "^3.3.0",
"husky": "^7.0.4",
"lint-staged": "^12.1.3",
"nodemon": "^2.0.15",
"prettier": "^2.5.1",
"husky": "^8.0.1",
"lint-staged": "^13.0.1",
"nodemon": "^2.0.16",
"prettier": "^2.6.2",
"rimraf": "^3.0.2",
"standard-version": "^9.3.1"
"standard-version": "^9.5.0"
},
"prettier": {
"trailingComma": "es5",
@ -52,5 +51,5 @@
"yarn prettier --write"
]
},
"packageManager": "yarn@3.2.0-rc.8"
"packageManager": "yarn@3.2.1"
}

4127
yarn.lock

File diff suppressed because it is too large Load diff