Merge pull request #3 from MiniDiscordThemes/rp-4.7.0

- Split selectors into chunks to improve readability in devtools
- Add more SVG icon replacements
- Temporarily retrieving v4.7.0 from the github repo rather than from npm, will replace when v4.7.0 is released

.github/workflows/bd.yml

@@ -1,4 +1,4 @@
-name: "Build and deploy CSS for BetterDiscord"
+name: Build and deploy CSS for BetterDiscord
 
 on:
   push:
@@ -7,32 +7,32 @@ on:
 
 jobs:
   build:
-    name: "Build CSS"
-    runs-on: "ubuntu-latest"
+    name: Build CSS
+    runs-on: ubuntu-latest
 
     steps:
-      - name: Checkout Git repository
-        uses: "actions/checkout@v2"
+      - name: Checkout theme
+        uses: actions/checkout@v2
 
-      - name: Set up Node.js
+      - name: Setup node
         uses: actions/setup-node@v3
         with:
           node-version: 18
 
-      - name: Install PNPM
+      - name: Setup pnpm
         uses: pnpm/action-setup@v2
         with:
           version: latest
 
-      - name: Install Node.js dependencies
+      - name: Install dependencies
         run: pnpm install
 
       - name: Build CSS
         run: pnpm run bd
 
-      - name: "Deploy"
-        uses: "peaceiris/actions-gh-pages@v3"
+      - name: Deploy
+        uses: peaceiris/actions-gh-pages@v3
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
-          publish_branch: "deploy"
-          publish_dir: "./"
+          publish_branch: deploy
+          publish_dir: ./

.github/workflows/lint.yml

@@ -12,20 +12,20 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - name: Checkout Git repository
-        uses: "actions/checkout@v2"
+      - name: Checkout theme
+        uses: actions/checkout@v2
 
-      - name: Set up Node.js
+      - name: Setup node
         uses: actions/setup-node@v3
         with:
           node-version: 18
 
-      - name: Install PNPM
+      - name: Setup pnpm
         uses: pnpm/action-setup@v2
         with:
           version: latest
 
-      - name: Install Node.js dependencies
+      - name: Install dependencies
         run: pnpm install
 
       - name: Run linters

.github/workflows/rp.yml

@@ -13,27 +13,48 @@ jobs:
       contents: write
 
     steps:
-      - name: Checkout Git repository
-        uses: "actions/checkout@v2"
-
-      - name: Set up Node.js
+      - name: Setup node
         uses: actions/setup-node@v3
         with:
           node-version: 18
 
-      - name: Install PNPM
+      - name: Setup pnpm
         uses: pnpm/action-setup@v2
         with:
           version: latest
 
-      - name: Install Node.js dependencies
-        run: pnpm install
-
-      - name: Build TypeScript and bundle into asar
-        run: pnpm run rp
+      - name: Checkout theme
+        uses: actions/checkout@v2
+        with:
+          path: theme
 
-      - uses: ncipollo/release-action@v1
+      - name: Checkout Replugged
+        uses: actions/checkout@v2
+        with:
+          repository: replugged-org/replugged
+          path: replugged
+          ref: v4.7.0
+
+      - name: Link Replugged into theme
+        run: |
+          cd theme
+          pnpm link ../replugged
+
+      - name: Build and bundle Replugged
+        run: |
+          cd replugged
+          pnpm install
+          pnpm run bundle
+
+      - name: Build and bundle theme into .asar
+        run: |
+          cd theme
+          pnpm install
+          pnpm run rp:all
+
+      - name: Release theme .asar and .json
+        uses: ncipollo/release-action@v1
         with:
-          artifacts: "bundle/*, *.theme.css"
+          artifacts: theme/bundle/*
           makeLatest: true
           generateReleaseNotes: true

.prettierrc.json

@@ -10,6 +10,12 @@
       "options": {
         "tabWidth": 2
       }
+    },
+    {
+      "files": "**/path/**/_!(index).scss",
+      "options": {
+        "printWidth": 40
+      }
     }
   ]
 }

Squared.theme.css

@@ -4,7 +4,7 @@
  * @authorLink https://github.com/Saltssaumure
  * @description Squares all circles in Discord.
  * @license MIT
- * @version 1.2
+ * @version 1.4
  * @invite uy8nKQVatp
  * @source https://github.com/MiniDiscordThemes/Squared
  * @donate https://ko-fi.com/saltssaumure

manifest.json

@@ -7,7 +7,7 @@
     "discordID": "134142022092062720",
     "github": "Saltssaumure"
   },
-  "version": "1.3.1",
+  "version": "1.4.0",
   "updater": {
     "type": "store",
     "id": "net.saltssaumure.Squared"

package.json

@@ -1,6 +1,6 @@
 {
   "name": "squared-discord-theme",
-  "version": "1.3.1",
+  "version": "1.4.0",
   "description": "A theme to square all circles in Discord.",
   "repository": "github:MiniDiscordThemes/Squared",
   "author": "Saltssaumure <[email protected]>",
@@ -17,13 +17,8 @@
     "release": "replugged release"
   },
   "type": "module",
-  "dependencies": {
-    "@parcel/config-default": "^2.9.3",
-    "@parcel/core": "^2.9.3",
-    "@parcel/transformer-sass": "^2.9.3",
-    "@types/node": "^20.5.9",
+  "devDependencies": {
     "prettier": "^3.0.3",
-    "replugged": "^4.6.1",
     "salt-bd-scss": "^1.1.0"
   }
 }