@b9g/shovel 0.2.0-beta.0 → 0.2.0-beta.2

package/bin/cli.js

@@ -24,10 +24,61 @@ import * as Platform from "@b9g/platform";
 // src/esbuild/watcher.ts
 import * as ESBuild from "esbuild";
 import { watch } from "fs";
-import { resolve, dirname, join } from "path";
+import { resolve, dirname as dirname2, join } from "path";
 import { readFileSync } from "fs";
 import { mkdir } from "fs/promises";
 import { assetsPlugin } from "@b9g/assets/plugin";
+
+// src/esbuild/import-meta-plugin.ts
+import { readFile } from "fs/promises";
+import { dirname } from "path";
+import { pathToFileURL } from "url";
+function importMetaPlugin() {
+  return {
+    name: "import-meta-transform",
+    setup(build3) {
+      build3.onLoad({ filter: /\.[jt]sx?$/, namespace: "file" }, async (args) => {
+        if (args.path.includes("node_modules")) {
+          return null;
+        }
+        const contents = await readFile(args.path, "utf8");
+        if (!contents.includes("import.meta.url") && !contents.includes("import.meta.dirname") && !contents.includes("import.meta.filename")) {
+          return null;
+        }
+        const fileUrl = pathToFileURL(args.path).href;
+        const fileDirname = dirname(args.path);
+        const fileFilename = args.path;
+        let transformed = contents;
+        transformed = transformed.replace(
+          /\bimport\.meta\.url\b/g,
+          JSON.stringify(fileUrl)
+        );
+        transformed = transformed.replace(
+          /\bimport\.meta\.dirname\b/g,
+          JSON.stringify(fileDirname)
+        );
+        transformed = transformed.replace(
+          /\bimport\.meta\.filename\b/g,
+          JSON.stringify(fileFilename)
+        );
+        const ext = args.path.split(".").pop();
+        let loader = "js";
+        if (ext === "ts")
+          loader = "ts";
+        else if (ext === "tsx")
+          loader = "tsx";
+        else if (ext === "jsx")
+          loader = "jsx";
+        return {
+          contents: transformed,
+          loader
+        };
+      });
+    }
+  };
+}
+
+// src/esbuild/watcher.ts
 import { getLogger } from "@logtape/logtape";
 var logger = getLogger(["watcher"]);
 var Watcher = class {
@@ -44,7 +95,7 @@ var Watcher = class {
   async start() {
     const entryPath = resolve(this.#options.entrypoint);
     await this.#build();
-    const watchDir = dirname(entryPath);
+    const watchDir = dirname2(entryPath);
     logger.info("Watching for changes", { watchDir });
     this.#watcher = watch(
       watchDir,
@@ -88,7 +139,7 @@ var Watcher = class {
       const version = Date.now();
       const initialCwd = process.cwd();
       let workspaceRoot = initialCwd;
-      while (workspaceRoot !== dirname(workspaceRoot)) {
+      while (workspaceRoot !== dirname2(workspaceRoot)) {
         try {
           const packageJSON = JSON.parse(
             readFileSync(resolve(workspaceRoot, "package.json"), "utf8")
@@ -98,9 +149,9 @@ var Watcher = class {
           }
         } catch {
         }
-        workspaceRoot = dirname(workspaceRoot);
+        workspaceRoot = dirname2(workspaceRoot);
       }
-      if (workspaceRoot === dirname(workspaceRoot)) {
+      if (workspaceRoot === dirname2(workspaceRoot)) {
         workspaceRoot = initialCwd;
       }
       logger.info("Building", { entryPath });
@@ -117,6 +168,7 @@ var Watcher = class {
         packages: "external",
         absWorkingDir: workspaceRoot,
         plugins: [
+          importMetaPlugin(),
           assetsPlugin({
             outputDir: `${outputDir}/assets`,
             manifest: `${outputDir}/server/asset-manifest.json`
@@ -303,14 +355,10 @@ async function infoCommand() {
 
 // src/commands/build.ts
 import * as ESBuild2 from "esbuild";
-import { resolve as resolve2, join as join2, dirname as dirname2 } from "path";
-import { mkdir as mkdir2, readFile, writeFile } from "fs/promises";
+import { resolve as resolve2, join as join2, dirname as dirname3 } from "path";
+import { mkdir as mkdir2, readFile as readFile2, writeFile } from "fs/promises";
 import { fileURLToPath } from "url";
 import { assetsPlugin as assetsPlugin2 } from "@b9g/assets/plugin";
-import {
-  cloudflareWorkerBanner,
-  cloudflareWorkerFooter
-} from "@b9g/platform-cloudflare";
 import { configure as configure2, getConsoleSink as getConsoleSink2, getLogger as getLogger5 } from "@logtape/logtape";
 import { AsyncContext as AsyncContext2 } from "@b9g/async-context";
 await configure2({
@@ -390,7 +438,7 @@ async function initializeBuild({
   const entryPath = resolve2(entrypoint);
   const outputDir = resolve2(outDir);
   try {
-    const stats = await readFile(entryPath, "utf8");
+    const stats = await readFile2(entryPath, "utf8");
     if (stats.length === 0) {
       logger5.warn("Entry point is empty", { entryPath });
     }
@@ -433,37 +481,37 @@ async function initializeBuild({
 }
 async function findWorkspaceRoot() {
   let workspaceRoot = process.cwd();
-  while (workspaceRoot !== dirname2(workspaceRoot)) {
+  while (workspaceRoot !== dirname3(workspaceRoot)) {
     try {
       const packageJSON = JSON.parse(
-        await readFile(resolve2(workspaceRoot, "package.json"), "utf8")
+        await readFile2(resolve2(workspaceRoot, "package.json"), "utf8")
       );
       if (packageJSON.workspaces) {
         return workspaceRoot;
       }
     } catch {
     }
-    workspaceRoot = dirname2(workspaceRoot);
+    workspaceRoot = dirname3(workspaceRoot);
   }
   return workspaceRoot;
 }
 async function findShovelPackageRoot() {
-  let currentDir = dirname2(fileURLToPath(import.meta.url));
+  let currentDir = dirname3(fileURLToPath(import.meta.url));
   let packageRoot = currentDir;
-  while (packageRoot !== dirname2(packageRoot)) {
+  while (packageRoot !== dirname3(packageRoot)) {
     try {
       const packageJSONPath = join2(packageRoot, "package.json");
-      const content = await readFile(packageJSONPath, "utf8");
+      const content = await readFile2(packageJSONPath, "utf8");
       const pkg2 = JSON.parse(content);
       if (pkg2.name === "@b9g/shovel" || pkg2.name === "shovel") {
         if (packageRoot.endsWith("/dist") || packageRoot.endsWith("\\dist")) {
-          return dirname2(packageRoot);
+          return dirname3(packageRoot);
         }
         return packageRoot;
       }
     } catch {
     }
-    packageRoot = dirname2(packageRoot);
+    packageRoot = dirname3(packageRoot);
   }
   return currentDir;
 }
@@ -492,10 +540,11 @@ async function createBuildConfig({
         target: BUILD_DEFAULTS.target,
         platform: "node",
         outfile: join2(serverDir, "server.js"),
-        absWorkingDir: workspaceRoot || dirname2(entryPath),
+        absWorkingDir: workspaceRoot || dirname3(entryPath),
         mainFields: ["module", "main"],
         conditions: ["import", "module"],
         plugins: [
+          importMetaPlugin(),
           assetsPlugin2({
             outputDir: assetsDir,
             manifest: join2(serverDir, "asset-manifest.json")
@@ -559,10 +608,11 @@ async function createBuildConfig({
         serverDir,
         isCloudflare ? "server.js" : BUILD_DEFAULTS.outputFile
       ),
-      absWorkingDir: workspaceRoot || dirname2(entryPath),
+      absWorkingDir: workspaceRoot || dirname3(entryPath),
       mainFields: ["module", "main"],
       conditions: ["import", "module"],
       plugins: isCloudflare ? [
+        importMetaPlugin(),
         assetsPlugin2({
           outputDir: assetsDir,
           manifest: join2(serverDir, "asset-manifest.json")
@@ -587,6 +637,7 @@ async function createBuildConfig({
   }
 }
 async function configureCloudflareTarget(buildConfig) {
+  const { cloudflareWorkerBanner, cloudflareWorkerFooter } = await import("@b9g/platform-cloudflare");
   buildConfig.platform = "browser";
   buildConfig.conditions = ["worker", "browser"];
   buildConfig.banner = { js: cloudflareWorkerBanner };
@@ -603,20 +654,20 @@ import "${userEntryPath}";
   return await createWorkerEntry(userEntryPath, workerCount, platform);
 }
 async function createWorkerEntry(userEntryPath, workerCount, platform) {
-  let currentDir = dirname2(fileURLToPath(import.meta.url));
+  let currentDir = dirname3(fileURLToPath(import.meta.url));
   let packageRoot = currentDir;
-  while (packageRoot !== dirname2(packageRoot)) {
+  while (packageRoot !== dirname3(packageRoot)) {
     try {
       const packageJSONPath = join2(packageRoot, "package.json");
-      await readFile(packageJSONPath, "utf8");
+      await readFile2(packageJSONPath, "utf8");
       break;
     } catch {
-      packageRoot = dirname2(packageRoot);
+      packageRoot = dirname3(packageRoot);
     }
   }
   let templatePath = join2(packageRoot, "src/worker-entry.ts");
   try {
-    await readFile(templatePath, "utf8");
+    await readFile2(templatePath, "utf8");
   } catch {
     templatePath = join2(packageRoot, "src/worker-entry.js");
   }
@@ -645,10 +696,10 @@ async function logBundleAnalysis(metafile) {
   }
 }
 async function generatePackageJSON({ serverDir, platform, verbose, entryPath }) {
-  const entryDir = dirname2(entryPath);
+  const entryDir = dirname3(entryPath);
   const sourcePackageJsonPath = resolve2(entryDir, "package.json");
   try {
-    const packageJSONContent = await readFile(sourcePackageJsonPath, "utf8");
+    const packageJSONContent = await readFile2(sourcePackageJsonPath, "utf8");
     try {
       JSON.parse(packageJSONContent);
     } catch (parseError) {

package/package.json

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