Skip to content

Add import conditions to prevent node dependencies in client bundle #3832

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

Open
jog1t wants to merge 1 commit into
base: main
Choose a base branch
from
+46 −14
Open

Add import conditions to prevent node dependencies in client bundle #3832

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
38 changes: 31 additions & 7 deletions rivetkit-typescript/packages/rivetkit/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,35 @@
"type": "module",
"exports": {
".": {
"import": {
"types": "./dist/tsup/mod.d.ts",
"default": "./dist/tsup/mod.js"
"node": {
"import": {
"types": "./dist/tsup/mod.d.ts",
"default": "./dist/tsup/mod.js"
},
"require": {
"types": "./dist/tsup/mod.d.cts",
"default": "./dist/tsup/mod.cjs"
}
},
"require": {
"types": "./dist/tsup/mod.d.cts",
"default": "./dist/tsup/mod.cjs"
"browser": {
"import": {
"types": "./dist/tsup/client/mod.d.ts",
"default": "./dist/tsup/client/mod.js"
},
"require": {
"types": "./dist/tsup/client/mod.d.cts",
"default": "./dist/tsup/client/mod.cjs"
}
},
"default": {
"import": {
"types": "./dist/tsup/mod.d.ts",
"default": "./dist/tsup/mod.js"
},
"require": {
"types": "./dist/tsup/mod.d.cts",
"default": "./dist/tsup/mod.cjs"
}
}
},
"./client": {
Expand Down Expand Up @@ -172,7 +194,6 @@
"@rivetkit/engine-runner": "workspace:*",
"@rivetkit/fast-json-patch": "^3.1.2",
"cbor-x": "^1.6.0",
"get-port": "^7.1.0",
"hono": "^4.7.0",
"invariant": "^2.2.4",
"nanoevents": "^9.1.0",
Expand All @@ -183,6 +204,9 @@
"zod": "^4.1.0",
"vbare": "^0.0.4"
},
"optionalDependencies": {
"get-port": "^7.1.0"
},
"devDependencies": {
"@bare-ts/tools": "^0.13.0",
"@biomejs/biome": "^2.2.3",
Expand Down
22 changes: 15 additions & 7 deletions rivetkit-typescript/packages/rivetkit/src/registry/serve.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,24 @@ const DEFAULT_PORT = 6420;
*/
export async function findFreePort(startPort: number = DEFAULT_PORT): Promise<number> {
const getPortModule = "get-port";
const { default: getPort } = await import(/* webpackIgnore: true */ getPortModule);
try {
const { default: getPort } = await import(/* webpackIgnore: true */ getPortModule);

// Create an iterable of ports starting from startPort
function* portRange(start: number, count: number = 100): Iterable<number> {
for (let i = 0; i < count; i++) {
yield start + i;
// Create an iterable of ports starting from startPort
function* portRange(start: number, count: number = 100): Iterable<number> {
for (let i = 0; i < count; i++) {
yield start + i;
}
}
}

return getPort({ port: portRange(startPort) });
return getPort({ port: portRange(startPort) });
} catch (err) {
logger().error({
msg: "failed to import get-port. please run 'npm install get-port'",
error: stringifyError(err),
});
throw new Error("get-port is required for finding free ports. Please install it with 'npm install get-port'");
}
}

export async function crossPlatformServe(
Expand Down