improve dev menu, fix shelter-ui build script

uwu · Nov 27, 2024 · 78d5d4b · 78d5d4b
1 parent 797aea6
commit 78d5d4b
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 6 deletions.
diff --git a/packages/shelter-ui/package.json b/packages/shelter-ui/package.json
@@ -10,7 +10,7 @@
   "module": "dist/index.jsx",
   "types": "dist/index.d.ts",
   "scripts": {
-    "prepare": "tsc && node esbuild.mjs"
+    "prepare": "rimraf dist && tsc && mv dist/src/* dist && rmdir dist/src && node esbuild.mjs"
   },
   "devDependencies": {
     "esbuild": "^0.20.1",

diff --git a/packages/shelter/src/components/DevUI.tsx b/packages/shelter/src/components/DevUI.tsx
@@ -5,12 +5,16 @@ import { devModeReservedId, enableDevmode, stopDevmode } from "../devmode";
 import { installedPlugins } from "../plugins";
 import { createMemo, Show } from "solid-js";
 
-export default () => {
+// fullVersion shows the header and the toggle for always showing the mini menu
+export default (props: { fullVersion?: boolean }) => {
   const devModeOn = createMemo(() => devModeReservedId in installedPlugins());
 
   return (
     <div>
-      <Header tag={HeaderTags.EYEBROW}>Developer Tools</Header>
+      <Show when={props.fullVersion}>
+        <Header tag={HeaderTags.EYEBROW}>Developer Tools</Header>
+      </Show>
+
       <SwitchItem value={dbStore.logDispatch} onChange={(v) => (dbStore.logDispatch = v)}>
         Log FluxDispatcher events to the console
       </SwitchItem>
@@ -58,7 +62,19 @@ export default () => {
         {(plugin) => <PluginCard id={devModeReservedId} plugin={plugin} />}
       </Show>
 
-      <Divider mt />
+      <Divider mt mb />
+
+      <Show when={props.fullVersion}>
+        <SwitchItem
+          checked={dbStore.alwaysDevMenu}
+          onChange={(v) => (dbStore.alwaysDevMenu = v)}
+          note={
+            "The developer tools menu icon shows when lune dev mode is enabled, turning this on shows it at all times."
+          }
+        >
+          Always show developer tools menu icon
+        </SwitchItem>
+      </Show>
     </div>
   );
 };
diff --git a/packages/shelter/src/components/Settings.tsx b/packages/shelter/src/components/Settings.tsx
@@ -50,7 +50,7 @@ export default () => {
             </Button>
           </div>
         </div>
-        <DevUi />
+        <DevUi fullVersion />
         <Plugins />
       </div>
     </>

diff --git a/packages/shelter/src/devmode/index.tsx b/packages/shelter/src/devmode/index.tsx
@@ -5,6 +5,7 @@ import { css, classes } from "./devmode.css";
 import { log } from "../util";
 import DevUI from "../components/DevUI";
 import { createEffect } from "solid-js";
+import { dbStore } from "../storage";
 
 // any string would work here but this is funnier
 export const devModeReservedId = "__DEVMODE_PLUGIN_DO_NOT_USE_OR_YOU_WILL_BE_FIRED";
@@ -42,7 +43,7 @@ export async function initDevmode() {
     unobs1?.();
     unobs2?.();
 
-    if (devModeIsOn()) {
+    if (devModeIsOn() || dbStore.alwaysDevMenu) {
       unobs1 = observe(`[class*="anchor"]`, (e: HTMLAnchorElement) => {
         if (e.href === "https://support.discord.com/") {
           e.href = "#";