Skip to content

Upgrade electron to v29. #187

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 3, 2024
Merged

Upgrade electron to v29. #187

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/thin-trains-type.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'electron-trpc': minor
---

Upgrade electron to v29.
2 changes: 1 addition & 1 deletion examples/basic-react-superjson/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"@trpc/client": "10.33.1",
"@trpc/react-query": "10.33.1",
"@trpc/server": "10.33.1",
"electron": "^25.1.1",
"electron": "29.3.2",
"electron-trpc": "0.5.2",
"react": "^18.2.0",
"react-dom": "^18.2.0",
Expand Down
5 changes: 4 additions & 1 deletion examples/basic-react/index.e2e.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
import { _electron as electron, test, expect } from '@playwright/test';

test('Hello Electron', async () => {
const electronApp = await electron.launch({ args: [`${__dirname}`] });
const electronApp = await electron.launch({
args: [`${__dirname}`],
executablePath: process.env.PLAYWRIGHT_ELECTRON_PATH ?? undefined,
});

const window = await electronApp.firstWindow();
expect(await window.title()).toBe('Hello from Electron renderer!');
Expand Down
2 changes: 1 addition & 1 deletion examples/basic-react/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"@trpc/client": "10.33.1",
"@trpc/react-query": "10.33.1",
"@trpc/server": "10.33.1",
"electron": "^25.1.1",
"electron": "29.3.2",
"electron-trpc": "0.5.2",
"react": "^18.2.0",
"react-dom": "^18.2.0",
Expand Down
13 changes: 7 additions & 6 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
"test:e2e": "playwright test",
"test:ci": "corepack pnpm -r test:ci",
"lint": "prettier --check .",
"lint:fix": "prettier --write .",
"prepublishOnly": "corepack pnpm build",
"changeset": "changeset",
"changeset:version": "changeset version && pnpm install --no-frozen-lockfile",
Expand All @@ -17,14 +18,14 @@
"packageManager": "pnpm@8.6.11",
"devDependencies": {
"@changesets/changelog-github": "^0.4.8",
"@changesets/cli": "^2.26.1",
"@playwright/test": "^1.35.1",
"@changesets/cli": "^2.27.1",
"@playwright/test": "^1.43.1",
"prettier": "^2.8.8",
"typescript": "^5.1.3",
"unocss": "^0.54.0",
"vite": "^4.3.9",
"typescript": "^5.4.5",
"unocss": "^0.59.4",
"vite": "^5.2.11",
"vitepress": "1.0.0-beta.7",
"vue": "^3.3.4"
"vue": "^3.4.24"
},
"engines": {
"node": ">=18",
Expand Down
8 changes: 4 additions & 4 deletions packages/electron-trpc/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
"renderer.d.ts"
],
"scripts": {
"build": "tsc && vite build -c src/main/vite.config.ts && vite build -c src/renderer/vite.config.ts && pnpm build:types",
"build:types": "dts-bundle-generator --config ./dts-bundle-generator.config.ts && pnpm run copy:types",
"build": "tsc && vite build -c src/main/vite.config.ts && vite build -c src/renderer/vite.config.ts && corepack pnpm build:types",
"build:types": "dts-bundle-generator --config ./dts-bundle-generator.config.ts && corepack pnpm run copy:types",
"copy:types": "cp dist/main.d.ts dist/renderer.d.ts ./",
"test": "vitest -c vitest.config.ts",
"test:ci": "vitest run -c vitest.config.ts --coverage",
Expand All @@ -40,8 +40,8 @@
"@types/node": "^20.3.1",
"@vitest/coverage-v8": "^0.34.0",
"builtin-modules": "^3.3.0",
"dts-bundle-generator": "^8.0.1",
"electron": "^25.1.1",
"dts-bundle-generator": "9.5.1",
"electron": "29.3.2",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"superjson": "^1.12.3",
Expand Down
Loading