Skip to content

Commit 10cc85b

Browse files
prk-Jrprk-Jr
authored
Update CLI commands, Cloudflare adapter, and dependency references (#159)
1 parent 5335517 commit 10cc85b

32 files changed

Lines changed: 218 additions & 308 deletions

File tree

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
bin/
33
pkg/
44
target/
5+
.wrangler/
56

67
# env
78
.env

‎Cargo.lock‎

Lines changed: 8 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ Production-ready toolkit for portable edge HTTP workloads. Write once, deploy to
99
cargo install --path crates/edgezero-cli
1010

1111
# Create a new project
12-
edgezero new my-app
12+
edgezero-cli new my-app
1313
cd my-app
1414

1515
# Start the dev server
16-
edgezero dev
16+
edgezero-cli dev
1717

1818
# Test it
1919
curl http://127.0.0.1:8787/

‎crates/edgezero-adapter-axum/src/cli.rs‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,14 +48,14 @@ static AXUM_DEPENDENCIES: &[DependencySpec] = &[
4848
DependencySpec {
4949
key: "dep_edgezero_core_axum",
5050
repo_crate: "crates/edgezero-core",
51-
fallback: "edgezero-core = { git = \"ssh://git@github.com/stackpop/edgezero.git\", package = \"edgezero-core\" }",
51+
fallback: "edgezero-core = { git = \"https://git@github.com/stackpop/edgezero.git\", package = \"edgezero-core\" }",
5252
features: &[],
5353
},
5454
DependencySpec {
5555
key: "dep_edgezero_adapter_axum",
5656
repo_crate: "crates/edgezero-adapter-axum",
5757
fallback:
58-
"edgezero-adapter-axum = { git = \"ssh://git@github.com/stackpop/edgezero.git\", package = \"edgezero-adapter-axum\", default-features = false }",
58+
"edgezero-adapter-axum = { git = \"https://git@github.com/stackpop/edgezero.git\", package = \"edgezero-adapter-axum\", default-features = false }",
5959
features: &["axum"],
6060
},
6161
];
@@ -89,7 +89,10 @@ static AXUM_BLUEPRINT: AdapterBlueprint = AdapterBlueprint {
8989
readme: ReadmeInfo {
9090
description: "{display} adapter entrypoint.",
9191
dev_heading: "{display} (local)",
92-
dev_steps: &["cd {crate_dir}", "cargo run"],
92+
dev_steps: &[
93+
"`cd {crate_dir}`",
94+
"`cargo run` or `edgezero-cli serve --adapter axum`",
95+
],
9396
},
9497
run_module: "edgezero_adapter_axum",
9598
};

‎crates/edgezero-adapter-axum/src/templates/Cargo.toml.hbs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ path = "src/main.rs"
1010

1111
[dependencies]
1212
{{proj_core}} = { path = "../{{proj_core}}" }
13-
{{{dep_edgezero_adapter_axum}}}
14-
edgezero-core = { workspace = true }
1513
anyhow = { workspace = true }
1614
axum = { workspace = true }
15+
{{{dep_edgezero_adapter_axum}}}
16+
edgezero-core = { workspace = true }
1717
log = { workspace = true }
1818
simple_logger = { workspace = true }
1919
tokio = { workspace = true, features = ["macros", "rt-multi-thread"] }

‎crates/edgezero-adapter-cloudflare/src/cli.rs‎

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,10 @@ static CLOUDFLARE_TEMPLATE_REGISTRATIONS: &[TemplateRegistration] = &[
115115
name: "cf_Cargo_toml",
116116
contents: include_str!("templates/Cargo.toml.hbs"),
117117
},
118+
TemplateRegistration {
119+
name: "cf_src_lib_rs",
120+
contents: include_str!("templates/src/lib.rs.hbs"),
121+
},
118122
TemplateRegistration {
119123
name: "cf_src_main_rs",
120124
contents: include_str!("templates/src/main.rs.hbs"),
@@ -134,6 +138,10 @@ static CLOUDFLARE_FILE_SPECS: &[AdapterFileSpec] = &[
134138
template: "cf_Cargo_toml",
135139
output: "Cargo.toml",
136140
},
141+
AdapterFileSpec {
142+
template: "cf_src_lib_rs",
143+
output: "src/lib.rs",
144+
},
137145
AdapterFileSpec {
138146
template: "cf_src_main_rs",
139147
output: "src/main.rs",
@@ -152,21 +160,21 @@ static CLOUDFLARE_DEPENDENCIES: &[DependencySpec] = &[
152160
DependencySpec {
153161
key: "dep_edgezero_core_cloudflare",
154162
repo_crate: "crates/edgezero-core",
155-
fallback: "edgezero-core = { git = \"ssh://git@github.com/stackpop/edgezero.git\", package = \"edgezero-core\", default-features = false }",
163+
fallback: "edgezero-core = { git = \"https://git@github.com/stackpop/edgezero.git\", package = \"edgezero-core\", default-features = false }",
156164
features: &[],
157165
},
158166
DependencySpec {
159167
key: "dep_edgezero_adapter_cloudflare",
160168
repo_crate: "crates/edgezero-adapter-cloudflare",
161169
fallback:
162-
"edgezero-adapter-cloudflare = { git = \"ssh://git@github.com/stackpop/edgezero.git\", package = \"edgezero-adapter-cloudflare\", default-features = false }",
170+
"edgezero-adapter-cloudflare = { git = \"https://git@github.com/stackpop/edgezero.git\", package = \"edgezero-adapter-cloudflare\", default-features = false }",
163171
features: &[],
164172
},
165173
DependencySpec {
166174
key: "dep_edgezero_adapter_cloudflare_wasm",
167175
repo_crate: "crates/edgezero-adapter-cloudflare",
168176
fallback:
169-
"edgezero-adapter-cloudflare = { git = \"ssh://git@github.com/stackpop/edgezero.git\", package = \"edgezero-adapter-cloudflare\", default-features = false, features = [\"cloudflare\"] }",
177+
"edgezero-adapter-cloudflare = { git = \"https://git@github.com/stackpop/edgezero.git\", package = \"edgezero-adapter-cloudflare\", default-features = false, features = [\"cloudflare\"] }",
170178
features: &["cloudflare"],
171179
},
172180
];
@@ -188,9 +196,9 @@ static CLOUDFLARE_BLUEPRINT: AdapterBlueprint = AdapterBlueprint {
188196
build_features: &["cloudflare"],
189197
},
190198
commands: CommandTemplates {
191-
build: "cargo build --release --target wasm32-unknown-unknown -p {crate}",
192-
serve: "wrangler dev --config {crate_dir}/wrangler.toml",
193-
deploy: "wrangler publish --config {crate_dir}/wrangler.toml",
199+
build: "wrangler build --cwd {crate_dir}",
200+
deploy: "wrangler deploy --cwd {crate_dir}",
201+
serve: "wrangler dev --cwd {crate_dir}",
194202
},
195203
logging: LoggingDefaults {
196204
endpoint: None,
@@ -200,7 +208,7 @@ static CLOUDFLARE_BLUEPRINT: AdapterBlueprint = AdapterBlueprint {
200208
readme: ReadmeInfo {
201209
description: "{display} entrypoint.",
202210
dev_heading: "{display} (local)",
203-
dev_steps: &["cd {crate_dir}", "wrangler dev"],
211+
dev_steps: &["`edgezero-cli serve --adapter cloudflare`"],
204212
},
205213
run_module: "edgezero_adapter_cloudflare",
206214
};

‎crates/edgezero-adapter-cloudflare/src/templates/Cargo.toml.hbs‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@ publish = false
88
name = "{{proj_cloudflare}}"
99
path = "src/main.rs"
1010

11+
[lib]
12+
crate-type = ["cdylib", "rlib"]
13+
path = "src/lib.rs"
14+
1115
[features]
1216
default = ["cloudflare"]
1317
cloudflare = ["edgezero-adapter-cloudflare/cloudflare"]
@@ -18,6 +22,6 @@ cloudflare = ["edgezero-adapter-cloudflare/cloudflare"]
1822
edgezero-core = { workspace = true }
1923

2024
[target.'cfg(target_arch = "wasm32")'.dependencies]
21-
{{{dep_edgezero_core_cloudflare}}}
2225
{{{dep_edgezero_adapter_cloudflare_wasm}}}
26+
{{{dep_edgezero_core_cloudflare}}}
2327
worker = { workspace = true }

‎crates/edgezero-adapter-cloudflare/src/templates/src/lib.rs.hbs‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
#![cfg_attr(target_arch = "wasm32", no_main)]
2+
3+
#[cfg(target_arch = "wasm32")]
4+
use worker::*;
5+
#[cfg(target_arch = "wasm32")]
6+
use {{proj_core_mod}}::App;
7+
8+
#[cfg(target_arch = "wasm32")]
9+
#[event(fetch)]
10+
pub async fn main(req: Request, env: Env, ctx: Context) -> Result<Response> {
11+
edgezero_adapter_cloudflare::run_app::<App>(req, env, ctx).await
12+
}

‎crates/edgezero-adapter-cloudflare/src/templates/src/main.rs.hbs‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,3 @@
1-
#![cfg_attr(target_arch = "wasm32", no_main)]
2-
3-
#[cfg(target_arch = "wasm32")]
4-
use worker::*;
5-
#[cfg(target_arch = "wasm32")]
6-
use {{proj_core_mod}}::App;
7-
8-
#[cfg(target_arch = "wasm32")]
9-
#[event(fetch)]
10-
pub async fn main(req: Request, env: Env, ctx: Context) -> Result<Response> {
11-
edgezero_adapter_cloudflare::run_app::<App>(req, env, ctx).await
12-
}
13-
14-
#[cfg(not(target_arch = "wasm32"))]
151
fn main() {
162
eprintln!(
173
"Run `wrangler dev` or target wasm32-unknown-unknown to execute {{proj_cloudflare}}."

‎crates/edgezero-adapter-cloudflare/src/templates/wrangler.toml.hbs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,4 @@ main = "build/worker/shim.mjs"
33
compatibility_date = "2023-05-01"
44

55
[build]
6-
command = "worker-build --release"
7-
6+
command = "worker-build --release"

0 commit comments

Comments
 (0)