Merge pull request #45 from hacksu/feat/37-move-to-bun

Move to Bun

Author: Struck713

.github/workflows/build_and_deploy.yml

@@ -22,30 +22,10 @@ jobs:
       cancel-in-progress: true
 
     name: Deploy
-    outputs:
-      run_build: ${{ steps.check_build.outputs.run_build }}
 
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
-      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 2
-      - name: Determine Build Requirement
-        id: check_build
-        run: |
-          echo "========== Modified Files =========="
-          git diff --name-only HEAD^ HEAD
-          echo "===================================="
-          if grep -q "src" <<< $(git diff --name-only HEAD^ HEAD); then
-            echo "Build Required"
-            echo "::set-output name=run_build::true"
-          else
-            echo "::set-output name=run_build::false"
-          fi
-
-      - name: Deploying
+      - name: Deploy to server
         uses: appleboy/ssh-action@master
         with:
           host: ${{ secrets.REMOTE_HOST }}
@@ -59,31 +39,7 @@ jobs:
             git fetch
             echo "Pulling Changes from Github"
             git pull
-            echo "Installing Modules"
-            yarn install
-            echo "Restarting Application"
-            pm2 restart hacksu-2021
-            echo "Finished"
-            exit
-
-  build:
-    name: Build
-    needs: deploy
-    if: github.event_name == 'workflow_dispatch' || needs.deploy.outputs.run_build == 'true'
-    runs-on: ubuntu-latest
-    steps:
-      - name: Building Vue
-        uses: appleboy/ssh-action@master
-        with:
-          host: ${{ secrets.REMOTE_HOST }}
-          username: ${{ secrets.REMOTE_USER }}
-          key: ${{ secrets.KEY }}
-          port: ${{ secrets.PORT }}
-          #passphrase: ${{ secrets.KEY_PASSPHRASE }}
-          script: |
-            cd /var/www/hacksu-2021
-            yarn build  # goes to dist2 by default
-            ls dist2
-            rm -rf dist
-            mv dist2 dist
-            exit
+            echo "Take down docker compose stack"
+            docker compose down
+            echo "Start docker compose stack and rebuild"
+            docker compose up --build -d

Dockerfile

@@ -0,0 +1,11 @@
+FROM oven/bun:latest
+WORKDIR /app
+
+COPY . .
+RUN bun install
+RUN bun run build
+
+EXPOSE 8000
+
+ENV NODE_ENV=production
+CMD ["bun", "./server/index.js"]

README.md

@@ -4,14 +4,14 @@ Note that you can edit some of the site's content without changing its source co
 
 ## Guide to development
 
-Install [Node.js](https://nodejs.org/en) and [yarn](https://yarnpkg.com/).
+Install [Node.js](https://nodejs.org/en) and [Bun](https://bun.sh).
 
 ### Install dependencies
 
 Run this before attempting to start the site:
 
 ```
-yarn install
+bun install
 ```
 
 ### The configuration file
@@ -48,15 +48,15 @@ The Discord application whose client ID and secret are currently used in the ser
 ### Run a server in debug mode with hot-reloading for development
 
 ```
-yarn dev
+bun dev
 ```
 
 Then go to the localhost URL that shows up in the browser console.
 
 ### Bundle for production
 
 ```
-yarn build
+bun build
 ```
 
 This step uses [vite-ssg](https://github.com/antfu-collective/vite-ssg) to save the site's content as HTML. Keep this step in mind when developing the site; if you write code in a Vue component that directly accesses objects that are provided by a browser, like `window`, this step will crash, since this initial build is not run in a browser. You can usually move code that accesses browser-y stuff to a callback like `onMounted` to avoid this.

bun.lock

@@ -0,0 +1,19 @@
+name: "hacksu-website"
+
+services:
+  app:
+    build:
+      context: .
+      dockerfile: Dockerfile
+    labels:
+      - "traefik.enable=true"
+      - "traefik.http.routers.hacksu-website.rule=Host(`hacksu.com`)"
+      - "traefik.http.routers.hacksu-website.entrypoints=websecure"
+      - "traefik.http.routers.hacksu-website.tls.certresolver=letsencrypt"
+      - "traefik.http.services.hacksu-website.loadbalancer.server.port=8000"
+    networks:
+      - traefik
+
+networks:
+  traefik:
+    external: true

docker-compose.yml

@@ -4,38 +4,42 @@
   "private": true,
   "type": "module",
   "scripts": {
-    "serve": "cross-env NODE_ENV=production node server/index.js",
+    "serve": "cross-env NODE_ENV=production bun server/index.js",
     "dev": "nodemon --watch server --watch db --ignore \"db/*.json\" server/index.js",
-    "build": "vite-ssg build -c src/vite.config.js",
-    "preview": "vite preview",
-    "update": "git fetch && git pull && npm run build && pm2 restart hacksu"
+    "build": "bunx vite-ssg build -c src/vite.config.js",
+    "preview": "bunx --bun vite preview",
+    "update": "git fetch && git pull && bun run build && pm2 restart hacksu"
   },
   "browser": {
     "markdown-it": false
   },
   "dependencies": {
-    "@unhead/vue": "^1.9.8",
+    "@unhead/vue": "^1.11.20",
     "@vueuse/head": "^1.3.1",
-    "body-parser": "^1.19.0",
+    "body-parser": "^1.20.3",
     "cross-env": "^7.0.3",
-    "express": "^4.17.1",
-    "express-session": "^1.17.3",
+    "express": "^4.21.2",
+    "express-session": "^1.18.1",
     "i": "^0.3.7",
     "markdown-it": "^13.0.2",
-    "multer": "^1.4.5-lts.1",
+    "multer": "^1.4.5-lts.2",
     "passport": "^0.6.0",
     "passport-discord": "^0.1.4",
-    "remult": "^0.22.9",
+    "remult": "^0.22.12",
     "sharp": "^0.32.6",
-    "vite-ssg": "^0.22.1",
-    "vue": "^3.0.0",
-    "vue-advanced-cropper": "^2.8.8",
-    "vue-router": "^4.0.0-0"
+    "vite-ssg": "^0.22.2",
+    "vue": "^3.5.16",
+    "vue-advanced-cropper": "^2.8.9",
+    "vue-router": "^4.5.1"
   },
   "devDependencies": {
-    "@vitejs/plugin-vue": "^4.4.0",
-    "nodemon": "^3.0.1",
-    "sass": "^1.26.5",
-    "vite": "^4.4.11"
-  }
+    "@vitejs/plugin-vue": "^4.6.2",
+    "nodemon": "^3.1.10",
+    "sass": "^1.89.2",
+    "vite": "^4.5.14"
+  },
+  "trustedDependencies": [
+    "@parcel/watcher",
+    "sharp"
+  ]
 }

package.json

@@ -1,6 +1,6 @@
-import { defineConfig } from 'vite';
-import path from 'path';
 import vue from '@vitejs/plugin-vue';
+import path from 'path';
+import { defineConfig } from 'vite';
 
 // https://vitejs.dev/config/
 export default defineConfig({
@@ -27,8 +27,7 @@ export default defineConfig({
     }
   },
   build: {
-    // files are moved to dist by github actions cd
-    outDir: "../dist2"
+    outDir: "../dist"
   },
   server: {
     watch: {