Exit pre release.

.changeset/config.json

@@ -6,6 +6,5 @@
   "linked": [],
   "access": "public",
   "baseBranch": "main",
-  "updateInternalDependencies": "patch",
-  "ignore": []
+  "updateInternalDependencies": "patch"
 }

.changeset/green-badgers-move.md

@@ -0,0 +1,5 @@
+---
+'electron-trpc': patch
+---
+
+Set minimum version for electron peer dependency.

.changeset/healthy-wolves-boil.md

@@ -0,0 +1,5 @@
+---
+'electron-trpc': patch
+---
+
+Updated API to be simpler and require fewer steps.

.changeset/kind-tables-prove.md

@@ -0,0 +1,5 @@
+---
+'electron-trpc': patch
+---
+
+Update tRPC to rc.7.

.changeset/pre.json

@@ -0,0 +1,20 @@
+{
+  "mode": "exit",
+  "tag": "next",
+  "initialVersions": {
+    "electron-trpc": "0.1.0",
+    "examples/basic": "0.0.0",
+    "examples/custom-preload": "0.0.1-next.0"
+  },
+  "changesets": [
+    "green-badgers-move",
+    "healthy-wolves-boil",
+    "kind-tables-prove",
+    "rotten-forks-design",
+    "sharp-crews-melt",
+    "sweet-grapes-eat",
+    "ten-bobcats-ring",
+    "unlucky-seas-divide",
+    "wild-dots-change"
+  ]
+}

.changeset/rotten-forks-design.md

@@ -0,0 +1,5 @@
+---
+'electron-trpc': patch
+---
+
+Upgrade to tRPC v10 rc.1.

.changeset/sharp-crews-melt.md

@@ -0,0 +1,5 @@
+---
+'electron-trpc': patch
+---
+
+Fix transformer path.

.changeset/sweet-grapes-eat.md

@@ -0,0 +1,5 @@
+---
+'electron-trpc': patch
+---
+
+Update tRPC to rc.2.

.changeset/tasty-carrots-cheer.md

@@ -0,0 +1,5 @@
+---
+'electron-trpc': minor
+---
+
+Update electron-trpc to v10 release.

.changeset/ten-bobcats-ring.md

@@ -0,0 +1,5 @@
+---
+'electron-trpc': minor
+---
+
+Move to tRPC v10.

.changeset/unlucky-seas-divide.md

@@ -0,0 +1,5 @@
+---
+'electron-trpc': patch
+---
+
+Fix server import from ipcLink.

.changeset/wild-dots-change.md

@@ -0,0 +1,5 @@
+---
+'electron-trpc': patch
+---
+
+Fix TypeScript type resolution. (Authored by @skyrpex, thanks!)

.github/workflows/main.yml

@@ -9,7 +9,7 @@ jobs:
         os: [ubuntu-latest]
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: pnpm/action-setup@v2
         with:
           version: 7
@@ -19,10 +19,11 @@ jobs:
           cache: 'pnpm'
       - run: pnpm install --frozen-lockfile
       - run: pnpm build
+      - run: pnpm --filter=examples/basic build
       - run: pnpm test:coverage
       - uses: codecov/codecov-action@v3
 
-  release:
+  release-main:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
@@ -33,7 +34,34 @@ jobs:
     if: github.event_name == 'push' && github.ref == 'refs/heads/main'
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
+      - uses: pnpm/action-setup@v2
+        with:
+          version: 7
+      - uses: actions/setup-node@v3
+        with:
+          node-version: ${{ matrix.node }}
+          cache: 'pnpm'
+      - run: pnpm install --frozen-lockfile
+      - uses: changesets/action@v1
+        with:
+          publish: pnpm release
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
+
+  release-next:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        node: ['16.x']
+        os: [ubuntu-latest]
+
+    needs: test
+    if: github.event_name == 'push' && github.ref == 'refs/heads/next'
+
+    steps:
+      - uses: actions/checkout@v3
       - uses: pnpm/action-setup@v2
         with:
           version: 7

.gitignore

@@ -1,3 +1,6 @@
 node_modules
-/dist
-/coverage
+dist/
+dist-electron/
+coverage/
+packages/electron-trpc/renderer.d.ts
+packages/electron-trpc/main.d.ts

CHANGELOG.md

@@ -1,5 +1,23 @@
 # electron-trpc
 
