@b9g/shovel 0.2.0-beta.11 → 0.2.0-beta.12

package/CHANGELOG.md

@@ -124,8 +124,7 @@ router.use(cors({ origin: "https://example.com" }));
 ### CLI Changes
 
 - `shovel develop` - Development server with hot reload (note: `dev` alias removed)
-- `shovel build` - Production build
-- `shovel activate` - Static site generation
+- `shovel build` - Production build (use `--lifecycle` flag to run lifecycle events)
 - Removed `--verbose` flags (use logging config instead)
 
 ### Infrastructure

package/README.md

@@ -5,6 +5,7 @@
 Shovel is a CLI platform for developing and deploying service workers as application servers.
 
 ```javascript
+// src/server.ts
 import {Router} from "@b9g/router";
 const router = new Router();
 
@@ -16,12 +17,12 @@ self.addEventListener("fetch", (ev) => {
 ```
 
 ```bash
-shovel develop app.js
+shovel develop src/server.ts
 ```
 ## Quick Start
 
 ```javascript
-// app.js
+// src/server.js
 import {Router} from "@b9g/router";
 
 const router = new Router();
@@ -42,12 +43,12 @@ self.addEventListener("fetch", (event) => {
 npm create @b9g/shovel my-app
 
 # Development with hot reload
-npx @b9g/shovel develop app.js
+npx @b9g/shovel develop src/server.ts
 
 # Build for production
-npx @b9g/shovel build app.js --platform=node
-npx @b9g/shovel build app.js --platform=bun
-npx @b9g/shovel build app.js --platform=cloudflare
+npx @b9g/shovel build src/server.ts --platform=node
+npx @b9g/shovel build src/server.ts --platform=bun
+npx @b9g/shovel build src/server.ts --platform=cloudflare
 ```
 
 
