Skip to content

Commit

Permalink
Merge pull request #89 from wednesday-solutions/chore/update-dependen…
Browse files Browse the repository at this point in the history
…cies

chore/update-dependencies: update dependencies to latest version
  • Loading branch information
praveenkumar1798 authored Mar 12, 2024
2 parents 34ed080 + c5a2a1e commit 7f18a9d
Show file tree
Hide file tree
Showing 9 changed files with 3,596 additions and 3,177 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [14.x]
node-version: [20.x]
steps:
- uses: actions/checkout@v2
- name: Setup environment
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [16.x]
node-version: [20.x]

steps:
- uses: actions/checkout@v2
Expand Down
59 changes: 35 additions & 24 deletions .github/workflows/coverage-report.yml
Original file line number Diff line number Diff line change
@@ -1,27 +1,38 @@
name: Jest Coverage Report with Annotations (CI)
on:
pull_request:
branches:
- main
pull_request:
branches:
- main
jobs:
coverage_report:
name: Jest Coverage Report
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [14.x]
steps:
- uses: actions/checkout@v2
- name: Get Threshold
id: threshold
uses: notiz-dev/github-action-json-property@release
with:
path: 'jest.config.json'
prop_path: 'coverageThreshold.global.statements'
- name: Test and generate coverage report
uses: artiomtr/jest-coverage-report-action@v2.0-rc.1
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
threshold: ${{steps.threshold.outputs.prop}}
package-manager: yarn
custom-title: Jest Coverage Report
coverage_report:
name: Jest Coverage Report
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [18.x]

steps:
- uses: actions/checkout@v2
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v2
with:
node-version: ${{ matrix.node-version }}
cache: 'yarn'

- name: Get Threshold
id: threshold
uses: notiz-dev/github-action-json-property@release
with:
path: 'jest.config.json'
prop_path: 'coverageThreshold.global.statements'

- name: Install dependencies
run: rm yarn.lock && yarn

- name: Test and generate coverage report
uses: artiomtr/jest-coverage-report-action@v2.0-rc.4
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
threshold: ${{steps.threshold.outputs.prop}}
package-manager: yarn
custom-title: Jest Coverage Report
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:14
FROM node:20
ARG ENVIRONMENT_NAME
ARG BUILD_NAME
RUN mkdir -p /app-build
Expand All @@ -8,7 +8,7 @@ RUN --mount=type=cache,target=/root/.yarn YARN_CACHE_FOLDER=/root/.yarn yarn --f
RUN yarn
RUN yarn build:$BUILD_NAME

FROM node:14-alpine
FROM node:20-alpine
ARG ENVIRONMENT_NAME
ARG BUILD_NAME
RUN apk add yarn
Expand Down
55 changes: 28 additions & 27 deletions jest.config.json
Original file line number Diff line number Diff line change
@@ -1,29 +1,30 @@
{
"setupFilesAfterEnv": ["./jest.setup.js"],
"clearMocks": true,
"restoreMocks": true,
"resetMocks": true,
"globals": {
"server": null
},
"moduleNameMapper": {
"@root(.*)$": "<rootDir>/$1",
"@(models|routes|daos|services)(.*)$": "<rootDir>/lib/$1/$2",
"@(utils|config|plugins)(.*)$": "<rootDir>/$1/$2"
},
"coverageReporters": ["json-summary", "text", "lcov"],
"coverageThreshold": {
"global": {
"statements": 85,
"branches": 85,
"functions": 85,
"lines": 85
}
},
"coveragePathIgnorePatterns": [
"<rootDir>/node_modules/",
"<rootDir>/utils/testUtils.js",
"<rootDir>/utils/mockData.js",
"<rootDir>/lib/testServer.js"
]
"setupFilesAfterEnv": ["./jest.setup.js"],
"clearMocks": true,
"restoreMocks": true,
"resetMocks": true,
"globals": {
"server": null
},
"moduleNameMapper": {
"@root(.*)$": "<rootDir>/$1",
"@(models|routes|daos|services)(.*)$": "<rootDir>/lib/$1/$2",
"@(utils|config|plugins)(.*)$": "<rootDir>/$1/$2"
},
"coverageReporters": ["json-summary", "text", "lcov"],
"coverageThreshold": {
"global": {
"statements": 85,
"branches": 85,
"functions": 85,
"lines": 85
}
},
"testTimeout": 20000,
"coveragePathIgnorePatterns": [
"<rootDir>/node_modules/",
"<rootDir>/utils/testUtils.js",
"<rootDir>/utils/mockData.js",
"<rootDir>/lib/testServer.js"
]
}
6 changes: 0 additions & 6 deletions migrations/20200413132815-oauth.js

This file was deleted.

