Skip to content

Commit 7f4dcc1

Browse files
Merge pull request #80 from elek-io/upgrade-dependencies
Upgrade dependencies
2 parents 3928be2 + 986f696 commit 7f4dcc1

95 files changed

Lines changed: 7837 additions & 7950 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.changeset/moody-gifts-camp.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@elek-io/client': patch
3+
---
4+
5+
Updated to latest Core

.eslintrc.json

Lines changed: 0 additions & 9 deletions
This file was deleted.

.github/workflows/cd.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ jobs:
1313
matrix:
1414
# @see https://docs.github.com/en/actions/using-github-hosted-runners/about-github-hosted-runners/about-github-hosted-runners#standard-github-hosted-runners-for-public-repositories
1515
# macos-13 = intel
16-
# macos-14 = M1 (arm)
17-
platform: [ubuntu-24.04, macos-13, macos-14, windows-2022]
18-
node-version: [20]
16+
# macos-14+ = M1 (arm)
17+
platform: [ubuntu-24.04, macos-13, macos-15, windows-2025]
18+
node-version: [22]
1919
runs-on: ${{ matrix.platform }}
2020
steps:
2121
- name: Check out code

.github/workflows/ci.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ jobs:
1111
fail-fast: false
1212
matrix:
1313
# @see https://docs.github.com/en/actions/using-github-hosted-runners/about-github-hosted-runners/about-github-hosted-runners#standard-github-hosted-runners-for-public-repositories
14-
# macos-12 = intel
15-
# macos-14 = M1 (arm)
16-
platform: [ubuntu-22.04, macos-12, macos-14, windows-2022]
17-
node-version: [20]
14+
# macos-13 = intel
15+
# macos-14+ = M1 (arm)
16+
platform: [ubuntu-24.04, macos-13, macos-15, windows-2025]
17+
node-version: [22]
1818
runs-on: ${{ matrix.platform }}
1919
steps:
2020
- name: Check out code

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,9 @@ typings/
8888
# Vite
8989
.vite/
9090

91+
# Tanstack
92+
.tanstack/
93+
9194
# Electron-Forge
9295
out/
9396
dist/

electron.vite.config.ts

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import { sentryVitePlugin } from '@sentry/vite-plugin';
2-
import { TanStackRouterVite } from '@tanstack/router-plugin/vite';
2+
import tailwindcss from '@tailwindcss/vite';
3+
import { tanstackRouter } from '@tanstack/router-plugin/vite';
34
import viteReact from '@vitejs/plugin-react';
45
import { defineConfig, externalizeDepsPlugin } from 'electron-vite';
56
import { resolve } from 'path';
@@ -36,11 +37,14 @@ export default defineConfig({
3637
},
3738
},
3839
plugins: [
39-
TanStackRouterVite({
40+
tanstackRouter({
41+
target: 'react',
42+
autoCodeSplitting: true,
4043
routesDirectory: './src/renderer/src/routes',
4144
generatedRouteTree: './src/renderer/src/routeTree.gen.ts',
4245
}),
4346
viteReact(),
47+
tailwindcss(),
4448
],
4549
},
4650
});

eslint.config.mjs

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
import eslintConfigPrettier from '@electron-toolkit/eslint-config-prettier';
2+
import tseslint from '@electron-toolkit/eslint-config-ts';
3+
import eslintPluginReact from 'eslint-plugin-react';
4+
import eslintPluginReactHooks from 'eslint-plugin-react-hooks';
5+
import eslintPluginReactRefresh from 'eslint-plugin-react-refresh';
6+
7+
export default tseslint.config(
8+
{ ignores: ['**/node_modules', '**/dist', '**/out'] },
9+
tseslint.configs.recommended,
10+
eslintPluginReact.configs.flat.recommended,
11+
eslintPluginReact.configs.flat['jsx-runtime'],
12+
{
13+
settings: {
14+
react: {
15+
version: 'detect',
16+
},
17+
},
18+
},
19+
{
20+
files: ['**/*.{ts,tsx}'],
21+
plugins: {
22+
'react-hooks': eslintPluginReactHooks,
23+
'react-refresh': eslintPluginReactRefresh,
24+
},
25+
rules: {
26+
...eslintPluginReactHooks.configs.recommended.rules,
27+
...eslintPluginReactRefresh.configs.vite.rules,
28+
},
29+
},
30+
eslintConfigPrettier
31+
);

0 commit comments

Comments
 (0)