@b9g/shovel 0.2.0-beta.5 → 0.2.0-beta.7

package/bin/cli.js

@@ -23,9 +23,9 @@ import * as Platform from "@b9g/platform";
 
 // src/esbuild/watcher.ts
 import * as ESBuild from "esbuild";
-import { resolve, dirname as dirname2, join } from "path";
-import { readFileSync } from "fs";
-import { mkdir, unlink } from "fs/promises";
+import { existsSync } from "fs";
+import { resolve, join, dirname as dirname2 } from "path";
+import { mkdir } from "fs/promises";
 import { assetsPlugin } from "@b9g/assets/plugin";
 
 // src/esbuild/import-meta-plugin.ts
@@ -80,27 +80,36 @@ function importMetaPlugin() {
 // src/esbuild/watcher.ts
 import { getLogger } from "@logtape/logtape";
 var logger = getLogger(["watcher"]);
+function findProjectRoot() {
+  let dir = process.cwd();
+  while (dir !== dirname2(dir)) {
+    if (existsSync(join(dir, "package.json"))) {
+      return dir;
+    }
+    dir = dirname2(dir);
+  }
+  return process.cwd();
+}
 var Watcher = class {
   #options;
   #ctx;
+  #projectRoot;
   #initialBuildComplete;
   #initialBuildResolve;
   #currentEntrypoint;
-  #previousEntrypoint;
   constructor(options) {
     this.#options = options;
+    this.#projectRoot = findProjectRoot();
     this.#initialBuildComplete = false;
     this.#currentEntrypoint = "";
-    this.#previousEntrypoint = "";
   }
   /**
    * Start watching and building
    * @returns Result with success status and the hashed entrypoint path
    */
   async start() {
-    const entryPath = resolve(this.#options.entrypoint);
-    const outputDir = resolve(this.#options.outDir);
-    const workspaceRoot = this.#findWorkspaceRoot();
+    const entryPath = resolve(this.#projectRoot, this.#options.entrypoint);
+    const outputDir = resolve(this.#projectRoot, this.#options.outDir);
     await mkdir(join(outputDir, "server"), { recursive: true });
     await mkdir(join(outputDir, "static"), { recursive: true });
     const initialBuildPromise = new Promise((resolve3) => {
@@ -115,7 +124,7 @@ var Watcher = class {
       outdir: `${outputDir}/server`,
       entryNames: "[name]-[hash]",
       metafile: true,
-      absWorkingDir: workspaceRoot,
+      absWorkingDir: this.#projectRoot,
       plugins: [
         importMetaPlugin(),
         assetsPlugin({
@@ -137,34 +146,20 @@ var Watcher = class {
                 const outputs = Object.keys(result.metafile.outputs);
                 const jsOutput = outputs.find((p) => p.endsWith(".js"));
                 if (jsOutput) {
-                  outputPath = resolve(jsOutput);
+                  outputPath = resolve(this.#projectRoot, jsOutput);
                 }
               }
               if (success) {
                 logger.info("Build complete", { entrypoint: outputPath });
-                if (this.#currentEntrypoint && this.#currentEntrypoint !== outputPath) {
-                  try {
-                    await unlink(this.#currentEntrypoint);
-                    await unlink(this.#currentEntrypoint + ".map").catch(
-                      () => {
-                      }
-                    );
-                    logger.debug("Cleaned up old build", {
-                      oldEntrypoint: this.#currentEntrypoint
-                    });
-                  } catch {
-                  }
-                }
               } else {
                 logger.error("Build errors", { errors: result.errors });
               }
-              this.#previousEntrypoint = this.#currentEntrypoint;
               this.#currentEntrypoint = outputPath;
               if (!this.#initialBuildComplete) {
                 this.#initialBuildComplete = true;
                 this.#initialBuildResolve?.({ success, entrypoint: outputPath });
               } else {
-                this.#options.onBuild?.(success, outputPath);
+                await this.#options.onBuild?.(success, outputPath);
               }
             });
           }
@@ -187,27 +182,9 @@ var Watcher = class {
       this.#ctx = void 0;
     }
   }
-  #findWorkspaceRoot() {
-    const initialCwd = process.cwd();
-    let workspaceRoot = initialCwd;
-    while (workspaceRoot !== dirname2(workspaceRoot)) {
-      try {
-        const packageJSON = JSON.parse(
-          readFileSync(resolve(workspaceRoot, "package.json"), "utf8")
-        );
-        if (packageJSON.workspaces) {
-          return workspaceRoot;
-        }
-      } catch {
-      }
-      workspaceRoot = dirname2(workspaceRoot);
-    }
-    return initialCwd;
-  }
 };
 
 // src/commands/develop.ts
-var logger2 = getLogger2(["cli"]);
 await configure({
   contextLocalStorage: new AsyncContext.Variable(),
   sinks: {
@@ -226,6 +203,7 @@ await configure({
     { category: ["worker"], level: "debug", sinks: ["console"] }
   ]
 });
+var logger2 = getLogger2(["cli"]);
 async function developCommand(entrypoint, options) {
   try {
     const platformName = Platform.resolvePlatform(options);
@@ -374,7 +352,6 @@ import { configure as configure2, getConsoleSink as getConsoleSink2, getLogger a
 import { AsyncContext as AsyncContext2 } from "@b9g/async-context";
 await configure2({
   reset: true,
-  // Allow reconfiguration if already configured
   contextLocalStorage: new AsyncContext2.Variable(),
   sinks: {
     console: getConsoleSink2()

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@b9g/shovel",
-  "version": "0.2.0-beta.5",
+  "version": "0.2.0-beta.7",
   "description": "ServiceWorker-first universal deployment platform. Write ServiceWorker apps once, deploy anywhere (Node/Bun/Cloudflare). Registry-based multi-app orchestration.",
   "license": "MIT",
   "bin": {
@@ -21,27 +21,27 @@
     "source-map": "^0.7.4"
   },
   "devDependencies": {
-    "@b9g/assets": "^0.1.12",
+    "@b9g/assets": "^0.1.13",
     "@b9g/cache": "^0.1.4",
     "@b9g/crank": "^0.7.2",
     "@b9g/filesystem": "^0.1.6",
     "@b9g/http-errors": "^0.1.5",
     "@b9g/libuild": "^0.1.17",
-    "@b9g/platform": "^0.1.9",
-    "@b9g/platform-bun": "^0.1.7",
-    "@b9g/platform-cloudflare": "^0.1.6",
-    "@b9g/platform-node": "^0.1.9",
-    "@b9g/router": "^0.1.7",
+    "@b9g/platform": "^0.1.10",
+    "@b9g/platform-bun": "^0.1.8",
+    "@b9g/platform-cloudflare": "^0.1.7",
+    "@b9g/platform-node": "^0.1.10",
+    "@b9g/router": "^0.1.8",
     "@types/bun": "^1.2.2",
     "mitata": "^1.0.34",
     "typescript": "^5.7.3"
   },
   "peerDependencies": {
     "@b9g/node-webworker": "^0.1.3",
-    "@b9g/platform": "^0.1.9",
-    "@b9g/platform-node": "^0.1.9",
-    "@b9g/platform-cloudflare": "^0.1.6",
-    "@b9g/platform-bun": "^0.1.7",
+    "@b9g/platform": "^0.1.10",
+    "@b9g/platform-node": "^0.1.10",
+    "@b9g/platform-cloudflare": "^0.1.7",
+    "@b9g/platform-bun": "^0.1.8",
     "@b9g/cache": "^0.1.4",
     "@b9g/filesystem": "^0.1.6",
     "@b9g/http-errors": "^0.1.5"