Merge pull request #71 from CyferShepard/main

Update to main

.github/workflows/docker-image-arm.yml

@@ -0,0 +1,30 @@
+name: Docker CI Unstable ARM
+on:
+  push:
+    branches: [main]
+  pull_request:
+    branches: [main]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+    - name: Set up QEMU
+      uses: docker/setup-qemu-action@v1
+    - name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v1
+    - name: Login to Docker Hub
+      uses: docker/login-action@v2.1.0
+      with:
+        username: ${{ secrets.DOCKER_USERNAME }}
+        password: ${{ secrets.DOCKER_TOKEN }}
+    - name: Build and push Docker image for ARM
+      uses: docker/build-push-action@v2
+      with:
+        context: .
+        file: ./Dockerfile-arm
+        push: true
+        tags: cyfershepard/jellystat:arm
+        platforms: linux/arm/v7

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "jfstat",
-  "version": "1.0.5.0",
+  "version": "1.0.5",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "jfstat",
-      "version": "1.0.4.10",
+      "version": "1.0.5",
       "dependencies": {
         "@emotion/react": "^11.10.6",
         "@emotion/styled": "^11.10.6",
@@ -18264,8 +18264,9 @@
       "license": "MIT"
     },
     "node_modules/tough-cookie": {
-      "version": "4.1.2",
-      "license": "BSD-3-Clause",
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.3.tgz",
+      "integrity": "sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw==",
       "dependencies": {
         "psl": "^1.1.33",
         "punycode": "^2.1.1",
@@ -19192,8 +19193,9 @@
       }
     },
     "node_modules/word-wrap": {
-      "version": "1.2.3",
-      "license": "MIT",
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz",
+      "integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==",
       "engines": {
         "node": ">=0.10.0"
       }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "jfstat",
-  "version": "1.0.5.0",
+  "version": "1.0.5",
   "private": true,
   "dependencies": {
     "@emotion/react": "^11.10.6",