shiply-cli 0.18.0 → 0.18.1

package/dist/bundle.js

@@ -1,58 +1,59 @@
 import { cp, mkdir, mkdtemp, rm, writeFile } from 'node:fs/promises';
 import { tmpdir } from 'node:os';
-import { dirname, join } from 'node:path';
+import { join } from 'node:path';
 import { build } from 'esbuild';
 const BUNDLE_COMPAT_DATE = '2025-05-05';
-/** Stage a temp publish dir: static assets at root, worker modules under
- *  `.shiply/bundle/`, plus `.shiply/bundle.json`. Returns the dir; the caller
- *  removes it after publish. The existing publish pipeline handles the rest. */
+/** Cloudflare runtime built-ins (`cloudflare:workers`, …) and `node:*` (provided
+ *  by `nodejs_compat`) resolve at the edge — they must stay external. Everything
+ *  else, including the framework server code that an adapter's `_worker.js`
+ *  imports from OUTSIDE its output dir, gets inlined. */
+const WORKER_EXTERNALS = ['cloudflare:*', 'node:*'];
+/** esbuild-bundle a worker entry into one self-contained ESM module. */
+async function bundleWorker(entryAbs) {
+    const result = await build({
+        entryPoints: [entryAbs],
+        bundle: true,
+        format: 'esm',
+        platform: 'neutral',
+        target: 'es2022',
+        external: WORKER_EXTERNALS,
+        write: false,
+        logLevel: 'silent',
+    });
+    return result.outputFiles[0].text;
+}
+/** Stage a temp publish dir: a single bundled worker under `.shiply/bundle/`,
+ *  static assets at the root, plus `.shiply/bundle.json`. Returns the dir; the
+ *  caller removes it after publish. The existing publish pipeline handles the rest.
+ *
+ *  BOTH tiers esbuild-bundle the entry. Adapter output (SvelteKit, Astro) is NOT
+ *  self-contained — `_worker.js` imports server code from sibling dirs
+ *  (`../output/server`, `../cloudflare-tmp`) — so we bundle it exactly as
+ *  `wrangler deploy` would, rather than upload it as-is. */
 export async function prepareBundle(sourceDir, ssr) {
     const out = await mkdtemp(join(tmpdir(), 'shiply-bundle-'));
     const bundleDir = join(out, '.shiply', 'bundle');
     await mkdir(bundleDir, { recursive: true });
     if (ssr.tier0) {
-        // Tier 0: esbuild-bundle the worker entry into one ESM module.
-        const result = await build({
-            entryPoints: [join(ssr.assetsDir, ssr.workerMain)],
-            bundle: true,
-            format: 'esm',
-            platform: 'neutral',
-            target: 'es2022',
-            write: false,
-            logLevel: 'silent',
-        });
-        await writeFile(join(bundleDir, 'index.js'), result.outputFiles[0].text);
+        // Tier 0: bundle the wrangler `main` entry; optional static assets dir.
+        await writeFile(join(bundleDir, 'index.js'), await bundleWorker(join(ssr.assetsDir, ssr.workerMain)));
         if (ssr.staticDir) {
             await cp(join(sourceDir, ssr.staticDir), out, { recursive: true });
         }
-        await writeManifest(out, {
-            framework: ssr.framework,
-            entry: 'index.js',
-            modules: ['index.js'],
-            compatibilityDate: ssr.compatibilityDate ?? BUNDLE_COMPAT_DATE,
-            compatibilityFlags: ssr.compatibilityFlags,
-        });
-        return out;
-    }
-    // Tier 1: copy the whole assets dir, then RELOCATE worker modules into
-    // .shiply/bundle/ so they aren't double-served as static assets.
-    await cp(ssr.assetsDir, out, { recursive: true });
-    for (const m of ssr.modules) {
-        const from = join(out, m);
-        const to = join(bundleDir, m);
-        await mkdir(dirname(to), { recursive: true });
-        await cp(from, to, { recursive: true });
-        await rm(from, { recursive: true, force: true });
     }
-    // If the entry lived in a worker subdir (Astro's _worker.js/), drop the
-    // original subdir entirely so no leftover files are served as assets.
-    if (ssr.entry.includes('/')) {
+    else {
+        // Tier 1: bundle the adapter's worker entry into one module, then copy the
+        // rest of the output dir as static assets (minus the now-bundled entry).
+        await writeFile(join(bundleDir, 'index.js'), await bundleWorker(join(ssr.assetsDir, ssr.entry)));
+        await cp(ssr.assetsDir, out, { recursive: true });
+        // Drop the original worker entry (file, or Astro's `_worker.js/` dir) so it
+        // isn't double-served as a static asset.
         await rm(join(out, ssr.entry.split('/')[0]), { recursive: true, force: true });
     }
     await writeManifest(out, {
         framework: ssr.framework,
-        entry: ssr.entry,
-        modules: ssr.modules,
+        entry: 'index.js',
+        modules: ['index.js'],
         compatibilityDate: ssr.compatibilityDate ?? BUNDLE_COMPAT_DATE,
         compatibilityFlags: ssr.compatibilityFlags,
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "shiply-cli",
-  "version": "0.18.0",
+  "version": "0.18.1",
   "description": "Publish static sites to shiply.now from the command line — instant web hosting for agents.",
   "license": "MIT",
   "type": "module",