Fix toaster deinit error

.github/workflows/build.yml

@@ -75,12 +75,6 @@ jobs:
         name: PluginLoader
         path: dist
 
-    - name: Bump version and push tag ⏫
-      id: tag_version
-      uses: mathieudutour/github-tag-action@v6.0
-      with:
-        github_token: ${{ secrets.GITHUB_TOKEN }}
-
     - name: Release 📦
       uses: softprops/action-gh-release@v1
       with:
@@ -89,9 +83,9 @@ jobs:
         files: ./dist/PluginLoader
         generate_release_notes: true
 
-  nightly:
-    name: Release the nightly version of the package
-    if: ${{ github.event_name == 'schedule' || (github.event_name == 'workflow_dispatch' && github.event.inputs.release == 'prerelease') }}
+  prerelease:
+    name: Release the pre-release version of the package
+    if: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.release == 'prerelease' }}
     needs: build
     runs-on: ubuntu-latest
 
@@ -105,6 +99,12 @@ jobs:
         name: PluginLoader
         path: dist
     
+    - name: Install semver-tool asdf
+      uses: asdf-vm/actions/install@v1
+      with:
+        tool_versions: |
+          semver 3.3.0
+    
     - name: Get tag 🏷️
       id: old_tag
       uses: rafarlopes/get-latest-pre-release-tag-action@v1
@@ -112,20 +112,22 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         repository: 'decky-loader'
-    
+
     - name: Prepare tag ⚙️
       id: ready_tag
       run: |
         export VERSION=${{ steps.old_tag.outputs.tag }}
-        export COMMIT=$(git log -1 --pretty=format:%h)
-        echo ::set-output name=tag_name::$(sed -r 's/(-.*)?-pre$//' <<< $VERSION)-$COMMIT-pre
+        echo "VERS: $VERSION"
+        OUT=$(semver bump prerel "$VERSION")
+        echo "OUT: $OUT"
+        echo ::set-output name=tag_name::v$OUT
 
     - name: Push tag 📤
       uses: rickstaa/action-create-tag@v1.3.2
       if: ${{ steps.ready_tag.outputs.tag_name && github.event_name == 'workflow_dispatch' }}
       with:
         tag: ${{ steps.ready_tag.outputs.tag_name }}
-        message: Nightly ${{ steps.ready_tag.outputs.tag_name }}
+        message: Pre-release ${{ steps.ready_tag.outputs.tag_name }}
 
     - name: Release 📦
       uses: softprops/action-gh-release@v1
@@ -137,6 +139,54 @@ jobs:
         prerelease: true
         generate_release_notes: true
 
+  # nightly:
+  #   name: Release the nightly version of the package
+  #   if: ${{ github.event_name == 'schedule' }}
+  #   needs: build
+  #   runs-on: ubuntu-latest
+
+  #   steps:
+  #   - name: Checkout 🧰
+  #     uses: actions/checkout@v3
+
+  #   - name: Fetch package artifact ⬇️
+  #     uses: actions/download-artifact@v3
+  #     with:
+  #       name: PluginLoader
+  #       path: dist
+    
+  #   - name: Get tag 🏷️
+  #     id: old_tag
+  #     uses: rafarlopes/get-latest-pre-release-tag-action@v1
+  #     env:
+  #       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+  #     with:
+  #       repository: 'decky-loader'
+    
+  #   - name: Prepare tag ⚙️
+  #     id: ready_tag
+  #     run: |
+  #       export VERSION=${{ steps.old_tag.outputs.tag }}
+  #       export COMMIT=$(git log -1 --pretty=format:%h)
+  #       echo ::set-output name=tag_name::$(sed -r 's/(-.*)?-pre$//' <<< $VERSION)-$COMMIT-nightly
+
+  #   - name: Push tag 📤
+  #     uses: rickstaa/action-create-tag@v1.3.2
+  #     if: ${{ steps.ready_tag.outputs.tag_name && github.event_name == 'workflow_dispatch' }}
+  #     with:
+  #       tag: ${{ steps.ready_tag.outputs.tag_name }}
+  #       message: Nightly ${{ steps.ready_tag.outputs.tag_name }}
+
+  #   - name: Release 📦
+  #     uses: softprops/action-gh-release@v1
+  #     if: ${{ github.event_name == 'workflow_dispatch' }}
+  #     with:
+  #       name: Prerelease ${{ steps.ready_tag.outputs.tag_name }}
+  #       tag_name: ${{ steps.ready_tag.outputs.tag_name }}
+  #       files: ./dist/PluginLoader
+  #       prerelease: true
+  #       generate_release_notes: true
+
     # - name: Bump prerelease ⏫
     #   id: bump
     #   if: ${{ github.event_name == 'schedule' }}

backend/updater.py

@@ -68,7 +68,7 @@ class Updater:
         async with ClientSession() as web:
             async with web.request("GET", "https://api.github.com/repos/SteamDeckHomebrew/decky-loader/releases", ssl=helpers.get_ssl_context()) as res:
                 remoteVersions = await res.json()
-                self.remoteVer = next(filter(lambda ver: ver["prerelease"] and ver["tag_name"].startswith("v") and ver["tag_name"].endswith("-pre"), remoteVersions), None)
+                self.remoteVer = next(filter(lambda ver: ver["prerelease"] and ver["tag_name"].startswith("v") and ver["tag_name"].find("-pre"), remoteVersions), None)
                 logger.info("Updated remote version information")
                 tab = await get_tab("SP")
                 await tab.evaluate_js(f"window.DeckyPluginLoader.notifyUpdates()", False, True, False)

