Merge pull request #34 from supabase/refactor-crates

fix: use  prefix for custom crates

Author: laktek

Cargo.lock

@@ -3,9 +3,9 @@ members = [
   "./crates/base",
   "./crates/cli",
   "./crates/module_fetcher",
-  "./crates/supa_workers",
-  "./crates/supa_worker_context",
-  "./crates/supa_env",
+  "./crates/sb_workers",
+  "./crates/sb_worker_context",
+  "./crates/sb_env",
   "./crates/sb_core"
 ]
 resolver = "2"

Cargo.toml

@@ -33,9 +33,9 @@ serde = { version = "1.0.149", features = ["derive"] }
 tokio.workspace = true
 url = { version = "2.3.1" }
 v8 = { version = "0.60.1", default-features = false }
-supabase_edge_worker_context = { version = "0.1.0", path = "../supa_worker_context" }
-supabase_edge_workers = { version = "0.1.0", path = "../supa_workers" }
-supabase_edge_env = { version = "0.1.0", path = "../supa_env" }
+sb_worker_context = { version = "0.1.0", path = "../sb_worker_context" }
+sb_workers = { version = "0.1.0", path = "../sb_workers" }
+sb_env = { version = "0.1.0", path = "../sb_env" }
 sb_core = { version = "0.1.0", path = "../sb_core" }
 uuid.workspace = true
 
@@ -66,7 +66,7 @@ serde = { version = "1.0.149", features = ["derive"] }
 tokio.workspace = true
 url = { version = "2.3.1" }
 v8 = { version = "0.60.1", default-features = false }
-supabase_edge_worker_context = { version = "0.1.0", path = "../supa_worker_context" }
-supabase_edge_workers = { version = "0.1.0", path = "../supa_workers" }
-supabase_edge_env = { version = "0.1.0", path = "../supa_env" }
+sb_worker_context = { version = "0.1.0", path = "../sb_worker_context" }
+sb_workers = { version = "0.1.0", path = "../sb_workers" }
+sb_env = { version = "0.1.0", path = "../sb_env" }
 sb_core = { version = "0.1.0", path = "../sb_core" }

crates/base/Cargo.toml

@@ -29,9 +29,9 @@ use sb_core::net::sb_core_net;
 use sb_core::permissions::{sb_core_permissions, Permissions};
 use sb_core::runtime::sb_core_runtime;
 use sb_core::sb_core_main;
-use supabase_edge_env::supabase_env;
-use supabase_edge_worker_context::essentials::UserWorkerMsgs;
-use supabase_edge_workers::supabase_user_workers;
+use sb_env::sb_env;
+use sb_worker_context::essentials::UserWorkerMsgs;
+use sb_workers::sb_user_workers;
 
 fn load_import_map(maybe_path: Option<String>) -> Result<Option<ImportMap>, Error> {
     if let Some(path_str) = maybe_path {
@@ -66,7 +66,7 @@ fn print_import_map_diagnostics(diagnostics: &[ImportMapDiagnostic]) {
 pub struct MainWorker {
     js_runtime: JsRuntime,
     main_module_url: ModuleSpecifier,
-    worker_pool_tx: mpsc::UnboundedSender<supabase_edge_worker_context::essentials::UserWorkerMsgs>,
+    worker_pool_tx: mpsc::UnboundedSender<UserWorkerMsgs>,
 }
 
 impl MainWorker {
@@ -122,8 +122,8 @@ impl MainWorker {
             ),
             deno_http::deno_http::init_ops_and_esm(),
             deno_tls::deno_tls::init_ops_and_esm(),
-            supabase_env::init_ops_and_esm(),
-            supabase_user_workers::init_ops_and_esm(),
+            sb_env::init_ops_and_esm(),
+            sb_user_workers::init_ops_and_esm(),
             sb_core_main::init_ops_and_esm(),
             sb_core_net::init_ops_and_esm(),
             sb_core_http::init_ops_and_esm(),
@@ -269,8 +269,8 @@ impl UserWorker {
             ),
             deno_http::deno_http::init_ops_and_esm(),
             deno_tls::deno_tls::init_ops_and_esm(),
-            supabase_env::init_ops_and_esm(),
-            supabase_user_workers::init_ops_and_esm(),
+            sb_env::init_ops_and_esm(),
+            sb_user_workers::init_ops_and_esm(),
             sb_core_main::init_ops_and_esm(),
             sb_core_net::init_ops_and_esm(),
             sb_core_http::init_ops_and_esm(),

crates/base/src/js_worker.rs

@@ -3,14 +3,12 @@ use crate::js_worker::{MainWorker, UserWorker};
 use anyhow::{bail, Error};
 use hyper::{Body, Request, Response};
 use log::{debug, error};
+use sb_worker_context::essentials::{CreateUserWorkerResult, UserWorkerMsgs, UserWorkerOptions};
 use std::collections::HashMap;
 use std::path::Path;
 use std::path::PathBuf;
 use std::sync::Arc;
 use std::thread;
-use supabase_edge_worker_context::essentials::{
-    CreateUserWorkerResult, UserWorkerMsgs, UserWorkerOptions,
-};
 use tokio::net::UnixStream;
 use tokio::sync::oneshot::Receiver;
 use tokio::sync::RwLock;

crates/base/src/worker_ctx.rs

@@ -22,4 +22,4 @@ deno_http.workspace = true
 hyper.workspace = true
 serde.workspace = true
 bytes.workspace = true
-supabase_edge_worker_context = { version = "0.1.0", path = "../supa_worker_context" }
+sb_worker_context = { version = "0.1.0", path = "../sb_worker_context" }

crates/sb_core/Cargo.toml

@@ -22,8 +22,8 @@ import * as tls from "ext:deno_net/02_tls.js";
 import * as net from "ext:deno_net/01_net.js";
 import * as response from "ext:deno_fetch/23_response.js";
 import * as request from "ext:deno_fetch/23_request.js";
-import { SUPABASE_USER_WORKERS } from "ext:supabase_user_workers/user_workers.js";
-import { SUPABASE_ENV } from "ext:supabase_env/env.js";
+import { SUPABASE_USER_WORKERS } from "ext:sb_user_workers/user_workers.js";
+import { SUPABASE_ENV } from "ext:sb_env/env.js";
 
 
 const core = globalThis.Deno.core;

crates/sb_core/js/bootstrap.js

@@ -1,5 +1,5 @@
 [package]
-name = "supabase_edge_env"
+name = "sb_env"
 version = "0.1.0"
 authors = ["Supabase <team@supabase.com>"]
 edition = "2021"
@@ -13,4 +13,4 @@ path = "lib.rs"
 [dependencies]
 deno_core.workspace = true
 deno_node.workspace = true
-sb_core = { version = "0.1.0", path = "../sb_core" }
+sb_core = { version = "0.1.0", path = "../sb_core" }

crates/supa_env/Cargo.toml crates/sb_env/Cargo.tomlcrates/supa_env/Cargo.toml renamed to crates/sb_env/Cargo.toml

@@ -12,7 +12,7 @@ use std::path::Path;
 pub type EnvVars = HashMap<String, String>;
 
 deno_core::extension!(
-    supabase_env,
+    sb_env,
     ops = [op_set_env, op_env, op_get_env, op_delete_env],
     esm = ["env.js"]
 );