Skip to content

Commit 09ee72c

Browse files
vitordinovitordino
authored
🔧 update demo (#5)
* 🔧 tsconfig + paths * ⬆️ upgrade electron * ⬆️ upgrade vite
1 parent b84f3d6 commit 09ee72c

39 files changed

+3123
-5505
lines changed

‎package-lock.json‎

Lines changed: 2963 additions & 5321 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎packages/demo/electron.vite.config.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import vue from '@vitejs/plugin-vue'
66
import tsconfigPaths from 'vite-tsconfig-paths'
77

88
export default defineConfig({
9-
main: { plugins: [tsconfigPaths(), externalizeDepsPlugin()] },
10-
preload: { plugins: [tsconfigPaths(), externalizeDepsPlugin()] },
9+
main: { plugins: [tsconfigPaths(), externalizeDepsPlugin({ exclude: ['reduxtron'] })] },
10+
preload: { plugins: [tsconfigPaths(), externalizeDepsPlugin({ exclude: ['reduxtron'] })] },
1111
renderer: {
1212
plugins: [tsconfigPaths(), react(), svelte(), vue()],
1313
publicDir: '../../resources',

‎packages/demo/package.json‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"prettier": "prettier-config-custom",
2626
"eslintConfig": { "extends": "custom" },
2727
"dependencies": {
28-
"reduxtron": "*",
28+
"reduxtron": "npm:reduxtron",
2929
"@electron-toolkit/utils": "^1.0.2",
3030
"@radix-ui/colors": "^0.1.8",
3131
"@radix-ui/react-dropdown-menu": "^2.0.4",
@@ -37,15 +37,16 @@
3737
"@reduxjs/toolkit": "^1.9.3",
3838
"@tailwindcss/forms": "^0.5.3",
3939
"@tailwindcss/line-clamp": "^0.4.4",
40-
"@vitejs/plugin-vue": "^4.2.1",
41-
"@vitejs/plugin-vue-jsx": "^3.0.1",
40+
"@vitejs/plugin-vue": "^5.0.4",
41+
"@vitejs/plugin-vue-jsx": "^3.1.0",
4242
"class-variance-authority": "^0.5.2",
4343
"clsx": "^1.2.1",
4444
"framer-motion": "^10.11.6",
4545
"react-hotkeys-hook": "^4.4.0",
4646
"react-icons": "^4.8.0",
4747
"react-router-dom": "^6.10.0",
4848
"redux": "^4.2.1",
49+
"svelte": "^4.2.12",
4950
"redux-undo": "^1.0.1",
5051
"uid": "^2.0.2",
5152
"windy-radix-palette": "^0.6.1",
@@ -57,23 +58,22 @@
5758
"@electron/notarize": "^1.2.3",
5859
"@redux-devtools/cli": "^2.0.0",
5960
"@redux-devtools/extension": "^3.2.5",
60-
"@sveltejs/vite-plugin-svelte": "^2.1.1",
61-
"@tsconfig/svelte": "^4.0.1",
62-
"@types/node": "16.18.21",
61+
"@sveltejs/vite-plugin-svelte": "^3.0.2",
62+
"@types/node": "^18.19.9",
6363
"@types/react": "18.0.30",
6464
"@types/react-dom": "18.0.11",
65-
"@vitejs/plugin-react": "^3.1.0",
65+
"@vitejs/plugin-react": "^4.2.1",
6666
"autoprefixer": "^10.4.14",
67-
"electron": "24.1.1",
68-
"electron-builder": "^23.6.0",
67+
"electron": "29.3.0",
68+
"electron-builder": "^24.13.3",
6969
"electron-devtools-assembler": "^1.2.0",
70-
"electron-vite": "^1.0.21",
70+
"electron-vite": "^2.1.0",
7171
"postcss": "^8.4.21",
7272
"react": "^18.2.0",
7373
"react-dom": "^18.2.0",
7474
"tailwindcss": "^3.3.1",
7575
"typescript": "^4.9.5",
76-
"vite": "^4.2.1",
77-
"vite-tsconfig-paths": "^4.2.0"
76+
"vite": "^5.2.9",
77+
"vite-tsconfig-paths": "^4.3.2"
7878
}
7979
}

‎packages/demo/src/main/index.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
*/
1111
import { app, ipcMain } from 'electron'
1212
import { mainReduxBridge } from 'reduxtron/main'
13-
import { store } from 'main/store'
14-
import { windowManager } from './window/window-manager'
15-
import { tray } from './tray/tray'
13+
import { store } from 'src/main/store'
14+
import { windowManager } from 'src/main/window/window-manager'
15+
import { tray } from 'src/main/tray/tray'
1616

1717
const { unsubscribe } = mainReduxBridge(ipcMain, store)
1818

‎packages/demo/src/main/store/index.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import { configureStore } from '@reduxjs/toolkit'
22

3-
import { reducer, State, Action, Store } from 'shared/reducers'
4-
import { middleware } from 'main/store/middlewares'
5-
import { enhancers } from 'main/store/enhancers'
3+
import { reducer, State, Action, Store } from 'src/shared/reducers'
4+
import { middleware } from 'src/main/store/middlewares'
5+
import { enhancers } from 'src/main/store/enhancers'
66

77
export const store: Store = configureStore<State, Action>({
88
reducer,

‎packages/demo/src/main/store/middlewares/folder.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { dialog, OpenDialogOptions } from 'electron'
2-
import { Middleware } from 'shared/reducers'
2+
import { Middleware } from 'src/shared/reducers'
33

44
const properties: OpenDialogOptions['properties'] = [
55
'openDirectory',

‎packages/demo/src/main/store/middlewares/index.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import thunk from 'redux-thunk'
22

3-
import { Middleware } from 'shared/reducers'
4-
import { folderMiddleware } from 'main/store/middlewares/folder'
5-
import { persistanceMiddleware } from 'main/store/middlewares/persistance'
6-
import { swrMiddleware } from 'main/store/middlewares/swr'
7-
import { uiMiddleware } from 'main/store/middlewares/ui'
3+
import { Middleware } from 'src/shared/reducers'
4+
import { folderMiddleware } from 'src/main/store/middlewares/folder'
5+
import { persistanceMiddleware } from 'src/main/store/middlewares/persistance'
6+
import { swrMiddleware } from 'src/main/store/middlewares/swr'
7+
import { uiMiddleware } from 'src/main/store/middlewares/ui'
88

99
export const middleware: Middleware[] = [
1010
thunk,

‎packages/demo/src/main/store/middlewares/swr.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { readdir } from 'node:fs/promises'
22
import type { Middleware as BaseMiddleware } from 'redux'
3-
import type { Middleware, Action } from 'shared/reducers'
4-
import { KEY_PREFIX_MAP } from 'shared/reducers/swr'
3+
import type { Middleware, Action } from 'src/shared/reducers'
4+
import { KEY_PREFIX_MAP } from 'src/shared/reducers/swr'
55

66
const actionsToIntercept = [
77
'SWR:FETCH_URL',

‎packages/demo/src/main/store/middlewares/ui.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import type { Middleware } from 'shared/reducers'
2-
import { tray } from 'main/tray/tray'
3-
import { windowManager } from 'main/window/window-manager'
4-
import { WindowPath, WindowState } from 'shared/reducers/settings'
1+
import type { Middleware } from 'src/shared/reducers'
2+
import { tray } from 'src/main/tray/tray'
3+
import { windowManager } from 'src/main/window/window-manager'
4+
import { WindowPath, WindowState } from 'src/shared/reducers/settings'
55

66
const difference = <T>(a: T[], b: T[]): T[] => a.filter(x => !b.includes(x))
77

‎packages/demo/src/main/tray/Dog.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { MenuItemConstructorOptions } from 'electron'
2-
import type { Dispatch, State } from 'shared/reducers'
2+
import type { Dispatch, State } from 'src/shared/reducers'
33

44
const ALL_BREEDS_ENDPOINT = 'https://dog.ceo/api/breeds/list/all'
55

@@ -35,10 +35,10 @@ export const TrayDog = (state: Partial<State>, dispatch: Dispatch): MenuItemCons
3535
payload: label,
3636
}),
3737
})),
38-
}
38+
}
3939
: {
4040
label: `no breeds: ${status}`,
41-
},
41+
},
4242
],
4343
}
4444
}

0 commit comments

Comments
 (0)