chore: upgrade all deps

chore: upgrade bun chore: switch to devbox chore: cleanup tailwind warning
satisfactorymodding · Jul 25, 2024 · c691a32 · c691a32
1 parent 9a7a314
commit c691a32
Show file tree

Hide file tree

Showing 19 changed files with 210 additions and 228 deletions.
diff --git a/.envrc b/.envrc
@@ -1 +1,7 @@
-use flake
+# Automatically sets up your devbox environment whenever you cd into this
+# directory via our direnv integration:
+
+eval "$(devbox generate direnv --print-envrc)"
+
+# check out https://www.jetpack.io/devbox/docs/ide_configuration/direnv/
+# for more details
diff --git a/.eslintignore b/.eslintignore
diff --git a/.github/workflows/push-base.yml b/.github/workflows/push-base.yml
@@ -7,9 +7,6 @@ on:
         required: true
         type: string
 
-env:
-  BUN_VERSION: "1.0.18"
-
 jobs:
   build:
     name: Build
@@ -19,11 +16,11 @@ jobs:
       matrix:
         action: [ "build:node", "build:static" ]
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
-      - uses: oven-sh/setup-bun@v1
+      - uses: oven-sh/setup-bun@v2
         with:
-          bun-version: ${{ env.BUN_VERSION }}
+          bun-version-file: package.json
 
       - name: Install dependencies
         run: bun install
@@ -39,11 +36,11 @@ jobs:
     name: Lint
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
-      - uses: oven-sh/setup-bun@v1
+      - uses: oven-sh/setup-bun@v2
         with:
-          bun-version: ${{ env.BUN_VERSION }}
+          bun-version-file: package.json
 
       - name: Install dependencies
         run: bun install
