Skip to content

Commit

Permalink
Update packages (#39)
Browse files Browse the repository at this point in the history
* continue

* fix tests

* up
  • Loading branch information
AmauryD authored Nov 9, 2023
1 parent 38071d3 commit 1daeb76
Show file tree
Hide file tree
Showing 47 changed files with 1,745 additions and 1,756 deletions.
14 changes: 3 additions & 11 deletions .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,17 +20,9 @@
"@typescript-eslint/no-unused-vars": "error",
"@typescript-eslint/no-redeclare": "error",
"@typescript-eslint/no-useless-constructor": "error",
"unused-imports/no-unused-imports": "error",
"unused-imports/no-unused-vars": [
"warn",
{
"vars": "all",
"varsIgnorePattern": "^_",
"args": "after-used",
"argsIgnorePattern": "^_"
}
],
"@typescript-eslint/consistent-type-imports": "error",
"@typescript-eslint/no-import-type-side-effects": "error",
"import/consistent-type-specifier-style": "error",
"import/no-duplicates": "error",
"@typescript-eslint/member-delimiter-style": [
"error",
{
Expand Down
10 changes: 2 additions & 8 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,8 @@ jobs:
# Steps represent a sequence of tasks that will be executed as part of the job
steps:
- uses: actions/checkout@v3
- name: Setup MySQL
uses: mirromutth/[email protected]
with:
mysql root password: "test123*"
mysql database: "nfw_test"
mysql user: "nfw"
mysql password: "test123*"
mysql version: "8"
- name: Run docker
run: docker compose up -d
- uses: pnpm/action-setup@v2
name: Install pnpm
id: pnpm-install
Expand Down
6 changes: 3 additions & 3 deletions config/env/development.env
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ JWT_SECRET="h8566MNQ18oo5cMmHROVh8566MNQ18oo5cMmHROVh8566MNQ18oo5cMmHROVh8566MNQ
JWT_EXPIRES=15
JWT_ISS=localhost
JWT_AUDIENCE=localhost
DATABASE_PORT=3306
DATABASE_PORT=5432
DATABASE_PASSWORD=test123*
DATABASE_HOST=localhost
DATABASE_NAME=nfw
DATABASE_USER=root
DATABASE_TYPE=mysql
DATABASE_USER=postgres
DATABASE_TYPE=postgresql
DEBUG=false
CORS=*
8 changes: 4 additions & 4 deletions config/env/test.env
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@ JWT_SECRET="h8566MNQ18oo5cMmHROVh8566MNQ18oo5cMmHROVh8566MNQ18oo5cMmHROVh8566MNQ
JWT_EXPIRES=15
JWT_ISS=localhost
JWT_AUDIENCE=localhost
DATABASE_PORT=3306
DATABASE_PORT=5432
DATABASE_PASSWORD=test123*
DATABASE_HOST=localhost
DATABASE_NAME=nfw_test
DATABASE_USER=root
DATABASE_TYPE=mysql
DATABASE_USER=postgres
DATABASE_TYPE=postgresql
DATABASE_MODELS=src/database/models
DEBUG=false
LOGGING=false
LOGGING=true
CORS=*
6 changes: 3 additions & 3 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ version: '3.6'

services:
db:
image: mysql
image: postgres
volumes:
- ./database:/docker-entrypoint-initdb.d
ports:
- 3306:3306
- 5432:5432
environment:
MYSQL_ROOT_PASSWORD: test123*
POSTGRES_PASSWORD: test123*
102 changes: 51 additions & 51 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
"test:acceptance": "vitest -c config/vitest/acceptance.vitest.config.ts",
"test:unit": "vitest -c config/vitest/unit.vitest.config.ts",
"test:integration": "vitest -c config/vitest/integration.vitest.config.ts",
"lint": "eslint {tests,src} --ext .ts",
"lint:fix": "eslint {tests,src} --ext .ts --fix",
"lint": "eslint . --ext .ts",
"lint:fix": "eslint . --ext .ts --fix",
"lint:duplication": "jscpd -c config/jscpd.json --exitCode 1",
"mikro-orm:cli": "MIKRO_ORM_CLI_USE_TS_NODE=1 MIKRO_ORM_DYNAMIC_IMPORTS=1 node --experimental-specifier-resolution=node --loader ts-node/esm ./node_modules/@mikro-orm/cli/cli.js",
"start:dev": "node start.js",
Expand All @@ -32,76 +32,76 @@
"url": "https://github.com/TRIPTYK/nfw/issues"
},
"dependencies": {
"@faker-js/faker": "~7.6.0",
"@faker-js/faker": "~8.2.0",
"@koa/cors": "~4.0.0",
"@mikro-orm/cli": "~5.7.5",
"@mikro-orm/core": "~5.7.5",
"@mikro-orm/migrations": "~5.7.5",
"@mikro-orm/mysql": "~5.7.5",
"@mikro-orm/seeder": "~5.7.5",
"@triptyk/nfw-core": "~5.0.0-alpha.1",
"@triptyk/nfw-http": "~5.0.0-alpha.1",
"@triptyk/nfw-mikro-orm": "~5.0.0-alpha.1",
"@triptyk/nfw-resources": "~5.0.0-alpha.1",
"bcrypt": "~5.1.0",
"jsonwebtoken": "~9.0.0",
"@mikro-orm/cli": "~5.9.3",
"@mikro-orm/core": "~5.9.3",
"@mikro-orm/migrations": "~5.9.3",
"@mikro-orm/postgresql": "~5.9.3",
"@mikro-orm/seeder": "~5.9.3",
"@triptyk/nfw-core": "~5.0.0",
"@triptyk/nfw-http": "~5.0.0",
"@triptyk/nfw-mikro-orm": "~5.0.0",
"@triptyk/nfw-resources": "~5.0.0",
"bcrypt": "~5.1.1",
"jsonwebtoken": "~9.0.2",
"koa": "~2.14.2",
"koa-body": "~6.0.1",
"koa-helmet": "~7.0.2",
"koa-qs": "~3.0.0",
"koa-ratelimit": "~5.0.1",
"param-case": "~3.0.4",
"param-case": "~4.0.0",
"pluralize": "~8.0.0",
"reflect-metadata": "~0.1.13",
"tracer": "~1.1.6",
"tracer": "~1.3.0",
"ts-dotenv": "~0.9.1",
"typescript": "~4.9.5",
"uuid": "~9.0.0",
"yup": "~1.1.1"
"typescript": "~5.2.2",
"uuid": "~9.0.1",
"yup": "~1.3.2"
},
"homepage": "https://github.com/TRIPTYK/nfw#readme",
"devDependencies": {
"fetch-blob": "^3.2.0",
"@casl/ability": "~6.5.0",
"@types/bcrypt": "~5.0.0",
"@types/formidable": "~2.0.6",
"@types/json-api-serializer": "~2.6.3",
"@types/jsonwebtoken": "~9.0.2",
"@types/koa": "~2.13.6",
"@types/koa-qs": "~2.0.0",
"@types/koa-ratelimit": "~5.0.0",
"@types/koa__cors": "~4.0.0",
"@types/koa__router": "~12.0.0",
"@types/node": "~18.16.3",
"@types/pluralize": "~0.0.29",
"@types/uuid": "~9.0.1",
"@typescript-eslint/eslint-plugin": "~5.59.5",
"@typescript-eslint/parser": "~5.59.5",
"@vitest/coverage-c8": "^0.31.0",
"@vitest/ui": "~0.31.0",
"concurrently": "~8.0.1",
"eslint": "~8.40.0",
"eslint-config-standard": "~17.0.0",
"eslint-plugin-import": "~2.27.5",
"eslint-plugin-n": "~15.7.0",
"@types/bcrypt": "~5.0.2",
"@types/formidable": "~3.4.5",
"@types/json-api-serializer": "~2.6.6",
"@types/jsonwebtoken": "~9.0.5",
"@types/koa": "~2.13.11",
"@types/koa-qs": "~2.0.3",
"@types/koa-ratelimit": "~5.0.4",
"@types/koa__cors": "~4.0.3",
"@types/koa__router": "~12.0.4",
"@types/node": "~20.9.0",
"@types/pluralize": "~0.0.33",
"@types/uuid": "~9.0.7",
"@typescript-eslint/eslint-plugin": "~6.10.0",
"@typescript-eslint/parser": "~6.10.0",
"@vitest/coverage-v8": "~0.34.6",
"@vitest/ui": "~0.34.6",
"concurrently": "~8.2.2",
"eslint": "~8.53.0",
"eslint-config-standard": "~17.1.0",
"eslint-plugin-import": "~2.29.0",
"eslint-plugin-n": "~16.3.0",
"eslint-plugin-node": "~11.1.0",
"eslint-plugin-promise": "~6.1.1",
"eslint-plugin-unused-imports": "~2.0.0",
"eslint-plugin-unused-imports": "~3.0.0",
"fetch-blob": "^4.0.0",
"formdata-polyfill": "^4.0.10",
"jscpd": "~3.5.9",
"node-fetch": "~3.3.1",
"nodemon": "~2.0.22",
"prettier-eslint": "~15.0.1",
"jscpd": "~3.5.10",
"node-fetch": "~3.3.2",
"nodemon": "~3.0.1",
"prettier-eslint": "~16.1.2",
"ts-node": "~10.9.1",
"ts-node-dev": "~2.0.0",
"tsconfig-paths": "^4.2.0",
"type-fest": "~3.10.0",
"vite": "~4.3.5",
"vite-tsconfig-paths": "^4.2.0",
"vitest": "~0.31.0"
"type-fest": "~4.7.1",
"vite": "~4.5.0",
"vite-tsconfig-paths": "^4.2.1",
"vitest": "~0.34.6"
},
"volta": {
"node": "18.16.0"
"node": "20.9.0"
},
"packageManager": "[email protected]"
}
Loading

0 comments on commit 1daeb76

Please sign in to comment.