Merge remote-tracking branch 'upstream/master' into version-aware-skip

Author: Shadowghost

.github/workflows/__automation.yml

@@ -11,7 +11,7 @@ jobs:
     name: Merge conflict labeling 🏷️
     runs-on: ubuntu-latest
     steps:
-      - uses: eps1lon/actions-label-merge-conflict@1df065ebe6e3310545d4f4c4e862e43bdca146f0 # v3.0.3
+      - uses: eps1lon/actions-label-merge-conflict@0273be72a0bbd58fcd71d0d6c02c209b50d1e5e1 # v3.1.0
         with:
           dirtyLabel: 'merge conflict'
           commentOnDirty: 'This pull request has merge conflicts. Please resolve the conflicts so the PR can be successfully reviewed and merged.'

.github/workflows/__codeql.yml

@@ -20,21 +20,21 @@ jobs:
 
     steps:
       - name: Checkout repository ⬇️
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
         with:
           ref: ${{ inputs.commit }}
           show-progress: false
 
       - name: Initialize CodeQL 🛠️
-        uses: github/codeql-action/init@38697555549f1db7851b81482ff19f1fa5c4fedc # v4.34.1
+        uses: github/codeql-action/init@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4.36.2
         with:
           queries: security-and-quality
           languages: ${{ matrix.language }}
 
       - name: Autobuild 📦
-        uses: github/codeql-action/autobuild@38697555549f1db7851b81482ff19f1fa5c4fedc # v4.34.1
+        uses: github/codeql-action/autobuild@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4.36.2
 
       - name: Perform CodeQL Analysis 🧪
-        uses: github/codeql-action/analyze@38697555549f1db7851b81482ff19f1fa5c4fedc # v4.34.1
+        uses: github/codeql-action/analyze@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4.36.2
         with:
           category: '/language:${{matrix.language}}'

.github/workflows/__deploy.yml

@@ -62,7 +62,7 @@ jobs:
           github-token: ${{ github.token }}
 
       - name: Publish to Cloudflare Pages 📃
-        uses: cloudflare/wrangler-action@da0e0dfe58b7a431659754fdf3f186c529afbe65 # v3.14.1
+        uses: cloudflare/wrangler-action@9acf94ace14e7dc412b076f2c5c20b8ce93c79cd # v3.15.0
         id: cf
         with:
           apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}

.github/workflows/__package.yml

@@ -14,12 +14,12 @@ jobs:
 
     steps:
       - name: Check out Git repository
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
         with:
           ref: ${{ inputs.commit || github.sha }}
 
       - name: Setup node environment
-        uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6.3.0
+        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
         with:
           node-version-file: .nvmrc
           cache: npm
@@ -39,7 +39,7 @@ jobs:
           mv dist/config.tmp.json dist/config.json
 
       - name: Upload artifact
-        uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
         with:
           name: frontend
           path: dist

.github/workflows/__quality_checks.yml

@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
         with:
           ref: ${{ inputs.commit }}
           show-progress: false
@@ -42,13 +42,13 @@ jobs:
 
     steps:
       - name: Checkout ⬇️
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
         with:
           ref: ${{ inputs.commit }}
           show-progress: false
 
       - name: Setup node environment ⚙️
-        uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6.3.0
+        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
         with:
           node-version-file: .nvmrc
           cache: npm

.github/workflows/pull_request.yml

@@ -46,12 +46,12 @@ jobs:
 
     steps:
       - name: Check out Git repository
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
         with:
           ref: ${{ github.event.pull_request.head.sha }}
 
       - name: Setup node environment
-        uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6.3.0
+        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
         with:
           node-version-file: .nvmrc
           cache: npm
@@ -61,6 +61,6 @@ jobs:
         run: npm ci --no-audit
 
       - name: Run eslint
-        uses: CatChen/eslint-suggestion-action@efbe3942e76df120000621539d93ce7e0b54f7a7 # v4.1.27
+        uses: CatChen/eslint-suggestion-action@2b07b898c0dd5a016586d22b54282199b79cd358 # v4.1.33
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/schedule.yml

@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     if: ${{ contains(github.repository, 'jellyfin/') }}
     steps:
-      - uses: actions/stale@b5d41d4e1d5dceea10e7104786b73624c18a190f # v10.2.0
+      - uses: actions/stale@eb5cf3af3ac0a1aa4c9c45633dd1ae542a27a899 # v10.3.0
         with:
           repo-token: ${{ secrets.JF_BOT_TOKEN }}
           operations-per-run: 75

CONTRIBUTING.md

