update deps, remove tslint

This commit is contained in:
2020-08-14 15:17:25 +03:00
parent 1c3bd9fccd
commit 820c80d4ad
6 changed files with 8802 additions and 11558 deletions

View File

@@ -1,3 +1,14 @@
module.exports = { module.exports = {
"extends": ["airbnb", "plugin:prettier/recommended"] root: true,
parser: "@typescript-eslint/parser",
plugins: ["@typescript-eslint"],
extends: [
"eslint:recommended",
"plugin:@typescript-eslint/recommended",
"prettier/@typescript-eslint",
],
env: {
browser: true,
node: true
},
}; };

View File

@@ -1,4 +1,5 @@
{ {
"trailingComma": "all", "trailingComma": "all",
"tabWidth": 4 "tabWidth": 4,
"endOfLine": "auto"
} }

File diff suppressed because it is too large Load Diff

View File

@@ -10,32 +10,32 @@
"@types/enzyme": "^3.10.5", "@types/enzyme": "^3.10.5",
"@types/enzyme-adapter-react-16": "^1.0.6", "@types/enzyme-adapter-react-16": "^1.0.6",
"@types/highlight.js": "^9.12.4", "@types/highlight.js": "^9.12.4",
"@types/jest": "^25.2.3", "@types/jest": "^26.0.9",
"@types/parcel-bundler": "^1.12.1", "@types/parcel-bundler": "^1.12.1",
"@types/react": "^16.9.35", "@types/react": "^16.9.46",
"@types/react-dom": "^16.9.8", "@types/react-dom": "^16.9.8",
"@types/react-redux": "^7.1.9", "@types/react-redux": "^7.1.9",
"@types/react-router": "^5.1.7", "@types/react-router": "^5.1.8",
"@types/react-router-dom": "^5.1.5", "@types/react-router-dom": "^5.1.5",
"@types/sass": "^1.16.0", "@types/sass": "^1.16.0",
"autoprefixer": "^9.8.0", "autoprefixer": "^9.8.6",
"enzyme": "^3.11.0", "enzyme": "^3.11.0",
"enzyme-adapter-react-16": "^1.15.2", "enzyme-adapter-react-16": "^1.15.3",
"jest": "^26.0.1", "jest": "^26.4.0",
"parcel-bundler": "^1.12.4", "parcel-bundler": "^1.12.4",
"postcss-modules": "^2.0.0", "postcss-modules": "^3.2.0",
"redux-devtools-extension": "^2.13.8", "redux-devtools-extension": "^2.13.8",
"sass": "^1.26.8", "sass": "^1.26.10",
"ts-jest": "^26.1.0" "ts-jest": "^26.2.0"
}, },
"dependencies": { "dependencies": {
"@blueprintjs/core": "^3.28.1", "@blueprintjs/core": "^3.31.0",
"@blueprintjs/icons": "^3.18.0", "@blueprintjs/icons": "^3.20.1",
"highlight.js": "^10.0.3", "highlight.js": "^10.1.2",
"react": "^16.13.1", "react": "^16.13.1",
"react-dom": "^16.13.1", "react-dom": "^16.13.1",
"react-markdown": "^4.3.1", "react-markdown": "^4.3.1",
"react-redux": "^7.2.0", "react-redux": "^7.2.1",
"react-router": "^5.2.0", "react-router": "^5.2.0",
"react-router-dom": "^5.2.0", "react-router-dom": "^5.2.0",
"react-spring": "^8.0.27", "react-spring": "^8.0.27",

10887
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@@ -1,11 +1,10 @@
{ {
"name": "writer-backend", "name": "writer-backend",
"devDependencies": { "devDependencies": {
"@blueprintjs/tslint-config": "^3.0.0",
"@types/bcrypt": "^3.0.0", "@types/bcrypt": "^3.0.0",
"@types/chai": "^4.2.11", "@types/chai": "^4.2.12",
"@types/concurrently": "^5.2.1", "@types/concurrently": "^5.2.1",
"@types/eslint": "^6.8.1", "@types/eslint": "^7.2.0",
"@types/eslint-plugin-prettier": "^3.1.0", "@types/eslint-plugin-prettier": "^3.1.0",
"@types/jsonwebtoken": "^8.5.0", "@types/jsonwebtoken": "^8.5.0",
"@types/koa": "^2.11.3", "@types/koa": "^2.11.3",
@@ -15,52 +14,50 @@
"@types/koa-sslify": "^4.0.1", "@types/koa-sslify": "^4.0.1",
"@types/koa-static": "^4.0.1", "@types/koa-static": "^4.0.1",
"@types/koa__cors": "^3.0.1", "@types/koa__cors": "^3.0.1",
"@types/lodash": "^4.14.155", "@types/lodash": "^4.14.159",
"@types/mocha": "^7.0.2", "@types/mocha": "^8.0.2",
"@types/mysql": "^2.15.13", "@types/mysql": "^2.15.15",
"@types/node": "^14.0.12", "@types/node": "^14.0.27",
"@types/prettier": "^2.0.1", "@types/prettier": "^2.0.2",
"@types/supertest": "^2.0.9", "@types/supertest": "^2.0.10",
"@typescript-eslint/eslint-plugin": "^3.9.0",
"@typescript-eslint/parser": "^3.9.0",
"chai": "^4.2.0", "chai": "^4.2.0",
"eslint": "^7.2.0", "eslint": "^7.6.0",
"eslint-config-airbnb": "^18.1.0", "eslint-config-airbnb": "^18.2.0",
"eslint-config-prettier": "^6.11.0", "eslint-config-prettier": "^6.11.0",
"eslint-plugin-import": "^2.21.1", "eslint-plugin-import": "^2.22.0",
"eslint-plugin-jsx-a11y": "^6.2.3", "eslint-plugin-jsx-a11y": "^6.3.1",
"eslint-plugin-prettier": "^3.1.3", "eslint-plugin-prettier": "^3.1.4",
"eslint-plugin-react": "^7.20.0", "eslint-plugin-react": "^7.20.6",
"eslint-plugin-react-hooks": "^4.0.4", "eslint-plugin-react-hooks": "^4.0.8",
"husky": "^4.2.5", "husky": "^4.2.5",
"mocha": "^7.2.0", "mocha": "^8.1.1",
"prettier": "^2.0.5", "prettier": "^2.0.5",
"supertest": "^4.0.2", "supertest": "^4.0.2",
"ts-node-dev": "^1.0.0-pre.44", "ts-node-dev": "^1.0.0-pre.57",
"tslint": "^6.1.2", "typescript": "^3.9.7"
"tslint-config-prettier": "^1.18.0",
"tslint-no-unused-expression-chai": "^0.1.4",
"tslint-plugin-prettier": "^2.3.0"
}, },
"dependencies": { "dependencies": {
"@koa/cors": "^3.1.0", "@koa/cors": "^3.1.0",
"bcrypt": "^5.0.0", "bcrypt": "^5.0.0",
"concurrently": "^5.2.0", "concurrently": "^5.3.0",
"cross-env": "^7.0.2", "cross-env": "^7.0.2",
"jsonwebtoken": "^8.5.1", "jsonwebtoken": "^8.5.1",
"koa": "^2.12.0", "koa": "^2.13.0",
"koa-body": "^4.1.3", "koa-body": "^4.2.0",
"koa-jwt": "^4.0.0", "koa-jwt": "^4.0.0",
"koa-logger": "^3.2.1", "koa-logger": "^3.2.1",
"koa-router": "^9.0.1", "koa-router": "^9.4.0",
"koa-send": "^5.0.0", "koa-send": "^5.0.1",
"koa-sslify": "^4.0.3", "koa-sslify": "^4.0.3",
"koa-static": "^5.0.0", "koa-static": "^5.0.0",
"lodash": "^4.17.15", "lodash": "^4.17.20",
"mysql": "^2.18.1", "mysql": "^2.18.1",
"reflect-metadata": "^0.1.13", "reflect-metadata": "^0.1.13",
"ts-node": "8.10.2", "ts-node": "8.10.2",
"tsconfig-paths": "^3.9.0", "tsconfig-paths": "^3.9.0",
"typeorm": "0.2.25", "typeorm": "0.2.25"
"typescript": "3.9.5"
}, },
"cacheDirectories": [ "cacheDirectories": [
"frontend/node_modules", "frontend/node_modules",
@@ -75,11 +72,12 @@
"build": "npm run build-backend && npm run build-frontend", "build": "npm run build-backend && npm run build-frontend",
"frontend": "cd frontend && npm start", "frontend": "cd frontend && npm start",
"dev": "cross-env NODE_ENV=development concurrently npm:ts-node-dev npm:frontend -c 'blue,green'", "dev": "cross-env NODE_ENV=development concurrently npm:ts-node-dev npm:frontend -c 'blue,green'",
"test": "cross-env NODE_ENV=test mocha --timeout 15000 -r ts-node/register -r tsconfig-paths/register 'tests/**/*.ts' " "test": "cross-env NODE_ENV=test mocha --timeout 15000 -r ts-node/register -r tsconfig-paths/register 'tests/**/*.ts' ",
"lint": "eslint ./src/** ./frontend/src/** --ext .js,.jsx,.ts,.tsx"
}, },
"husky": { "husky": {
"hooks": { "hooks": {
"pre-commit": "tslint --project . --fix && tslint --project ./frontend --fix && prettier src/** --write && prettier frontend/src/** --write", "pre-commit": "prettier src/** --write && prettier frontend/src/** --write",
"pre-push": "npm test && cd frontend && npm test" "pre-push": "npm test && cd frontend && npm test"
} }
} }