Merge pull request #289 from TaloDev/develop

Release 0.32.0

.github/workflows/create-release.yml

@@ -27,7 +27,7 @@ jobs:
         run: npm run build
 
       - name: Create GitHub release
-        uses: softprops/action-gh-release@v1
+        uses: softprops/action-gh-release@v2
         if: "!contains(github.event.head_commit.message, '--no-release')"
         with:
           generate_release_notes: true

.github/workflows/docker.yml

@@ -10,21 +10,21 @@ jobs:
       - run: echo "TAG=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
 
       - 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 DockerHub
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build and push
         id: docker_build
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v5
         with:
           push: true
           tags: |

.husky/install.mjs

@@ -0,0 +1,6 @@
+// Skip Husky install in production and CI
+if (process.env.NODE_ENV === 'production' || process.env.CI === 'true') {
+  process.exit(0)
+}
+const husky = (await import('husky')).default
+console.log(husky())

Dockerfile

@@ -6,6 +6,7 @@ COPY package-lock.json .
 EXPOSE 80
 
 FROM base AS dev
+COPY .husky .husky
 RUN npm ci
 CMD [ "npm", "run", "watch" ]
 

docker-compose.ci.yml

@@ -2,8 +2,8 @@ version: '3.9'
 
 services:
   test-db:
-    image: mysql:8
-    command: --default-authentication-plugin=mysql_native_password --sql_mode=
+    image: mysql:8.4
+    command: --mysql-native-password=ON
     environment:
       - MYSQL_DATABASE=${DB_NAME}
       - MYSQL_ROOT_PASSWORD=${DB_PASS}

docker-compose.test.yml

@@ -3,7 +3,7 @@ version: '3.9'
 services:
   test-db:
     image: mysql:8
-    command: --default-authentication-plugin=mysql_native_password --sql_mode=
+    command: --mysql-native-password=ON
     environment:
       - MYSQL_DATABASE=${DB_NAME}
       - MYSQL_ROOT_PASSWORD=${DB_PASS}

docker-compose.yml

@@ -10,7 +10,7 @@ services:
 
   db:
     image: mysql:8
-    command: --default-authentication-plugin=mysql_native_password --sql_mode=
+    command: --mysql-native-password=ON
     environment:
       - MYSQL_DATABASE=${DB_NAME}
       - MYSQL_ROOT_PASSWORD=${DB_PASS}

package.json

@@ -1,28 +1,28 @@
 {
   "name": "game-services",
-  "version": "0.31.1",
+  "version": "0.32.0",
   "description": "",
   "main": "src/index.ts",
   "scripts": {
     "watch": "tsnd --respawn src/index.ts",
     "build": "npx tsc -p tsconfig.build.json",
-    "seed": "docker-compose -f docker-compose.yml -f docker-compose.dev.yml exec backend npx ts-node tests/seed.ts",
     "dc": "docker-compose -f docker-compose.yml -f docker-compose.dev.yml",
+    "seed": "npm run dc -- exec backend npx ts-node tests/seed.ts",
     "test": "./tests/run-tests.sh",
-    "up": "npm run dc up --build -d",
-    "down": "npm run dc down",
-    "restart": "npm run dc restart backend && npm run logs",
-    "logs": "npm run dc logs --follow backend",
+    "up": "npm run dc -- up --build -d",
+    "down": "npm run dc -- down",
+    "restart": "npm run dc -- restart backend && npm run logs",
+    "logs": "npm run dc -- logs backend --follow",
     "migration:create": "DB_HOST=127.0.0.1 mikro-orm migration:create",
     "migration:up": "DB_HOST=127.0.0.1 mikro-orm migration:up",
     "service:create": "hygen service new",
-    "prepare": "husky || true",
+    "prepare": "node .husky/install.mjs",
     "lint": "eslint src/**/*.ts tests/**/*.ts"
   },
   "author": "Sleepy Studios",
   "license": "MIT",
   "devDependencies": {
-    "@mikro-orm/cli": "^6.2.3",
+    "@mikro-orm/cli": "^6.2.8",
     "@types/koa": "^2.13.5",
     "@types/koa-bodyparser": "^4.3.7",
     "@types/koa-logger": "^3.1.2",
@@ -33,7 +33,6 @@
     "@typescript-eslint/parser": "^5.40.1",
     "@vitest/coverage-v8": "^1.5.2",
     "axios-mock-adapter": "^1.22.0",
-    "casual": "^1.6.2",
     "eslint": "^8.26.0",
     "hefty": "^1.1.0",
     "husky": "^9.0.11",
@@ -49,17 +48,18 @@
   "dependencies": {
     "@dinero.js/currencies": "^2.0.0-alpha.14",
     "@koa/cors": "^5.0.0",
-    "@mikro-orm/core": "^6.2.3",
-    "@mikro-orm/migrations": "^6.2.3",
-    "@mikro-orm/mysql": "^6.2.3",
-    "@mikro-orm/reflection": "^6.2.3",
+    "@mikro-orm/core": "^6.2.8",
+    "@mikro-orm/migrations": "^6.2.8",
+    "@mikro-orm/mysql": "^6.2.8",
+    "@mikro-orm/reflection": "^6.2.8",
     "@sendgrid/mail": "^7.6.2",
     "@sentry/node": "^7.47.0",
     "@sentry/utils": "^7.47.0",
     "adm-zip": "^0.5.6",
     "axios": "^1.6.8",
     "bcrypt": "^5.1.0",
     "bullmq": "^3.2.0",
+    "casual": "^1.6.2",
     "date-fns": "^2.28.0",
     "dinero.js": "^2.0.0-alpha.14",
     "dotenv": "^16.0.0",