From 90503abd4be9d0cf95b1374b492dc3c6689aeb9d Mon Sep 17 00:00:00 2001 From: Oscar Beaumont Date: Tue, 19 Dec 2023 12:33:08 +0800 Subject: [PATCH] Fix package scope --- .github/workflows/ci.yml | 4 ++-- examples/astro/package.json | 10 ++++---- examples/astro/src/components/react-alpha.tsx | 4 ++-- .../src/components/react-batch-alpha.tsx | 4 ++-- examples/astro/src/components/react.tsx | 4 ++-- examples/astro/src/components/solid.tsx | 4 ++-- examples/astro/test/client.test.ts | 4 ++-- examples/astro/test/react.test.tsx | 4 ++-- examples/astro/test/solid.test.tsx | 4 ++-- examples/astro/tsconfig.json | 2 +- package.json | 24 +++++++++---------- packages/client/package.json | 4 ++-- packages/client/rollup.config.ts | 2 +- packages/client/tsconfig.json | 2 +- packages/config/getRollupConfig.ts | 2 +- packages/config/package.json | 2 +- packages/config/tsconfig.json | 14 +++++------ packages/react/package.json | 8 +++---- packages/react/rollup.config.ts | 2 +- packages/react/src/index.tsx | 2 +- packages/react/src/v2.tsx | 4 ++-- packages/react/tsconfig.json | 2 +- packages/solid/package.json | 8 +++---- packages/solid/src/index.tsx | 2 +- packages/solid/tsconfig.json | 2 +- packages/tauri/package.json | 6 ++--- packages/tauri/rollup.config.ts | 2 +- packages/tauri/src/index.ts | 2 +- packages/tauri/src/v2.ts | 2 +- packages/tauri/tsconfig.json | 2 +- pnpm-lock.yaml | 22 ++++++++--------- 31 files changed, 80 insertions(+), 80 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cf96fb5a..9a82e0d2 100644 --- a/.github/workflows/ci.yml +++ b/.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') || ''}} diff --git a/examples/astro/package.json b/examples/astro/package.json index 4d744fb4..c410189d 100644 --- a/examples/astro/package.json +++ b/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" }, diff --git a/examples/astro/src/components/react-alpha.tsx b/examples/astro/src/components/react-alpha.tsx index 75ea181f..11d798bc 100644 --- a/examples/astro/src/components/react-alpha.tsx +++ b/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"; diff --git a/examples/astro/src/components/react-batch-alpha.tsx b/examples/astro/src/components/react-batch-alpha.tsx index 259314a0..a20dc707 100644 --- a/examples/astro/src/components/react-batch-alpha.tsx +++ b/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"; diff --git a/examples/astro/src/components/react.tsx b/examples/astro/src/components/react.tsx index 1e465f17..34fbcccb 100644 --- a/examples/astro/src/components/react.tsx +++ b/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"; diff --git a/examples/astro/src/components/solid.tsx b/examples/astro/src/components/solid.tsx index 01868130..90167a46 100644 --- a/examples/astro/src/components/solid.tsx +++ b/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! diff --git a/examples/astro/test/client.test.ts b/examples/astro/test/client.test.ts index fd4c6229..e84ace83 100644 --- a/examples/astro/test/client.test.ts +++ b/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(); diff --git a/examples/astro/test/react.test.tsx b/examples/astro/test/react.test.tsx index ebe9d18d..be305c8e 100644 --- a/examples/astro/test/react.test.tsx +++ b/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"; diff --git a/examples/astro/test/solid.test.tsx b/examples/astro/test/solid.test.tsx index 1237bac7..867c6006 100644 --- a/examples/astro/test/solid.test.tsx +++ b/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"; diff --git a/examples/astro/tsconfig.json b/examples/astro/tsconfig.json index 332e2fc3..d389db03 100644 --- a/examples/astro/tsconfig.json +++ b/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", diff --git a/package.json b/package.json index 7147bd8d..c6ec4345 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "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": [], @@ -7,19 +7,19 @@ "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": { diff --git a/packages/client/package.json b/packages/client/package.json index 12f61925..91da19eb 100644 --- a/packages/client/package.json +++ b/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", diff --git a/packages/client/rollup.config.ts b/packages/client/rollup.config.ts index a45e5b7b..33dc2366 100644 --- a/packages/client/rollup.config.ts +++ b/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"]); diff --git a/packages/client/tsconfig.json b/packages/client/tsconfig.json index c07c2811..d4d8693e 100644 --- a/packages/client/tsconfig.json +++ b/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"] }, diff --git a/packages/config/getRollupConfig.ts b/packages/config/getRollupConfig.ts index 0610b51b..9395d5e8 100644 --- a/packages/config/getRollupConfig.ts +++ b/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` }), ], }, diff --git a/packages/config/package.json b/packages/config/package.json index 9f64f22f..5c5bf473 100644 --- a/packages/config/package.json +++ b/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", diff --git a/packages/config/tsconfig.json b/packages/config/tsconfig.json index 9b3affae..f492149e 100644 --- a/packages/config/tsconfig.json +++ b/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"] diff --git a/packages/react/package.json b/packages/react/package.json index 17ec07da..3844ee54 100644 --- a/packages/react/package.json +++ b/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" } diff --git a/packages/react/rollup.config.ts b/packages/react/rollup.config.ts index a02643ec..7aae91bb 100644 --- a/packages/react/rollup.config.ts +++ b/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"]); diff --git a/packages/react/src/index.tsx b/packages/react/src/index.tsx index 71edb36c..22cccec0 100644 --- a/packages/react/src/index.tsx +++ b/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 { rspc?: { diff --git a/packages/react/src/v2.tsx b/packages/react/src/v2.tsx index 6adf0546..5722c7af 100644 --- a/packages/react/src/v2.tsx +++ b/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]; diff --git a/packages/react/tsconfig.json b/packages/react/tsconfig.json index 6ab40bfc..0230cd50 100644 --- a/packages/react/tsconfig.json +++ b/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"] diff --git a/packages/solid/package.json b/packages/solid/package.json index 9db1d886..73f2344f 100644 --- a/packages/solid/package.json +++ b/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" } diff --git a/packages/solid/src/index.tsx b/packages/solid/src/index.tsx index 9fc718c1..4db13573 100644 --- a/packages/solid/src/index.tsx +++ b/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, diff --git a/packages/solid/tsconfig.json b/packages/solid/tsconfig.json index 78e36e1f..e0991d18 100644 --- a/packages/solid/tsconfig.json +++ b/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", diff --git a/packages/tauri/package.json b/packages/tauri/package.json index 3edc401b..e27cf6a5 100644 --- a/packages/tauri/package.json +++ b/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", diff --git a/packages/tauri/rollup.config.ts b/packages/tauri/rollup.config.ts index 4c931672..349a986f 100644 --- a/packages/tauri/rollup.config.ts +++ b/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"]); diff --git a/packages/tauri/src/index.ts b/packages/tauri/src/index.ts index e0a705ae..9c004a16 100644 --- a/packages/tauri/src/index.ts +++ b/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"; diff --git a/packages/tauri/src/v2.ts b/packages/tauri/src/v2.ts index ebf76b32..0c364b66 100644 --- a/packages/tauri/src/v2.ts +++ b/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"; diff --git a/packages/tauri/tsconfig.json b/packages/tauri/tsconfig.json index 57df5375..4790035f 100644 --- a/packages/tauri/tsconfig.json +++ b/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"] }, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index c1b55ce3..3786a0c9 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -10,13 +10,13 @@ importers: examples/astro: dependencies: - '@oscartbeaumont-sd/client': + '@oscartbeaumont-sd/rspc-client': specifier: workspace:* version: link:../../packages/client - '@oscartbeaumont-sd/react': + '@oscartbeaumont-sd/rspc-react': specifier: workspace:* version: link:../../packages/react - '@oscartbeaumont-sd/solid': + '@oscartbeaumont-sd/rspc-solid': specifier: workspace:* version: link:../../packages/solid '@tanstack/react-query': @@ -44,7 +44,7 @@ importers: '@astrojs/solid-js': specifier: ^2.1.0 version: 2.1.0(@babel/core@7.21.8)(solid-js@1.7.3) - '@oscartbeaumont-sd/config': + '@oscartbeaumont-sd/rspc-config': specifier: workspace:* version: link:../../packages/config '@types/react': @@ -56,7 +56,7 @@ importers: packages/client: devDependencies: - '@oscartbeaumont-sd/config': + '@oscartbeaumont-sd/rspc-config': specifier: workspace:* version: link:../config rollup: @@ -117,10 +117,10 @@ importers: packages/react: devDependencies: - '@oscartbeaumont-sd/client': + '@oscartbeaumont-sd/rspc-client': specifier: workspace:* version: link:../client - '@oscartbeaumont-sd/config': + '@oscartbeaumont-sd/rspc-config': specifier: workspace:* version: link:../config '@tanstack/react-query': @@ -147,10 +147,10 @@ importers: packages/solid: devDependencies: - '@oscartbeaumont-sd/client': + '@oscartbeaumont-sd/rspc-client': specifier: workspace:* version: link:../client - '@oscartbeaumont-sd/config': + '@oscartbeaumont-sd/rspc-config': specifier: workspace:* version: link:../config '@tanstack/solid-query': @@ -177,11 +177,11 @@ importers: packages/tauri: dependencies: - '@oscartbeaumont-sd/client': + '@oscartbeaumont-sd/rspc-client': specifier: workspace:* version: link:../client devDependencies: - '@oscartbeaumont-sd/config': + '@oscartbeaumont-sd/rspc-config': specifier: workspace:* version: link:../config '@tauri-apps/api':