[pull] master from v0l:main

.dockerignore

@@ -1,10 +1,3 @@
 **/node_modules
-**/.pnp.*
-**/.yarn/*
-!**/.yarn/patches
-!**/.yarn/plugins
-!**/.yarn/releases
-!**/.yarn/sdks
-!**/.yarn/versions
 **/.idea
 **/target

.drone.yml

@@ -22,12 +22,13 @@ steps:
       - name: cache
         path: /cache
     environment:
-      YARN_CACHE_FOLDER: /cache/.yarn-docker
       NODE_CONFIG_ENV: default
     commands:
-      - apt update && apt install -y git
-      - yarn install
-      - yarn build
+      - apt update && apt install -y git curl unzip
+      - curl -fsSL https://bun.sh/install | bash
+      - export PATH="$HOME/.bun/bin:$PATH"
+      - bun install
+      - bun run build
   - name: build docker image
     image: docker
     privileged: true
@@ -40,7 +41,7 @@ steps:
     commands:
       - dockerd &
       - docker login -u voidic -p $TOKEN
-      - docker buildx create --name mybuilder --bootstrap --use
+      - docker buildx create --platform linux/amd64,linux/arm64 --bootstrap --use
       - docker buildx build -t voidic/snort:latest --platform linux/amd64,linux/arm64 --push -f Dockerfile.prebuilt .
       - kill $(cat /var/run/docker.pid)
 volumes:
@@ -62,14 +63,14 @@ steps:
       - name: cache
         path: /cache
     environment:
-      YARN_CACHE_FOLDER: /cache/.yarn-test
       NODE_CONFIG_ENV: default
     commands:
-      - yarn install
-      - yarn build
-      - yarn test
-      - yarn workspace @snort/app eslint
-      - yarn prettier --check .
+      - curl -fsSL https://bun.sh/install | bash
+      - export PATH="$HOME/.bun/bin:$PATH"
+      - bun install
+      - bun run build
+      - bun test
+      - bunx --bun biome lint
 volumes:
   - name: cache
     claim:
@@ -94,7 +95,6 @@ steps:
       - name: cache
         path: /cache
     environment:
-      YARN_CACHE_FOLDER: /cache/.yarn-translations
       NODE_CONFIG_ENV: default
       TOKEN:
         from_secret: gitea
@@ -104,10 +104,12 @@ steps:
       - git config --global user.email [email protected]
       - git config --global user.name "Drone CI"
       - git remote set-url origin https://drone:[email protected]/Kieran/snort.git
-      - yarn install
-      - npx @crowdin/cli upload sources -b main -T $CTOKEN
-      - npx @crowdin/cli pull -b main -T $CTOKEN
-      - yarn prettier --write .
+      - curl -fsSL https://bun.sh/install | bash
+      - export PATH="$HOME/.bun/bin:$PATH"
+      - bun install
+      - bunx @crowdin/cli upload sources -b main -T $CTOKEN
+      - bunx @crowdin/cli pull -b main -T $CTOKEN
+      - bunx --bun biome lint --write
       - git add .
       - >
         if output=$(git status --porcelain) && [ -n "$output" ]; then
@@ -140,12 +142,13 @@ steps:
       - name: cache
         path: /cache
     environment:
-      YARN_CACHE_FOLDER: /cache/.yarn-docker-
       NODE_CONFIG_ENV: default
     commands:
-      - apt update && apt install -y git
-      - yarn install
-      - yarn build
+      - apt update && apt install -y git curl unzip
+      - curl -fsSL https://bun.sh/install | bash
+      - export PATH="$HOME/.bun/bin:$PATH"
+      - bun install
+      - bun run build
   - name: build docker image
     image: docker
     privileged: true
@@ -158,7 +161,7 @@ steps:
     commands:
       - dockerd &
       - docker login -u voidic -p $TOKEN
-      - docker buildx create --name mybuilder --bootstrap --use
+      - docker buildx create --platform linux/amd64,linux/arm64 --bootstrap --use
       - docker buildx build -t voidic/snort:$DRONE_TAG --platform linux/amd64,linux/arm64 --push -f Dockerfile.prebuilt .
       - kill $(cat /var/run/docker.pid)
 volumes:

.github/workflows/nsite.yml

@@ -0,0 +1,27 @@
+name: Deploy nsite
+on:
+  push:
+    branches:
+      - main
+
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Repo
+        uses: actions/checkout@v4
+
+      - name: Setup Bun
+        uses: oven-sh/setup-bun@v2
+
+      - name: Install Dependencies
+        run: bun install
+
+      - name: Build
+        run: bun run build
+
+      - name: Redirect 404 to Index for SPA
+        run: cp packages/app/build/index.html packages/app/build/404.html
+
+      - name: Deploy nsite
+        run: bunx nsite-cli upload packages/app/build --verbose --purge --privatekey ${{ secrets.NSITE_KEY }} --servers 'https://nostr.download,https://blossom.band'

.github/workflows/release.yml

@@ -16,28 +16,24 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
 
-      - name: Set up JDK 17
-        uses: actions/setup-java@v1
+      - name: Set up JDK 21
+        uses: actions/setup-java@v4
         with:
-          java-version: 17
+          distribution: temurin
+          java-version: 21
 
-      - name: Cache gradle
-        uses: actions/cache@v1
-        with:
-          path: ~/.gradle/caches
-          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }}
-          restore-keys: |
-            ${{ runner.os }}-gradle-            
+      - name: Setup Bun
+        uses: oven-sh/setup-bun@v2
 
       - name: Install frontend dependencies
-        run: yarn install
+        run: bun install
 
       - name: Build Site
-        run: yarn build
+        run: bun run build
 
       - name: Copy files
         run: |-
-          git clone --depth 1 --branch ${{ github.ref_name }} https://git.v0l.io/Kieran/snort_android.git
+          git clone --depth 1 --branch ${{ github.ref_name }} https://github.com/v0l/snort_android.git
           mkdir -p snort_android/app/src/main/assets/
           cp -r packages/app/build/* snort_android/app/src/main/assets/
 

.gitignore

@@ -1,12 +1,6 @@
 node_modules/
 .idea
 .pnp.*
-.yarn/*
-!.yarn/patches
-!.yarn/plugins
-!.yarn/releases
-!.yarn/sdks
-!.yarn/versions
 dist/
 *.tgz
 *.log

.vscode/extensions.json

@@ -1,7 +1,6 @@
 {
   "recommendations": [
     "arcanis.vscode-zipfs",
-    "dbaeumer.vscode-eslint",
-    "esbenp.prettier-vscode"
+    "biomejs.biome"
   ]
 }

.vscode/settings.json

@@ -8,12 +8,7 @@
     "**/Thumbs.db": true,
     "**/node_modules": true
   },
-  "search.exclude": {
-    "**/.yarn": true,
-    "**/.pnp.*": true
-  },
-  "typescript.tsdk": ".yarn/sdks/typescript/lib",
-  "typescript.enablePromptUseWorkspaceTsdk": true,
-  "eslint.nodePath": ".yarn/sdks",
-  "prettier.prettierPath": ".yarn/sdks/prettier/index.cjs"
+  "search.exclude": {},
+  "typescript.tsdk": "node_modules/typescript/lib",
+  "typescript.enablePromptUseWorkspaceTsdk": true
 }