Skip to content

Commit

Permalink
Merge pull request #24 from rudemex/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
rudemex authored Aug 16, 2023
2 parents 59f4e0c + d88d34c commit 9ae792d
Show file tree
Hide file tree
Showing 10 changed files with 84 additions and 66 deletions.
6 changes: 6 additions & 0 deletions .github/workflows/branches.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,12 @@ jobs:
env:
NODE_ENV: 'test'

- name: "📊 Publish Test Report"
uses: mikepenz/action-junit-report@v3
if: always()
with:
report_paths: '**/junit.xml'

- name: "📊 Upload coverage report to Codecov"
uses: codecov/codecov-action@v1
with:
Expand Down
6 changes: 6 additions & 0 deletions .github/workflows/develop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,12 @@ jobs:
env:
NODE_ENV: 'test'

- name: "📊 Publish Test Report"
uses: mikepenz/action-junit-report@v3
if: always()
with:
report_paths: '**/junit.xml'

- name: "📊 Upload coverage report to Codecov"
uses: codecov/codecov-action@v1
with:
Expand Down
6 changes: 6 additions & 0 deletions .github/workflows/master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,12 @@ jobs:
env:
NODE_ENV: 'test'

- name: "📊 Publish Test Report"
uses: mikepenz/action-junit-report@v3
if: always()
with:
report_paths: '**/junit.xml'

- name: "📊 Upload coverage report to Codecov"
uses: codecov/codecov-action@v1
with:
Expand Down
6 changes: 6 additions & 0 deletions .github/workflows/quality.yml
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,12 @@ jobs:
env:
NODE_ENV: 'test'

- name: "📊 Publish Test Report"
uses: mikepenz/action-junit-report@v3
if: always()
with:
report_paths: '**/junit.xml'

- name: "📊 Upload coverage report to Codecov"
uses: codecov/codecov-action@v1
with:
Expand Down
6 changes: 6 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,12 @@ jobs:
env:
NODE_ENV: 'test'

- name: "📊 Publish Test Report"
uses: mikepenz/action-junit-report@v3
if: always()
with:
report_paths: '**/junit.xml'

