diff --git a/Docker.mk b/Docker.mk index 3d7bcb4..1db9b77 100644 --- a/Docker.mk +++ b/Docker.mk @@ -1,15 +1,3 @@ -# **************************************************************************** # -# # -# ::: :::::::: # -# Docker.mk :+: :+: :+: # -# +:+ +:+ +:+ # -# By: nrobinso +#+ +:+ +#+ # -# +#+#+#+#+#+ +#+ # -# Created: 2025/06/11 18:10:26 by maiboyer #+# #+# # -# Updated: 2025/12/19 14:33:21 by maiboyer ### ########.fr # -# # -# **************************************************************************** # - .PHONY: logs # TODO: REMOVE THIS BEFORE LAUNCH diff --git a/Makefile b/Makefile index 53e38e8..e870a66 100644 --- a/Makefile +++ b/Makefile @@ -1,15 +1,3 @@ -# **************************************************************************** # -# # -# ::: :::::::: # -# Makefile :+: :+: :+: # -# +:+ +:+ +:+ # -# By: rparodi +#+ +:+ +#+ # -# +#+#+#+#+#+ +#+ # -# Created: 2023/11/12 11:05:05 by rparodi #+# #+# # -# Updated: 2025/12/12 14:55:40 by maiboyer ### ########.fr # -# # -# **************************************************************************** # - # Colors GREEN = \033[32m BLACK = \033[30m @@ -28,7 +16,6 @@ PROJECT = ft_transcendence BASE_PATH=$(shell realpath .) ECHO = /usr/bin/env echo - all: @$(MAKE) --no-print-directory header @$(MAKE) --no-print-directory -f ./Docker.mk @@ -115,14 +102,15 @@ npm@eslint: (cd ./src/ && npx pnpm run eslint) npm@install: - (cd ./src/ && npx pnpm install) + (cd ./src/ && npx pnpm install --frozen-lockfile) + (cd ./frontend/ && npx pnpm install --frozen-lockfile) npm@build: (cd ./src/ && npx pnpm run build) npm@update: - (cd ./src/ && rm -rf ./node_modules/ && npx pnpm update -r --workspace) - (cd ./frontend/ && rm -rf ./node_modules/ && npx pnpm update) + (cd ./src/ && rm -rf ./node_modules/ && npx pnpm install --lockfile-only && npx pnpm install --frozen-lockfile) + (cd ./frontend/ && rm -rf ./node_modules/ && npx pnpm install --lockfile-only && npx pnpm install --frozen-lockfile) npm@openapi: openapi.jar @(cd ./src/ && npx pnpm run --if-present -r build:openapi) diff --git a/src/pnpm-lock.yaml b/src/pnpm-lock.yaml index 8932a9b..d13511c 100644 --- a/src/pnpm-lock.yaml +++ b/src/pnpm-lock.yaml @@ -220,9 +220,6 @@ importers: '@types/node': specifier: ^22.19.3 version: 22.19.3 - fastify-socket.io: - specifier: ^5.1.0 - version: 5.1.0(fastify@5.6.2)(socket.io@4.8.1) rollup-plugin-node-externals: specifier: ^8.1.2 version: 8.1.2(rollup@4.54.0) @@ -1434,18 +1431,9 @@ packages: resolution: {integrity: sha512-7Jsfj2uLuGWvnxjrGDrHWpSm65+OcVx0ZbTD2wwkz6Wt6KjGm6+ZYwwpdXdwAlzbJYq+LCEMNvDJc4485AQ1vQ==} hasBin: true - fastify-plugin@4.5.1: - resolution: {integrity: sha512-stRHYGeuqpEZTL1Ef0Ovr2ltazUT9g844X5z/zEBFLG8RYlpDiOCIG+ATvYEp+/zmc7sN29mcIMp8gvYplYPIQ==} - fastify-plugin@5.1.0: resolution: {integrity: sha512-FAIDA8eovSt5qcDgcBvDuX/v0Cjz0ohGhENZ/wpc3y+oZCY2afZ9Baqql3g/lC+OHRnciQol4ww7tuthOb9idw==} - fastify-socket.io@5.1.0: - resolution: {integrity: sha512-GC1gjrxBGeTbMWV779XHF4uw3AtgKwSQJ9MnjGiMp91ZBuPXEdBYa7NnAMDEl3oZPgK9JO4BlNncTV+UAN+1kg==} - peerDependencies: - fastify: 4.x.x - socket.io: '>=4' - fastify@5.6.2: resolution: {integrity: sha512-dPugdGnsvYkBlENLhCgX8yhyGCsCPrpA8lFWbTNU428l+YOnLgYHR69hzV8HWPC79n536EqzqQtvhtdaCE0dKg==} @@ -2485,9 +2473,6 @@ packages: tslib@2.6.2: resolution: {integrity: sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==} - tslib@2.8.1: - resolution: {integrity: sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==} - tunnel-agent@0.6.0: resolution: {integrity: sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==} @@ -3919,17 +3904,8 @@ snapshots: semver: 7.7.3 yargs-parser: 22.0.0 - fastify-plugin@4.5.1: {} - fastify-plugin@5.1.0: {} - fastify-socket.io@5.1.0(fastify@5.6.2)(socket.io@4.8.1): - dependencies: - fastify: 5.6.2 - fastify-plugin: 4.5.1 - socket.io: 4.8.1 - tslib: 2.8.1 - fastify@5.6.2: dependencies: '@fastify/ajv-compiler': 4.0.5 @@ -5036,8 +5012,6 @@ snapshots: tslib@2.6.2: {} - tslib@2.8.1: {} - tunnel-agent@0.6.0: dependencies: safe-buffer: 5.2.1 diff --git a/src/pnpm-workspace.yaml b/src/pnpm-workspace.yaml index 2840480..311c660 100644 --- a/src/pnpm-workspace.yaml +++ b/src/pnpm-workspace.yaml @@ -9,4 +9,3 @@ onlyBuiltDependencies: - core-js - esbuild - protobufjs - - sharp diff --git a/src/tic-tac-toe/package.json b/src/tic-tac-toe/package.json index e75880b..3079a99 100644 --- a/src/tic-tac-toe/package.json +++ b/src/tic-tac-toe/package.json @@ -27,9 +27,7 @@ }, "devDependencies": { "@types/node": "^22.19.3", - "fastify-socket.io": "^5.1.0", "rollup-plugin-node-externals": "^8.1.2", - "socket.io": "^4.8.1", "vite": "^7.3.0", "vite-tsconfig-paths": "^5.1.4" }