@@ -63,16 +60,16 @@ jobs:
       - lint
     if: ${{ github.event_name != 'pull_request' }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
-      - uses: oven-sh/setup-bun@v1
+      - uses: oven-sh/setup-bun@v2
         with:
-          bun-version: ${{ env.BUN_VERSION }}
+          bun-version-file: package.json
 
       - name: Install dependencies
         run: bun install
 
-      - uses: rlespinasse/github-slug-action@v3.x
+      - uses: rlespinasse/github-slug-action@v4
 
       - name: Build
         run: |
@@ -83,7 +80,7 @@ jobs:
           NODE_ENV: ${{ inputs.env }}
 
       - name: Deploy to pages
-        uses: JamesIves/github-pages-deploy-action@4.1.0
+        uses: JamesIves/github-pages-deploy-action@4
         with:
           branch: gh-pages
           folder: build/static
@@ -96,22 +93,22 @@ jobs:
       - build
       - lint
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
-      - uses: docker/login-action@v2
+      - uses: docker/login-action@v3
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - id: meta
-        uses: docker/metadata-action@v4
+        uses: docker/metadata-action@v5
         with:
           images: ghcr.io/${{ github.repository }}
           flavor: |
             latest=false
 
-      - uses: docker/build-push-action@v4
+      - uses: docker/build-push-action@v6
         with:
           context: .
           push: ${{ github.event_name != 'pull_request' }}

diff --git a/.husky/commit-msg b/.husky/commit-msg
@@ -1,4 +1,3 @@
 #!/bin/sh
-. "$(dirname "$0")/_/husky.sh"
 
 bunx commitlint -e $1
diff --git a/.husky/pre-commit b/.husky/pre-commit
@@ -1,4 +1,3 @@
 #!/bin/sh
-. "$(dirname "$0")/_/husky.sh"
 
 bun run lint && bun run check
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM oven/bun:1.0.18 as build
+FROM oven/bun:1.1.20 as build
 
 ARG NODE_ENV_ARG=production
 
@@ -20,7 +20,7 @@ RUN NODE_ENV=$NODE_ENV_ARG set -o allexport; set -ex; source .env.$NODE_ENV_ARG;
 
 FROM ghcr.io/vilsol/yeet:v0.6.4 as yeet
 
-FROM oven/bun:1.0.18
+FROM oven/bun:1.1.20
 
 COPY --from=yeet /yeet /yeet
 

diff --git a/bun.lockb b/bun.lockb
diff --git a/devbox.json b/devbox.json
@@ -0,0 +1,3 @@
+{
+  "packages": ["[email protected]", "[email protected]"]
+}
diff --git a/devbox.lock b/devbox.lock
@@ -0,0 +1,101 @@
+{
+  "lockfile_version": "1",
+  "packages": {
+    "[email protected]": {
+      "last_modified": "2024-07-17T09:45:27Z",
+      "resolved": "github:NixOS/nixpkgs/5e73714b16ca222dcb2fc3ea2618fd7ba698da65#bun",
+      "source": "devbox-search",
+      "version": "1.1.20",
+      "systems": {
+        "aarch64-darwin": {
+          "outputs": [
+            {
+              "name": "out",
+              "path": "/nix/store/sjhdi5ixjsqyldxfmdzcazk1r3asa7c5-bun-1.1.20",
+              "default": true
+            }
+          ],
+          "store_path": "/nix/store/sjhdi5ixjsqyldxfmdzcazk1r3asa7c5-bun-1.1.20"
+        },
+        "aarch64-linux": {
+          "outputs": [
+            {
+              "name": "out",
+              "path": "/nix/store/1cg8hfz38pxcxqvk3ms1v9hr52bh9yrm-bun-1.1.20",
+              "default": true
+            }
+          ],
+          "store_path": "/nix/store/1cg8hfz38pxcxqvk3ms1v9hr52bh9yrm-bun-1.1.20"
+        },
+        "x86_64-darwin": {
+          "outputs": [
+            {
+              "name": "out",
+              "path": "/nix/store/2mnl4ry24y9q261caia8yn46h47ckpz3-bun-1.1.20",
+              "default": true
+            }
+          ],
+          "store_path": "/nix/store/2mnl4ry24y9q261caia8yn46h47ckpz3-bun-1.1.20"
+        },
+        "x86_64-linux": {
+          "outputs": [
+            {
+              "name": "out",
+              "path": "/nix/store/6a8kqmk0jda5a3kyka1c55dh9h5ry5ii-bun-1.1.20",
+              "default": true
+            }
+          ],
+          "store_path": "/nix/store/6a8kqmk0jda5a3kyka1c55dh9h5ry5ii-bun-1.1.20"
+        }
+      }
+    },
+    "[email protected]": {
+      "last_modified": "2024-07-07T07:43:47Z",
+      "resolved": "github:NixOS/nixpkgs/b60793b86201040d9dee019a05089a9150d08b5b#watchman",
+      "source": "devbox-search",
+      "version": "2024.03.11.00",
+      "systems": {
+        "aarch64-darwin": {
+          "outputs": [
+            {
+              "name": "out",
+              "path": "/nix/store/ds6z2gkwjmzha7qi1miwcym1rvwa541k-watchman-2024.03.11.00",
+              "default": true
+            }
+          ],
+          "store_path": "/nix/store/ds6z2gkwjmzha7qi1miwcym1rvwa541k-watchman-2024.03.11.00"
+        },
+        "aarch64-linux": {
+          "outputs": [
+            {
+              "name": "out",
+              "path": "/nix/store/gbvqiihi6shg3mb3faj93c34v92cfvr7-watchman-2024.03.11.00",
+              "default": true
+            }
+          ],
+          "store_path": "/nix/store/gbvqiihi6shg3mb3faj93c34v92cfvr7-watchman-2024.03.11.00"
+        },
+        "x86_64-darwin": {
+          "outputs": [
+            {
+              "name": "out",
+              "path": "/nix/store/ykiz3z4jrlzyd6kyzga12z63zyk41vsj-watchman-2024.03.11.00",
+              "default": true
+            }
+          ],
+          "store_path": "/nix/store/ykiz3z4jrlzyd6kyzga12z63zyk41vsj-watchman-2024.03.11.00"
+        },
+        "x86_64-linux": {
+          "outputs": [
+            {
+              "name": "out",
+              "path": "/nix/store/fa2py5dfyzvss8ww2n845mikpk2ldf8x-watchman-2024.03.11.00",
+              "default": true
+            }
+          ],
+          "store_path": "/nix/store/fa2py5dfyzvss8ww2n845mikpk2ldf8x-watchman-2024.03.11.00"
+        }
+      }
+    }
+  }
+}
diff --git a/eslint.config.js b/eslint.config.js
@@ -34,7 +34,13 @@ const rules = {
 
 export default [
   {
-    ignores: [".svelte-kit/**/*"],
+    ignores: [
+      ".svelte-kit/**/*",
+      "node_modules/**/*",
+      "dist/**/*",
+      "build/**/*",
+      "src/i18n/**/*"
+    ],
   },
 
   {

diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix