chore: pnpm-workspace

PreMiD · Mar 28, 2023 · 022d0a8 · 022d0a8
1 parent e162677
commit 022d0a8
Show file tree

Hide file tree

Showing 58 changed files with 3,493 additions and 4,072 deletions.
diff --git a/master/.dockerignore → .dockerignore b/master/.dockerignore → .dockerignore
diff --git a/.github/workflows/CD-dev.yml b/.github/workflows/CD-dev.yml
@@ -14,7 +14,8 @@ jobs:
     if: ${{ github.event.workflow_run.conclusion == 'success' }}
     uses: "Recodive/Workflows/.github/workflows/CD Docker.yml@main"
     with:
-      context: master/.
+      file: apps/master/Dockerfile
+      context: .
       tags: premid/api-master
       version: dev-${{ github.sha }}-${{ github.run_number }}
     secrets:
@@ -26,7 +27,8 @@ jobs:
     if: ${{ github.event.workflow_run.conclusion == 'success' }}
     uses: "Recodive/Workflows/.github/workflows/CD Docker.yml@main"
     with:
-      context: worker/.
+      file: apps/worker/Dockerfile
+      context: .
       tags: premid/api-worker
       version: dev-${{ github.sha }}-${{ github.run_number }}
     secrets:

diff --git a/.github/workflows/CD.yml b/.github/workflows/CD.yml
@@ -9,7 +9,8 @@ jobs:
   docker-master:
     uses: "Recodive/Workflows/.github/workflows/CD Docker.yml@main"
     with:
-      context: master/.
+      file: apps/master/Dockerfile
+      context: .
       tags: premid/api-master
       version: ${{ github.ref_name }}
     secrets:
@@ -20,7 +21,8 @@ jobs:
   docker-worker:
     uses: "Recodive/Workflows/.github/workflows/CD Docker.yml@main"
     with:
-      context: worker/.
+      file: apps/worker/Dockerfile
+      context: .
       tags: premid/api-worker
       version: ${{ github.ref_name }}
     secrets:

diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -13,5 +13,5 @@ jobs:
         with:
           node-version: "lts/*"
           cache: "pnpm"
