From: SleeplessOne1917 <abias1122@gmail.com>
Date: Thu, 15 Jun 2023 15:51:52 +0000 (+0000)
Subject: Merge branch 'main' into generate-theme-css
X-Git-Url: http://these/git/%7B%60%24%7BwebArchiveUrl%7D/%22%7B%7D/%22https:/nerdica.net/%7Bthis.props.imageSrc%7D?a=commitdiff_plain;h=4c67ff255b299d20272f615cc5c79b17f24b46eb;p=lemmy-ui.git

Merge branch 'main' into generate-theme-css
---

4c67ff255b299d20272f615cc5c79b17f24b46eb
diff --cc package.json
index 2e09e89,2298d9e..be239e9
--- a/package.json
+++ b/package.json
@@@ -14,21 -14,12 +14,14 @@@
      "dev": "yarn start",
      "lint": "node generate_translations.js && tsc --noEmit && eslint --report-unused-disable-directives --ext .js,.ts,.tsx \"src/**\" && prettier --check \"src/**/*.{ts,tsx,js,css,scss}\"",
      "prepare": "husky install",
 -    "start": "yarn build:dev --watch"
 +    "start": "yarn build:dev --watch",
 +    "themes:build": "sass src/assets/css/themes/:src/assets/css/themes",
 +    "themes:watch": "sass --watch src/assets/css/themes/:src/assets/css/themes"
    },
    "lint-staged": {
-     "*.{ts,tsx,js}": [
-       "prettier --write",
-       "eslint --fix"
-     ],
-     "*.{css, scss}": [
-       "prettier --write"
-     ],
-     "package.json": [
-       "sortpack"
-     ]
+     "*.{ts,tsx,js}": ["prettier --write", "eslint --fix"],
+     "*.{css, scss}": ["prettier --write"],
+     "package.json": ["sortpack"]
    },
    "dependencies": {
      "@babel/plugin-proposal-decorators": "^7.21.0",