Fix package scope

.github/workflows/ci.yml

@@ -104,7 +104,7 @@ jobs:
 
       - name: Publish main to npm
         if: github.ref == 'refs/heads/main'
-        run: pnpm publish -r ${TAG} --no-git-checks --filter "@oscartbeaumont-sd/*" --access public
+        run: pnpm publish -r ${TAG} --no-git-checks --filter "@oscartbeaumont-sd/rspc-*" --access public
         env:
           TAG: ${{ (github.ref == 'refs/heads/main' && '--tag=main') || '' }}
 
@@ -114,6 +114,6 @@ jobs:
 
       # - name: Publish release to npm
       #   if: github.ref_type == 'tag'
-      #   run: pnpm publish -r ${TAG} --no-git-checks --filter "@oscartbeaumont-sd/*" --access public
+      #   run: pnpm publish -r ${TAG} --no-git-checks --filter "@oscartbeaumont-sd/rspc-*" --access public
       #   env:
       #     TAG: ${{ (contains(github.ref_name, '-beta.') && '--tag=beta') || ''}}

examples/astro/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "@oscartbeaumont-sd/examples-astro",
+  "name": "@oscartbeaumont-sd/rspc-examples-astro",
   "version": "0.0.0",
   "description": "A project to test the RSPC frontend libraries",
   "keywords": [],
@@ -10,9 +10,9 @@
     "dev": "astro dev"
   },
   "dependencies": {
-    "@oscartbeaumont-sd/client": "workspace:*",
-    "@oscartbeaumont-sd/react": "workspace:*",
-    "@oscartbeaumont-sd/solid": "workspace:*",
+    "@oscartbeaumont-sd/rspc-client": "workspace:*",
+    "@oscartbeaumont-sd/rspc-react": "workspace:*",
+    "@oscartbeaumont-sd/rspc-solid": "workspace:*",
     "@tanstack/react-query": "^4.29.5",
     "@tanstack/solid-query": "^4.29.5",
     "astro": "2.3.2",
@@ -23,7 +23,7 @@
   "devDependencies": {
     "@astrojs/react": "^2.1.1",
     "@astrojs/solid-js": "^2.1.0",
-    "@oscartbeaumont-sd/config": "workspace:*",
+    "@oscartbeaumont-sd/rspc-config": "workspace:*",
     "@types/react": "^18.2.0",
     "typescript": "^5.0.4"
   },

examples/astro/src/components/react-alpha.tsx

@@ -1,5 +1,5 @@
-import { initRspc, httpLink, wsLink } from "@oscartbeaumont-sd/client/v2";
-import { createReactQueryHooks } from "@oscartbeaumont-sd/react/v2";
+import { initRspc, httpLink, wsLink } from "@oscartbeaumont-sd/rspc-client/v2";
+import { createReactQueryHooks } from "@oscartbeaumont-sd/rspc-react/v2";
 import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
 import React, { useState } from "react";
 

examples/astro/src/components/react-batch-alpha.tsx

@@ -2,8 +2,8 @@ import {
   initRspc,
   httpBatchLink,
   wsBatchLink,
-} from "@oscartbeaumont-sd/client/v2";
-import { createReactQueryHooks } from "@oscartbeaumont-sd/react/v2";
+} from "@oscartbeaumont-sd/rspc-client/v2";
+import { createReactQueryHooks } from "@oscartbeaumont-sd/rspc-react/v2";
 import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
 import React, { useState } from "react";
 

examples/astro/src/components/react.tsx

@@ -2,8 +2,8 @@ import {
   createClient,
   FetchTransport,
   WebsocketTransport,
-} from "@oscartbeaumont-sd/client";
-import { createReactQueryHooks } from "@oscartbeaumont-sd/react";
+} from "@oscartbeaumont-sd/rspc-client";
+import { createReactQueryHooks } from "@oscartbeaumont-sd/rspc-react";
 import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
 import React, { useState } from "react";
 

examples/astro/src/components/solid.tsx

@@ -1,7 +1,7 @@
 /** @jsxImportSource solid-js */
 
