[WIP] Full Rewrite/Refactor

.github/workflows/push.yml

@@ -8,69 +8,69 @@ jobs:
     runs-on: ubuntu-20.04
 
     steps:
-    - name: Checkout
-      uses: actions/checkout@v3
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Set up NodeJS 20
+        uses: actions/setup-node@v3
+        with:
+          node-version: 20
+
+      - name: Install JS dependencies
+        run: |
+          npm i -g pnpm
+          pnpm install
+
+      - name: Build Frontend
+        run: |
+          pnpm run build
+
+      - name: Package Release
+        run: |
+          mkdir "SDH-CssLoader"
+          cp *.py "./SDH-CssLoader"
+          cp *.json "./SDH-CssLoader"
+          cp LICENSE "./SDH-CssLoader"
+          cp README.md "./SDH-CssLoader"
+          cp -r dist "./SDH-CssLoader"
+          mkdir upload
+          mv "./SDH-CssLoader" ./upload
+
+      - name: Upload package artifact
+        uses: actions/upload-artifact@v3
+        with:
+          name: SDH-CSSLoader-Decky
+          path: ./upload
 
-    - name: Set up NodeJS 18
-      uses: actions/setup-node@v3
-      with:
-        node-version: 18
-
-    - name: Install JS dependencies
-      run: |
-        npm i -g pnpm
-        pnpm install
-
-    - name: Build Frontend
-      run: |
-        pnpm run build
-
-    - name: Package Release
-      run: |
-        mkdir "SDH-CssLoader"
-        cp *.py "./SDH-CssLoader"
-        cp *.json "./SDH-CssLoader"
-        cp LICENSE "./SDH-CssLoader"
-        cp README.md "./SDH-CssLoader"
-        cp -r dist "./SDH-CssLoader"
-        mkdir upload
-        mv "./SDH-CssLoader" ./upload
-
-    - name: Upload package artifact
-      uses: actions/upload-artifact@v3
-      with:
-        name: SDH-CSSLoader-Decky
-        path: ./upload
-
   build-standalone-win:
     name: Build SDH-CSSLoader Standalone for Windows
     runs-on: windows-2022
 
     steps:
-    - name: Checkout
-      uses: actions/checkout@v3
+      - name: Checkout
+        uses: actions/checkout@v3
 
-    - name: Set up Python 3.10.2
-      uses: actions/setup-python@v4
-      with:
-        python-version: "3.10.2"
+      - name: Set up Python 3.10.2
+        uses: actions/setup-python@v4
+        with:
+          python-version: "3.10.2"
 
-    - name: Install Python dependencies
-      run: |
-        python -m pip install --upgrade pip
-        pip install pyinstaller==5.5
-        pip install -r requirements.txt
+      - name: Install Python dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install pyinstaller==5.5
+          pip install -r requirements.txt
 
-    - name: Build Python Backend
-      run: pyinstaller --noconfirm --onefile --add-data "./assets;/assets" --name "CssLoader-Standalone" ./main.py ./css_win_tray.py
+      - name: Build Python Backend
+        run: pyinstaller --noconfirm --onefile --add-data "./assets;/assets" --name "CssLoader-Standalone" ./main.py ./css_win_tray.py
 
-    - name: Build Python Backend Headless
-      run: pyinstaller --noconfirm --noconsole --onefile --add-data "./assets;/assets" --name "CssLoader-Standalone-Headless" ./main.py ./css_win_tray.py
+      - name: Build Python Backend Headless
+        run: pyinstaller --noconfirm --noconsole --onefile --add-data "./assets;/assets" --name "CssLoader-Standalone-Headless" ./main.py ./css_win_tray.py
 
-    - name: Upload package artifact
-      uses: actions/upload-artifact@v3
-      with:
-        name: SDH-CSSLoader-Win-Standalone
-        path: |
-          ./dist/CssLoader-Standalone.exe
-          ./dist/CssLoader-Standalone-Headless.exe
+      - name: Upload package artifact
+        uses: actions/upload-artifact@v3
+        with:
+          name: SDH-CSSLoader-Win-Standalone
+          path: |
+            ./dist/CssLoader-Standalone.exe
+            ./dist/CssLoader-Standalone-Headless.exe

