chore: simplify package directories

packages/actor/package.json

@@ -78,7 +78,7 @@
     "test": "vitest run"
   },
   "dependencies": {
-    "@rivetkit/core": "workspace:*"
+    "rivetkit": "workspace:*"
   },
   "devDependencies": {
     "@types/node": "^22.14.0",

packages/actor/src/client.ts

@@ -1 +1 @@
-export * from "@rivetkit/core/client";
+export * from "rivetkit/client";

packages/actor/src/errors.ts

@@ -1 +1 @@
-export * from "@rivetkit/core/errors";
+export * from "rivetkit/errors";

packages/actor/src/log.ts

@@ -1 +1 @@
-export * from "@rivetkit/core/log";
+export * from "rivetkit/log";

packages/actor/src/mod.ts

@@ -1 +1 @@
-export * from "@rivetkit/core";
+export * from "rivetkit";

packages/actor/src/test.ts

@@ -1 +1 @@
-export * from "@rivetkit/core/test";
+export * from "rivetkit/test";

packages/drivers/cloudflare-workers/package.json → packages/cloudflare-workers/package.json

@@ -47,7 +47,7 @@
     "invariant": "^2.2.4",
     "zod": "^3.25.76",
     "hono": "4.8.3",
-    "@rivetkit/core": "workspace:*"
+    "rivetkit": "workspace:*"
   },
   "stableVersion": "0.8.0"
 }

packages/drivers/cloudflare-workers/src/actor-driver.ts → packages/cloudflare-workers/src/actor-driver.ts

