Skip to content

Commit

Permalink
Indiescripter/align website format lint configs (verdaccio#2398)
Browse files Browse the repository at this point in the history
* build: update deps dompurify, esbuild-loader, envinfo, express-rate-limit, fastify, handlebars, jsdom

* build: remove unused devDep wait-on

* build: update dep http-status-codes

* build: update devDeps @typescript-eslint/*; deps aws-sdk & memfs

* build: update devDep terser-webpack-plugin

* build: update devDep eslint-plugin-prettier

* build: update dev/devDeps node-fetch, react-hook-form

* build: update e2e-cli deps npm & pnpm

* build: update website devDev sass

* build: update ui-theme devDep github-markdown-css

* build: update logger dep pino minor version

* build: update web devDep node-html-parser

* build: remove some legacy flow-typed cruft

* style: eslint-config-airbnb-typescript => @verdaccio/eslint-config; use prettier width 100 in website

* fix: attempt eslint fix in Features.tsx as suggested by @semoal; website eslint still 1 error

* fix: attempt to fix eslint warn about hooks usage

Co-authored-by: Sergio Moreno <[email protected]>
  • Loading branch information
Justin Johansson and semoal authored Sep 1, 2021
1 parent 2e51c93 commit b121e36
Show file tree
Hide file tree
Showing 37 changed files with 545 additions and 430 deletions.
1 change: 0 additions & 1 deletion .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
**/types/custom.d.ts
build/
coverage/
flow-typed/
node_modules/
static/
website/
Expand Down
2 changes: 0 additions & 2 deletions .npmignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

## npm
npm-debug.log
yarn-error.log
Expand All @@ -23,7 +22,6 @@ docs/
wiki/

## flow
flow-typed/
types/

# jest
Expand Down
File renamed without changes.
9 changes: 4 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,8 @@
"@types/validator": "13.6.3",
"@types/webpack": "4.41.26",
"@types/webpack-env": "1.16.2",
"@typescript-eslint/eslint-plugin": "4.29.3",
"@typescript-eslint/parser": "4.29.3",
"@typescript-eslint/eslint-plugin": "4.30.0",
"@typescript-eslint/parser": "4.30.0",
"@verdaccio/benchmark": "workspace:*",
"@verdaccio/eslint-config": "workspace:*",
"@verdaccio/types": "workspace:*",
Expand All @@ -90,12 +90,11 @@
"eslint": "7.32.0",
"eslint-config-google": "0.14.0",
"eslint-config-prettier": "8.3.0",
"eslint-config-airbnb-typescript": "14.0.0",
"eslint-plugin-babel": "5.3.1",
"eslint-plugin-import": "2.24.2",
"eslint-plugin-jest": "24.4.0",
"eslint-plugin-jsx-a11y": "6.4.1",
"eslint-plugin-prettier": "3.4.1",
"eslint-plugin-prettier": "4.0.0",
"eslint-plugin-react": "7.25.1",
"eslint-plugin-react-hooks": "4.2.0",
"eslint-plugin-simple-import-sort": "7.0.0",
Expand All @@ -112,7 +111,7 @@
"kleur": "3.0.3",
"lint-staged": "9.5.0",
"nock": "12.0.3",
"node-fetch": "2.6.1",
"node-fetch": "3.0.0-beta.6-exportfix",
"nodemon": "2.0.12",
"npm-run-all": "4.1.5",
"prettier": "2.3.2",
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
"@verdaccio/fastify-migration": "workspace:6.0.0-6-next.10",
"commander": "6.2.0",
"clipanion": "3.0.1",
"envinfo": "7.4.0",
"envinfo": "7.8.1",
"kleur": "3.0.3",
"semver": "7.3.5"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/core/commons-api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
},
"dependencies": {
"http-errors": "1.8.0",
"http-status-codes": "1.4.0"
"http-status-codes": "2.1.4"
},
"scripts": {
"clean": "rimraf ./build",
Expand Down
4 changes: 2 additions & 2 deletions packages/core/readme/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@
"build"
],
"dependencies": {
"dompurify": "2.0.8",
"jsdom": "15.2.1",
"dompurify": "2.3.1",
"jsdom": "17.0.0",
"marked": "1.1.1"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/core/server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"@verdaccio/logger": "workspace:6.0.0-6-next.4",
"@verdaccio/store": "workspace:6.0.0-6-next.10",
"debug": "4.3.2",
"fastify": "3.15.1",
"fastify": "3.20.2",
"fastify-plugin": "3.0.0"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/hooks/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"@verdaccio/commons-api": "workspace:11.0.0-alpha.3",
"@verdaccio/logger": "workspace:6.0.0-6-next.4",
"debug": "4.3.2",
"handlebars": "4.5.3",
"handlebars": "4.7.7",
"undici": "4.5.1",
"undici-fetch": "1.0.0-rc.4"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/logger-prettify/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
},
"devDependencies": {
"@types/pino": "6.3.11",
"pino": "6.11.3"
"pino": "6.13.1"
},
"funding": {
"type": "opencollective",
Expand Down
2 changes: 1 addition & 1 deletion packages/logger/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
"@verdaccio/logger-prettify": "workspace:6.0.0-alpha.3",
"debug": "4.3.2",
"lodash": "4.17.21",
"pino": "6.11.3"
"pino": "6.13.1"
},
"devDependencies": {
"@types/pino": "6.3.11",
Expand Down
6 changes: 0 additions & 6 deletions packages/middleware/src/middleware.ts
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,6 @@ export function setSecurityWebHeaders(
next();
}

// flow: express does not match properly
// flow info
// https://github.com/flowtype/flow-typed/issues?utf8=%E2%9C%93&q=is%3Aissue+is%3Aopen+express
export function validateName(
req: $RequestExtend,
res: $ResponseExtend,
Expand All @@ -85,9 +82,6 @@ export function validateName(
}
}

// flow: express does not match properly
// flow info
// https://github.com/flowtype/flow-typed/issues?utf8=%E2%9C%93&q=is%3Aissue+is%3Aopen+express
export function validatePackage(
req: $RequestExtend,
res: $ResponseExtend,
Expand Down
2 changes: 1 addition & 1 deletion packages/plugins/audit/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"dependencies": {
"express": "4.17.1",
"https-proxy-agent": "5.0.0",
"node-fetch": "2.6.1"
"node-fetch": "3.0.0-beta.6-exportfix"
},
"devDependencies": {
"@verdaccio/types": "workspace:11.0.0-6-next.7",
Expand Down
2 changes: 1 addition & 1 deletion packages/plugins/aws-storage/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"dependencies": {
"@verdaccio/commons-api": "workspace:11.0.0-alpha.3",
"@verdaccio/streams": "workspace:11.0.0-alpha.3",
"aws-sdk": "2.978.0"
"aws-sdk": "2.980.0"
},
"devDependencies": {
"@verdaccio/types": "workspace:11.0.0-6-next.7",
Expand Down
2 changes: 1 addition & 1 deletion packages/plugins/memory/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"@verdaccio/streams": "workspace:11.0.0-alpha.3",
"memory-fs": "0.5.0",
"debug": "4.3.2",
"memfs": "3.2.2"
"memfs": "3.2.3"
},
"devDependencies": {
"@verdaccio/types": "workspace:11.0.0-6-next.7"
Expand Down
7 changes: 3 additions & 4 deletions packages/plugins/ui-theme/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"emotion-theming": "10.0.27",
"file-loader": "5.1.0",
"friendly-errors-webpack-plugin": "1.7.0",
"github-markdown-css": "3.0.1",
"github-markdown-css": "4.0.0",
"harmony-reflect": "1.6.2",
"history": "^4.10.1",
"html-webpack-plugin": "5.3.2",
Expand All @@ -60,7 +60,7 @@
"react": "17.0.2",
"react-autosuggest": "10.1.0",
"react-dom": "17.0.2",
"react-hook-form": "7.14.0",
"react-hook-form": "7.14.2",
"react-hot-loader": "4.13.0",
"react-i18next": "11.11.4",
"react-router": "5.2.1",
Expand All @@ -77,10 +77,9 @@
"stylelint-processor-styled-components": "1.10.0",
"stylelint-webpack-plugin": "^2.2.1",
"supertest": "6.1.6",
"terser-webpack-plugin": "5.1.4",
"terser-webpack-plugin": "5.2.0",
"url-loader": "4.1.1",
"validator": "13.6.0",
"wait-on": "5.2.0",
"webpack": "5.33.2",
"webpack-bundle-analyzer": "3.8.0",
"webpack-bundle-size-analyzer": "3.1.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
"compression": "1.7.4",
"cors": "2.8.5",
"express": "4.17.1",
"express-rate-limit": "5.2.3",
"express-rate-limit": "5.3.0",
"lodash": "4.17.21"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/tools/benchmark/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
},
"devDependencies": {
"autocannon": "7.4.0",
"node-fetch": "2.6.1",
"node-fetch": "3.0.0-beta.6-exportfix",
"ts-node": "10.2.1"
}
}
1 change: 0 additions & 1 deletion packages/verdaccio/test/jest.config.functional.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ module.exports = {
'<rootDir>/../tools',
'<rootDir>/../wiki',
'<rootDir>/../systemd',
'<rootDir>/../flow-typed',
'<rootDir>unit/partials/mock-store/.*/package.json',
'<rootDir>functional/store/.*/package.json',
'<rootDir>/../build',
Expand Down
2 changes: 1 addition & 1 deletion packages/web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
"devDependencies": {
"@verdaccio/types": "workspace:11.0.0-6-next.7",
"body-parser": "1.19.0",
"node-html-parser": "2.2.1",
"node-html-parser": "4.1.4",
"supertest": "6.1.6",
"verdaccio-auth-memory": "workspace:11.0.0-alpha.3",
"verdaccio-memory": "workspace:11.0.0-6-next.4"
Expand Down
Loading

0 comments on commit b121e36

Please sign in to comment.