- name: "📊 Upload coverage report to Codecov"
uses: codecov/codecov-action@v1
with:
Expand Down
7 changes: 7 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,14 @@ lerna-debug.log*
# Tests
/coverage
/.nyc_output
test-results
test-results/*
test-report.xml
junit.xml
sonar-project.properties
gl-sast-report.json
gl-secret-detection-report.json
semgrep.sarif
.scannerwork

# IDEs and editors
Expand Down
13 changes: 7 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
</div>

<p align="center">
<img src="https://img.shields.io/static/v1.svg?style=flat&label=Node&message=v16.14.2&labelColor=339933&color=757575&logoColor=FFFFFF&logo=Node.js" alt="Node.js"/>
<img src="https://img.shields.io/static/v1.svg?style=flat&label=Npm&message=v8.5.0&labelColor=CB3837&logoColor=FFFFFF&color=757575&logo=npm" alt="Npm"/>
<img src="https://img.shields.io/static/v1.svg?style=flat&label=NestJs&message=v9.2.1&labelColor=E0234E&logoColor=FFFFFF&color=757575&logo=Nestjs" alt="NestJs"/>
<img src="https://img.shields.io/static/v1.svg?style=flat&label=NodeJS&message=v18.17.0&labelColor=339933&color=757575&logoColor=FFFFFF&logo=Node.js" alt="Node.js"/>
<img src="https://img.shields.io/static/v1.svg?style=flat&label=NPM&message=v9.6.7&labelColor=CB3837&logoColor=FFFFFF&color=757575&logo=npm" alt="Npm"/>
<img src="https://img.shields.io/static/v1.svg?style=flat&label=NestJS&message=v10.1.3&labelColor=E0234E&logoColor=FFFFFF&color=757575&logo=Nestjs" alt="NestJs"/>
<a href="https://github.com/rudemex/nestjs-starter/releases/latest">
<img alt="Last Release" src="https://img.shields.io/github/v/tag/rudemex/nestjs-starter?label=release">
</a>
Expand Down Expand Up @@ -87,9 +87,10 @@ Reduce exposición de datos sensibles. El BFF contiene API's que filtran estos d

## 📝 Requerimientos básicos

- Node.js v16.14.2 or higher ([Download](https://nodejs.org/es/download/))
- NPM v8.5.0 or higher
- NestJS v9.2.1 or higher ([Documentación](https://nestjs.com/))
- Node.js v18.17.0 or higher ([Download](https://nodejs.org/es/download/))
- YARN v1.22.18 or higher
- NPM v9.6.7 or higher
- NestJS v10.1.3 or higher ([Documentación](https://nestjs.com/))

<a name="install-dependencies"></a>

Expand Down
25 changes: 2 additions & 23 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ services:
TZ: 'America/Argentina/Buenos_Aires'

elasticsearch:
image: docker.elastic.co/elasticsearch/elasticsearch:8.3.3
image: docker.elastic.co/elasticsearch/elasticsearch:8.8.1
container_name: local-elasticsearch
restart: always
ports:
Expand All @@ -113,7 +113,7 @@ services:
# - ./.elasticsearch-data:/usr/share/elasticsearch/data

kibana:
image: docker.elastic.co/kibana/kibana:8.3.3
image: docker.elastic.co/kibana/kibana:8.8.1
container_name: local-kibana
restart: always
ports:
Expand Down Expand Up @@ -153,24 +153,3 @@ services:
- '3000:3000'
environment:
- GF_SECURITY_ADMIN_PASSWORD=admin

#app:
# container_name: local-app
# env_file:
# - .env
# #- .env.dev
# build:
# context: .
# dockerfile: Dockerfile
# command: "yarn start"
# ports:
# - '8080:8080'
# networks:
# - nestjs-network
# volumes:
# - ./usr/src/app
# - ./usr/src/app/node_modules
# restart: unless-stopped

#networks:
# nestjs-network:
69 changes: 35 additions & 34 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -55,56 +55,57 @@
},
"dependencies": {
"@nestjs/class-transformer": "^0.4.0",
"@nestjs/class-validator": "^0.13.3",
"@nestjs/common": "^9.4.2",
"@nestjs/config": "^2.3.2",
"@nestjs/core": "^9.4.2",
"@nestjs/platform-express": "^9.4.2",
"@nestjs/swagger": "^6.3.0",
"@tresdoce-nestjs-toolkit/archetype": "^0.4.3",
"@tresdoce-nestjs-toolkit/http-client": "^0.2.3",
"@tresdoce-nestjs-toolkit/paas": "^0.5.1",
"@nestjs/class-validator": "^0.13.4",
"@nestjs/common": "^10.1.3",
"@nestjs/config": "^3.0.0",
"@nestjs/core": "^10.1.3",
"@nestjs/platform-express": "^10.1.3",
"@nestjs/swagger": "^7.1.8",
"@tresdoce-nestjs-toolkit/archetype": "^1.0.0",
"@tresdoce-nestjs-toolkit/http-client": "^1.0.0",
"@tresdoce-nestjs-toolkit/paas": "^1.0.0",
"class-transformer": "^0.5.1",
"compression": "^1.7.4",
"cookie-parser": "^1.4.6",
"cross-env": "^7.0.3",
"helmet": "^7.0.0",
"joi": "^17.9.1",
"reflect-metadata": "^0.1.13",
"rimraf": "^5.0.1",
"rxjs": "^7.8.0",
"swagger-ui-express": "^4.6.3"
"swagger-ui-express": "^5.0.0"
},
"devDependencies": {
"@commitlint/cli": "^17.6.3",
"@commitlint/config-conventional": "^17.6.3",
"@nestjs/cli": "^9.5.0",
"@nestjs/schematics": "^9.2.0",
"@nestjs/testing": "^9.4.2",
"@tresdoce-nestjs-toolkit/commons": "^0.2.2",
"@tresdoce-nestjs-toolkit/test-utils": "^0.5.2",
"@commitlint/cli": "^17.7.1",
"@commitlint/config-conventional": "^17.7.0",
"@nestjs/cli": "^10.1.11",
"@nestjs/schematics": "^10.0.2",
"@nestjs/testing": "^10.1.3",
"@tresdoce-nestjs-toolkit/commons": "^1.0.0",
"@tresdoce-nestjs-toolkit/test-utils": "^1.0.0",
"@types/express": "^4.17.17",
"@types/jest": "^29.5.0",
"@types/node": "^20.2.3",
"@types/supertest": "^2.0.10",
"@typescript-eslint/eslint-plugin": "^5.59.7",
"@typescript-eslint/parser": "^5.59.7",
"dotenv": "^16.0.3",
"eslint": "^8.41.0",
"eslint-config-prettier": "^8.8.0",
"eslint-plugin-prettier": "^4.0.0",
"@types/jest": "^29.5.3",
"@types/node": "^20.5.0",
"@types/supertest": "^2.0.11",
"@typescript-eslint/eslint-plugin": "^6.4.0",
"@typescript-eslint/parser": "^6.4.0",
"dotenv": "^16.3.1",
"eslint": "^8.47.0",
"eslint-config-prettier": "^9.0.0",
"eslint-plugin-prettier": "^5.0.0",
"husky": "^8.0.3",
"jest": "^29.5.0",
"jest-extended": "^3.2.4",
"jest-mock-extended": "^3.0.1",
"jest": "^29.6.2",
"jest-extended": "^4.0.1",
"jest-junit": "^16.0.0",
"jest-mock-extended": "^3.0.5",
"jest-sonar-reporter": "^2.0.0",
"lint-staged": "^13.2.1",
"prettier": "^2.8.7",
"lint-staged": "^14.0.0",
"prettier": "^3.0.2",
"rimraf": "^5.0.1",
"standard-version": "^9.5.0",
"supertest": "^6.2.4",
"ts-jest": "^29.1.0",
"ts-loader": "^9.4.3",
"ts-node": "^10.9.0",
"ts-loader": "^9.4.4",
"ts-node": "^10.9.1",
"tsconfig-paths": "^4.2.0",
"typescript": "^4.9.5"
}
Expand Down
6 changes: 3 additions & 3 deletions tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@
"baseUrl": "./",
"incremental": true,
"skipLibCheck": true,
"esModuleInterop": true,
"resolveJsonModule": true,
"strictNullChecks": false,
"noImplicitAny": false,
"strictBindCallApply": false,
"forceConsistentCasingInFileNames": false,
"noFallthroughCasesInSwitch": false,
"allowJs": true
"esModuleInterop": true,
"resolveJsonModule": true,
"allowJs": true,
},
"exclude": [
"node_modules",
Expand Down

0 comments on commit 9ae792d

Please sign in to comment.