Merge pull request #577 from Mastermindzh/snyk-upgrade-b144be84df6292449bfe4eacd9662b97

[Snyk] Upgrade sass from 1.79.4 to 1.85.1
fix: upgrade sass from 1.79.4 to 1.85.1
2025-11-04 10:49:26 +01:00 · 2025-04-18 14:50:52 +02:00 · 2025-04-05 07:45:32 +00:00 · 2025-03-30 13:10:28 +02:00 · 2025-03-30 12:52:48 +02:00 · 2025-03-30 12:50:31 +02:00
8 changed files with 101 additions and 143 deletions
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -24,27 +24,27 @@ jobs:
          node-version: 22.4
      - run: npm install
      - run: npm run build
-      - uses: actions/upload-artifact@master
-        with:
-          name: linux-builds
-          path: dist/
+      # - uses: actions/upload-artifact@master
+      #   with:
+      #     name: linux-builds
+      #     path: dist/

-  build_on_mac:
-    runs-on: macos-latest
-    steps:
-      - uses: actions/checkout@master
-      - uses: actions/setup-node@master
-        with:
-          node-version: 22.4
-      - run: npm install
-      - run: npm run build
+  # build_on_mac:
+  #   runs-on: macos-latest
+  #   steps:
+  #     - uses: actions/checkout@master
+  #     - uses: actions/setup-node@master
+  #       with:
+  #         node-version: 22.4
+  #     - run: npm install
+  #     - run: npm run build

-  build_on_win:
-    runs-on: windows-latest
-    steps:
-      - uses: actions/checkout@master
-      - uses: actions/setup-node@master
-        with:
-          node-version: 22.4
-      - run: npm install
-      - run: npm run build
+  # build_on_win:
+  #   runs-on: windows-latest
+  #   steps:
+  #     - uses: actions/checkout@master
+  #     - uses: actions/setup-node@master
+  #       with:
+  #         node-version: 22.4
+  #     - run: npm install
+  #     - run: npm run build
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -29,30 +29,30 @@ jobs:
          name: linux-builds
          path: dist/

-  build_on_mac:
-    runs-on: macos-latest
-    steps:
-      - uses: actions/checkout@master
-      - uses: actions/setup-node@master
-        with:
-          node-version: 22.4
-      - run: npm install
-      - run: npm run build
-      - uses: actions/upload-artifact@master
-        with:
-          name: mac-builds
-          path: ./dist/
+  # build_on_mac:
+  #   runs-on: macos-latest
+  #   steps:
+  #     - uses: actions/checkout@master
+  #     - uses: actions/setup-node@master
+  #       with:
+  #         node-version: 22.4
+  #     - run: npm install
+  #     - run: npm run build
+  #     - uses: actions/upload-artifact@master
+  #       with:
+  #         name: mac-builds
+  #         path: ./dist/

-  build_on_win:
-    runs-on: windows-latest
-    steps:
-      - uses: actions/checkout@master
-      - uses: actions/setup-node@master
-        with:
-          node-version: 22.4
-      - run: npm install
-      - run: npm run build
-      - uses: actions/upload-artifact@master
-        with:
-          name: windows-builds
-          path: dist/
+  # build_on_win:
+  #   runs-on: windows-latest
+  #   steps:
+  #     - uses: actions/checkout@master
+  #     - uses: actions/setup-node@master
+  #       with:
+  #         node-version: 22.4
+  #     - run: npm install
+  #     - run: npm run build
+  #     - uses: actions/upload-artifact@master
+  #       with:
+  #         name: windows-builds
+  #         path: dist/
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

+## [5.18.2]
+
+- Reverted to sass 1.79.4 to fix `Nix` builds
+- Changed electron-builder.base.yml to now generate the correct .desktop entries again
+  - Should fix flatpak build
+
 ## [5.18.1]

 - Fixed the login bug
--- a/build/electron-builder.base.yml
+++ b/build/electron-builder.base.yml
@@ -22,20 +22,19 @@ linux:
      "--enable-features=WaylandWindowDecorations",
    ]
  desktop:
