benjaminbours · benjaminbours · Aug 3, 2024 · Jul 18, 2024 · Aug 1, 2024 · Aug 2, 2024
diff --git a/.changeset/blue-books-draw.md b/.changeset/blue-books-draw.md
@@ -1,5 +1,5 @@
 ---
-"@benjaminbours/composite-api-client": patch
+"@benjaminbours/composite-core-api-client": patch
 "@benjaminbours/composite-core": patch
 "composite-front": patch
 "composite-back": patch

diff --git a/.changeset/brave-sheep-invite.md b/.changeset/brave-sheep-invite.md
@@ -1,7 +1,7 @@
 ---
 "composite-back": patch
 "composite-front": patch
-"@benjaminbours/composite-api-client": patch
+"@benjaminbours/composite-core-api-client": patch
 "@benjaminbours/composite-core": patch
 ---
 

diff --git a/.changeset/dry-pumpkins-act.md b/.changeset/dry-pumpkins-act.md
@@ -1,5 +1,5 @@
 ---
-"@benjaminbours/composite-api-client": patch
+"@benjaminbours/composite-core-api-client": patch
 "@benjaminbours/composite-core": patch
 "composite-front": patch
 "composite-back": patch

diff --git a/.changeset/dull-shrimps-allow.md b/.changeset/dull-shrimps-allow.md
@@ -1,5 +1,5 @@
 ---
-"@benjaminbours/composite-api-client": patch
+"@benjaminbours/composite-core-api-client": patch
 "@benjaminbours/composite-core": patch
 "composite-front": patch
 "composite-back": patch

diff --git a/.changeset/early-cups-join.md b/.changeset/early-cups-join.md
@@ -1,5 +1,5 @@
 ---
-"@benjaminbours/composite-api-client": patch
+"@benjaminbours/composite-core-api-client": patch
 "@benjaminbours/composite-core": patch
 "composite-front": patch
 "composite-back": patch

diff --git a/.changeset/few-eagles-smash.md b/.changeset/few-eagles-smash.md
@@ -1,5 +1,5 @@
 ---
-"@benjaminbours/composite-api-client": patch
+"@benjaminbours/composite-core-api-client": patch
 "@benjaminbours/composite-core": patch
 "composite-front": patch
 "composite-back": patch

diff --git a/.changeset/few-games-count.md b/.changeset/few-games-count.md
@@ -1,5 +1,5 @@
 ---
-"@benjaminbours/composite-api-client": patch
+"@benjaminbours/composite-core-api-client": patch
 "@benjaminbours/composite-core": patch
 "composite-front": patch
 "composite-back": patch

diff --git a/.changeset/five-islands-rule.md b/.changeset/five-islands-rule.md
@@ -1,5 +1,5 @@
 ---
-"@benjaminbours/composite-api-client": patch
+"@benjaminbours/composite-core-api-client": patch
 "@benjaminbours/composite-core": patch
 "composite-front": patch
 "composite-back": patch

diff --git a/.changeset/five-wasps-mix.md b/.changeset/five-wasps-mix.md
@@ -1,5 +1,5 @@
 ---
-"@benjaminbours/composite-api-client": patch
+"@benjaminbours/composite-core-api-client": patch
 "@benjaminbours/composite-core": patch
 "composite-front": patch
 "composite-back": patch

diff --git a/.changeset/forty-clocks-remain.md b/.changeset/forty-clocks-remain.md
@@ -1,5 +1,5 @@
 ---
-"@benjaminbours/composite-api-client": patch
+"@benjaminbours/composite-core-api-client": patch
 "@benjaminbours/composite-core": patch
 "composite-front": patch
 "composite-back": patch

diff --git a/.changeset/forty-countries-repeat.md b/.changeset/forty-countries-repeat.md
@@ -1,5 +1,5 @@
 ---
-"@benjaminbours/composite-api-client": patch
+"@benjaminbours/composite-core-api-client": patch
 "@benjaminbours/composite-core": patch
 "composite-front": patch
 "composite-back": patch

diff --git a/.changeset/fresh-teachers-tan.md b/.changeset/fresh-teachers-tan.md
@@ -0,0 +1,5 @@
+---
+"@benjaminbours/composite-core": patch
+---
+
+Update three.js version
diff --git a/.changeset/healthy-eggs-lick.md b/.changeset/healthy-eggs-lick.md
@@ -1,5 +1,5 @@
 ---
-"@benjaminbours/composite-api-client": patch
+"@benjaminbours/composite-core-api-client": patch
 "@benjaminbours/composite-core": patch
 "composite-front": patch
 "composite-back": patch

diff --git a/.changeset/loud-experts-float.md b/.changeset/loud-experts-float.md
@@ -1,5 +1,5 @@
 ---
-"@benjaminbours/composite-api-client": patch
+"@benjaminbours/composite-core-api-client": patch
 "@benjaminbours/composite-core": patch
 "composite-front": patch
 "composite-back": patch

diff --git a/.changeset/nervous-apes-explain.md b/.changeset/nervous-apes-explain.md
@@ -1,5 +1,5 @@
 ---
