Skip to content

Commit

Permalink
Merge pull request #262 from MariachiBear/develop
Browse files Browse the repository at this point in the history
1.6.0
  • Loading branch information
RubenConde authored May 16, 2024
2 parents cf6a18f + ed4214d commit 6181fb2
Show file tree
Hide file tree
Showing 13 changed files with 6,299 additions and 4,805 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/build_and_push_docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,24 +20,24 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Set up QEMU
uses: docker/setup-qemu-action@v2
uses: docker/setup-qemu-action@v3

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3

- name: Login to Docker Hub
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
registry: ${{ secrets.DOCKER_HUB_REGISTRY }}
username: ${{ secrets.DOCKER_HUB_USERNAME }}

- name: Get repository name
id: get-repo-name
uses: mariachibear/get-repo-name-action@v1.1.0
uses: mariachibear/get-repo-name-action@v1.3.0
with:
string-case: "lowercase"

Expand All @@ -46,7 +46,7 @@ jobs:
DOCKER_IMAGE_PATH: ${{ secrets.DOCKER_HUB_REGISTRY }}/${{ secrets.DOCKER_HUB_USERNAME }}
RELEASE_VERSION: ${{ inputs.tag }}
REPOSITORY_NAME: ${{ steps.get-repo-name.outputs.repository-name }}
uses: docker/build-push-action@v3
uses: docker/build-push-action@v5
with:
context: .
file: ./Dockerfile
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/continuous_integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,16 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Install Node.js
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: 16

- name: Install pnpm
id: pnpm-install
uses: pnpm/action-setup@v2.2.2
uses: pnpm/action-setup@v4.0.0
with:
version: 7
run_install: false
Expand All @@ -38,7 +38,7 @@ jobs:
- name: Setup pnpm cache
id: cache-nodemodules
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: |
**/node_modules
Expand All @@ -58,17 +58,17 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Install pnpm
id: pnpm-install
uses: pnpm/action-setup@v2.2.2
uses: pnpm/action-setup@v4.0.0
with:
version: 7
run_install: false

- name: Setup pnpm cache
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: |
**/node_modules
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/production_deployment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Get tag version
id: get-tag
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/rebase_to_master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,14 @@ jobs:
steps:
- name: Checkout to ${{ inputs.branch_name }}
if: ${{ inputs.branch_name != 0 }}
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0
ref: ${{ inputs.branch_name }}

