@b9g/shovel 0.2.0-beta.4 → 0.2.0-beta.6

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 } from "fs/promises";
+import { existsSync } from "fs";
+import { resolve, join, dirname as dirname2 } from "path";
+import { mkdir, unlink } from "fs/promises";
 import { assetsPlugin } from "@b9g/assets/plugin";
 
 // src/esbuild/import-meta-plugin.ts
@@ -80,23 +80,38 @@ 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;
-  #initialBuildComplete = false;
-  #initialBuildSuccess = false;
+  #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 true if initial build succeeded, false if it failed
+   * @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) => {
@@ -108,9 +123,10 @@ var Watcher = class {
       format: "esm",
       target: "es2022",
       platform: "node",
-      outfile: `${outputDir}/server/app.js`,
-      // No packages: "external" - bundle everything for dev/prod parity
-      absWorkingDir: workspaceRoot,
+      outdir: `${outputDir}/server`,
+      entryNames: "[name]-[hash]",
+      metafile: true,
+      absWorkingDir: this.#projectRoot,
       plugins: [
         importMetaPlugin(),
         assetsPlugin({
@@ -125,20 +141,41 @@ var Watcher = class {
                 entrypoint: this.#options.entrypoint
               });
             });
-            build2.onEnd((result) => {
-              const version = Date.now();
+            build2.onEnd(async (result) => {
               const success = result.errors.length === 0;
+              let outputPath = "";
+              if (result.metafile) {
+                const outputs = Object.keys(result.metafile.outputs);
+                const jsOutput = outputs.find((p) => p.endsWith(".js"));
+                if (jsOutput) {
+                  outputPath = resolve(this.#projectRoot, jsOutput);
+                }
+              }
               if (success) {
-                logger.info("Build complete", { version });
+                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.#initialBuildSuccess = success;
-                this.#initialBuildResolve?.(success);
+                this.#initialBuildResolve?.({ success, entrypoint: outputPath });
               } else {
-                this.#options.onBuild?.(success, version);
+                this.#options.onBuild?.(success, outputPath);
               }
             });
           }
@@ -161,23 +198,6 @@ 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
@@ -224,21 +244,20 @@ async function developCommand(entrypoint, options) {
     const watcher = new Watcher({
       entrypoint,
       outDir,
-      onBuild: async (success, version) => {
+      onBuild: async (success, builtEntrypoint2) => {
         if (success && serviceWorker) {
-          logger2.info("Reloading Workers", { version });
+          logger2.info("Reloading Workers", { entrypoint: builtEntrypoint2 });
           if (platformInstance && typeof platformInstance.reloadWorkers === "function") {
-            await platformInstance.reloadWorkers(version);
+            await platformInstance.reloadWorkers(builtEntrypoint2);
           }
           logger2.info("Workers reloaded", {});
         }
       }
     });
-    const buildSuccess = await watcher.start();
+    const { success: buildSuccess, entrypoint: builtEntrypoint } = await watcher.start();
     if (!buildSuccess) {
       logger2.error("Initial build failed, watching for changes to retry", {});
     }
-    const builtEntrypoint = `${outDir}/server/app.js`;
     serviceWorker = await platformInstance.loadServiceWorker(builtEntrypoint, {
       hotReload: true,
       workerCount
@@ -526,6 +545,11 @@ async function createBuildConfig({
         absWorkingDir: workspaceRoot || dirname3(entryPath),
         mainFields: ["module", "main"],
         conditions: ["import", "module"],
+        // Allow user code to import @b9g packages from shovel's packages directory
+        nodePaths: [
+          join2(shovelRoot, "packages"),
+          join2(shovelRoot, "node_modules")
+        ],
         plugins: [
           importMetaPlugin(),
           assetsPlugin2({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@b9g/shovel",
-  "version": "0.2.0-beta.4",
+  "version": "0.2.0-beta.6",
   "description": "ServiceWorker-first universal deployment platform. Write ServiceWorker apps once, deploy anywhere (Node/Bun/Cloudflare). Registry-based multi-app orchestration.",
   "license": "MIT",
   "bin": {
@@ -21,30 +21,30 @@
     "source-map": "^0.7.4"
   },
   "devDependencies": {
-    "@b9g/assets": "^0.1.9",
+    "@b9g/assets": "^0.1.13",
     "@b9g/cache": "^0.1.4",
     "@b9g/crank": "^0.7.2",
-    "@b9g/filesystem": "^0.1.5",
-    "@b9g/http-errors": "^0.1.4",
+    "@b9g/filesystem": "^0.1.6",
+    "@b9g/http-errors": "^0.1.5",
     "@b9g/libuild": "^0.1.17",
-    "@b9g/platform": "^0.1.7",
-    "@b9g/platform-bun": "^0.1.6",
-    "@b9g/platform-cloudflare": "^0.1.5",
-    "@b9g/platform-node": "^0.1.8",
-    "@b9g/router": "^0.1.6",
+    "@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.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.7",
-    "@b9g/platform-node": "^0.1.8",
-    "@b9g/platform-cloudflare": "^0.1.5",
-    "@b9g/platform-bun": "^0.1.6",
+    "@b9g/platform": "^0.1.9",
+    "@b9g/platform-node": "^0.1.9",
+    "@b9g/platform-cloudflare": "^0.1.6",
+    "@b9g/platform-bun": "^0.1.7",
     "@b9g/cache": "^0.1.4",
-    "@b9g/filesystem": "^0.1.5",
-    "@b9g/http-errors": "^0.1.4"
+    "@b9g/filesystem": "^0.1.6",
+    "@b9g/http-errors": "^0.1.5"
   },
   "peerDependenciesMeta": {
     "@b9g/platform": {