-"@benjaminbours/composite-api-client": patch
+"@benjaminbours/composite-core-api-client": patch
 "@benjaminbours/composite-core": patch
 "composite-front": patch
 "composite-back": patch

diff --git a/.changeset/olive-sheep-eat.md b/.changeset/olive-sheep-eat.md
@@ -1,5 +1,5 @@
 ---
-"@benjaminbours/composite-api-client": major
+"@benjaminbours/composite-core-api-client": major
 "@benjaminbours/composite-core": major
 "composite-front": major
 "composite-back": major

diff --git a/.changeset/pink-socks-hang.md b/.changeset/pink-socks-hang.md
@@ -1,5 +1,5 @@
 ---
-"@benjaminbours/composite-api-client": patch
+"@benjaminbours/composite-core-api-client": patch
 "@benjaminbours/composite-core": patch
 "composite-front": patch
 "composite-back": patch

diff --git a/.changeset/polite-melons-type.md b/.changeset/polite-melons-type.md
@@ -1,5 +1,5 @@
 ---
-"@benjaminbours/composite-api-client": patch
+"@benjaminbours/composite-core-api-client": patch
 "@benjaminbours/composite-core": patch
 "composite-front": patch
 "composite-back": patch

diff --git a/.changeset/poor-cherries-burn.md b/.changeset/poor-cherries-burn.md
@@ -1,5 +1,5 @@
 ---
-"@benjaminbours/composite-api-client": patch
+"@benjaminbours/composite-core-api-client": patch
 "@benjaminbours/composite-core": patch
 "composite-front": patch
 "composite-back": patch

