From: SleeplessOne1917 <abias1122@gmail.com>
Date: Sat, 17 Jun 2023 02:25:18 +0000 (+0000)
Subject: Merge branch 'main' into route-data-refactor
X-Git-Url: http://these/git/%7B%60%24%7BwebArchiveUrl%7D/save/static/%24%7Bargs.pageFn.jump%20n%7D?a=commitdiff_plain;h=6c998ed862f8982ccae69467988b3c2a1954fb77;p=lemmy-ui.git

Merge branch 'main' into route-data-refactor
---

6c998ed862f8982ccae69467988b3c2a1954fb77
diff --cc package.json
index 20e5645,5eae485..3f6c4ed
--- a/package.json
+++ b/package.json
@@@ -14,19 -14,14 +14,21 @@@
      "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",