@@ -57,7 +58,7 @@ Shovel is obsessively standards-first. All Shovel APIs use web standards, and Sh
   | API | Standard | Purpose |
   |-----|----------|--------------|
   | `fetch()` | [Fetch](https://fetch.spec.whatwg.org) | Networking |
-  | `"install"`, `"activate"`, `"fetch"` events | [Service Workers](https://w3c.github.io/ServiceWorker/) | Server lifecycle |
+  | `install`, `activate`, `fetch` events | [Service Workers](https://w3c.github.io/ServiceWorker/) | Server lifecycle |
   | `AsyncContext.Variable` | [TC39 Stage 2](https://github.com/tc39/proposal-async-context) | Request-scoped state |
   | `self.caches` | [Cache API](https://w3c.github.io/ServiceWorker/#cache-interface) | Response caching |
   | `self.directories` | [FileSystem API](https://fs.spec.whatwg.org/) | Storage (local, S3, R2) |
@@ -92,13 +93,12 @@ Each storage type is:
 - **Configured uniformly** - all are configured by `shovel.json`
 - **Platform-aware** - sensible defaults per platform, override what you need
 
-This pattern means your app logic stays clean. Swap Redis for memory cache, S3 for local filesystem, Postgres for SQLite - change the config, not the code.
-
+This pattern means your app logic stays clean. Swap in Redis for caches, S3 for local filesystem, Postgres for SQLite - change the config, not the code.
 
 ## Platform APIs
 
 ```javascript
-// Cache API - response caching
+// Cache API - Request/Response-based caching
 const cache = await self.caches.open("my-cache");
 await cache.put(request, response.clone());
 const cached = await cache.match(request);
@@ -124,8 +124,8 @@ requestId.run(crypto.randomUUID(), async () => {
 Import any file and get its production URL with content hashing:
 
 ```javascript
-import styles from "./styles.css" with { assetBase: "/assets" };
-import logo from "./logo.png" with { assetBase: "/assets" };
+import styles from "./styles.css" with {assetBase: "/assets"};
+import logo from "./logo.png" with {assetBase: "/assets"};
 
 // styles = "/assets/styles-a1b2c3d4.css"
 // logo = "/assets/logo-e5f6g7h8.png"
@@ -137,8 +137,8 @@ At build time, Shovel:
 - Transforms imports to return the final URLs
 
 Assets are served via the platform's best option:
-- **Cloudflare**: Workers Assets (edge-cached, zero config)
 - **Node/Bun**: Static file middleware or directory storage
+- **Cloudflare**: Workers Assets (edge-cached, zero config)
 
 ## Configuration
 

package/bin/cli.d.ts

@@ -1,2 +1 @@
-#!/usr/bin/env sh
 export {};

package/bin/cli.js

@@ -5,10 +5,11 @@ import {
   DEFAULTS,
   findProjectRoot,
   loadConfig
-} from "../src/_chunks/chunk-GRAFMTEH.js";
+} from "../src/_chunks/chunk-PTLNYIRW.js";
 
 // bin/cli.ts
 import { resolve } from "path";
+import { spawnSync } from "child_process";
 import { configureLogging } from "@b9g/platform/runtime";
 import { Command } from "commander";
 import pkg from "../package.json" with { type: "json" };
@@ -36,27 +37,39 @@ await configureLogging({
 });
 var program = new Command();
 program.name("shovel").description("Shovel CLI").version(pkg.version);
+function checkPlatformReexec(options) {
+  const platform = options.platform ?? config.platform;
+  const isBun = typeof globalThis.Bun !== "undefined";
+  if (platform === "bun" && !isBun) {
+    const result = spawnSync("bun", process.argv.slice(1), { stdio: "inherit" });
+    process.exit(result.status ?? 1);
+  }
+  if (platform === "node" && isBun) {
+    const result = Bun.spawnSync(["node", ...process.argv.slice(1)], {
+      stdout: "inherit",
+      stderr: "inherit",
+      stdin: "inherit"
+    });
+    process.exit(result.exitCode ?? 1);
+  }
+}
 program.command("develop <entrypoint>").description("Start development server with hot reload").option("-p, --port <port>", "Port to listen on", DEFAULTS.SERVER.PORT).option("-h, --host <host>", "Host to bind to", DEFAULTS.SERVER.HOST).option(
   "-w, --workers <count>",
   "Number of workers (default: CPU cores)",
   DEFAULTS.WORKERS
 ).option("--platform <name>", "Runtime platform (node, cloudflare, bun)").action(async (entrypoint, options) => {
-  const { developCommand } = await import("../src/_chunks/develop-A7EU2ZDY.js");
+  checkPlatformReexec(options);
+  const { developCommand } = await import("../src/_chunks/develop-2R6YVDI7.js");
   await developCommand(entrypoint, options, config);
 });
-program.command("build <entrypoint>").description("Build app for production").option("-w, --workers <count>", "Worker count (defaults to 1)", void 0).option("--platform <name>", "Runtime platform (node, cloudflare, bun)").action(async (entrypoint, options) => {
-  const { buildCommand } = await import("../src/_chunks/build-V3IPZGKC.js");
-  await buildCommand(entrypoint, options, config);
-});
-program.command("activate <entrypoint>").description(
-  "Activate ServiceWorker (for static site generation in activate event)"
-).option("--platform <name>", "Runtime platform (node, cloudflare, bun)").option(
-  "-w, --workers <count>",
-  "Number of workers",
-  DEFAULTS.WORKERS.toString()
+program.command("build <entrypoint>").description("Build app for production").option("--platform <name>", "Runtime platform (node, cloudflare, bun)").option(
+  "--lifecycle [stage]",
+  "Run ServiceWorker lifecycle after build (install or activate, default: activate)"
 ).action(async (entrypoint, options) => {
-  const { activateCommand } = await import("../src/_chunks/activate-TP6RQP47.js");
-  await activateCommand(entrypoint, options, config);
+  checkPlatformReexec(options);
+  const { buildCommand } = await import("../src/_chunks/build-CZHJ4EAF.js");
+  await buildCommand(entrypoint, options, config);
+  process.exit(0);
 });
 program.command("info").description("Display platform and runtime information").action(async () => {
   const { infoCommand } = await import("../src/_chunks/info-TDUY3FZN.js");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@b9g/shovel",
-  "version": "0.2.0-beta.11",
+  "version": "0.2.0-beta.12",
   "description": "ServiceWorker-first universal deployment platform. Write ServiceWorker apps once, deploy anywhere (Node/Bun/Cloudflare). Registry-based multi-app orchestration.",
   "license": "MIT",
   "bin": {
@@ -27,13 +27,13 @@
     "@b9g/cache": "^0.2.0-beta.0",
     "@b9g/crank": "^0.7.2",
     "@logtape/file": "^1.0.0",
-    "@b9g/filesystem": "^0.1.7",
+    "@b9g/filesystem": "^0.1.8",
     "@b9g/http-errors": "^0.2.0-beta.0",
     "@b9g/libuild": "^0.1.22",
-    "@b9g/platform": "^0.1.12",
-    "@b9g/platform-bun": "^0.1.10",
-    "@b9g/platform-cloudflare": "^0.1.10",
-    "@b9g/platform-node": "^0.1.12",
+    "@b9g/platform": "^0.1.13",
+    "@b9g/platform-bun": "^0.1.11",
+    "@b9g/platform-cloudflare": "^0.1.11",
+    "@b9g/platform-node": "^0.1.13",
     "@b9g/router": "^0.2.0-beta.1",
     "@types/bun": "^1.3.4",
     "@typescript-eslint/eslint-plugin": "^8.0.0",
@@ -46,12 +46,12 @@
   },
   "peerDependencies": {
     "@b9g/node-webworker": "^0.2.0-beta.1",
-    "@b9g/platform": "^0.1.12",
-    "@b9g/platform-node": "^0.1.12",
-    "@b9g/platform-cloudflare": "^0.1.10",
-    "@b9g/platform-bun": "^0.1.10",
+    "@b9g/platform": "^0.1.13",
+    "@b9g/platform-node": "^0.1.13",
+    "@b9g/platform-cloudflare": "^0.1.11",
+    "@b9g/platform-bun": "^0.1.11",
     "@b9g/cache": "^0.2.0-beta.0",
-    "@b9g/filesystem": "^0.1.7",
+    "@b9g/filesystem": "^0.1.8",
     "@b9g/http-errors": "^0.2.0-beta.0"
   },
   "peerDependenciesMeta": {

package/src/_chunks/build-CZHJ4EAF.js

@@ -0,0 +1,159 @@
+import {
+  ServerBundler
+} from "./chunk-4DKAY5MA.js";
+import {
+  findProjectRoot,
+  findWorkspaceRoot
+} from "./chunk-PTLNYIRW.js";
+
+// src/commands/build.ts
+import { resolve, join, dirname } from "path";
+import { getLogger } from "@logtape/logtape";
+import * as Platform from "@b9g/platform";
+import { readFile, writeFile } from "fs/promises";
+var logger = getLogger(["shovel"]);
+async function buildForProduction({
+  entrypoint,
+  outDir,
+  platform = "node",
+  userBuildConfig,
+  lifecycle
+}) {
+  const entryPath = resolve(entrypoint);
+  const outputDir = resolve(outDir);
+  const serverDir = join(outputDir, "server");
+  const projectRoot = findProjectRoot(dirname(entryPath));
+  logger.debug("Entry:", { entryPath });
+  logger.debug("Output:", { outputDir });
+  logger.debug("Target platform:", { platform });
+  logger.debug("Project root:", { projectRoot });
+  const platformInstance = await Platform.createPlatform(platform);
+  const platformESBuildConfig = platformInstance.getESBuildConfig();
+  const bundler = new ServerBundler({
+    entrypoint,
+    outDir,
+    platform: platformInstance,
+    platformESBuildConfig,
+    userBuildConfig,
+    lifecycle
+  });
+  const { success, outputs } = await bundler.build();
+  if (!success) {
+    throw new Error("Build failed");
+  }
+  await generatePackageJSON({ serverDir, platform, entryPath });
+  logger.debug("Built app to", { outputDir });
+  logger.debug("Server files", { dir: serverDir });
+  logger.debug("Public files", { dir: join(outputDir, "public") });
+  logger.info("Build complete: {path}", {
+    path: outputs.index || outputs.worker
+  });
+  return {
+    platform: platformInstance,
+    workerPath: outputs.worker
+  };
+}
+async function generatePackageJSON({
+  serverDir,
+  platform,
+  entryPath
+}) {
+  const entryDir = dirname(entryPath);
+  const sourcePackageJsonPath = resolve(entryDir, "package.json");
+  try {
+    const packageJSONContent = await readFile(sourcePackageJsonPath, "utf8");
+    try {
+      JSON.parse(packageJSONContent);
+    } catch (parseError) {
+      throw new Error(`Invalid package.json format: ${parseError}`);
+    }
+    await writeFile(
+      join(serverDir, "package.json"),
+      packageJSONContent,
+      "utf8"
+    );
+    logger.debug("Copied package.json", { serverDir });
+  } catch (error) {
+    logger.debug("Could not copy package.json: {error}", { error });
+    try {
+      const generatedPackageJson = await generateExecutablePackageJSON(platform);
+      await writeFile(
+        join(serverDir, "package.json"),
+        JSON.stringify(generatedPackageJson, null, 2),
+        "utf8"
+      );
+      logger.debug("Generated package.json", { platform });
+    } catch (generateError) {
+      logger.debug("Could not generate package.json: {error}", {
+        error: generateError
+      });
+    }
+  }
+}
+async function generateExecutablePackageJSON(platform) {
+  const packageJSON = {
+    name: "shovel-executable",
+    version: "1.0.0",
+    type: "module",
+    private: true,
+    dependencies: {}
+  };
+  const isWorkspaceEnvironment = findWorkspaceRoot() !== null;
+  if (isWorkspaceEnvironment) {
+    packageJSON.dependencies = {};
+  } else {
+    switch (platform) {
+      case "node":
+        packageJSON.dependencies["@b9g/platform-node"] = "^0.1.0";
+        break;
+      case "bun":
+        packageJSON.dependencies["@b9g/platform-bun"] = "^0.1.0";
+        break;
+      case "cloudflare":
+        packageJSON.dependencies["@b9g/platform-cloudflare"] = "^0.1.0";
+        break;
+      default:
+        packageJSON.dependencies["@b9g/platform"] = "^0.1.0";
+    }
+    packageJSON.dependencies["@b9g/cache"] = "^0.1.0";
+    packageJSON.dependencies["@b9g/filesystem"] = "^0.1.0";
+  }
+  return packageJSON;
+}
+async function buildCommand(entrypoint, options, config) {
+  const platform = Platform.resolvePlatform({ ...options, config });
+  let lifecycleOption;
+  if (options.lifecycle) {
+    const stage = typeof options.lifecycle === "string" ? options.lifecycle : "activate";
+    if (stage !== "install" && stage !== "activate") {
+      throw new Error(
+        `Invalid lifecycle stage: ${stage}. Must be "install" or "activate".`
+      );
+    }
+    lifecycleOption = { stage };
+  }
+  const { platform: platformInstance, workerPath } = await buildForProduction({
+    entrypoint,
+    outDir: "dist",
+    platform,
+    userBuildConfig: config.build,
+    lifecycle: lifecycleOption
+  });
+  if (lifecycleOption) {
+    if (!workerPath) {
+      throw new Error("No worker entry point found in build outputs");
+    }
+    logger.info("Running ServiceWorker lifecycle: {stage}", {
+      stage: lifecycleOption.stage
+    });
+    await platformInstance.serviceWorker.register(workerPath);
+    await platformInstance.serviceWorker.ready;
+    await platformInstance.serviceWorker.terminate();
+    logger.info("Lifecycle complete");
+  }
+  await platformInstance.dispose();
+}
+export {
+  buildCommand,
+  buildForProduction
+};