+## 0.2.0-next.2
+
+### Patch Changes
+
+- [#26](https://github.com/jsonnull/electron-trpc/pull/26) [`073eecb`](https://github.com/jsonnull/electron-trpc/commit/073eecb504917ad7e8865a8f904827ca0a4ca2ba) Thanks [@jsonnull](https://github.com/jsonnull)! - Fix server import from ipcLink.
+
+## 0.2.0-next.1
+
+### Patch Changes
+
+- [#24](https://github.com/jsonnull/electron-trpc/pull/24) [`eba2b98`](https://github.com/jsonnull/electron-trpc/commit/eba2b98506bcf4590a3689397f445a0443fa9188) Thanks [@jsonnull](https://github.com/jsonnull)! - Set minimum version for electron peer dependency.
+
+## 0.2.0-next.0
+
+### Minor Changes
+
+- [`d392431`](https://github.com/jsonnull/electron-trpc/commit/d39243176897dd7cd209d768db68dc90cab92c58) Thanks [@jsonnull](https://github.com/jsonnull)! - Move to tRPC v10.
+
 ## 0.1.0
 
 ### Minor Changes

README.md

@@ -34,30 +34,34 @@ yarn add electron-trpc
 npm install --save electron-trpc
 ```
 
-## Setup
+## Basic Setup
 
 1. Add your tRPC router to the Electron main process using `createIPCHandler`:
 
    ```ts
-   import { app, ipcMain } from 'electron';
-   import { createIPCHandler } from 'electron-trpc';
-   import { router, createContext } from './api';
+   import { app } from 'electron';
+   import { createIPCHandler } from 'electron-trpc/main';
+   import { router } from './api';
 
    app.on('ready', () => {
-     createIPCHandler({ ipcMain, router, createContext });
-
-     // ...
+     createIPCHandler({ router });
+
+     const win = new BrowserWindow({
+       webPreferences: {
+         // Replace this path with the path to your preload file (see next step)
+         preload: 'path/to/preload.js',
+       },
+     });
    });
    ```
 
 2. Expose the IPC to the render process from the [preload file](https://www.electronjs.org/docs/latest/tutorial/process-model#preload-scripts):
 
    ```ts
-   import { contextBridge, ipcRenderer } from 'electron';
    import { exposeElectronTRPC } from 'electron-trpc';
 
    process.once('loaded', async () => {
-     exposeElectronTRPC({ contextBridge, ipcRenderer });
+     exposeElectronTRPC();
    });
    ```
 
@@ -67,7 +71,7 @@ npm install --save electron-trpc
 
    ```ts
    import * as trpc from '@trpc/client';
-   import { ipcLink } from 'electron-trpc';
+   import { ipcLink } from 'electron-trpc/renderer';
 
    export const trpcClient = trpc.createTRPCClient({
      links: [ipcLink()],

examples/basic/CHANGELOG.md

@@ -0,0 +1,22 @@
+# examples/basic
+
+## 0.0.1-next.2
+
+### Patch Changes
+
+- Updated dependencies [[`169c47f`](https://github.com/jsonnull/electron-trpc/commit/169c47f325de8899784187af06140c29758b0c0a)]:
+  - electron-trpc@0.2.0-next.7
+
+## 0.0.1-next.1
+
+### Patch Changes
+
+- Updated dependencies [[`a2103c4`](https://github.com/jsonnull/electron-trpc/commit/a2103c4e9789741aa98aa057fcebf78e4f339d9b)]:
+  - electron-trpc@0.2.0-next.6
+
+## 0.0.1-next.0
+
+### Patch Changes
+
+- Updated dependencies [[`333197f`](https://github.com/jsonnull/electron-trpc/commit/333197fb3e567aa37f350af992d123f8f8ed6796)]:
+  - electron-trpc@0.2.0-next.5

examples/basic/electron/api.ts

@@ -0,0 +1,16 @@
+import z from 'zod';
+import { initTRPC } from '@trpc/server';
+
+const t = initTRPC.create({ isServer: true });
+
+export const router = t.router({
+  greeting: t.procedure.input(z.object({ name: z.string() })).query((req) => {
+    const { input } = req;
+
+    return {
+      text: `Hello ${input.name}` as const,
+    };
+  }),
+});
+
+export type AppRouter = typeof router;

examples/basic/electron/index.ts

@@ -0,0 +1,28 @@
+import path from 'path';
+import { app, BrowserWindow } from 'electron';
+import { createIPCHandler } from 'electron-trpc/main';
+import { router } from './api';
+
+process.env.DIST = path.join(__dirname, '../dist');
+process.env.PUBLIC = app.isPackaged ? process.env.DIST : path.join(process.env.DIST, '../public');
+
+const preload = path.join(__dirname, './preload.js');
+const url = process.env['VITE_DEV_SERVER_URL'];
+
+app.on('ready', () => {
+  createIPCHandler({ router });
+
+  const win = new BrowserWindow({
+    webPreferences: {
+      preload,
+    },
+  });
+
+  if (url) {
+    win.loadURL(url);
+  } else {
+    win.loadFile(path.join(process.env.DIST, 'index.html'));
+  }
+
+  win.show();
+});

examples/basic/index.html

@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="UTF-8" />
+    <!-- https://developer.mozilla.org/en-US/docs/Web/HTTP/CSP -->
+    <meta http-equiv="Content-Security-Policy" content="default-src 'self'; script-src 'self'" />
+    <meta http-equiv="X-Content-Security-Policy" content="default-src 'self'; script-src 'self'" />
+    <title>Hello from Electron renderer!</title>
+  </head>
+  <body>
+    <div id="react-root"></div>
+  </body>
+  <script type="module" src="./src/index.tsx"></script>
+</html>

examples/basic/package.json

@@ -0,0 +1,31 @@
+{
+  "name": "examples/basic",
+  "description": "Electron support for tRPC",
+  "version": "0.0.1-next.2",
+  "private": true,
+  "main": "dist-electron/index.js",
+  "license": "MIT",
+  "scripts": {
+    "start": "vite",
+    "build": "vite build"
+  },
+  "dependencies": {
+    "@tanstack/react-query": "^4.8.0",
+    "@trpc/client": "10.4.3",
+    "@trpc/react-query": "10.4.3",
+    "@trpc/server": "10.4.3",
+    "electron": "^21.2.2",
+    "electron-trpc": "0.2.0-next.7",
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0",
+    "zod": "^3.19.1"
+  },
+  "devDependencies": {
+    "@types/node": "^18.0.0",
+    "@types/react": "^18.0.21",
+    "@types/react-dom": "^18.0.6",
+    "@vitejs/plugin-react": "^2.1.0",
+    "vite": "^3.0.3",
+    "vite-plugin-electron": "^0.10.3"
+  }
+}

examples/basic/preload/preload.ts

@@ -0,0 +1,5 @@
+import { exposeElectronTRPC } from 'electron-trpc/main';
+
+process.once('loaded', async () => {
+  exposeElectronTRPC();
+});