@@ -1,20 +1,20 @@
+import invariant from "invariant";
 import type {
 	AnyActorInstance as CoreAnyActorInstance,
 	RegistryConfig,
 	RunConfig,
-} from "@rivetkit/core";
+} from "rivetkit";
 import {
 	createGenericConnDrivers,
 	GenericConnGlobalState,
 	lookupInRegistry,
-} from "@rivetkit/core";
-import type { Client } from "@rivetkit/core/client";
+} from "rivetkit";
+import type { Client } from "rivetkit/client";
 import type {
 	ActorDriver,
 	AnyActorInstance,
 	ManagerDriver,
-} from "@rivetkit/core/driver-helpers";
-import invariant from "invariant";
+} from "rivetkit/driver-helpers";
 import { KEYS } from "./actor-handler-do";
 
 interface DurableObjectGlobalState {

packages/drivers/cloudflare-workers/src/actor-handler-do.ts → packages/cloudflare-workers/src/actor-handler-do.ts

@@ -1,18 +1,13 @@
 import { DurableObject, env } from "cloudflare:workers";
-import type {
-	ActorKey,
-	ActorRouter,
-	Registry,
-	RunConfig,
-} from "@rivetkit/core";
+import type { ExecutionContext } from "hono";
+import invariant from "invariant";
+import type { ActorKey, ActorRouter, Registry, RunConfig } from "rivetkit";
 import {
 	createActorRouter,
 	createClientWithDriver,
 	createInlineClientDriver,
-} from "@rivetkit/core";
-import { serializeEmptyPersistData } from "@rivetkit/core/driver-helpers";
-import type { ExecutionContext } from "hono";
-import invariant from "invariant";
+} from "rivetkit";
+import { serializeEmptyPersistData } from "rivetkit/driver-helpers";
 import {
 	CloudflareDurableObjectGlobalState,
 	createCloudflareActorsActorDriverBuilder,

packages/drivers/cloudflare-workers/src/config.ts → packages/cloudflare-workers/src/config.ts

@@ -1,5 +1,5 @@
-import { RunConfigSchema } from "@rivetkit/core/driver-helpers";
 import type { Hono } from "hono";
+import { RunConfigSchema } from "rivetkit/driver-helpers";
 import { z } from "zod";
 
 export const ConfigSchema = RunConfigSchema.removeDefault()

packages/drivers/cloudflare-workers/src/handler.ts → packages/cloudflare-workers/src/handler.ts

@@ -1,7 +1,7 @@
 import { env } from "cloudflare:workers";
-import type { Registry, RunConfig } from "@rivetkit/core";
-import type { Client } from "@rivetkit/core/client";
 import { Hono } from "hono";
+import type { Registry, RunConfig } from "rivetkit";
+import type { Client } from "rivetkit/client";
 import {
 	type ActorHandlerInterface,
 	createActorDurableObject,

packages/drivers/cloudflare-workers/src/log.ts → packages/cloudflare-workers/src/log.ts

@@ -1,4 +1,4 @@
-import { getLogger } from "@rivetkit/core/log";
+import { getLogger } from "rivetkit/log";
 
 export const LOGGER_NAME = "driver-cloudflare-workers";
 

packages/drivers/cloudflare-workers/src/manager-driver.ts → packages/cloudflare-workers/src/manager-driver.ts

@@ -1,4 +1,5 @@
-import type { Encoding } from "@rivetkit/core";
+import type { Context as HonoContext } from "hono";
+import type { Encoding } from "rivetkit";
 import {
 	type ActorOutput,
 	type CreateInput,
@@ -10,9 +11,8 @@ import {
 	HEADER_ENCODING,
 	HEADER_EXPOSE_INTERNAL_ERROR,
 	type ManagerDriver,
-} from "@rivetkit/core/driver-helpers";
-import { ActorAlreadyExists, InternalError } from "@rivetkit/core/errors";
-import type { Context as HonoContext } from "hono";
+} from "rivetkit/driver-helpers";
+import { ActorAlreadyExists, InternalError } from "rivetkit/errors";
 import { getCloudflareAmbientEnv } from "./handler";
 import { logger } from "./log";
 import type { Bindings } from "./mod";

packages/drivers/cloudflare-workers/tests/driver-tests.test.ts → packages/cloudflare-workers/tests/driver-tests.test.ts

@@ -4,8 +4,8 @@ import fs from "node:fs/promises";
 import os from "node:os";
 import path from "node:path";
 import { promisify } from "node:util";
-import { runDriverTests } from "@rivetkit/core/driver-test-suite";
-import { getPort } from "@rivetkit/core/test";
+import { runDriverTests } from "rivetkit/driver-test-suite";
+import { getPort } from "rivetkit/test";
 
 const execPromise = promisify(exec);
 
@@ -134,7 +134,7 @@ async function setupProject(projectPath: string) {
 	await fs.mkdir(nodeModulesDir, { recursive: true });
 
 	// Copy the built packages from workspace
-	const workspaceRoot = path.resolve(__dirname, "../../../..");
+	const workspaceRoot = path.resolve(__dirname, "../../..");
 	const rivetKitDir = path.join(nodeModulesDir, "@rivetkit");
 	await fs.mkdir(rivetKitDir, { recursive: true });
 

packages/drivers/cloudflare-workers/tsconfig.json → packages/cloudflare-workers/tsconfig.json

@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.base.json",
+  "extends": "../../tsconfig.base.json",
   "compilerOptions": {
     "types": ["@cloudflare/workers-types", "node"],
     "paths": {

packages/drivers/cloudflare-workers/tsup.config.ts → packages/cloudflare-workers/tsup.config.ts

@@ -1,5 +1,5 @@
 import { defineConfig } from "tsup";
-import defaultConfig from "../../../tsup.base.ts";
+import defaultConfig from "../../tsup.base.ts";
 
 export default defineConfig({
 	external: [/cloudflare:.*/],

packages/drivers/cloudflare-workers/vitest.config.ts → packages/cloudflare-workers/vitest.config.ts

@@ -1,5 +1,5 @@
 import { defineConfig } from "vitest/config";
-import defaultConfig from "../../../vitest.base.ts";
+import defaultConfig from "../../vitest.base.ts";
 
 export default defineConfig({
 	...defaultConfig,

packages/db/package.json

@@ -57,6 +57,6 @@
   "stableVersion": "0.8.0",
   "dependencies": {
     "better-sqlite3": "^11.10.0",
-    "@rivetkit/core": "workspace:*"
+    "rivetkit": "workspace:*"
   }
 }