Merge branch 'unstable2' of https://github.com/cewert/jellyfin-roku i…

…nto unstable2

.github/CODEOWNERS

@@ -0,0 +1 @@
+*               @jellyfin/roku

.github/workflows/auto-close-stale-pr.yml

@@ -18,4 +18,4 @@ jobs:
           days-before-pr-stale: 21
           days-before-pr-close: 7
           exempt-draft-pr: true
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
+          repo-token: ${{ secrets.JF_BOT_TOKEN }}

.github/workflows/automations.yml

@@ -30,4 +30,5 @@ jobs:
         uses: eps1lon/actions-label-merge-conflict@releases/2.x
         with:
           dirtyLabel: "merge conflict"
-          repoToken: ${{ secrets.GITHUB_TOKEN }}
+          commentOnDirty: "This pull request has merge conflicts. Please resolve the conflicts so the PR can be reviewed. Thanks!"
+          repoToken: ${{ secrets.JF_BOT_TOKEN }}

.github/workflows/build-dev.yml

@@ -1,4 +1,4 @@
-name: build
+name: build-dev
 
 on:
   pull_request:
@@ -12,16 +12,19 @@ jobs:
   dev:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3
-      - uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c # v3
+      - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4
+      - uses: actions/setup-node@5e21ff4d9bc1a8cf6de233a3057d20ec6b3fb69d # v3
         with:
           node-version: "lts/*"
           cache: "npm"
-      - run: npm ci
-      - run: npx ropm install
-      - run: make dev
-      - uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3
+      - name: NPM install
+        run: npm ci
+      - name: Install roku module dependencies
+        run: npm run ropm
+      - name: Build app
+        run: npm run build
+      - uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3
         with:
           name: Jellyfin-Roku-dev-${{ github.sha }}
-          path: ${{ github.workspace }}/out/staging
-          if-no-files-found: error
+          path: ${{ github.workspace }}/build/staging
+          if-no-files-found: error

.github/workflows/build-prod.yml

@@ -1,4 +1,4 @@
-name: build
+name: build-prod
 
 on:
   pull_request:
@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout master (the latest release)
-        uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3
+        uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4
         with:
           ref: master
       - name: Install jq to parse json
@@ -33,7 +33,7 @@ jobs:
       - name: Save old Makefile version
         run: awk 'BEGIN { FS=" = " } /^VERSION/ { print "oldMakeVersion="$2; }' Makefile >> $GITHUB_ENV
       - name: Checkout PR branch
-        uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3
+        uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4
       - name: Save new package.json version
         run: echo "newPackVersion=$(jq -r ".version" package.json)" >> $GITHUB_ENV
       - name: package.json version must be updated
@@ -61,16 +61,19 @@ jobs:
   prod:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3
-      - uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c # v3
+      - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4
+      - uses: actions/setup-node@5e21ff4d9bc1a8cf6de233a3057d20ec6b3fb69d # v3
         with:
           node-version: "lts/*"
           cache: "npm"
-      - run: npm ci
-      - run: npx ropm install
-      - run: make release
-      - uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3
+      - name: NPM install
+        run: npm ci
+      - name: Install roku module dependencies
+        run: npm run ropm
+      - name: Build app for production
+        run: npm run build-prod
+      - uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3
         with:
-          name: Jellyfin-Roku-release-${{ github.sha }}
-          path: ${{ github.workspace }}/out/staging
-          if-no-files-found: error
+          name: Jellyfin-Roku-v${{ env.newManVersion }}-${{ github.sha }}
+          path: ${{ github.workspace }}/build/staging
+          if-no-files-found: error

.github/workflows/roku-analysis.yml

@@ -0,0 +1,39 @@
+name: roku-analysis
+
+on:
+  pull_request:
+  push:
+
+env:
+  BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
+
+jobs:
+  static:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4
+      - uses: actions/setup-node@5e21ff4d9bc1a8cf6de233a3057d20ec6b3fb69d # v3
+        with:
+          node-version: "lts/*"
+          cache: "npm"
+      - name: NPM install
+        run: npm ci
+      - name: Install roku module dependencies
+        run: npm run ropm
+      - name: Build dev app
+        if: env.BRANCH_NAME != 'master'
+        run: npm run build
+      - name: Build app for production
+        if: env.BRANCH_NAME == 'master'
+        run: npm run build-prod
+      - name: Use Java 17
+        uses: actions/setup-java@cd89f46ac9d01407894225f350157564c9c7cee2 # v3
+        with:
+          distribution: "temurin"
+          java-version: "17"
+      - name: Download the Static Channel Analysis CLI
+        run: |
+          curl -sSL "https://devtools.web.roku.com/static-channel-analysis/sca-cmd.zip" -o sca-cmd.zip
+          unzip sca-cmd.zip
+      - name: Run Roku Static Analysis
+        run: ./sca-cmd/bin/sca-cmd ${{ github.workspace }}/build/staging --exit error

.gitignore

@@ -1,18 +1,17 @@
 *.svg
-jellyfin-roku.zip
-source/globals.brs
 .env
-
-###BrightScript specific
+# BrightScript 
 dist/apps
 out/
-
+build/
 roku_modules
-
-#NPM modules
+source/globals.brs
+jellyfin-roku.zip
+# Rooibos
+bsconfig-tdd.json
+# NPM 
 node_modules/
-
-#Eclipse
+# Eclipse
 .buildpath
 .project
 .settings