-    entry: |
-      [Desktop Entry]
-      Encoding=UTF-8
-      Name=TIDAL Hi-Fi
-      GenericName=TIDAL Hi-Fi
-      Comment=The web version of listen.tidal.com running in electron with hifi support thanks to widevine.
-      Icon=tidal-hifi
-      StartupNotify=true
-      Terminal=false
-      Type=Application
-      Categories=Network;Application;AudioVideo;Audio;Video
-      StartupWMClass=tidal-hifi
-      X-PulseAudio-Properties=media.role=music
-      MimeType=x-scheme-handler/tidal;
+    entry:
+      Encoding: "UTF-8"
+      Name: "TIDAL Hi-Fi"
+      GenericName: "TIDAL Hi-Fi"
+      Comment: "The web version of listen.tidal.com running in electron with hifi support thanks to widevine."
+      Icon: "tidal-hifi"
+      StartupNotify: "true"
+      Terminal: "false"
+      Type: "Application"
+      Categories: "Network;Application;AudioVideo;Audio;Video"
+      StartupWMClass: "tidal-hifi"
+      X-PulseAudio-Properties: "media.role=music"
+      MimeType: "x-scheme-handler/tidal;"
 mac:
  category: public.app-category.entertainment
 win:
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
  "name": "tidal-hifi",