-      - run: pnpm run init
-      - run: pnpm build
+      - run: pnpm i --frozen-lockfile
+      - run: pnpm -r build
diff --git a/apps/master/Dockerfile b/apps/master/Dockerfile
@@ -0,0 +1,26 @@
+FROM node:lts-alpine as base
+
+WORKDIR /app
+
+RUN corepack enable
+
+FROM base as builder
+
+RUN echo pnpm -v
+
+COPY pnpm-lock.yaml ./
+RUN pnpm fetch
+
+COPY . .
+RUN pnpm i
+RUN pnpm --filter=./apps/master build
+RUN pnpm --filter=./apps/master deploy --prod pruned
+
+FROM base
+
+ENV NODE_ENV=production
+
+COPY --from=builder /app/pruned/dist ./
+COPY --from=builder /app/pruned/node_modules ./node_modules
+
+CMD ["node", "index.js"]
diff --git a/master/package.json → apps/master/package.json b/master/package.json → apps/master/package.json
diff --git a/master/src/index.ts → apps/master/src/index.ts b/master/src/index.ts → apps/master/src/index.ts
diff --git a/master/src/util/calculatePresenceUsage.ts → ...master/src/util/calculatePresenceUsage.ts b/master/src/util/calculatePresenceUsage.ts → ...master/src/util/calculatePresenceUsage.ts
diff --git a/master/src/util/updateScience.ts → apps/master/src/util/updateScience.ts b/master/src/util/updateScience.ts → apps/master/src/util/updateScience.ts
diff --git a/master/tsconfig.json → apps/master/tsconfig.json b/master/tsconfig.json → apps/master/tsconfig.json
diff --git a/apps/worker/Dockerfile b/apps/worker/Dockerfile
@@ -0,0 +1,28 @@
+FROM node:lts-alpine as base
+
+WORKDIR /app
+
+RUN corepack enable
+
+FROM base as builder
+
+RUN echo pnpm -v
+
+COPY pnpm-lock.yaml ./
+RUN pnpm fetch
+
+COPY . .
+RUN pnpm i
+RUN pnpm --filter=./apps/worker build
+RUN pnpm --filter=./apps/worker deploy --prod pruned
+
+FROM base
+
+ENV NODE_ENV=production
+
+COPY --from=builder /app/pruned/dist ./
+COPY --from=builder /app/pruned/node_modules ./node_modules
+
+EXPOSE 3001
+
+CMD ["node", "index.js"]
diff --git a/worker/package.json → apps/worker/package.json b/worker/package.json → apps/worker/package.json
diff --git a/worker/src/generic/appUpdate.ts → apps/worker/src/generic/appUpdate.ts b/worker/src/generic/appUpdate.ts → apps/worker/src/generic/appUpdate.ts
diff --git a/worker/src/generic/ffUpdates.ts → apps/worker/src/generic/ffUpdates.ts b/worker/src/generic/ffUpdates.ts → apps/worker/src/generic/ffUpdates.ts
diff --git a/worker/src/generic/zippedPresences.ts → apps/worker/src/generic/zippedPresences.ts b/worker/src/generic/zippedPresences.ts → apps/worker/src/generic/zippedPresences.ts
diff --git a/worker/src/index.ts → apps/worker/src/index.ts b/worker/src/index.ts → apps/worker/src/index.ts
diff --git a/worker/src/plugins/fastifyAppClosePlugin.ts → ...rker/src/plugins/fastifyAppClosePlugin.ts b/worker/src/plugins/fastifyAppClosePlugin.ts → ...rker/src/plugins/fastifyAppClosePlugin.ts
diff --git a/worker/src/plugins/sentryPlugin.ts → apps/worker/src/plugins/sentryPlugin.ts b/worker/src/plugins/sentryPlugin.ts → apps/worker/src/plugins/sentryPlugin.ts
diff --git a/worker/src/scalars/StringOrStringArray.ts → ...worker/src/scalars/StringOrStringArray.ts b/worker/src/scalars/StringOrStringArray.ts → ...worker/src/scalars/StringOrStringArray.ts
diff --git a/worker/src/util/dataSources.ts → apps/worker/src/util/dataSources.ts b/worker/src/util/dataSources.ts → apps/worker/src/util/dataSources.ts
diff --git a/worker/src/util/functions/getDiscordUser.ts → ...rker/src/util/functions/getDiscordUser.ts b/worker/src/util/functions/getDiscordUser.ts → ...rker/src/util/functions/getDiscordUser.ts
diff --git a/worker/src/util/functions/zipPresences.ts → ...worker/src/util/functions/zipPresences.ts b/worker/src/util/functions/zipPresences.ts → ...worker/src/util/functions/zipPresences.ts
diff --git a/worker/src/v2/deleteScience.ts → apps/worker/src/v2/deleteScience.ts b/worker/src/v2/deleteScience.ts → apps/worker/src/v2/deleteScience.ts
diff --git a/worker/src/v2/versions.ts → apps/worker/src/v2/versions.ts b/worker/src/v2/versions.ts → apps/worker/src/v2/versions.ts
diff --git a/worker/src/v3/fields/addBetaUser.ts → apps/worker/src/v3/fields/addBetaUser.ts b/worker/src/v3/fields/addBetaUser.ts → apps/worker/src/v3/fields/addBetaUser.ts
diff --git a/worker/src/v3/fields/addScience.ts → apps/worker/src/v3/fields/addScience.ts b/worker/src/v3/fields/addScience.ts → apps/worker/src/v3/fields/addScience.ts
diff --git a/worker/src/v3/fields/alphaBetaAccess.ts → apps/worker/src/v3/fields/alphaBetaAccess.ts b/worker/src/v3/fields/alphaBetaAccess.ts → apps/worker/src/v3/fields/alphaBetaAccess.ts
diff --git a/worker/src/v3/fields/benefits.ts → apps/worker/src/v3/fields/benefits.ts b/worker/src/v3/fields/benefits.ts → apps/worker/src/v3/fields/benefits.ts
diff --git a/worker/src/v3/fields/betaUsers.ts → apps/worker/src/v3/fields/betaUsers.ts b/worker/src/v3/fields/betaUsers.ts → apps/worker/src/v3/fields/betaUsers.ts
diff --git a/worker/src/v3/fields/changelog.ts → apps/worker/src/v3/fields/changelog.ts b/worker/src/v3/fields/changelog.ts → apps/worker/src/v3/fields/changelog.ts
diff --git a/worker/src/v3/fields/credits.ts → apps/worker/src/v3/fields/credits.ts b/worker/src/v3/fields/credits.ts → apps/worker/src/v3/fields/credits.ts
diff --git a/worker/src/v3/fields/deleteScience.ts → apps/worker/src/v3/fields/deleteScience.ts b/worker/src/v3/fields/deleteScience.ts → apps/worker/src/v3/fields/deleteScience.ts
diff --git a/worker/src/v3/fields/discordUsers.ts → apps/worker/src/v3/fields/discordUsers.ts b/worker/src/v3/fields/discordUsers.ts → apps/worker/src/v3/fields/discordUsers.ts
diff --git a/worker/src/v3/fields/downloads.ts → apps/worker/src/v3/fields/downloads.ts b/worker/src/v3/fields/downloads.ts → apps/worker/src/v3/fields/downloads.ts
diff --git a/worker/src/v3/fields/jobs.ts → apps/worker/src/v3/fields/jobs.ts b/worker/src/v3/fields/jobs.ts → apps/worker/src/v3/fields/jobs.ts
diff --git a/worker/src/v3/fields/langFiles.ts → apps/worker/src/v3/fields/langFiles.ts b/worker/src/v3/fields/langFiles.ts → apps/worker/src/v3/fields/langFiles.ts
diff --git a/worker/src/v3/fields/partners.ts → apps/worker/src/v3/fields/partners.ts b/worker/src/v3/fields/partners.ts → apps/worker/src/v3/fields/partners.ts
diff --git a/worker/src/v3/fields/presences.ts → apps/worker/src/v3/fields/presences.ts b/worker/src/v3/fields/presences.ts → apps/worker/src/v3/fields/presences.ts
diff --git a/worker/src/v3/fields/science.ts → apps/worker/src/v3/fields/science.ts b/worker/src/v3/fields/science.ts → apps/worker/src/v3/fields/science.ts
diff --git a/worker/src/v3/fields/sponsors.ts → apps/worker/src/v3/fields/sponsors.ts b/worker/src/v3/fields/sponsors.ts → apps/worker/src/v3/fields/sponsors.ts
diff --git a/worker/src/v3/fields/usage.ts → apps/worker/src/v3/fields/usage.ts b/worker/src/v3/fields/usage.ts → apps/worker/src/v3/fields/usage.ts
diff --git a/worker/src/v3/fields/versions.ts → apps/worker/src/v3/fields/versions.ts b/worker/src/v3/fields/versions.ts → apps/worker/src/v3/fields/versions.ts
diff --git a/worker/src/v3/resolvers.ts → apps/worker/src/v3/resolvers.ts b/worker/src/v3/resolvers.ts → apps/worker/src/v3/resolvers.ts
diff --git a/worker/src/v3/typeDefinition.ts → apps/worker/src/v3/typeDefinition.ts b/worker/src/v3/typeDefinition.ts → apps/worker/src/v3/typeDefinition.ts
diff --git a/worker/src/v4/fields/availableLanguages.ts → ...orker/src/v4/fields/availableLanguages.ts b/worker/src/v4/fields/availableLanguages.ts → ...orker/src/v4/fields/availableLanguages.ts
diff --git a/...c/v4/fields/availablePresenceLanguages.ts → ...c/v4/fields/availablePresenceLanguages.ts b/...c/v4/fields/availablePresenceLanguages.ts → ...c/v4/fields/availablePresenceLanguages.ts
diff --git a/worker/src/v4/fields/strings.ts → apps/worker/src/v4/fields/strings.ts b/worker/src/v4/fields/strings.ts → apps/worker/src/v4/fields/strings.ts
diff --git a/worker/src/v4/resolvers.ts → apps/worker/src/v4/resolvers.ts b/worker/src/v4/resolvers.ts → apps/worker/src/v4/resolvers.ts
diff --git a/worker/src/v4/typeDefinition.ts → apps/worker/src/v4/typeDefinition.ts b/worker/src/v4/typeDefinition.ts → apps/worker/src/v4/typeDefinition.ts
diff --git a/worker/tsconfig.json → apps/worker/tsconfig.json b/worker/tsconfig.json → apps/worker/tsconfig.json
diff --git a/master/Dockerfile b/master/Dockerfile