diff --git a/.changeset/pre.json b/.changeset/pre.json
@@ -4,8 +4,9 @@
   "initialVersions": {
     "composite-back": "0.4.0",
     "composite-front": "0.4.0",
-    "@benjaminbours/composite-api-client": "0.0.1",
-    "@benjaminbours/composite-core": "0.3.0"
+    "@benjaminbours/composite-core-api-client": "0.0.1",
+    "@benjaminbours/composite-core": "0.3.0",
+    "real_time_api": "0.0.1"
   },
   "changesets": [
     "blue-books-draw",
@@ -24,6 +25,7 @@
     "five-wasps-mix",
     "forty-clocks-remain",
     "forty-countries-repeat",
+    "fresh-teachers-tan",
     "green-cars-flash",
     "healthy-ants-visit",
     "healthy-eggs-lick",
@@ -35,6 +37,7 @@
     "pink-socks-hang",
     "polite-melons-type",
     "poor-cherries-burn",
+    "sharp-tables-hope",
     "short-rules-sort",
     "six-files-boil",
     "sixty-ducks-bow",

diff --git a/.changeset/sharp-tables-hope.md b/.changeset/sharp-tables-hope.md
@@ -0,0 +1,5 @@
+---
+"@benjaminbours/composite-core": patch
+---
+
+Add fix when wrong three.js instance where patched for three-mesh-bvh
diff --git a/.changeset/six-files-boil.md b/.changeset/six-files-boil.md
@@ -1,5 +1,5 @@
 ---
-"@benjaminbours/composite-api-client": patch
+"@benjaminbours/composite-core-api-client": patch
 "@benjaminbours/composite-core": patch
 "composite-front": patch
 "composite-back": patch

diff --git a/.changeset/slow-shirts-return.md b/.changeset/slow-shirts-return.md
@@ -1,5 +1,5 @@
 ---
-"@benjaminbours/composite-api-client": patch
+"@benjaminbours/composite-core-api-client": patch
 "@benjaminbours/composite-core": patch
 "composite-front": patch
 "composite-back": patch

diff --git a/.changeset/smooth-plants-scream.md b/.changeset/smooth-plants-scream.md
@@ -1,5 +1,5 @@
 ---
-"@benjaminbours/composite-api-client": patch
+"@benjaminbours/composite-core-api-client": patch
 "@benjaminbours/composite-core": patch
 "composite-front": patch
 "composite-back": patch

diff --git a/.changeset/sour-files-hug.md b/.changeset/sour-files-hug.md
@@ -1,5 +1,5 @@
 ---
-"@benjaminbours/composite-api-client": patch
+"@benjaminbours/composite-core-api-client": patch
 "@benjaminbours/composite-core": patch
 "composite-front": patch
 "composite-back": patch

diff --git a/.changeset/strange-knives-melt.md b/.changeset/strange-knives-melt.md
@@ -1,5 +1,5 @@
 ---
-"@benjaminbours/composite-api-client": patch
+"@benjaminbours/composite-core-api-client": patch
 "@benjaminbours/composite-core": patch
 "composite-front": patch
 "composite-back": patch

diff --git a/.changeset/ten-buttons-rhyme.md b/.changeset/ten-buttons-rhyme.md
@@ -1,7 +1,7 @@
 ---
 "composite-front": patch
 "composite-back": patch
-"@benjaminbours/composite-api-client": patch
+"@benjaminbours/composite-core-api-client": patch
 "@benjaminbours/composite-core": patch
 ---
 

diff --git a/.changeset/thin-candles-notice.md b/.changeset/thin-candles-notice.md
@@ -1,5 +1,5 @@
 ---
-"@benjaminbours/composite-api-client": patch
+"@benjaminbours/composite-core-api-client": patch
 "@benjaminbours/composite-core": patch
 "composite-front": patch
 "composite-back": patch

diff --git a/.changeset/tidy-kiwis-wink.md b/.changeset/tidy-kiwis-wink.md
@@ -1,7 +1,7 @@
 ---
 "composite-back": patch
 "composite-front": patch
-"@benjaminbours/composite-api-client": patch
+"@benjaminbours/composite-core-api-client": patch
 "@benjaminbours/composite-core": patch
 ---
 

diff --git a/.changeset/unlucky-owls-work.md b/.changeset/unlucky-owls-work.md
@@ -1,5 +1,5 @@
 ---
-"@benjaminbours/composite-api-client": patch
+"@benjaminbours/composite-core-api-client": patch
 "@benjaminbours/composite-core": patch
 "composite-front": patch
 "composite-back": patch

diff --git a/.github/workflows/back_cd_staging.yml → .github/workflows/core_api_cd.yml b/.github/workflows/back_cd_staging.yml → .github/workflows/core_api_cd.yml
@@ -1,4 +1,4 @@
-name: Push backend image
+name: Push core_api image
 
 on:
   workflow_dispatch:
@@ -33,7 +33,7 @@ jobs:
 
       - name: Get version
         id: package
-        run: echo "::set-output name=version::$(node -p "require('./back/package.json').version")"
+        run: echo "::set-output name=version::$(node -p "require('./core_api/package.json').version")"
 
       - name: Login to Docker Hub
         uses: docker/login-action@v3
@@ -45,12 +45,12 @@ jobs:
         uses: docker/build-push-action@v5
         with:
           context: .
-          file: ./back/Dockerfile.back
+          file: ./core_api/Dockerfile
           target: final
           push: true
           tags: |
-            ${{ secrets.DOCKERHUB_USERNAME }}/composite-back:${{ steps.package.outputs.version }},
-            ${{ secrets.DOCKERHUB_USERNAME }}/composite-back:latest
+            ${{ secrets.DOCKERHUB_USERNAME }}/composite-core_api:${{ steps.package.outputs.version }},
+            ${{ secrets.DOCKERHUB_USERNAME }}/composite-core_api:latest
           build-args: |
             POSTGRES_USER=${{ secrets.POSTGRES_USER }}
             POSTGRES_PASSWORD=${{ secrets.POSTGRES_PASSWORD }}

diff --git a/.github/workflows/back_ci.yml → .github/workflows/core_api_ci.yml b/.github/workflows/back_ci.yml → .github/workflows/core_api_ci.yml
@@ -1,11 +1,11 @@
-name: Install, test and build API
+name: Install, test and build core_api
 
 # on: [pull_request, workflow_dispatch]
 on:
   workflow_dispatch:
   pull_request:
     paths:
-      - 'back/**'
+      - 'core_api/**'
 
 jobs:
   build:
@@ -44,16 +44,16 @@ jobs:
     - if: ${{ steps.cache-npm.outputs.cache-hit != 'true' }}
       name: List the state of node modules
       continue-on-error: true
-      run: npm list -w back
+      run: npm list -w core_api
 
     - name: Install dependencies
-      run: npm install -w packages -w back && cd back && npx prisma generate
+      run: npm install -w packages -w core_api && cd core_api && npx prisma generate
 
     - name: Build packages
       run: npm run build -w packages
 
     - name: Lint
-      run: npm run lint -w back
+      run: npm run lint -w core_api
 
     - name: Build the project
-      run: npm run build -w back
+      run: npm run build -w core_api
diff --git a/.github/workflows/front_cd_staging.yml → .github/workflows/front_cd.yml b/.github/workflows/front_cd_staging.yml → .github/workflows/front_cd.yml
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -2,6 +2,7 @@
     "cSpell.words": [
         "Collidable",
         "gsap",
+        "hathora",
         "Leaderboard",
         "phong"
     ]

diff --git a/Dockerfile.base b/Dockerfile.base
@@ -0,0 +1,13 @@
+FROM node:18-alpine AS base
+WORKDIR /app
+COPY . .
+
+RUN apk add --update --no-cache \
+    make \
+    g++ \
+    py3-pip \
+    libc6-compat && \
+    npm i && \
+    npm run build -w packages && \
+    npm cache clean --force && \
+    rm -rf /var/cache/apk/*
diff --git a/Dockerfile.base.dockerignore b/Dockerfile.base.dockerignore
@@ -0,0 +1,20 @@
+*
+!.npmrc
+
+!front
+front/node_modules
+front/.next
+
+!core_api
+core_api/node_modules
+core_api/dist
+
+!real_time_api
+real_time_api/node_modules
+real_time_api/dist
+
+!packages
+packages/core/node_modules
+packages/core-api-client/node_modules
+
+!./package.json