@just-be/deploy 0.7.0 → 0.8.1

package/index.ts

@@ -62,24 +62,13 @@ const DEBUG = process.env.DEBUG === "1" || process.env.DEBUG === "true";
 
 /**
  * Run wrangler command using bunx to ensure it resolves from package dependencies
- * Splits command into array so each part is passed as a separate argument
+ * Takes variable arguments and passes them as separate shell arguments
+ *
+ * @example
+ * wrangler('r2', 'object', 'put', 'bucket/key', '--file', 'path')
  */
-function wrangler(strings: TemplateStringsArray, ...values: unknown[]) {
-  // Build an array by interleaving string parts and values
-  const parts = [];
-  for (let i = 0; i < strings.length; i++) {
-    // Split string part on whitespace and add non-empty parts
-    const words = strings[i].trim().split(/\s+/).filter(Boolean);
-    parts.push(...words);
-
-    // Add the value as a separate argument
-    if (i < values.length) {
-      parts.push(String(values[i]));
-    }
-  }
-
-  // Bun's shell will treat array elements as separate arguments
-  return $`bunx wrangler ${parts}`;
+function wrangler(...args: string[]) {
+  return $`bunx wrangler ${args}`;
 }
 
 /**
@@ -190,7 +179,15 @@ async function findFiles(dir: string): Promise<string[]> {
  */
 async function uploadToR2(localPath: string, r2Key: string): Promise<boolean> {
   try {
-    await wrangler`r2 object put ${BUCKET_NAME}/${r2Key} --file ${localPath}`;
+    await wrangler(
+      "r2",
+      "object",
+      "put",
+      `${BUCKET_NAME}/${r2Key}`,
+      "--file",
+      localPath,
+      "--remote"
+    );
     return true;
   } catch (error) {
     if (DEBUG) {
@@ -211,7 +208,7 @@ async function uploadToR2(localPath: string, r2Key: string): Promise<boolean> {
  */
 async function validateWranglerAuth(): Promise<boolean> {
   try {
-    await wrangler`whoami`.quiet();
+    await wrangler("whoami").quiet();
     return true;
   } catch (error) {
     if (DEBUG) {
@@ -230,7 +227,7 @@ async function validateWranglerAuth(): Promise<boolean> {
  */
 async function validateKVAccess(): Promise<boolean> {
   try {
-    await wrangler`kv key list --namespace-id ${KV_NAMESPACE_ID}`.quiet();
+    await wrangler("kv", "key", "list", "--namespace-id", KV_NAMESPACE_ID, "--remote").quiet();
     return true;
   } catch (error) {
     if (DEBUG) {
@@ -281,7 +278,16 @@ function sanitizeBranchName(branch: string): string {
  */
 async function createKVEntry(subdomain: string, routeConfig: RouteConfig): Promise<void> {
   const configJson = JSON.stringify(routeConfig);
-  await wrangler`kv key put --namespace-id ${KV_NAMESPACE_ID} ${subdomain} ${configJson}`;
+  await wrangler(
+    "kv",
+    "key",
+    "put",
+    "--namespace-id",
+    KV_NAMESPACE_ID,
+    subdomain,
+    configJson,
+    "--remote"
+  );
 }
 
 /**
@@ -472,7 +478,7 @@ async function deploy() {
     console.log("This will open a browser window for you to authorize access.\n");
 
     try {
-      await wrangler`login`;
+      await wrangler("login");
       console.log("\n✓ Successfully authenticated!");
 
       // Verify authentication worked

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@just-be/deploy",
-  "version": "0.7.0",
+  "version": "0.8.1",
   "description": "Deploy static sites to Cloudflare R2 with subdomain routing",
   "type": "module",
   "bin": {