Skip to content

Commit

Permalink
fix(package): update deps, fix vuls
Browse files Browse the repository at this point in the history
  • Loading branch information
antongolub committed Aug 4, 2021
1 parent fbd5890 commit 158a85e
Show file tree
Hide file tree
Showing 20 changed files with 4,794 additions and 7,890 deletions.
9 changes: 3 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,12 @@
dist: xenial
language: node_js
node_js:
- '12'
- '16'

cache:
directories:
- node_modules

before_install:
- npm install -g yarn

before_script:
- curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
- chmod +x ./cc-test-reporter
Expand All @@ -20,7 +17,7 @@ after_script:
- ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT

install:
- sh scripts/sh/install.sh
- yarn
- yarn run bootstrap
- yarn run build

Expand All @@ -31,4 +28,4 @@ deploy:
provider: script
skip_cleanup: true
script:
- yarn release
- npx -p @qiwi/semrel-toolkit multi-semrel
39 changes: 8 additions & 31 deletions jest.config.json
Original file line number Diff line number Diff line change
@@ -1,34 +1,11 @@
{
"preset": "ts-jest",
"collectCoverage": true,
"coveragePathIgnorePatterns": [
"types.ts"
],
"collectCoverageFrom": [
"<rootDir>/src/main/ts/**/*.ts"
],
"testMatch": [
"<rootDir>/src/test/ts/**/*.ts",
"<rootDir>/src/test/js/**/*.js"
],
"testPathIgnorePatterns": [
"/node_modules/",
"<rootDir>/src/test/stub"
],
"moduleFileExtensions": [
"ts",
"tsx",
"js",
"jsx",
"json",
"node"
],
"transform": {
"^.+\\.(ts|tsx)$": "ts-jest"
},
"globals": {
"ts-jest": {
"tsConfig": "tsconfig.test.json"
}
}
"projects": [
"<rootDir>/packages/nestjs/jest.config.json",
"<rootDir>/packages/expressjs/jest.config.json",
"<rootDir>/packages/facade/jest.config.json",
"<rootDir>/packages/common/jest.config.json",
"<rootDir>/packages/open-rpc/jest.config.json",
"<rootDir>/packages/p3/jest.config.json"
]
}
58 changes: 18 additions & 40 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,55 +11,33 @@
"build": "yarn clean && yarn prebuild && lerna run build --stream --concurrency 2",
"bootstrap": "lerna bootstrap",
"jest": "jest",
"test:report": "yarn test && yarn codeclimate:push && yarn coveralls:push",
"test": "lerna run test --concurrency 1 --stream --no-prefix && yarn coverage:merge",
"test:report": "yarn test && yarn coveralls:push",
"//test": "lerna run test --concurrency 1 --stream --no-prefix && yarn coverage:merge",
"test": "lerna run lint --concurrency 2 --stream && yarn jest",
"coverage:merge": "node scripts/js/coverage-merge.js",
"codeclimate:push": "codeclimate-test-reporter < ./coverage/lcov.info",
"coveralls:push": "cat ./coverage/lcov.info | coveralls || echo 'coveralls push failed :(' && exit 0",
"docs": "typedoc packages/**/src/main --ignoreCompilerErrors || exit 0",
"postupdate": "yarn && yarn bootstrap && yarn build && yarn test",
"release": "multi-semantic-release --execasync"
},
"resolutions": {
"multi-semantic-release/execa": "3.2.0"
"docs": "typedoc packages/**/src/main",
"postupdate": "yarn && yarn bootstrap && yarn build && yarn test"
},
"devDependencies": {
"@semantic-release/changelog": "^5.0.1",
"@semantic-release/commit-analyzer": "^8.0.1",
"@semantic-release/git": "9.0.0",
"@semantic-release/github": "7.0.7",
"@semantic-release/npm": "7.0.5",
"@semantic-release/release-notes-generator": "9.0.1",
"@types/jest": "^26.0.4",
"@types/lodash": "^4.14.157",
"@types/node": "^14.0.23",
"codeclimate-test-reporter": "^0.5.1",
"coveralls": "^3.1.0",
"@types/jest": "^26.0.24",
"@types/lodash": "^4.14.172",
"@types/node": "^16.4.11",
"coveralls": "^3.1.1",
"esm": "^3.2.25",
"find-git-root": "^1.0.4",
"jest": "^26.1.0",
"lerna": "^3.22.1",
"lodash": "^4.17.19",
"@qiwi/multi-semantic-release": "^3.1.0",
"replace-in-file": "^6.1.0",
"semantic-release": "17.1.1",
"snazzy": "^8.0.0",
"ts-jest": "^26.1.2",
"typedoc": "^0.17.8",
"typescript": "^3.9.6",
"yargs": "^15.4.1",
"jest": "^27.0.6",
"lerna": "^4.0.0",
"lodash": "^4.17.21",
"replace-in-file": "^6.2.0",
"snazzy": "^9.0.0",
"ts-jest": "^27.0.4",
"typedoc": "^0.21.5",
"typescript": "^4.3.5",
"yargs": "^17.0.1",
"rimraf": "^3.0.2"
},
"jest": {
"collectCoverage": true,
"projects": [
"<rootDir>/packages/nestjs/jest.config.json",
"<rootDir>/packages/expressjs/jest.config.json",
"<rootDir>/packages/facade/jest.config.json",
"<rootDir>/packages/common/jest.config.json",
"<rootDir>/packages/open-rpc/jest.config.json"
]
},
"repository": {
"type": "git",
"url": "git+https://github.com/qiwi/json-rpc.git"
Expand Down
48 changes: 10 additions & 38 deletions packages/common/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,51 +28,23 @@
"build:es6": "mkdir -p target/es6 && tsc -p tsconfig.es6.json",
"build:ts": "cp -r src/main/ts/ target/ts/",
"build:bundle": "microbundle build src/main/ts/index.ts -o target/bundle",
"build:libdef": "dts-generator --project ./ --out typings/index.d.ts --prefix @qiwi/json-rpc-common/target/es5 --name @qiwi/json-rpc-common --main @qiwi/json-rpc-common/target/es5/index && libdeffix --dts=./typings/index.d.ts --prefix=@qiwi/json-rpc-common/target/es5 && flowgen typings/index.d.ts --output-file flow-typed/index.flow.js",
"test:report": "yarn test && yarn push:report",
"push:report": "yarn coveralls:push",
"coveralls:push": "cat ./coverage/lcov.info | coveralls",
"docs": "typedoc --readme README.md --tsconfig tsconfig.json src/main --ignoreCompilerErrors || exit 0",
"build:libdef": "libdefkit --tsconfig=tsconfig.es5.json --tsconfig=tsconfig.es6.json",
"docs": "typedoc",
"uglify": "for f in $(find target -name '*.js'); do short=${f%.js}; terser -c -m -o $short.js -- $f; done",
"postupdate": "yarn && yarn build && yarn test"
},
"dependencies": {
"@qiwi/substrate": "^1.18.35",
"@types/express": "^4.17.7",
"@types/lodash": "^4.14.157",
"lodash": "^4.17.19",
"jsonrpc-lite": "^2.1.0",
"tslib": "^2.0.0",
"@qiwi/substrate": "^1.20.9",
"@types/express": "^4.17.13",
"@types/lodash": "^4.14.172",
"lodash": "^4.17.21",
"jsonrpc-lite": "^2.2.0",
"tslib": "^2.3.0",
"reflect-metadata": "^0.1.13"
},
"devDependencies": {
"@qiwi/libdefkit": "^1.0.2",
"@qiwi/semantic-release-gh-pages-plugin": "^4.0.0",
"@semantic-release/changelog": "^5.0.1",
"@semantic-release/git": "^9.0.0",
"@semantic-release/github": "^7.0.7",
"@semantic-release/npm": "^7.0.5",
"@types/jest": "^26.0.4",
"@types/jest-json-schema": "^2.1.2",
"@types/supertest": "^2.0.10",
"coveralls": "^3.1.0",
"eslint-plugin-typescript": "^0.14.0",
"esm": "^3.2.25",
"jest": "^26.1.0",
"lodash": "^4.17.15",
"microbundle": "^0.12.2",
"semantic-release": "^17.1.1",
"supertest": "^4.0.2",
"terser": "^4.8.0",
"ts-jest": "^26.1.2",
"tslint": "^6.1.2",
"tslint-config-qiwi": "^1.5.0",
"typedoc": "^0.17.8",
"typedoc-plugin-external-module-name": "^4.0.3",
"typescript": "^3.9.6",
"typescript-eslint-parser": "^22.0.0",
"rimraf": "^3.0.2",
"@swissquote/crafty-preset-jest": "^1.12.0"
"@qiwi/json-rpc-infra": "*",
"lodash": "^4.17.15"
},
"repository": {
"type": "git",
Expand Down
17 changes: 7 additions & 10 deletions packages/common/typedoc.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,12 @@
{
"name": "@qiwi/json-rpc-common",
"mode": "file",
"out": "./docs",
"target": "ES6",
"exclude": ["test", "node_modules", "paralleljs"],
"externalPattern": "**/node_modules/**",
"excludePrivate": true,
"excludeNotExported": true,
"moduleResolution": "node",
"module": "commonjs",
"entryPoints": ["src/main/ts"],
"exclude": ["src/test", "**/node_modules/**", "paralleljs"],
"externalPattern": ["**/node_modules/**"],
"excludePrivate": false,
"hideGenerator": true,
"readme": "none",
"ignoreCompilerErrors": true
"readme": "README.md",
"theme": "minimal",
"tsconfig": "./tsconfig.es5.json"
}
56 changes: 14 additions & 42 deletions packages/expressjs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,56 +28,28 @@
"build:es6": "mkdir -p target/es6 && tsc -p tsconfig.es6.json",
"build:ts": "cp -r src/main/ts/ target/ts/",
"build:bundle": "microbundle build src/main/ts/index.ts -o target/bundle",
"build:libdef": "dts-generator --project ./ --out typings/index.d.ts --prefix expressjs-json-rpc/target/es5 --name expressjs-json-rpc --main expressjs-json-rpc/target/es5/index && libdeffix --dts=./typings/index.d.ts --prefix=expressjs-json-rpc/target/es5 && flowgen typings/index.d.ts --output-file flow-typed/index.flow.js",
"test:report": "yarn test && yarn push:report",
"push:report": "yarn coveralls:push",
"coveralls:push": "cat ./coverage/lcov.info | coveralls",
"docs": "typedoc --readme README.md --tsconfig tsconfig.json src/main --ignoreCompilerErrors || exit 0",
"build:libdef": "libdefkit --tsconfig=tsconfig.es5.json --tsconfig=tsconfig.es6.json",
"docs": "typedoc",
"uglify": "for f in $(find target -name '*.js'); do short=${f%.js}; terser -c -m -o $short.js -- $f; done",
"postupdate": "yarn && yarn build && yarn test"
},
"dependencies": {
"@qiwi/decorator-utils": "^3.2.0",
"@qiwi/mware": "^1.10.0",
"@qiwi/decorator-utils": "^3.2.7",
"@qiwi/mware": "^1.12.1",
"@qiwi/json-rpc-common": "1.1.4",
"@qiwi/substrate": "^1.18.35",
"@types/express": "^4.17.7",
"@types/lodash": "^4.14.157",
"class-transformer": "^0.2.3",
"class-validator": "^0.12.2",
"jsonrpc-lite": "^2.1.0",
"lodash": "^4.17.19",
"@qiwi/substrate": "^1.20.9",
"@types/express": "^4.17.13",
"@types/lodash": "^4.14.172",
"class-transformer": "^0.4.0",
"class-validator": "^0.13.1",
"jsonrpc-lite": "^2.2.0",
"lodash": "^4.17.21",
"reflect-metadata": "^0.1.13",
"rxjs": "^6.6.0",
"tslib": "^2.0.0"
"rxjs": "^7.3.0",
"tslib": "^2.3.0"
},
"devDependencies": {
"@qiwi/libdefkit": "^1.0.2",
"@qiwi/semantic-release-gh-pages-plugin": "^4.0.0",
"@qiwi/substrate-types": "^1.43.0",
"@semantic-release/changelog": "^5.0.1",
"@semantic-release/git": "^9.0.0",
"@semantic-release/github": "^7.0.7",
"@semantic-release/npm": "^7.0.5",
"@swissquote/crafty-preset-jest": "^1.12.0",
"@types/jest": "^26.0.4",
"@types/jest-json-schema": "^2.1.2",
"coveralls": "^3.1.0",
"eslint-plugin-typescript": "^0.14.0",
"esm": "^3.2.25",
"jest": "^26.1.0",
"microbundle": "^0.12.2",
"reqresnext": "^1.6.3",
"rimraf": "^3.0.2",
"semantic-release": "^17.1.1",
"terser": "^4.8.0",
"ts-jest": "^26.1.2",
"tslint": "^6.1.2",
"tslint-config-qiwi": "^1.5.0",
"typedoc": "^0.17.8",
"typedoc-plugin-external-module-name": "^4.0.3",
"typescript": "^3.9.6",
"typescript-eslint-parser": "^22.0.0"
"@qiwi/json-rpc-infra": "*"
},
"repository": {
"type": "git",
Expand Down
17 changes: 7 additions & 10 deletions packages/expressjs/typedoc.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,12 @@
{
"name": "expressjs-json-rpc",
"mode": "file",
"out": "./docs",
"target": "ES6",
"exclude": ["test", "node_modules", "paralleljs"],
"externalPattern": "**/node_modules/**",
"excludePrivate": true,
"excludeNotExported": true,
"moduleResolution": "node",
"module": "commonjs",
"entryPoints": ["src/main/ts"],
"exclude": ["src/test", "**/node_modules/**", "paralleljs"],
"externalPattern": ["**/node_modules/**"],
"excludePrivate": false,
"hideGenerator": true,
"readme": "none",
"ignoreCompilerErrors": true
"readme": "README.md",
"theme": "minimal",
"tsconfig": "./tsconfig.es5.json"
}
40 changes: 6 additions & 34 deletions packages/facade/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,49 +28,21 @@
"build:es6": "mkdir -p target/es6 && tsc -p tsconfig.es6.json",
"build:ts": "cp -r src/main/ts/ target/ts/",
"build:bundle": "microbundle build src/main/ts/index.ts -o target/bundle",
"build:libdef": "dts-generator --project ./ --out typings/index.d.ts --prefix @qiwi/json-rpc/target/es5 --name @qiwi/json-rpc --main @qiwi/json-rpc/target/es5/index && libdeffix --dts=./typings/index.d.ts --prefix=@qiwi/json-rpc/target/es5 && flowgen typings/index.d.ts --output-file flow-typed/index.flow.js",
"test:report": "yarn test && yarn push:report",
"push:report": "yarn coveralls:push",
"coveralls:push": "cat ./coverage/lcov.info | coveralls",
"docs": "typedoc --readme README.md --tsconfig tsconfig.json src/main --ignoreCompilerErrors || exit 0",
"build:libdef": "libdefkit --tsconfig=tsconfig.es5.json --tsconfig=tsconfig.es6.json",
"docs": "typedoc",
"uglify": "for f in $(find target -name '*.js'); do short=${f%.js}; terser -c -m -o $short.js -- $f; done",
"postupdate": "yarn && yarn build && yarn test"
},
"dependencies": {
"expressjs-json-rpc": "1.4.4",
"nestjs-json-rpc": "1.1.8",
"@qiwi/json-rpc-common": "1.1.4",
"tslib": "^2.0.0"
"tslib": "^2.3.0"
},
"devDependencies": {
"@qiwi/libdefkit": "^1.0.2",
"@qiwi/semantic-release-gh-pages-plugin": "^4.0.0",
"@semantic-release/changelog": "^5.0.1",
"@semantic-release/git": "^9.0.0",
"@semantic-release/github": "^7.0.7",
"@semantic-release/npm": "^7.0.5",
"@types/bluebird": "^3.5.32",
"@types/jest": "^26.0.4",
"@types/jest-json-schema": "^2.1.2",
"class-transformer": "^0.2.3",
"class-validator": "^0.12.2",
"coveralls": "^3.1.0",
"eslint-plugin-typescript": "^0.14.0",
"esm": "^3.2.25",
"jest": "^26.1.0",
"lodash": "^4.17.19",
"microbundle": "^0.12.2",
"semantic-release": "^17.1.1",
"terser": "^4.8.0",
"ts-jest": "^26.1.2",
"tslint": "^6.1.2",
"tslint-config-qiwi": "^1.5.0",
"typedoc": "^0.17.8",
"typedoc-plugin-external-module-name": "^4.0.3",
"typescript": "^3.9.6",
"typescript-eslint-parser": "^22.0.0",
"rimraf": "^3.0.2",
"@swissquote/crafty-preset-jest": "^1.12.0"
"@qiwi/json-rpc-infra": "*",
"class-transformer": "^0.4.0",
"class-validator": "^0.13.1"
},
"repository": {
"type": "git",
Expand Down
Loading

0 comments on commit 158a85e

Please sign in to comment.