commit-styles-macos.sh

@@ -0,0 +1,14 @@
+#!/bin/bash
+
+# TODO: NOT FINISHED
+
+# This uses macos' sed, which is different from the one in linux
+
+css_file_path="$(dirname "$0")/src/styles/styles.css"
+css_as_string_path="$(dirname "$0")/src/styles/styles-as-string.ts"
+
+# Read the content of the CSS file, ignoring lines that start with '/*'
+css_content=$(sed '/^\s*\/\*/d' "$css_file_path")
+
+export_header_line_number=$(grep -n "export const styles" $css_as_string_path | cut -d: -f1)
+echo export_header_line_number: $export_header_line_number

main.py

@@ -23,7 +23,7 @@
 
 try:
     if setting_redirect_logs():
-        import decky_plugin
+        import decky
 except:
     pass
 
@@ -217,7 +217,8 @@ async def run(self):
             count = 0
             while count < 5:
                 try:
-                    task = asyncio.create_task(Plugin._main(Plugin))
+                    instance = Plugin()
+                    task = asyncio.create_task(instance._main())
                     await asyncio.shield(task)
                 except asyncio.CancelledError as e:
                     print(str(e))

package.json

@@ -1,6 +1,7 @@
 {
   "name": "SDH-CssLoader",
-  "version": "2.1.2",
+  "type": "module",
+  "version": "2.2.0",
   "description": "A css loader",
   "scripts": {
     "build": "shx rm -rf dist && rollup -c",
@@ -18,34 +19,33 @@
     "steam-deck",
     "deck"
   ],
-  "author": "Jonas Dellinger <[email protected]>",
+  "author": "Deckthemes",
   "license": "GPL-2.0-or-later",
   "bugs": {
     "url": "https://github.com/SteamDeckHomebrew/decky-plugin-template/issues"
   },
   "homepage": "https://github.com/SteamDeckHomebrew/decky-plugin-template#readme",
   "devDependencies": {
-    "@rollup/plugin-commonjs": "^21.1.0",
-    "@rollup/plugin-json": "^4.1.0",
-    "@rollup/plugin-node-resolve": "^13.2.1",
-    "@rollup/plugin-replace": "^4.0.0",
-    "@rollup/plugin-typescript": "^8.3.2",
+    "@rollup/plugin-alias": "^5.1.0",
     "@types/color": "^3.0.3",
     "@types/lodash": "^4.14.191",
     "@types/react": "16.14.0",
     "@types/webpack": "^5.28.0",
-    "rollup": "^2.70.2",
-    "rollup-plugin-import-assets": "^1.1.1",
-    "rollup-plugin-styles": "^4.0.0",
+    "rollup": "^4.24.4",
     "shx": "^0.3.4",
     "tslib": "^2.4.0",
-    "typescript": "^4.6.4"
+    "typescript": "^5.6.3"
   },
   "dependencies": {
+    "@decky/api": "^1.0.6",
+    "@decky/rollup": "^1.0.1",
+    "@decky/ui": "^4.4.0",
+    "clsx": "^2.1.1",
     "color": "^4.2.3",
-    "decky-frontend-lib": "^3.25.0",
     "lodash": "^4.17.21",
-    "react-icons": "^4.12.0"
+    "react-icons": "^4.12.0",
+    "tailwind-merge": "^2.3.0",
+    "zustand": "^4.5.2"
   },
   "pnpm": {
     "peerDependencyRules": {
@@ -54,5 +54,6 @@
         "react-dom"
       ]
     }
-  }
+  },
+  "packageManager": "[email protected]+sha512.60c18acd138bff695d339be6ad13f7e936eea6745660d4cc4a776d5247c540d0edee1a563695c183a66eb917ef88f2b4feb1fc25f32a7adcadc7aaf3438e99c1"
 }

plugin.json

@@ -1,6 +1,7 @@
 {
   "name": "CSS Loader",
   "author": "DeckThemes",
+  "api_version": 1,
   "flags": [],
   "publish": {
     "tags": ["style"],