Skip to content

Commit

Permalink
Merge branch 'master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
hrfarmer authored Nov 19, 2024
2 parents d75d755 + 9f9f34e commit a1395fa
Show file tree
Hide file tree
Showing 6 changed files with 23 additions and 1 deletion.
1 change: 1 addition & 0 deletions .env.development
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
VITE_SOLID_DEVTOOLS=true
Binary file modified bun.lockb
Binary file not shown.
14 changes: 13 additions & 1 deletion electron.vite.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import { defineConfig, externalizeDepsPlugin } from "electron-vite";
import { resolve } from "path";
import lucidePreprocess from "vite-plugin-lucide-preprocess";
import solid from "vite-plugin-solid";
import devtools from "solid-devtools/vite";

export default defineConfig({
main: {
Expand All @@ -16,6 +17,17 @@ export default defineConfig({
"@renderer": resolve("src/renderer/src"),
},
},
plugins: [lucidePreprocess(), solid()],
plugins: [
lucidePreprocess(),
devtools({
autoname: true,
locator: {
targetIDE: "vscode", // can also be "webstorm"
componentLocation: true,
jsxLocation: true,
},
}),
solid(),
],
},
});
3 changes: 3 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,8 @@
"@electron/notarize": "^2.5.0",
"@eslint/eslintrc": "^3.1.0",
"@eslint/js": "^9.13.0",
"@solid-devtools/logger": "^0.8.4",
"@solid-devtools/overlay": "^0.30.1",
"@trivago/prettier-plugin-sort-imports": "^4.3.0",
"@types/eslint__eslintrc": "^2.1.2",
"@types/eslint__js": "^8.42.3",
Expand All @@ -65,6 +67,7 @@
"prettier": "^3.3.3",
"prettier-plugin-packagejson": "^2.5.3",
"prettier-plugin-tailwindcss": "^0.6.8",
"solid-devtools": "^0.30.1",
"solid-js": "^1.7.6",
"tailwindcss": "^3.4.13",
"typescript": "~5.6.3",
Expand Down
5 changes: 5 additions & 0 deletions src/renderer/src/main.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,10 @@ import App from "./App";
import "@renderer/css/global.css";
import "@renderer/css/theme.css";
import { render } from "solid-js/web";
import { attachDevtoolsOverlay } from "@solid-devtools/overlay";

if (import.meta.env.VITE_SOLID_DEVTOOLS !== "false") {
attachDevtoolsOverlay();
}

render(() => <App />, document.getElementById("root") as HTMLElement);
1 change: 1 addition & 0 deletions tsconfig.web.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
],
"compilerOptions": {
"noImplicitAny": true,
"sourceMap": true,
"composite": true,
"jsxImportSource": "solid-js",
"baseUrl": ".",
Expand Down

0 comments on commit a1395fa

Please sign in to comment.