frontend/package.json

@@ -37,7 +37,7 @@
     }
   },
   "dependencies": {
-    "decky-frontend-lib": "^1.5.0",
+    "decky-frontend-lib": "^1.5.1",
     "react-icons": "^4.4.0"
   }
 }

frontend/pnpm-lock.yaml

@@ -9,7 +9,7 @@ specifiers:
   '@types/react': 16.14.0
   '@types/react-router': 5.1.18
   '@types/webpack': ^5.28.0
-  decky-frontend-lib: ^1.5.0
+  decky-frontend-lib: ^1.5.1
   husky: ^8.0.1
   import-sort-style-module: ^6.0.0
   inquirer: ^8.2.4
@@ -23,7 +23,7 @@ specifiers:
   typescript: ^4.7.4
 
 dependencies:
-  decky-frontend-lib: 1.5.0
+  decky-frontend-lib: 1.5.1
   react-icons: 4.4.0_react@16.14.0
 
 devDependencies:
@@ -806,8 +806,10 @@ packages:
       ms: 2.1.2
     dev: true
 
-  /decky-frontend-lib/1.5.0:
-    resolution: {integrity: sha512-BT/txV7Q1NJfbnT99jt0OdUE2Qv4Gm1jhrevctx84D+pp7TfpCYau+Khnq2B9agEQQo7CWh5hOJW/SX5n2dKnQ==}
+  /decky-frontend-lib/1.5.1:
+    resolution: {integrity: sha512-XrcMNxqdXJFyuJYJX4Wmo7DvFVkwBsl8aWU5wfLdPQmcPz3drafyEgqIdO4AxpFuTsHTf1qaHBiYYw349vYpgw==}
+    dependencies:
+      minimist: 1.2.6
     dev: false
 
   /deepmerge/4.2.2:
@@ -1253,6 +1255,10 @@ packages:
       brace-expansion: 1.1.11
     dev: true
 
+  /minimist/1.2.6:
+    resolution: {integrity: sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==}
+    dev: false
+
   /ms/2.1.2:
     resolution: {integrity: sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==}
     dev: true

frontend/src/components/DeckyRouterState.tsx

@@ -80,7 +80,6 @@ export const DeckyRouterStateContextProvider: FC<Props> = ({ children, deckyRout
 
   useEffect(() => {
     function onUpdate() {
-      console.log('test', deckyRouterState.publicState());
       setPublicDeckyRouterState({ ...deckyRouterState.publicState() });
     }
 

frontend/src/router-hook.tsx

@@ -1,5 +1,5 @@
 import { afterPatch, findModuleChild, unpatch } from 'decky-frontend-lib';
-import { ReactElement, createElement, memo } from 'react';
+import React, { ReactElement, cloneElement, createElement, memo } from 'react';
 import type { Route, RouteProps } from 'react-router';
 
 import {
@@ -40,7 +40,7 @@ class RouterHook extends Logger {
 
     let Route: new () => Route;
     // Used to store the new replicated routes we create to allow routes to be unpatched.
-    let toReplace = new Map<string, Route>();
+    let toReplace = new Map<string, ReactNode>();
     const DeckyWrapper = ({ children }: { children: ReactElement }) => {
       const { routes, routePatches } = useDeckyRouterState();
 
@@ -62,17 +62,24 @@ class RouterHook extends Logger {
       routeList.forEach((route: Route, index: number) => {
         const replaced = toReplace.get(route?.props?.path as string);
         if (replaced) {
-          routeList[index] = replaced;
+          routeList[index].props.children = replaced;
           toReplace.delete(route?.props?.path as string);
         }
         if (route?.props?.path && routePatches.has(route.props.path as string)) {
           toReplace.set(
             route?.props?.path as string,
             // @ts-ignore
-            createElement(routeList[index].type, routeList[index].props, routeList[index].props.children),
+            routeList[index].props.children,
           );
           routePatches.get(route.props.path as string)?.forEach((patch) => {
-            routeList[index].props = patch(routeList[index].props);
+            const oType = routeList[index].props.children.type;
+            routeList[index].props.children = patch({
+              ...routeList[index].props,
+              children: {
+                ...cloneElement(routeList[index].props.children),
+                type: (props) => createElement(oType, props),
+              },
+            }).children;
           });
         }
       });

frontend/src/tabs-hook.ts

@@ -103,7 +103,7 @@ class TabsHook extends Logger {
   }
 
   deinit() {
-    unpatch(this.cNode.stateNode, 'render');
+    if (this.cNode) unpatch(this.cNode.stateNode, 'render');
     if (this.qAPTree) this.qAPTree.type = this.quickAccess;
     if (this.rendererTree) this.rendererTree.type = this.tabRenderer;
     if (this.cNode) this.cNode.stateNode.forceUpdate();

frontend/src/toaster.tsx

@@ -84,9 +84,9 @@ class Toaster extends Logger {
   }
 
   deinit() {
-    unpatch(this.instanceRet, 'type');
-    delete this.node.stateNode.render;
-    this.node.stateNode.forceUpdate();
+    this.instanceRet && unpatch(this.instanceRet, 'type');
+    this.node && delete this.node.stateNode.render;
+    this.node && this.node.stateNode.forceUpdate();
   }
 }