-  "version": "5.18.1",
+  "version": "5.18.2",
  "lockfileVersion": 3,
  "requires": true,
  "packages": {
    "": {
      "name": "tidal-hifi",
-      "version": "5.18.1",
+      "version": "5.18.2",
      "license": "MIT",
      "dependencies": {
        "@electron/remote": "^2.1.2",
@@ -19,7 +19,7 @@
        "hotkeys-js": "^3.13.9",
        "mpris-service": "^2.1.2",
        "request": "^2.88.2",
-        "sass": "^1.79.4",
+        "sass": "^1.85.1",
        "swagger-ui-express": "^5.0.1"
      },
      "devDependencies": {
@@ -9000,9 +9000,9 @@
      }
    },
    "node_modules/sass": {
-      "version": "1.86.0",
-      "resolved": "https://registry.npmjs.org/sass/-/sass-1.86.0.tgz",
-      "integrity": "sha512-zV8vGUld/+mP4KbMLJMX7TyGCuUp7hnkOScgCMsWuHtns8CWBoz+vmEhoGMXsaJrbUP8gj+F1dLvVe79sK8UdA==",
+      "version": "1.85.1",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.85.1.tgz",
+      "integrity": "sha512-Uk8WpxM5v+0cMR0XjX9KfRIacmSG86RH4DCCZjLU2rFh5tyutt9siAXJ7G+YfxQ99Q6wrRMbMlVl6KqUms71ag==",
      "license": "MIT",
      "dependencies": {
        "chokidar": "^4.0.0",
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "tidal-hifi",
-  "version": "5.18.1",
+  "version": "5.18.2",
  "description": "Tidal on Electron with widevine(hifi) support",
  "main": "ts-dist/main.js",
  "scripts": {
@@ -48,7 +48,7 @@
    "express": "^4.21.2",
    "hotkeys-js": "^3.13.9",
    "mpris-service": "^2.1.2",
-    "sass": "^1.79.4",
+    "sass": "1.85.1",
    "swagger-ui-express": "^5.0.1",
    "cors": "^2.8.5",
    "request": "^2.88.2"
--- a/src/features/api/swagger.json
+++ b/src/features/api/swagger.json
@@ -2,7 +2,7 @@
  "openapi": "3.1.0",
  "info": {
    "title": "TIDAL Hi-Fi API",
-    "version": "5.18.1",
+    "version": "5.18.2",
    "description": "",
    "license": {
      "name": "MIT",
@@ -21,9 +21,7 @@
    "/current": {
      "get": {
        "summary": "Get current media info",
-        "tags": [
-          "current"
-        ],
+        "tags": ["current"],
        "responses": {
          "200": {
            "description": "Current media info",
@@ -41,9 +39,7 @@
    "/current/image": {
      "get": {
        "summary": "Get current media image",
-        "tags": [
-          "current"
-        ],
+        "tags": ["current"],
        "responses": {
          "200": {
            "description": "Current media image",
@@ -65,9 +61,7 @@
    "/player/play": {
      "post": {
        "summary": "Play the current media",
-        "tags": [
-          "player"
-        ],
+        "tags": ["player"],
        "responses": {
          "200": {
            "description": "Ok",
@@ -85,9 +79,7 @@
    "/player/favorite/toggle": {
      "post": {
        "summary": "Add the current media to your favorites, or remove it if its already added to your favorites",
-        "tags": [
-          "player"
-        ],
+        "tags": ["player"],
        "responses": {
          "200": {
            "description": "Ok",
@@ -105,9 +97,7 @@
    "/player/pause": {
      "post": {
        "summary": "Pause the current media",
-        "tags": [
-          "player"
-        ],
+        "tags": ["player"],
        "responses": {
          "200": {
            "description": "Ok",
@@ -125,9 +115,7 @@
    "/player/next": {
      "post": {
        "summary": "Play the next song",
-        "tags": [
-          "player"
-        ],
+        "tags": ["player"],
        "responses": {
          "200": {
            "description": "Ok",
@@ -145,9 +133,7 @@
    "/player/previous": {
      "post": {
        "summary": "Play the previous song",
-        "tags": [
-          "player"
-        ],
+        "tags": ["player"],
        "responses": {
          "200": {
            "description": "Ok",
@@ -165,9 +151,7 @@
    "/player/shuffle/toggle": {
      "post": {
        "summary": "Play the previous song",
-        "tags": [
-          "player"
-        ],
+        "tags": ["player"],
        "responses": {
          "200": {
            "description": "Ok",
@@ -185,9 +169,7 @@
    "/player/repeat/toggle": {
      "post": {
        "summary": "Toggle the repeat status, toggles between \"off\" , \"single\" and \"all\"",
-        "tags": [
-          "player"
-        ],
+        "tags": ["player"],
        "responses": {
          "200": {
            "description": "Ok",
@@ -205,9 +187,7 @@
    "/player/playpause": {
      "post": {
        "summary": "Start playing the media if paused, or pause the media if playing",
-        "tags": [
-          "player"
-        ],
+        "tags": ["player"],
        "responses": {
          "200": {
            "description": "Ok",
@@ -225,9 +205,7 @@
    "/settings/skipped-artists": {
      "get": {
        "summary": "get a list of artists that TIDAL Hi-Fi will skip if skipping is enabled",
-        "tags": [
-          "settings"
-        ],
+        "tags": ["settings"],
        "responses": {
          "200": {
            "description": "The list book.",
@@ -243,9 +221,7 @@
      },
      "post": {
        "summary": "Add new artists to the list of skipped artists",
-        "tags": [
-          "settings"
-        ],
+        "tags": ["settings"],
        "requestBody": {
          "required": true,
          "content": {
@@ -266,9 +242,7 @@
    "/settings/skipped-artists/delete": {
      "post": {
        "summary": "Remove artists from the list of skipped artists",
-        "tags": [
-          "settings"
-        ],
+        "tags": ["settings"],
        "requestBody": {
          "required": true,
          "content": {
@@ -289,9 +263,7 @@
    "/settings/skipped-artists/current": {
      "post": {
        "summary": "Add the current artist to the list of skipped artists",
-        "tags": [
-          "settings"
-        ],
+        "tags": ["settings"],
        "responses": {
          "200": {
            "description": "Ok"
@@ -300,9 +272,7 @@
      },
      "delete": {
        "summary": "Remove the current artist from the list of skipped artists",
-        "tags": [
-          "settings"
-        ],
+        "tags": ["settings"],
        "responses": {
          "200": {
            "description": "Ok"
@@ -313,9 +283,7 @@
    "/image": {
      "get": {
        "summary": "Get current image",
-        "tags": [
-          "legacy"
-        ],
+        "tags": ["legacy"],
        "deprecated": true,
        "responses": {
          "200": {
@@ -338,9 +306,7 @@
    "/play": {
      "get": {
        "summary": "Play the current media",
-        "tags": [
-          "legacy"
-        ],
+        "tags": ["legacy"],
        "deprecated": true,
        "responses": {
          "200": {
@@ -359,9 +325,7 @@
    "/favorite/toggle": {
      "get": {
        "summary": "Add the current media to your favorites, or remove it if its already added to your favorites",
-        "tags": [
-          "legacy"
-        ],
+        "tags": ["legacy"],
        "deprecated": true,
        "responses": {
          "200": {
@@ -380,9 +344,7 @@
    "/pause": {
      "get": {
        "summary": "Pause the current media",
-        "tags": [
-          "legacy"
-        ],
+        "tags": ["legacy"],
        "deprecated": true,
        "responses": {
          "200": {
@@ -401,9 +363,7 @@
    "/next": {
      "get": {
        "summary": "Play the next song",
-        "tags": [
-          "legacy"
-        ],
+        "tags": ["legacy"],
        "deprecated": true,
        "responses": {
          "200": {
@@ -422,9 +382,7 @@
    "/previous": {
      "get": {
        "summary": "Play the previous song",
-        "tags": [
-          "legacy"
-        ],
+        "tags": ["legacy"],
        "deprecated": true,
        "responses": {
          "200": {
@@ -443,9 +401,7 @@
    "/playpause": {
      "get": {
        "summary": "Toggle play/pause",
-        "tags": [
-          "legacy"
-        ],
+        "tags": ["legacy"],
        "deprecated": true,
        "responses": {
          "200": {
@@ -558,10 +514,7 @@
        "items": {
          "type": "string"
        },
-        "example": [
-          "Artist1",
-          "Artist2"
-        ]
+        "example": ["Artist1", "Artist2"]
      }
    }
  },
@@ -579,4 +532,4 @@
      "description": "The settings management API"
    }
  ]
-}
+}
--- a/src/pages/settings/settings.html
+++ b/src/pages/settings/settings.html
@@ -478,7 +478,7 @@
          <h4>TIDAL Hi-Fi</h4>
          <div class="about-section__version">
            <a target="_blank" rel="noopener"
-              href="https://github.com/Mastermindzh/tidal-hifi/releases/tag/5.18.1">5.18.1</a>
+              href="https://github.com/Mastermindzh/tidal-hifi/releases/tag/5.18.2">5.18.2</a>
          </div>
          <div class="about-section__links">
            <a target="_blank" rel="noopener" href="https://github.com/mastermindzh/tidal-hifi/"
Author	SHA1	Message	Date
Rick van Lieshout	8fc49f500e	Merge pull request #577 from Mastermindzh/snyk-upgrade-b144be84df6292449bfe4eacd9662b97 [Snyk] Upgrade sass from 1.79.4 to 1.85.1	2025-04-18 14:50:52 +02:00
snyk-bot	49f5a01b58	fix: upgrade sass from 1.79.4 to 1.85.1 Snyk has created this PR to upgrade sass from 1.79.4 to 1.85.1. See this package in npm: sass See this project in Snyk: https://app.snyk.io/org/mastermindzh/project/dade8f03-2064-49a3-8957-edbacec3887c?utm_source=github&utm_medium=referral&page=upgrade-pr	2025-04-05 07:45:32 +00:00
Rick van Lieshout	48f4fe47ef	Merge pull request #573 from Mastermindzh/next Next	2025-03-30 13:10:28 +02:00
Rick van Lieshout	a819e1eb45	removing mac/win builds, they aren't targetted anyway	2025-03-30 12:52:48 +02:00
Rick van Lieshout	57e6342b5f	Merge branch 'next' of github.com:Mastermindzh/tidal-hifi into next	2025-03-30 12:50:31 +02:00
Rick van Lieshout	58a543a3c8	fixed .desktop file	2025-03-30 12:50:27 +02:00
Rick van Lieshout	1c915d99fe	Merge pull request #572 from QF0xB/fix/nix-build-temporarily Reverted sass to 1.79.4	2025-03-30 12:49:29 +02:00
Quirin Brändli	8994360415	Reverted sass to 1.79.4	2025-03-30 00:06:46 +01:00