updates

.dockerignore

@@ -2,10 +2,8 @@ dist
 node_modules
 README.md
 tsconfig.tsbuildinfo
-.env*
+*.env*
 .flaskenv*
-!.env.project
-!.env.vault
 .turbo
 .idea
 .devcontainer

.gitattributes

@@ -0,0 +1 @@
+*.sh text eol=lf

.github/README.md

@@ -30,15 +30,17 @@ qnaplus is a project with the purpose of improving the quality of life for the V
 
 This project uses [PNPM Workspaces](https://pnpm.io/workspaces) to manage structure and builds.
 
-- `packages`: Internal packages that are used by services.
-  - `dotenv`: Type-safe library for accessing environment variables.
-  - `store`: Supabase-related abstractions.
-  - `logger`: For creating service-unique loggers.
-  - `typescript-config`: Shared config for all packages/services.
-  - `utils`: Library for shared utility functions.
-- `services`: Applications that tie together the functionality in `packages`
-  - `updater`: Service for continuously watching for updates on the Q&A.
-  - `bot`: Discord Bot for announcing new answers.
+| Path | Description |
+|------|-------------|
+| `packages/` | Internal packages used by services |
+| `packages/dotenv` | Type-safe library for accessing environment variables |
+| `packages/store` | Supabase-related abstractions |
+| `packages/logger` | For creating service-unique loggers |
+| `packages/typescript-config` | Shared config for all packages/services |
+| `packages/utils` | Library for shared utility functions |
+| `services/` | Applications that tie together the functionality in `packages` |
+| `services/updater` | Service for continuously watching for updates on the Q&A |
+| `services/bot` | Discord Bot for announcing new answers |
 
 ## Features and Bugs
 

.github/workflows/bot_image.yml

@@ -17,7 +17,6 @@ on:
       - '!services/updater/**'
       - services/bot/**
       - packages/**
-      - .env.vault
       - package.json
       - turbo.json
       - pnpm-lock.yaml
@@ -69,11 +68,22 @@ jobs:
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
+      -
+        name: Set NODE_ENV
+        id: node_env
+        run: |
+          if [[ "${{ github.ref_name }}" == "master" ]]; then
+            echo "value=production" >> $GITHUB_OUTPUT
+          else
+            echo "value=development" >> $GITHUB_OUTPUT
+          fi
       -
         name: Build and push
         uses: docker/build-push-action@v5
         with:
           push: true
           file: services/bot/Dockerfile
           tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
+          labels: ${{ steps.meta.outputs.labels }}
+          build-args: |
+            NODE_ENV=${{ steps.node_env.outputs.value }}

.github/workflows/pr_checks.yml

@@ -0,0 +1,17 @@
+name: PR Checks
+
+on:
+  pull_request:
+    types: [opened, reopened, edited, synchronize]
+    branches:
+      - master
+
+jobs:
+  checks:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v6
+      - uses: jdx/mise-action@v4
+      - run: pnpm i --frozen-lockfile
+      - run: pnpm neat
+      - run: pnpm build

.github/workflows/updater_image.yml

@@ -17,7 +17,6 @@ on:
       - '!services/bot/**'
       - services/updater/**
       - packages/**
-      - .env.vault
       - package.json
       - turbo.json
       - pnpm-lock.yaml
@@ -69,11 +68,22 @@ jobs:
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
+      -
+        name: Set NODE_ENV
+        id: node_env
+        run: |
+          if [[ "${{ github.ref_name }}" == "master" ]]; then
+            echo "value=production" >> $GITHUB_OUTPUT
+          else
+            echo "value=development" >> $GITHUB_OUTPUT
+          fi
       -
         name: Build and push
         uses: docker/build-push-action@v5
         with:
           push: true
           file: services/updater/Dockerfile
           tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
+          labels: ${{ steps.meta.outputs.labels }}
+          build-args: |
+            NODE_ENV=${{ steps.node_env.outputs.value }}

.gitignore

@@ -39,10 +39,10 @@ dist
 # API keys and secrets
 .env*
 .flaskenv*
-!.env.project
-!.env.vault
 !.env.template
 
 .turbo
 
-out/
+out/
+
+*.env

.infisical.json

@@ -0,0 +1,5 @@
+{
+    "workspaceId": "1e4a9be2-aaf8-4e0b-be53-185dac145515",
+    "defaultEnvironment": "",
+    "gitBranchToEnvironmentMapping": null
+}

.npmrc

@@ -1,3 +1 @@
 registry=https://registry.npmjs.org/
-sync-injected-deps-after-scripts[]=build
-inject-workspace-packages=true

.oxfmtrc.json

@@ -0,0 +1,9 @@
+{
+  "$schema": "./node_modules/oxfmt/configuration_schema.json",
+  "ignorePatterns": [
+    "src/oc/build/**",
+    "src/vite-env.d.ts"
+  ],
+  "tabWidth": 4,
+  "useTabs": true
+}

.oxlintrc.json

@@ -0,0 +1,16 @@
+{
+  "$schema": "./node_modules/oxlint/configuration_schema.json",
+  "plugins": [
+    "typescript",
+    "unicorn",
+    "oxc",
+    "import"
+  ],
+  "categories": {
+    "correctness": "error"
+  },
+  "rules": {},
+  "env": {
+    "builtin": true
+  }
+}

.vscode/extensions.json

@@ -0,0 +1,5 @@
+{
+    "recommendations": [
+        "oxc.oxc-vscode"
+    ]
+}

.vscode/settings.json

@@ -1,3 +1,3 @@
 {
-	"typescript.tsdk": "node_modules/typescript/lib"
+	"js/ts.tsdk.path": "node_modules/typescript/lib"
 }

compose.yml

@@ -0,0 +1,24 @@
+name: qnaplus
+
+services:
+  bot:
+    image: battlesquid0101/qnaplus-bot:${QNAPLUS_TAG:-latest}
+    restart: unless-stopped
+    environment:
+      NODE_ENV: ${NODE_ENV:-production}
+      INFISICAL_MACHINE_CLIENT_ID: ${INFISICAL_MACHINE_CLIENT_ID}
+      INFISICAL_MACHINE_CLIENT_SECRET: ${INFISICAL_MACHINE_CLIENT_SECRET}
+      INFISICAL_SECRET_ENV: ${INFISICAL_SECRET_ENV:-prod}
+    labels:
+      dockhand.order: "1"
+
+  updater:
+    image: battlesquid0101/qnaplus-updater:${QNAPLUS_TAG:-latest}
+    restart: unless-stopped
+    environment:
+      NODE_ENV: ${NODE_ENV:-production}
+      INFISICAL_MACHINE_CLIENT_ID: ${INFISICAL_MACHINE_CLIENT_ID}
+      INFISICAL_MACHINE_CLIENT_SECRET: ${INFISICAL_MACHINE_CLIENT_SECRET}
+      INFISICAL_SECRET_ENV: ${INFISICAL_SECRET_ENV:-prod}
+    labels:
+      dockhand.order: "2"

mise.toml

@@ -0,0 +1,3 @@
+[tools]
+node = "26.2.0"
+pnpm = "11.3.0"

package.json

@@ -6,34 +6,30 @@
 	"author": "battlesqui_d",
 	"license": "GPL-3.0",
 	"devDependencies": {
-		"@biomejs/biome": "1.9.4",
-		"dotenv-vault": "^1.26.2",
-		"rimraf": "^6.0.1",
-		"syncpack": "^13.0.2",
-		"tsx": "^4.19.3",
-		"typescript": "^5.8.2"
+		"@types/node": "^25.8.0",
+		"oxfmt": "^0.49.0",
+		"oxlint": "^1.64.0",
+		"tsx": "^4.22.0",
+		"typescript": "^6.0.3"
 	},
 	"scripts": {
 		"build": "tsc --build",
 		"check-types": "pnpm -r check-types",
-		"clean": "pnpm -r clean",
-		"clean:full": "pnpm -r clean:full",
-		"neat": "biome check .",
-		"neat:fix": "biome check . --write",
+		"lint": "pnpm -r lint",
+		"lint:fix": "pnpm -r lint:fix",
+		"fmt": "pnpm -r fmt",
+		"fmt:fix": "pnpm -r fmt:fix",
+		"neat": "pnpm lint && pnpm fmt",
+		"neat:fix": "pnpm lint:fix && pnpm fmt:fix",
 		"bot": "pnpm --filter=@qnaplus/bot run start",
 		"bot:dev": "pnpm --filter=@qnaplus/bot run dev",
 		"updater": "pnpm --filter=@qnaplus/updater run start",
 		"updater:dev": "pnpm --filter=@qnaplus/updater run dev",
 		"updater:storage": "pnpm --filter=@qnaplus/updater run update_storage",
-		"store:populate": "pnpm --filter=@qnaplus/store run populate",
-		"store:populate-metadata": "pnpm --filter=@qnaplus/store run populate_metadata",
-		"vault:remove-previous": "rimraf .env.previous .env.production.previous",
-		"vault:pull": "dotenv-vault pull && dotenv-vault pull production && pnpm vault:remove-previous",
-		"vault:push": "dotenv-vault push && dotenv-vault push production && pnpm vault:pull"
+		"store:init": "pnpm --filter=@qnaplus/store run populate",
+		"store:init-meta": "pnpm --filter=@qnaplus/store run populate_metadata",
+        "docker:build-updater": "docker build --rm -t battlesquid0101/qnaplus-updater -f ./services/updater/Dockerfile .",
+        "docker:build-bot": "docker build --rm -t battlesquid0101/qnaplus-bot -f ./services/bot/Dockerfile ."
 	},
-	"volta": {
-		"pnpm": "10.7.0",
-		"node": "22.14.0"
-	},
-	"packageManager": "pnpm@10.6.5"
+	"packageManager": "pnpm@11.3.0"
 }