Skip to content

Commit

Permalink
Merge pull request #3636 from sap-labs-france/master-qa
Browse files Browse the repository at this point in the history
Merge master-qa
  • Loading branch information
LucasBrazi06 authored Jun 19, 2022
2 parents 91799a6 + bdd4346 commit 7efbd09
Show file tree
Hide file tree
Showing 56 changed files with 70,049 additions and 13,608 deletions.
176 changes: 105 additions & 71 deletions package-lock.json

Large diffs are not rendered by default.

12 changes: 7 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ev-server",
"version": "2.6.8",
"version": "2.6.9",
"engines": {
"node": "16.x.x",
"npm": "8.x.x"
Expand Down Expand Up @@ -58,7 +58,7 @@
"import-sort": "npx import-sort-cli --write 'src/**/*.ts{,x}' 'test/**/*.ts{,x}' 'types/**/*.ts{,x}'",
"test": "npm version && cross-env TS_NODE_FILES=true jest --config='test/jest.config.ts' --reporters='default' --reporters='./JestEvseReporter.js' --runInBand --logHeapUsage --verbose --colors --silent --forceExit --testPathIgnorePatterns='.*Runner.ts$'",
"test:createContext": "npm version && cross-env TS_NODE_FILES=true jest --config='test/jest.config.ts' --runInBand --logHeapUsage --verbose --colors --silent --forceExit -- test/**/**/ContextBuilderRunner.ts",
"test:create:utbilling": "npm version && cross-env TS_NODE_FILES=true TENANT_FILTER=utbilling jest --config='test/jest.config.ts' --runInBand --logHeapUsage --verbose --colors --silent --forceExit -- test/**/**/ContextBuilderRunner.ts",
"test:create:utbilling": "npm version && cross-env TS_NODE_FILES=true TENANT_FILTER=utbilling.* jest --config='test/jest.config.ts' --runInBand --logHeapUsage --verbose --colors --silent --forceExit -- test/**/**/ContextBuilderRunner.ts",
"test:asset": "npm version && cross-env TS_NODE_FILES=true jest --config='./test/jest.config.ts' --runInBand --logHeapUsage --verbose --colors --silent -- test/**/AssetTest.ts",
"test:authentication": "npm version && cross-env TS_NODE_FILES=true jest --config='./test/jest.config.ts' --runInBand --logHeapUsage --verbose --colors --silent -- test/**/AuthenticationTest.ts",
"test:billing": "npm version && cross-env TS_NODE_FILES=true jest --config='./test/jest.config.ts' --runInBand --logHeapUsage --verbose --colors --silent -- test/**/BillingTest.ts",
Expand Down Expand Up @@ -97,6 +97,7 @@
"bluebird": "^3.7.2",
"body-parser": "^1.20.0",
"body-parser-xml": "^2.0.3",
"bufferutil": "^4.0.6",
"busboy": "^1.4.0",
"chalk": "^4.1.2",
"cors": "^2.8.5",
Expand Down Expand Up @@ -149,6 +150,7 @@
"tslib": "^2.2.0",
"tz-lookup": "^6.1.25",
"urlencode": "^1.1.0",
"utf-8-validate": "^5.0.9",
"uWebSockets.js": "github:uNetworking/uWebSockets.js#v20.10.0",
"validator": "^13.7.0",
"ws": "^8.4.2"
Expand Down Expand Up @@ -198,7 +200,7 @@
"@types/tz-lookup": "^6.1.0",
"@types/urlencode": "^1.1.2",
"@types/uuid": "^8.3.4",
"@types/validator": "^13.7.2",
"@types/validator": "^13.7.3",
"@types/ws": "^8.2.2",
"@typescript-eslint/eslint-plugin": "^4.33.0",
"@typescript-eslint/parser": "^4.32.0",
Expand Down Expand Up @@ -229,10 +231,10 @@
"rosie": "^2.1.0",
"ts-jest": "^27.1.3",
"ts-loader": "^9.3.0",
"ts-node": "^10.7.0",
"ts-node": "^10.8.1",
"ts-node-dev": "^1.1.8",
"typescript": "^4.5.4",
"webpack": "^5.72.0",
"webpack": "^5.73.0",
"webpack-cli": "^4.9.2",
"webpack-merge": "^5.8.0",
"webpack-node-externals": "^3.0.0",
Expand Down
Loading

0 comments on commit 7efbd09

Please sign in to comment.