-// import { createClient, FetchTransport } from "@oscartbeaumont-sd/client";
-// import { createSolidQueryHooks } from "@oscartbeaumont-sd/solid";
+// import { createClient, FetchTransport } from "@oscartbeaumont-sd/rspc-client";
+// import { createSolidQueryHooks } from "@oscartbeaumont-sd/rspc-solid";
 // import { QueryClient } from "@tanstack/solid-query";
 
 // Export from Rust. Run `cargo run -p example-axum` to start server and export it!

examples/astro/test/client.test.ts

@@ -11,8 +11,8 @@ import {
   inferInfiniteQueries,
   inferInfiniteQueryResult,
   inferInfiniteQueryInput,
-} from "@oscartbeaumont-sd/client";
-import { createReactQueryHooks } from "@oscartbeaumont-sd/react";
+} from "@oscartbeaumont-sd/rspc-client";
+import { createReactQueryHooks } from "@oscartbeaumont-sd/rspc-react";
 import { MyPaginatedData, Procedures } from "./bindings";
 
 export const rspc = createReactQueryHooks<Procedures>();

examples/astro/test/react.test.tsx

@@ -4,8 +4,8 @@ import {
   Client,
   createClient,
   NoOpTransport,
-} from "@oscartbeaumont-sd/client";
-import { createReactQueryHooks } from "@oscartbeaumont-sd/react";
+} from "@oscartbeaumont-sd/rspc-client";
+import { createReactQueryHooks } from "@oscartbeaumont-sd/rspc-react";
 import { QueryClient } from "@tanstack/react-query";
 import { Procedures } from "./bindings";
 

examples/astro/test/solid.test.tsx

@@ -4,8 +4,8 @@ import {
   Client,
   createClient,
   NoOpTransport,
-} from "@oscartbeaumont-sd/client";
-import { createSolidQueryHooks } from "@oscartbeaumont-sd/solid";
+} from "@oscartbeaumont-sd/rspc-client";
+import { createSolidQueryHooks } from "@oscartbeaumont-sd/rspc-solid";
 import { QueryClient } from "@tanstack/solid-query";
 import { Procedures } from "./bindings";
 

examples/astro/tsconfig.json

