Merge pull request #235 from Fallenbagel/prepare-for-next-version

Merge origin/develop

.all-contributorsrc

@@ -665,6 +665,78 @@
       "contributions": [
         "translation"
       ]
+    },
+    {
+      "login": "sambartik",
+      "name": "Samuel Bartík",
+      "avatar_url": "https://avatars.githubusercontent.com/u/63553146?v=4",
+      "profile": "https://github.com/sambartik",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "frank-cywong",
+      "name": "Chun Yeung Wong",
+      "avatar_url": "https://avatars.githubusercontent.com/u/90653148?v=4",
+      "profile": "https://github.com/frank-cywong",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "TheMeanCanEHdian",
+      "name": "TheMeanCanEHdian",
+      "avatar_url": "https://avatars.githubusercontent.com/u/16025103?v=4",
+      "profile": "https://github.com/TheMeanCanEHdian",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "Gylesie",
+      "name": "Gylesie",
+      "avatar_url": "https://avatars.githubusercontent.com/u/86306812?v=4",
+      "profile": "https://github.com/Gylesie",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "Fhd-pro",
+      "name": "Fhd-pro",
+      "avatar_url": "https://avatars.githubusercontent.com/u/82862079?v=4",
+      "profile": "https://github.com/Fhd-pro",
+      "contributions": [
+        "translation"
+      ]
+    },
+    {
+      "login": "PovilasID",
+      "name": "PovilasID",
+      "avatar_url": "https://avatars.githubusercontent.com/u/396243?v=4",
+      "profile": "https://github.com/PovilasID",
+      "contributions": [
+        "translation"
+      ]
+    },
+    {
+      "login": "byakurau",
+      "name": "byakurau",
+      "avatar_url": "https://avatars.githubusercontent.com/u/1811683?v=4",
+      "profile": "https://github.com/byakurau",
+      "contributions": [
+        "translation"
+      ]
+    },
+    {
+      "login": "miknii",
+      "name": "miknii",
+      "avatar_url": "https://avatars.githubusercontent.com/u/109232569?v=4",
+      "profile": "https://github.com/miknii",
+      "contributions": [
+        "translation"
+      ]
     }
   ],
   "badgeTemplate": "<a href=\"#contributors-\"><img alt=\"All Contributors\" src=\"https://img.shields.io/badge/all_contributors-<%= contributors.length %>-orange.svg\"/></a>",
@@ -673,5 +745,5 @@
   "projectOwner": "sct",
   "repoType": "github",
   "repoHost": "https://github.com",
-  "skipCi": true
+  "skipCi": false
 }

.dockerignore

@@ -26,3 +26,4 @@ public/os_logo_filled.png
 public/preview.jpg
 snap
 stylelint.config.js
+cypress

.eslintrc.js

@@ -7,6 +7,7 @@ module.exports = {
     'plugin:jsx-a11y/recommended',
     'plugin:react/recommended',
     'plugin:react-hooks/recommended',
+    'plugin:react/jsx-runtime',
     'prettier',
   ],
   parserOptions: {
@@ -26,11 +27,21 @@ module.exports = {
     'react-hooks/rules-of-hooks': 'error',
     'react-hooks/exhaustive-deps': 'warn',
     '@typescript-eslint/explicit-function-return-type': 'off',
-    'prettier/prettier': ['error', { endOfLine: 'auto' }],
     'formatjs/no-offset': 'error',
     'no-unused-vars': 'off',
     '@typescript-eslint/no-unused-vars': ['error'],
+    '@typescript-eslint/array-type': ['error', { default: 'array' }],
     'jsx-a11y/no-onchange': 'off',
+    '@typescript-eslint/consistent-type-imports': [
+      'error',
+      {
+        prefer: 'type-imports',
+      },
+    ],
+    'no-relative-import-paths/no-relative-import-paths': [
+      'error',
+      { allowSameFolder: true },
+    ],
   },
   overrides: [
     {
@@ -40,7 +51,7 @@ module.exports = {
       },
     },
   ],
-  plugins: ['jsx-a11y', 'prettier', 'react-hooks', 'formatjs'],
+  plugins: ['jsx-a11y', 'react-hooks', 'formatjs', 'no-relative-import-paths'],
   settings: {
     react: {
       pragma: 'React',

.github/workflows/ci.yml

@@ -3,7 +3,7 @@ name: Jellyseerr CI
 on:
   pull_request:
     branches:
-      - "*"
+      - '*'
   push:
     branches:
       - develop
@@ -13,16 +13,18 @@ jobs:
     name: Lint & Test Build
     if: github.event_name == 'pull_request'
     runs-on: ubuntu-20.04
-    container: node:16.14-alpine
+    container: node:16.17-alpine
     steps:
       - name: Checkout
         uses: actions/checkout@v3
       - name: Install dependencies
         env:
-          HUSKY_SKIP_INSTALL: 1
+          HUSKY: 0
         run: yarn
       - name: Lint
         run: yarn lint
+      - name: Formatting
+        run: yarn format:check
       - name: Build
         run: yarn build
 
@@ -34,23 +36,29 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v3
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
+        uses: docker/setup-qemu-action@v2
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v2
       - name: Cache Docker layers
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: /tmp/.buildx-cache
           key: ${{ runner.os }}-buildx-${{ github.sha }}
           restore-keys: |
             ${{ runner.os }}-buildx-
       - name: Log in to Docker Hub
-        uses: docker/login-action@v1
+        uses: docker/login-action@v2
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_TOKEN }}
+      - name: Log in to GitHub Container Registry
+        uses: docker/login-action@v2
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
       - name: Build and push
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v3
         with:
           context: .
           file: ./Dockerfile
@@ -77,7 +85,7 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       - name: Get Build Job Status
-        uses: technote-space/workflow-conclusion-action@v2
+        uses: technote-space/workflow-conclusion-action@v3
       - name: Combine Job Status
         id: status
         run: |

.github/workflows/cypress.yml

@@ -0,0 +1,30 @@
+name: Cypress Tests
+
+on:
+  pull_request:
+    branches:
+      - '*'
+  push:
+    branches:
+      - develop
+
+jobs:
+  cypress-run:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Cypress run
+        uses: cypress-io/github-action@v4
+        with:
+          build: yarn cypress:build
+          start: yarn start
+          wait-on: 'http://localhost:5055'
+          record: true
+        env:
+          CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          WITH_MIGRATIONS: true
+          # Fix test titles in cypress dashboard
+          COMMIT_INFO_MESSAGE: ${{github.event.pull_request.title}}
+          COMMIT_INFO_SHA: ${{github.event.pull_request.head.sha}}

.github/workflows/preview.yml

@@ -3,7 +3,7 @@ name: Jellyseerr Preview
 on:
   push:
     tags:
-      - "preview-*"
+      - 'preview-*'
 
 jobs:
   build_and_push:
@@ -16,16 +16,16 @@ jobs:
         id: get_version
         run: echo ::set-output name=VERSION::${GITHUB_REF#refs/tags/}
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
+        uses: docker/setup-qemu-action@v2
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v2
       - name: Log in to Docker Hub
-        uses: docker/login-action@v1
+        uses: docker/login-action@v2
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_TOKEN }}
       - name: Build and push
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v3
         with:
           context: .
           file: ./Dockerfile