- name: Checkout to dependencies
if: ${{ inputs.branch_name == 0 }}
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0
ref: dependencies
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ssh_deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Create ENV file
env:
Expand Down
115 changes: 56 additions & 59 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,72 +4,69 @@
"url": "https://github.com/MariachiBear/cutting-ninja-api/issues"
},
"dependencies": {
"@fastify/static": "6.5.0",
"@nestjs/common": "9.0.11",
"@nestjs/config": "2.2.0",
"@nestjs/core": "9.0.11",
"@nestjs/jwt": "9.0.0",
"@nestjs/mapped-types": "1.1.0",
"@nestjs/mongoose": "9.2.0",
"@nestjs/passport": "9.0.0",
"@nestjs/platform-fastify": "9.0.11",
"@nestjs/schedule": "2.1.0",
"@nestjs/swagger": "6.0.5",
"@nestjs/throttler": "3.0.0",
"@fastify/static": "7.0.4",
"@fastify/swagger": "8.14.0",
"@nestjs/common": "10.3.8",
"@nestjs/config": "3.2.2",
"@nestjs/core": "10.3.8",
"@nestjs/jwt": "10.2.0",
"@nestjs/mapped-types": "2.0.5",
"@nestjs/mongoose": "10.0.6",
"@nestjs/passport": "10.0.3",
"@nestjs/platform-fastify": "10.3.8",
"@nestjs/schedule": "4.0.2",
"@nestjs/swagger": "7.3.1",
"@nestjs/throttler": "5.1.2",
"bcryptjs": "2.4.3",
"class-transformer": "0.5.1",
"class-validator": "0.13.2",
"fastify": "4.5.2",
"fastify-swagger": "5.2.0",
"helmet": "5.1.1",
"isbot": "3.5.1",
"luxon": "3.0.1",
"mongoose": "6.5.2",
"nanoid": "3.3.4",
"passport": "0.6.0",
"passport-jwt": "4.0.0",
"class-validator": "0.14.1",
"fastify": "4.27.0",
"helmet": "7.1.0",
"isbot": "5.1.6",
"luxon": "3.4.4",
"mongoose": "8.3.5",
"nanoid": "3.3.7",
"passport": "0.7.0",
"passport-jwt": "4.0.1",
"passport-local": "1.0.0",
"reflect-metadata": "0.1.13",
"rimraf": "3.0.2",
"rxjs": "7.5.6",
"shortid": "2.2.16"
"reflect-metadata": "0.2.2",
"rimraf": "5.0.7",
"rxjs": "7.8.1"
},
"description": "Backend application to generate short urls and then redirect them. Made with Nest.js and MongoDB",
"devDependencies": {
"@nestjs/cli": "9.0.0",
"@nestjs/schematics": "9.0.1",
"@nestjs/testing": "9.0.11",
"@types/bcryptjs": "2.4.2",
"@types/cache-manager": "4.0.1",
"@types/cron": "2.0.0",
"@types/jest": "28.1.8",
"@types/luxon": "3.0.0",
"@types/node": "18.6.1",
"@types/passport": "1.0.10",
"@types/passport-jwt": "3.0.6",
"@types/passport-local": "1.0.34",
"@types/shortid": "0.0.29",
"@types/supertest": "2.0.12",
"@typescript-eslint/eslint-plugin": "5.34.0",
"@typescript-eslint/parser": "5.34.0",
"@nestjs/cli": "10.3.2",
"@nestjs/schematics": "10.1.1",
"@nestjs/testing": "10.3.8",
"@types/bcryptjs": "2.4.6",
"@types/cache-manager": "4.0.6",
"@types/jest": "29.5.12",
"@types/luxon": "3.4.2",
"@types/node": "20.12.12",
"@types/passport": "1.0.16",
"@types/passport-jwt": "4.0.1",
"@types/passport-local": "1.0.38",
"@types/supertest": "6.0.2",
"@typescript-eslint/eslint-plugin": "7.9.0",
"@typescript-eslint/parser": "7.9.0",
"cross-env": "7.0.3",
"eslint": "8.22.0",
"eslint": "8.57.0",
"eslint-config-airbnb": "19.0.4",
"eslint-config-prettier": "8.5.0",
"eslint-import-resolver-typescript": "3.5.0",
"eslint-plugin-import": "2.26.0",
"eslint-plugin-jsx-a11y": "6.6.1",
"eslint-plugin-prettier": "4.2.1",
"eslint-plugin-react": "7.30.1",
"jest": "28.1.3",
"pnpm": "7.9.5",
"prettier": "2.7.1",
"supertest": "6.2.4",
"ts-jest": "28.0.8",
"ts-loader": "9.3.1",
"ts-node": "10.9.1",
"tsconfig-paths": "4.1.0",
"typescript": "4.7.4"
"eslint-config-prettier": "9.1.0",
"eslint-import-resolver-typescript": "3.6.1",
"eslint-plugin-import": "2.29.1",
"eslint-plugin-jsx-a11y": "6.8.0",
"eslint-plugin-prettier": "5.1.3",
"eslint-plugin-react": "7.34.1",
"jest": "29.7.0",
"pnpm": "9.1.1",
"prettier": "3.2.5",
"supertest": "7.0.0",
"ts-jest": "29.1.2",
"ts-loader": "9.5.1",
"ts-node": "10.9.2",
"tsconfig-paths": "4.2.0",
"typescript": "5.4.5"
},
"directories": {
"test": "test"
Expand Down Expand Up @@ -122,5 +119,5 @@
"test:prettier": "prettier --ignore-path .gitignore -c \"./**/*.{js,jsx,ts,tsx}\"",
"test:watch": "jest --watch"
},
"version": "1.5.2"
"version": "1.6.0"
}
Loading

0 comments on commit 6181fb2

Please sign in to comment.