90 changes: 46 additions & 44 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,80 +37,82 @@
"@hapi/boom": "^9.1.0"
},
"dependencies": {
"@babel/register": "^7.18.9",
"@hapi/catbox-redis": "^6.0.2",
"@hapi/hapi": "^20.1.5",
"@hapi/inert": "^7.0.0",
"@babel/register": "^7.23.7",
"@hapi/catbox-redis": "^7.0.2",
"@hapi/hapi": "^21.3.3",
"@hapi/inert": "^7.1.0",
"@hapi/joi-date": "^2.0.1",
"@hapi/vision": "^7.0.0",
"axios": "^0.26.0",
"@hapi/vision": "^7.0.3",
"axios": "^1.6.7",
"cardinal": "^2.1.1",
"cls-rtracer": "^2.6.0",
"dotenv": "^10.0.0",
"cls-rtracer": "^2.6.3",
"dotenv": "^16.4.5",
"esm": "^3.2.25",
"glob-promise": "^5.0.0",
"glob-promise": "^6.0.5",
"hapi-auth-bearer-token": "^8.0.0",
"hapi-cors": "^1.0.3",
"hapi-pagination": "^4.0.0",
"hapi-rate-limit": "^5.0.0",
"hapi-rate-limit": "^7.1.0",
"hapi-swaggerui": "https://github.com/wednesday-solutions/hapi-swaggerui/#main",
"hbs": "^4.1.2",
"joi": "^17.6.1",
"hbs": "^4.2.0",
"joi": "^17.12.2",
"kill-port": "^2.0.1",
"loadash": "^1.0.0",
"lodash": "^4.17.21",
"map-keys-deep": "0.0.2",
"moment": "^2.29.1",
"mysql2": "^2.3.3",
"nodemon": "^2.0.12",
"opossum": "^6.3.0",
"moment": "^2.30.1",
"mysql2": "^3.9.2",
"nodemon": "^3.1.0",
"opossum": "^8.1.3",
"pg-hstore": "^2.3.4",
"qs": "^6.10.1",
"semver": "^6.3.0",
"sequelize": "^6.28.0",
"qs": "^6.12.0",
"semver": "^7.6.0",
"sequelize": "^6.37.1",
"shelljs": "^0.8.5",
"uuid": "^8.3.2",
"webpack": "^5.74.0",
"winston": "^3.3.3"
"uuid": "^9.0.1",
"webpack": "^5.90.3",
"winston": "^3.12.0"
},
"devDependencies": {
"@babel/cli": "^7.14.8",
"@babel/core": "^7.14.8",
"@babel/plugin-proposal-throw-expressions": "^7.18.6",
"@babel/plugin-syntax-import-assertions": "^7.18.6",
"@babel/plugin-transform-runtime": "^7.14.5",
"@babel/preset-env": "^7.14.8",
"@babel/preset-flow": "^7.18.6",
"@babel/runtime": "^7.14.8",
"@types/jest": "^29.0.3",
"@babel/cli": "^7.23.9",
"@babel/core": "^7.24.0",
"@babel/plugin-proposal-class-properties": "^7.18.6",
"@babel/plugin-proposal-throw-expressions": "^7.23.3",
"@babel/plugin-syntax-import-assertions": "^7.23.3",
"@babel/plugin-transform-runtime": "^7.24.0",
"@babel/preset-env": "^7.24.0",
"@babel/preset-flow": "^7.24.0",
"@babel/preset-typescript": "^7.23.3",
"@babel/runtime": "^7.24.0",
"@types/jest": "^29.5.12",
"babel-cli": "^6.26.0",
"babel-core": "^6.26.3",
"babel-eslint": "^10.0.3",
"babel-loader": "^8.2.2",
"babel-loader": "^9.1.3",
"babel-plugin-root-import": "^6.6.0",
"babel-plugin-transform-runtime": "^6.23.0",
"babel-polyfill": "^6.26.0",
"babel-preset-es2015": "^6.24.1",
"babel-preset-stage-0": "^6.24.1",
"babel-preset-stage-2": "^6.24.1",
"eslint": "^8.24.0",
"eslint": "^8.57.0",
"eslint-config-airbnb-base": "15.0.0",
"eslint-config-prettier": "^8.5.0",
"eslint-import-resolver-webpack": "^0.13.2",
"eslint-plugin-import": "^2.25.2",
"eslint-plugin-prettier": "^3.4.0",
"eslint-plugin-promise": "^5.1.0",
"jest": "^27.2.1",
"eslint-config-prettier": "^9.1.0",
"eslint-import-resolver-webpack": "^0.13.8",
"eslint-plugin-import": "^2.29.1",
"eslint-plugin-prettier": "^5.1.3",
"eslint-plugin-promise": "^6.1.1",
"jest": "^29.7.0",
"jest-coverage-badges": "^1.1.2",
"jest-extended": "^0.11.5",
"lint-staged": "^9.4.2",
"jest-extended": "^4.0.2",
"lint-staged": "^15.2.2",
"mockdate": "^3.0.5",
"path": "^0.12.7",
"pre-commit": "1.2.2",
"prettier": "2.3.2",
"sequelize-cli": "^6.2.0",
"prettier": "3.2.5",
"sequelize-cli": "^6.6.2",
"sequelize-mock": "^0.10.2",
"webpack-cli": "^4.10.0"
"webpack-cli": "^5.1.4"
},
"precommit": "lint:staged",
"lint-staged": {
Expand Down
2 changes: 1 addition & 1 deletion utils/cacheConstants.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ export const redisCacheType = {
export const redisCache = {
name: 'redis',
provider: {
constructor: CatboxRedis,
constructor: CatboxRedis.Engine,
options: {
partition: 'temp_dev_data',
host: process.env.REDIS_HOST,
Expand Down
Loading

0 comments on commit 7f18a9d

Please sign in to comment.