@@ -12,6 +12,7 @@ If you have any questions, please join one of our [development chat rooms](https
 
 * New files **MUST** be written in TypeScript.
 * API interactions **MUST** be made using the Jellyfin TypeScript SDK.
+* New app pages **MUST** be written using React components using `src/components/Page.tsx` as the base component.
 * **SHOULD** be covered by unit tests when possible (legacy component/view code is deemed untestable).
 * **SHOULD** avoid whitespace only changes in unchanged sections of code.
 * **SHOULD NOT** overuse dynamic imports. We use dynamic imports at the page level; otherwise we should let our build tooling deal with code-splitting for the best bundle sizes.
@@ -30,6 +31,7 @@ If you have any questions, please join one of our [development chat rooms](https
   * **SHOULD NOT** rebase once reviews are in progress.
 * **MUST** follow the [LLM development policy](https://jellyfin.org/docs/general/contributing/llm-policies).
 * **MUST** test that the change works as expected before marking a PR as ready for review.
+* **MUST** fully complete the PR template. Failing to do so will result in the PR being closed as invalid without review.
 * **SHOULD** represent a singular focus (i.e. a PR to fix a bug should not include unrelated refactoring).
 * **SHOULD NOT** update from `master` needlessly once opened (only update if conflicts exist).
 
@@ -51,15 +53,15 @@ You may be asked to update your Pull Request to target a release branch as part
 * [React](https://react.dev/reference/react) — User Interface library
 * [React Router](https://reactrouter.com/) — Routing library
 * [TanStack Query](https://tanstack.com/query/latest/docs/framework/react/overview) — State management library for server data
-* [MUI](https://mui.com/material-ui/getting-started/) components (in Dashboard and Experimental layouts) — UI component library
+* [MUI](https://mui.com/material-ui/getting-started/) components (in Dashboard and Modern layouts) — UI component library
 * [Webpack](https://webpack.js.org/concepts/) — Bundler / build tooling
 * [Vitest](https://vitest.dev/api/) — Test library
 
 #### Legacy Stack
 
 | Library | Replacement |
 | --- | --- |
-| [Emby WebComponents](./src/elements) | MUI components (Dashboard + Experimental apps ONLY; Untested on TVs) |
+| [Emby WebComponents](./src/elements) | MUI components (Dashboard + Modern apps ONLY; Untested on TVs) |
 | [App Router](./src/components/router/appRouter.js) | React Router |
 | [View Manager](./src/components/viewManager) | React Router |
 | [Jellyfin ApiClient](https://github.com/jellyfin-archive/jellyfin-apiclient-javascript) | Jellyfin TypeScript SDK |
@@ -73,13 +75,13 @@ The official list of supported browser versions can be found in the `browserlist
 
 ## Application Components
 
-* Stable App `src/apps/stable`
+* Modern App `src/apps/modern`
+  * Ongoing rewrite of the main user interface using MUI components
+  * Currently reuses content from the Legacy App to maintain parity
+  * Does not currently support TV layout!
+* Legacy App `src/apps/legacy`
   * Main user application
   * Supports TV layout
-* Experimental App `src/apps/experimental`
-  * Ongoing rewrite of the Stable App using MUI components
-  * Currently reuses (most) pages from the Stable App to maintain parity
-  * Does not currently support TV layout!
 * Dashboard App `src/apps/dashboard`
   * Admin dashboard and metadata editor pages
   * Almost completely rewritten using MUI components
@@ -103,13 +105,12 @@ The official list of supported browser versions can be found in the `browserlist
 └── src
     ├── apps
     │   ├── dashboard           # Admin dashboard app
-    │   ├── experimental        # New experimental app
-    │   ├── stable              # Classic (stable) app
+    │   ├── legacy              # Legacy app
+    │   ├── modern              # New modern (React based) app
     │   └── wizard              # Startup wizard app
     ├── assets                  # Static assets
     ├── components              # Higher order visual components and React components
     ├── constants               # Common constant values
-    ├── controllers             # Legacy page views and controllers 🧹 ❌
     ├── elements                # Basic webcomponents and React equivalents 🧹
     ├── hooks                   # Custom React hooks
     ├── lib                     # Reusable libraries

CONTRIBUTORS.md

@@ -107,6 +107,8 @@
 - [Lampan-git](https://github.com/Lampan-git)
 - [lmaotrigine](https://github.com/lmaotrigine)
 - [bjorntp](https://github.com/bjorntp)
+- [austinhardaway](https://github.com/austinhardaway)
+- [shindouj](https://github.com/shindouj)
 
 ## Emby Contributors
 

eslint.config.mjs

@@ -59,7 +59,6 @@ export default tseslint.config(
             'new-cap': [
                 'error',
                 {
-                    'capIsNewExceptions': ['jQuery.Deferred'],
                     'newIsCapExceptionPattern': String.raw`\.default$`
                 }
             ],