From 249944bc66c9376c27b6fa8077bd23154651cba4 Mon Sep 17 00:00:00 2001 From: Tsiry Sandratraina Date: Mon, 6 Oct 2025 15:28:47 +0300 Subject: [PATCH 1/2] feat: update workspace configuration and remove deprecated scripts --- Cargo.toml | 1 - README.md | 15 ++++++++++----- crates/package.json | 16 ---------------- package.json | 2 +- turbo.json | 44 -------------------------------------------- 5 files changed, 11 insertions(+), 67 deletions(-) delete mode 100644 crates/package.json diff --git a/Cargo.toml b/Cargo.toml index a39e4000..5851da97 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,5 +1,4 @@ [workspace] -default-members = ["crates/*"] members = ["crates/*"] resolver = "2" diff --git a/README.md b/README.md index 9a5afee3..192e4c25 100644 --- a/README.md +++ b/README.md @@ -86,15 +86,20 @@ A decentralized music tracking and discovery platform built on the AT Protocol ```bash turbo db:migrate --filter=@rocksky/api ``` -6. Start Analytics API: +6. Populate database (Optional): ```bash - turbo dev:analytics + bun run db:pgpull ``` -7. Start jetstream: + +7. Start Analytics API: + ```bash + bun run dev:analytics + ``` +8. Start jetstream: ```bash - turbo dev:jetstream + bun run dev:jetstream ``` -8. Start the development server: +9. Start the development server: ```bash turbo dev --filter=@rocksky/api --filter=@rocksky/web ``` diff --git a/crates/package.json b/crates/package.json deleted file mode 100644 index 71ac8ce4..00000000 --- a/crates/package.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "name": "@rocksky/crates", - "scripts": { - "dev:analytics": "cargo run -p rockskyd --release -- analytics serve", - "dev:connect": "cargo run -p rocksky-connect --release", - "dev:dropbox": "cargo run -p rockskyd --release -- dropbox serve", - "dev:googledrive": "cargo run -p rockskyd --release -- googledrive serve", - "dev:jetstream": "cargo run -p rockskyd --release -- jetstream", - "dev:playlists": "cargo run -p rockskyd --release -- playlist", - "dev:scrobbler": "cargo run -p rockskyd --release -- scrobbler", - "dev:spotify": "cargo run -p rockskyd --release -- spotify", - "dev:storage": "cargo run -p rocksky-storage --release -- serve", - "dev:webscrobbler": "cargo run -p rockskyd --release -- webscrobbler", - "dev:tracklist": "cargo run -p rockskyd --release -- tracklist" - } -} \ No newline at end of file diff --git a/package.json b/package.json index b47c7823..cd4ddcbd 100644 --- a/package.json +++ b/package.json @@ -26,7 +26,7 @@ "dev:storage": "cargo run -p rocksky-storage --release -- serve", "dev:webscrobbler": "cargo run -p rockskyd --release -- webscrobbler", "dev:tracklist": "cargo run -p rockskyd --release -- tracklist", - "build:raichu": "cd crates/raichu && wasm-pack build --release --target web && cp -r pkg ../../apps/web/src" + "db:pgpull": "cargo run -p rockskyd --release -- pull && rm -f rocksky-analytics.ddb* rocksky-feed.ddb* && curl -o rocksky-analytics.ddb https://backup.rocksky.app/rocksky-analytics.ddb && curl -o rocksky-feed.ddb https://backup.rocksky.app/rocksky-feed.ddb" }, "workspaces": [ "apps/api", diff --git a/turbo.json b/turbo.json index b1b62ea6..ef7ee504 100644 --- a/turbo.json +++ b/turbo.json @@ -89,50 +89,6 @@ "outputs": [ "./coverage/**" ] - }, - "dev:analytics": { - "persistent": false, - "cache": false - }, - "dev:connect": { - "persistent": false, - "cache": false - }, - "dev:dropbox": { - "persistent": false, - "cache": false - }, - "dev:googledrive": { - "persistent": false, - "cache": false - }, - "dev:jetstream": { - "persistent": false, - "cache": false - }, - "dev:playlists": { - "persistent": false, - "cache": false - }, - "dev:scrobbler": { - "persistent": false, - "cache": false - }, - "dev:spotify": { - "persistent": false, - "cache": false - }, - "dev:storage": { - "persistent": false, - "cache": false - }, - "dev:webscrobbler": { - "persistent": false, - "cache": false - }, - "dev:tracklist": { - "persistent": false, - "cache": false } } } \ No newline at end of file -- 2.51.2 From b1116c94eb91852299c257c7ed43a2b08c59e00d Mon Sep 17 00:00:00 2001 From: Tsiry Sandratraina Date: Mon, 6 Oct 2025 15:33:32 +0300 Subject: [PATCH 2/2] fix: remove redundant entry from workspaces in package.json --- package.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package.json b/package.json index cd4ddcbd..d6ee5795 100644 --- a/package.json +++ b/package.json @@ -37,7 +37,6 @@ "apps/doc", "apps/spotify-proxy", "apps/uploads", - "apps/xata-proxy", - "crates" + "apps/xata-proxy" ] } \ No newline at end of file -- 2.51.2