@@ -1,5 +1,5 @@
 {
-  "extends": "@oscartbeaumont-sd/config/tsconfig.json",
+  "extends": "@oscartbeaumont-sd/rspc-config/tsconfig.json",
   "compilerOptions": {
     "esModuleInterop": true,
     "jsx": "preserve",

package.json

@@ -1,25 +1,25 @@
 {
-  "name": "@oscartbeaumont-sd/workspace",
+  "name": "@oscartbeaumont-sd/rspc-workspace",
   "version": "0.0.0",
   "description": "A blazingly fast and easy to use TRPC-like server for Rust.",
   "keywords": [],
   "author": "Oscar Beaumont",
   "license": "MIT",
   "private": true,
   "scripts": {
-    "dev": "pnpm -r --parallel --filter=!@oscartbeaumont-sd/docs --filter=!@oscartbeaumont-sd/examples-* --filter=!rspc-vscode exec pnpm dev",
-    "build": "pnpm -r --parallel --filter=!@oscartbeaumont-sd/docs --filter=!@oscartbeaumont-sd/examples-* --filter=!rspc-vscode exec pnpm build",
+    "dev": "pnpm -r --parallel --filter=!@oscartbeaumont-sd/rspc-docs --filter=!@oscartbeaumont-sd/rspc-examples-* --filter=!rspc-vscode exec pnpm dev",
+    "build": "pnpm -r --parallel --filter=!@oscartbeaumont-sd/rspc-docs --filter=!@oscartbeaumont-sd/rspc-examples-* --filter=!rspc-vscode exec pnpm build",
     "postinstall": "pnpm run config build && pnpm build",
-    "test": "pnpm -r --parallel --filter=!@oscartbeaumont-sd/docs --filter=!@oscartbeaumont-sd/config --filter=!@oscartbeaumont-sd/examples-* --filter=!rspc-vscode exec pnpm test",
+    "test": "pnpm -r --parallel --filter=!@oscartbeaumont-sd/rspc-docs --filter=!@oscartbeaumont-sd/rspc-config --filter=!@oscartbeaumont-sd/rspc-examples-* --filter=!rspc-vscode exec pnpm test",
     "typecheck": "pnpm -r --filter=!rspc-vscode exec tsc --noEmit",
-    "docs": "pnpm --filter @oscartbeaumont-sd/docs -- ",
-    "client": "pnpm --filter @oscartbeaumont-sd/client -- ",
-    "config": "pnpm --filter @oscartbeaumont-sd/config -- ",
-    "examples": "pnpm --filter @oscartbeaumont-sd/examples-* -- ",
-    "playground": "pnpm --filter @oscartbeaumont-sd/playground -- ",
-    "react": "pnpm --filter @oscartbeaumont-sd/react -- ",
-    "solid": "pnpm --filter @oscartbeaumont-sd/solid -- ",
-    "tauri": "pnpm --filter @oscartbeaumont-sd/tauri -- ",
+    "docs": "pnpm --filter @oscartbeaumont-sd/rspc-docs -- ",
+    "client": "pnpm --filter @oscartbeaumont-sd/rspc-client -- ",
+    "config": "pnpm --filter @oscartbeaumont-sd/rspc-config -- ",
+    "examples": "pnpm --filter @oscartbeaumont-sd/rspc-examples-* -- ",
+    "playground": "pnpm --filter @oscartbeaumont-sd/rspc-playground -- ",
+    "react": "pnpm --filter @oscartbeaumont-sd/rspc-react -- ",
+    "solid": "pnpm --filter @oscartbeaumont-sd/rspc-solid -- ",
+    "tauri": "pnpm --filter @oscartbeaumont-sd/rspc-tauri -- ",
     "set-package-versions": "node .github/scripts/setPackageVersions.js"
   },
   "engines": {

packages/client/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "@oscartbeaumont-sd/client",
+  "name": "@oscartbeaumont-sd/rspc-client",
   "version": "0.1.3",
   "description": "A blazingly fast and easy to use TRPC-like server for Rust.",
   "keywords": [],
@@ -44,7 +44,7 @@
     "test": "vitest ./index.test.ts"
   },
   "devDependencies": {
-    "@oscartbeaumont-sd/config": "workspace:*",
+    "@oscartbeaumont-sd/rspc-config": "workspace:*",
     "rollup": "^3.21.2",
     "typescript": "^5.0.4",
     "vitest": "^0.30.1",

packages/client/rollup.config.ts

@@ -1,3 +1,3 @@
-import { buildConfig } from "@oscartbeaumont-sd/config/getRollupConfig";
+import { buildConfig } from "@oscartbeaumont-sd/rspc-config/getRollupConfig";
 
 export default buildConfig(["src/index.ts", "src/full.ts", "src/v2.ts"]);

packages/client/tsconfig.json

@@ -1,5 +1,5 @@
 {
-  "extends": "@oscartbeaumont-sd/config/tsconfig.json",
+  "extends": "@oscartbeaumont-sd/rspc-config/tsconfig.json",
   "compilerOptions": {
     "lib": ["esnext", "dom"]
   },

packages/config/getRollupConfig.ts

@@ -63,7 +63,7 @@ export function buildConfig(input: string | string[]): RollupOptions[] {
         visualizer({
           gzipSize: true,
           brotliSize: true,
-          // TODO: Support for viewing the bundle size of `@oscartbeaumont-sd/client/full`
+          // TODO: Support for viewing the bundle size of `@oscartbeaumont-sd/rspc-client/full`
         }),
       ],
     },

packages/config/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "@oscartbeaumont-sd/config",
+  "name": "@oscartbeaumont-sd/rspc-config",
   "version": "0.0.0",
   "author": "Oscar Beaumont",
   "license": "MIT",

packages/config/tsconfig.json

@@ -14,13 +14,13 @@
     "importHelpers": true,
     "skipLibCheck": true,
     "paths": {
-      "@oscartbeaumont-sd/client": ["../client/src"],
-      "@oscartbeaumont-sd/client/full": ["../client/src/full"],
-      "@oscartbeaumont-sd/client/v2": ["../client/src/v2"],
-      "@oscartbeaumont-sd/react": ["../react/src"],
-      "@oscartbeaumont-sd/react/v2": ["../react/src/v2"],
-      "@oscartbeaumont-sd/solid": ["../solid/src"],
-      "@oscartbeaumont-sd/tauri": ["../tauri/src"]
+      "@oscartbeaumont-sd/rspc-client": ["../client/src"],
+      "@oscartbeaumont-sd/rspc-client/full": ["../client/src/full"],
+      "@oscartbeaumont-sd/rspc-client/v2": ["../client/src/v2"],
+      "@oscartbeaumont-sd/rspc-react": ["../react/src"],
+      "@oscartbeaumont-sd/rspc-react/v2": ["../react/src/v2"],
+      "@oscartbeaumont-sd/rspc-solid": ["../solid/src"],
+      "@oscartbeaumont-sd/rspc-tauri": ["../tauri/src"]
     }
   },
   "include": ["./getRollupConfig.ts"]

packages/react/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "@oscartbeaumont-sd/react",
+  "name": "@oscartbeaumont-sd/rspc-react",
   "version": "0.1.3",
   "description": "A blazingly fast and easy to use TRPC-like server for Rust.",
   "keywords": [],
@@ -36,8 +36,8 @@
     "test": "vitest"
   },
   "devDependencies": {
-    "@oscartbeaumont-sd/client": "workspace:*",
-    "@oscartbeaumont-sd/config": "workspace:*",
+    "@oscartbeaumont-sd/rspc-client": "workspace:*",
+    "@oscartbeaumont-sd/rspc-config": "workspace:*",
     "@tanstack/react-query": "^4.29.5",
     "@types/react": "^18.2.0",
     "react": "^18.2.0",
@@ -47,7 +47,7 @@
     "vitest": "^0.30.1"
   },
   "peerDependencies": {
-    "@oscartbeaumont-sd/client": "workspace:*",
+    "@oscartbeaumont-sd/rspc-client": "workspace:*",
     "@tanstack/react-query": "^4.26.0",
     "react": "^18.2.0"
   }

packages/react/rollup.config.ts

@@ -1,3 +1,3 @@
-import { buildConfig } from "@oscartbeaumont-sd/config/getRollupConfig";
+import { buildConfig } from "@oscartbeaumont-sd/rspc-config/getRollupConfig";
 
 export default buildConfig(["src/index.tsx", "src/v2.tsx"]);

packages/react/src/index.tsx

@@ -34,7 +34,7 @@ import {
   inferMutationInput,
   inferSubscriptionResult,
   ProceduresDef,
-} from "@oscartbeaumont-sd/client";
+} from "@oscartbeaumont-sd/rspc-client";
 
 export interface BaseOptions<TProcedures extends ProceduresDef> {
   rspc?: {

packages/react/src/v2.tsx

@@ -29,8 +29,8 @@ import {
   inferMutationInput,
   ProceduresDef,
   inferProcedureResult,
-} from "@oscartbeaumont-sd/client";
-import { AlphaClient, AlphaRSPCError } from "@oscartbeaumont-sd/client/v2";
+} from "@oscartbeaumont-sd/rspc-client";
+import { AlphaClient, AlphaRSPCError } from "@oscartbeaumont-sd/rspc-client/v2";
 
 // TODO: Reuse one from client but don't export it in public API
 type KeyAndInput = [string] | [string, any];

packages/react/tsconfig.json

@@ -1,5 +1,5 @@
 {
-  "extends": "@oscartbeaumont-sd/config/tsconfig.json",
+  "extends": "@oscartbeaumont-sd/rspc-config/tsconfig.json",
   "compilerOptions": {
     "jsx": "react-jsx",
     "lib": ["esnext", "dom"]

packages/solid/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "@oscartbeaumont-sd/solid",
+  "name": "@oscartbeaumont-sd/rspc-solid",
   "version": "0.1.3",
   "description": "A blazingly fast and easy to use TRPC-like server for Rust.",
   "keywords": [],
@@ -28,8 +28,8 @@
     "test": "vitest"
   },
   "devDependencies": {
-    "@oscartbeaumont-sd/client": "workspace:*",
-    "@oscartbeaumont-sd/config": "workspace:*",
+    "@oscartbeaumont-sd/rspc-client": "workspace:*",
+    "@oscartbeaumont-sd/rspc-config": "workspace:*",
     "@tanstack/solid-query": "^4.29.5",
     "rollup": "^3.21.2",
     "rollup-preset-solid": "^2.0.1",
@@ -39,7 +39,7 @@
     "vitest": "^0.30.1"
   },
   "peerDependencies": {
-    "@oscartbeaumont-sd/client": "workspace:*",
+    "@oscartbeaumont-sd/rspc-client": "workspace:*",
     "@tanstack/solid-query": "^4.6.0",
     "solid-js": "^1.6.11"
   }

packages/solid/src/index.tsx

@@ -19,7 +19,7 @@ import {
   RSPCError,
   _inferInfiniteQueryProcedureHandlerInput,
   _inferProcedureHandlerInput,
-} from "@oscartbeaumont-sd/client";
+} from "@oscartbeaumont-sd/rspc-client";
 import {
   QueryClient,
   CreateQueryOptions,

packages/solid/tsconfig.json

@@ -1,5 +1,5 @@
 {
-  "extends": "@oscartbeaumont-sd/config/tsconfig.json",
+  "extends": "@oscartbeaumont-sd/rspc-config/tsconfig.json",
   "compilerOptions": {
     "jsx": "preserve",
     "jsxImportSource": "solid-js",

packages/tauri/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "@oscartbeaumont-sd/tauri",
+  "name": "@oscartbeaumont-sd/rspc-tauri",
   "version": "0.1.3",
   "description": "A blazingly fast and easy to use TRPC-like server for Rust.",
   "keywords": [],
@@ -36,10 +36,10 @@
     "test": "vitest"
   },
   "dependencies": {
-    "@oscartbeaumont-sd/client": "workspace:*"
+    "@oscartbeaumont-sd/rspc-client": "workspace:*"
   },
   "devDependencies": {
-    "@oscartbeaumont-sd/config": "workspace:*",
+    "@oscartbeaumont-sd/rspc-config": "workspace:*",
     "@tauri-apps/api": "^1.2.0",
     "rollup": "^3.21.2",
     "typescript": "^5.0.4",

packages/tauri/rollup.config.ts

@@ -1,3 +1,3 @@
-import { buildConfig } from "@oscartbeaumont-sd/config/getRollupConfig";
+import { buildConfig } from "@oscartbeaumont-sd/rspc-config/getRollupConfig";
 
 export default buildConfig(["src/index.ts", "src/v2.ts"]);

packages/tauri/src/index.ts

@@ -3,7 +3,7 @@ import {
   OperationType,
   Transport,
   RSPCError,
-} from "@oscartbeaumont-sd/client";
+} from "@oscartbeaumont-sd/rspc-client";
 import { listen, UnlistenFn } from "@tauri-apps/api/event";
 import { appWindow } from "@tauri-apps/api/window";
 

packages/tauri/src/v2.ts

@@ -2,7 +2,7 @@ import {
   AlphaRSPCError,
   Link,
   RspcRequest,
-} from "@oscartbeaumont-sd/client/v2";
+} from "@oscartbeaumont-sd/rspc-client/v2";
 import { listen } from "@tauri-apps/api/event";
 import { appWindow } from "@tauri-apps/api/window";
 

packages/tauri/tsconfig.json

@@ -1,5 +1,5 @@
 {
-  "extends": "@oscartbeaumont-sd/config/tsconfig.json",
+  "extends": "@oscartbeaumont-sd/rspc-config/tsconfig.json",
   "compilerOptions": {
     "lib": ["esnext", "dom"]
   },