Merge branch 'edge' of https://github.com/FreshRSS/FreshRSS into edge

package-lock.json

@@ -16,7 +16,7 @@
         "rtlcss": "^4.1.1",
         "sass": "^1.69.5",
         "stylelint": "^15.11.0",
-        "stylelint-config-recommended-scss": "^13.0.0",
+        "stylelint-config-recommended-scss": "git+https://github.com/Alkarex/stylelint-config-recommended-scss.git#load-no-partial-leading-underscore",
         "stylelint-order": "^6.0.3",
         "stylelint-stylistic": "^0.4.3"
       },
@@ -3459,9 +3459,9 @@
       }
     },
     "node_modules/punycode": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz",
-      "integrity": "sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==",
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
+      "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==",
       "dev": true,
       "engines": {
         "node": ">=6"
@@ -4198,11 +4198,11 @@
     },
     "node_modules/stylelint-config-recommended-scss": {
       "version": "13.0.0",
-      "resolved": "https://registry.npmjs.org/stylelint-config-recommended-scss/-/stylelint-config-recommended-scss-13.0.0.tgz",
-      "integrity": "sha512-7AmMIsHTsuwUQm7I+DD5BGeIgCvqYZ4BpeYJJpb1cUXQwrJAKjA+GBotFZgUEGP8lAM+wmd91ovzOi8xfAyWEw==",
+      "resolved": "git+ssh://git@github.com/Alkarex/stylelint-config-recommended-scss.git#9d2890f7fbb90be2e7b545f6d5e75ebdb3ded3a7",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "postcss-scss": "^4.0.7",
+        "postcss-scss": "^4.0.9",
         "stylelint-config-recommended": "^13.0.0",
         "stylelint-scss": "^5.1.0"
       },

package.json

@@ -42,7 +42,7 @@
     "rtlcss": "^4.1.1",
     "sass": "^1.69.5",
     "stylelint": "^15.11.0",
-    "stylelint-config-recommended-scss": "^13.0.0",
+    "stylelint-config-recommended-scss": "git+https://github.com/Alkarex/stylelint-config-recommended-scss.git#load-no-partial-leading-underscore",
     "stylelint-order": "^6.0.3",
     "stylelint-stylistic": "^0.4.3"
   },