mokup 2.1.1 → 2.2.1

package/dist/vite.mjs

@@ -1,12 +1,14 @@
 import { cwd } from 'node:process';
-import { k as buildManifestData, r as resolveDirs, s as scanRoutes, a as sortRoutes, c as createHonoApp, i as isInDirs, d as createDebouncer, b as buildSwScript, j as createMiddleware, e as resolvePlaygroundOptions, f as resolveSwConfig, g as resolveSwUnregisterConfig, h as createPlaygroundMiddleware } from './shared/mokup.ghra3mzH.mjs';
+import { b as buildBundleModule } from './shared/mokup.vAap-D_L.mjs';
+import { promises, existsSync } from 'node:fs';
+import { join, normalize } from '@mokup/shared/pathe';
+import { h as resolvePlaygroundDist, n as normalizePlaygroundPath, i as injectPlaygroundSw, j as resolveGroupRoot, k as resolveGroups, l as resolvePlaygroundRequestPath, t as toPlaygroundConfigFile, m as toPlaygroundIgnoredRoute, o as toPlaygroundDisabledRoute, p as toPlaygroundRoute, s as scanRoutes, a as sortRoutes, c as createHonoApp, b as buildSwScript, g as createMiddleware, r as resolvePlaygroundOptions, d as resolveSwConfig, e as resolveSwUnregisterConfig, f as createPlaygroundMiddleware } from './shared/mokup.CtSctWaa.mjs';
 import { createLogger } from '@mokup/shared/logger';
+import { r as resolveDirs, i as isInDirs, c as createDebouncer } from './shared/mokup.JBCzv4xR.mjs';
 import pc from 'picocolors';
-import { isAbsolute, resolve } from 'node:path';
+import { isAbsolute, resolve, dirname } from 'node:path';
 import chokidar from '@mokup/shared/chokidar';
-import { existsSync } from 'node:fs';
 import { fileURLToPath } from 'node:url';
-import '@mokup/shared/pathe';
 import 'node:module';
 import 'node:buffer';
 import '@mokup/shared/hono';
@@ -14,46 +16,77 @@ import '@mokup/shared/esbuild';
 import '@mokup/shared/jsonc-parser';
 import '@mokup/runtime';
 
-function buildBundleModule(params) {
-  const { manifest, modules } = buildManifestData({
-    routes: params.routes,
-    root: params.root,
-    ...params.resolveModulePath ? { resolveModulePath: params.resolveModulePath } : {}
-  });
-  const imports = [];
-  const moduleEntries = [];
-  let moduleIndex = 0;
-  for (const entry of modules) {
-    const name = `module${moduleIndex++}`;
-    imports.push(`import * as ${name} from '${entry.id}'`);
-    moduleEntries.push({ id: entry.id, name });
-  }
-  const lines = [];
-  if (imports.length > 0) {
-    lines.push(...imports, "");
-  }
-  lines.push(
-    `const manifest = ${JSON.stringify(manifest, null, 2)}`,
+function resolvePlaygroundOutDir(outDir, playgroundPath) {
+  const normalized = normalizePlaygroundPath(playgroundPath);
+  const trimmed = normalized.replace(/^\/+/, "");
+  return trimmed ? join(outDir, normalize(trimmed)) : outDir;
+}
+function stripSwLifecycle(html) {
+  return html.replace(
+    /<script[^>]*mokup-sw-lifecycle\.js[^>]*><\/script>\s*/gi,
     ""
   );
-  if (moduleEntries.length > 0) {
-    lines.push("const moduleMap = {");
-    for (const entry of moduleEntries) {
-      lines.push(
-        `  ${JSON.stringify(entry.id)}: ${entry.name},`
-      );
-    }
-    lines.push("}", "");
-  }
-  const runtimeOptions = moduleEntries.length > 0 ? "{ manifest, moduleMap }" : "{ manifest }";
-  lines.push(
-    `const mokupBundle = ${runtimeOptions}`,
-    "",
-    "export default mokupBundle",
-    "export { mokupBundle }",
-    ""
+}
+async function writeRoutesPayload(params, targetDir) {
+  const baseRoot = resolveGroupRoot(params.dirs, params.root);
+  const groups = resolveGroups(params.dirs, baseRoot);
+  const basePath = resolvePlaygroundRequestPath(params.base, params.playgroundPath);
+  const payload = {
+    basePath,
+    root: baseRoot,
+    count: params.routes.length,
+    groups: groups.map((group) => ({ key: group.key, label: group.label })),
+    routes: params.routes.map((route) => toPlaygroundRoute(route, baseRoot, groups)),
+    disabled: params.disabledRoutes.map(
+      (route) => toPlaygroundDisabledRoute(route, baseRoot, groups)
+    ),
+    ignored: params.ignoredRoutes.map(
+      (route) => toPlaygroundIgnoredRoute(route, baseRoot, groups)
+    ),
+    configs: params.configFiles.map((entry) => toPlaygroundConfigFile(entry, baseRoot, groups)),
+    disabledConfigs: params.disabledConfigFiles.map(
+      (entry) => toPlaygroundConfigFile(entry, baseRoot, groups)
+    )
+  };
+  await promises.writeFile(
+    join(targetDir, "routes"),
+    JSON.stringify(payload, null, 2),
+    "utf8"
   );
-  return lines.join("\n");
+}
+async function updateIndexHtml(targetDir, swScript) {
+  const indexPath = join(targetDir, "index.html");
+  const html = await promises.readFile(indexPath, "utf8");
+  const cleaned = stripSwLifecycle(html);
+  const output = swScript ? injectPlaygroundSw(cleaned, swScript) : cleaned;
+  await promises.writeFile(indexPath, output, "utf8");
+}
+async function removeLegacySwAsset(targetDir) {
+  const legacyFiles = [
+    join(targetDir, "assets", "mokup-sw-lifecycle.js"),
+    join(targetDir, "assets", "mokup-sw-lifecycle.js.map")
+  ];
+  await Promise.all(legacyFiles.map((file) => promises.rm(file, { force: true })));
+}
+async function writePlaygroundBuild(params) {
+  const distDir = resolvePlaygroundDist();
+  const targetDir = resolvePlaygroundOutDir(params.outDir, params.playgroundPath);
+  if (targetDir === params.outDir) {
+    params.logger.error("Playground build path resolves to the Vite outDir. Aborting output.");
+    return;
+  }
+  try {
+    await promises.stat(distDir);
+  } catch (error) {
+    params.logger.error("Failed to locate playground assets:", error);
+    return;
+  }
+  await promises.rm(targetDir, { recursive: true, force: true });
+  await promises.mkdir(params.outDir, { recursive: true });
+  await promises.cp(distDir, targetDir, { recursive: true });
+  await removeLegacySwAsset(targetDir);
+  await updateIndexHtml(targetDir, params.swScript);
+  await writeRoutesPayload(params, targetDir);
 }
 
 const legacyEntryKeys = [
@@ -606,17 +639,35 @@ async function configurePreviewServer(params) {
 }
 
 const swModuleCandidates = [
-  new URL("../../sw.ts", import.meta.url),
-  new URL("../../sw.js", import.meta.url)
+  "dist/sw.mjs",
+  "dist/sw.js",
+  "src/sw.ts",
+  "src/sw.js"
 ];
+function resolvePackageRoot() {
+  const moduleDir = dirname(fileURLToPath(import.meta.url));
+  let current = moduleDir;
+  for (let index = 0; index < 6; index += 1) {
+    if (existsSync(resolve(current, "package.json"))) {
+      return current;
+    }
+    const parent = dirname(current);
+    if (parent === current) {
+      break;
+    }
+    current = parent;
+  }
+  return moduleDir;
+}
 const localSwModulePath = (() => {
+  const packageRoot = resolvePackageRoot();
   for (const candidate of swModuleCandidates) {
-    const filePath = fileURLToPath(candidate);
+    const filePath = resolve(packageRoot, candidate);
     if (existsSync(filePath)) {
       return filePath;
     }
   }
-  return fileURLToPath(swModuleCandidates[0] ?? new URL("../../sw.ts", import.meta.url));
+  return resolve(packageRoot, "src/sw.ts");
 })();
 async function resolveSwModuleImport(context) {
   const resolved = await context.resolve("mokup/sw");
@@ -670,12 +721,102 @@ function buildSwLifecycleScript(params) {
     "})()"
   ].join("\n");
 }
+function buildSwLifecycleInlineScript(params) {
+  const {
+    swConfig,
+    unregisterConfig,
+    hasSwEntries,
+    hasSwRoutes,
+    resolveRequestPath,
+    resolveRegisterScope
+  } = params;
+  const shouldUnregister = unregisterConfig.unregister === true || !hasSwEntries;
+  if (shouldUnregister) {
+    const path2 = resolveRequestPath(unregisterConfig.path);
+    const scope2 = resolveRegisterScope(unregisterConfig.scope);
+    return [
+      "(async () => {",
+      "  if (typeof window === 'undefined' || !('serviceWorker' in navigator)) {",
+      "    return",
+      "  }",
+      `  const path = ${JSON.stringify(path2)}`,
+      `  const scope = ${JSON.stringify(scope2)}`,
+      "  const origin = window.location.origin",
+      "  const normalizeScope = (value) => {",
+      "    const url = new URL(value, origin)",
+      "    if (!url.pathname.endsWith('/')) {",
+      "      url.pathname = url.pathname + '/'",
+      "    }",
+      "    return url.href",
+      "  }",
+      "  const pathUrl = new URL(path, origin)",
+      "  const scopeUrl = normalizeScope(scope)",
+      "  const matchesScript = (scriptUrl) => {",
+      "    if (!scriptUrl) {",
+      "      return false",
+      "    }",
+      "    try {",
+      "      const parsed = new URL(scriptUrl)",
+      "      return parsed.origin === origin && parsed.pathname === pathUrl.pathname",
+      "    }",
+      "    catch {",
+      "      return false",
+      "    }",
+      "  }",
+      "  try {",
+      "    const registrations = await navigator.serviceWorker.getRegistrations()",
+      "    for (const registration of registrations) {",
+      "      if (registration.scope !== scopeUrl) {",
+      "        continue",
+      "      }",
+      "      const scriptUrls = [",
+      "        registration.active?.scriptURL,",
+      "        registration.waiting?.scriptURL,",
+      "        registration.installing?.scriptURL,",
+      "      ]",
+      "      if (scriptUrls.some(matchesScript)) {",
+      "        await registration.unregister()",
+      "      }",
+      "    }",
+      "  }",
+      "  catch (error) {",
+      "    console.warn('Failed to unregister service worker:', error)",
+      "  }",
+      "})()"
+    ].join("\n");
+  }
+  if (!swConfig || swConfig.register === false) {
+    return null;
+  }
+  if (!hasSwRoutes) {
+    return null;
+  }
+  const path = resolveRequestPath(swConfig.path);
+  const scope = resolveRegisterScope(swConfig.scope);
+  return [
+    "(async () => {",
+    "  if (typeof window === 'undefined' || !('serviceWorker' in navigator)) {",
+    "    return",
+    "  }",
+    `  const path = ${JSON.stringify(path)}`,
+    `  const scope = ${JSON.stringify(scope)}`,
+    "  try {",
+    "    await navigator.serviceWorker.register(path, { type: 'module', scope })",
+    "  }",
+    "  catch (error) {",
+    "    console.warn('Failed to register service worker:', error)",
+    "  }",
+    "})()"
+  ].join("\n");
+}
 
 function createMokupPlugin(options = {}) {
   let root = cwd();
   let base = "/";
   let command = "serve";
   let assetsDir = "assets";
+  let outDir = "dist";
+  let isSsrBuild = false;
   const state = {
     routes: [],
     serverRoutes: [],
@@ -894,6 +1035,8 @@ function createMokupPlugin(options = {}) {
       base = config.base ?? "/";
       command = config.command;
       assetsDir = config.build.assetsDir ?? "assets";
+      outDir = config.build.outDir ?? "dist";
+      isSsrBuild = !!config.build.ssr;
     },
     async configureServer(server) {
       currentServer = server;
@@ -933,9 +1076,35 @@ function createMokupPlugin(options = {}) {
         previewWatcher = null;
       });
     },
-    closeBundle() {
+    async closeBundle() {
       previewWatcher?.close();
       previewWatcher = null;
+      if (command !== "build" || isSsrBuild || !playgroundConfig.enabled || playgroundConfig.build !== true) {
+        return;
+      }
+      await refreshRoutes();
+      const swScript = buildSwLifecycleInlineScript({
+        swConfig,
+        unregisterConfig,
+        hasSwEntries,
+        hasSwRoutes: hasSwRoutes(),
+        resolveRequestPath: resolveSwRequestPath,
+        resolveRegisterScope: resolveSwRegisterScope
+      });
+      await writePlaygroundBuild({
+        outDir,
+        base,
+        playgroundPath: playgroundConfig.path,
+        root,
+        routes: state.routes,
+        disabledRoutes: state.disabledRoutes,
+        ignoredRoutes: state.ignoredRoutes,
+        configFiles: state.configFiles,
+        disabledConfigFiles: state.disabledConfigFiles,
+        dirs: resolveAllDirs(),
+        swScript,
+        logger
+      });
     }
   };
 }

package/dist/webpack.cjs

@@ -1,13 +1,14 @@
 'use strict';
 
 const process = require('node:process');
-const scanner = require('./shared/mokup.To7knvSq.cjs');
+const scanner = require('./shared/mokup.DLUSS6KF.cjs');
+require('node:fs');
+const pathe = require('@mokup/shared/pathe');
 const logger = require('@mokup/shared/logger');
+const manifest = require('./shared/mokup.C7-7PDF7.cjs');
 const esbuild = require('@mokup/shared/esbuild');
 const node_module = require('node:module');
-const pathe = require('@mokup/shared/pathe');
 const chokidar = require('@mokup/shared/chokidar');
-require('node:fs');
 require('node:buffer');
 require('@mokup/shared/hono');
 require('node:url');
@@ -255,7 +256,7 @@ function joinPublicPath(publicPath, fileName) {
 }
 function resolveModuleFilePath(file, root) {
   const absolute = pathe.isAbsolute(file) ? file : pathe.resolve(root, file);
-  const normalized = scanner.toPosix(absolute);
+  const normalized = manifest.toPosix(absolute);
   if (/^[a-z]:\//i.test(normalized)) {
     return `file:///${normalized}`;
   }
@@ -273,7 +274,7 @@ function createRouteRefresher(params) {
     const collectedConfigs = [];
     for (const entry of optionList) {
       const scanParams = {
-        dirs: scanner.resolveDirs(entry.dir, root()),
+        dirs: manifest.resolveDirs(entry.dir, root()),
         prefix: entry.prefix ?? "",
         logger,
         onSkip: (info) => collectedDisabled.push(info),
@@ -318,21 +319,21 @@ function createWebpackWatcher(params) {
     return null;
   }
   const watcher = chokidar__default.watch(params.dirs, { ignoreInitial: true });
-  const scheduleRefresh = scanner.createDebouncer(80, () => {
+  const scheduleRefresh = manifest.createDebouncer(80, () => {
     void params.onRefresh();
   });
   watcher.on("add", (file) => {
-    if (scanner.isInDirs(file, params.dirs)) {
+    if (manifest.isInDirs(file, params.dirs)) {
       scheduleRefresh();
     }
   });
   watcher.on("change", (file) => {
-    if (scanner.isInDirs(file, params.dirs)) {
+    if (manifest.isInDirs(file, params.dirs)) {
       scheduleRefresh();
     }
   });
   watcher.on("unlink", (file) => {
-    if (scanner.isInDirs(file, params.dirs)) {
+    if (manifest.isInDirs(file, params.dirs)) {
       scheduleRefresh();
     }
   });
@@ -376,7 +377,7 @@ function createMokupWebpackPlugin(options = {}) {
     const dirs = [];
     const seen = /* @__PURE__ */ new Set();
     for (const entry of optionList) {
-      for (const dir of scanner.resolveDirs(entry.dir, root)) {
+      for (const dir of manifest.resolveDirs(entry.dir, root)) {
         if (seen.has(dir)) {
           continue;
         }

package/dist/webpack.d.cts

@@ -1,8 +1,9 @@
-import { M as MokupPluginOptions } from './shared/mokup.CWQ8woZc.cjs';
-export { H as HttpMethod, a as MiddlewarePosition, b as MiddlewareRegistry, R as RequestHandler, c as RouteDirectoryConfig, d as RouteResponse, e as RouteRule, f as RuntimeMode, S as ServiceWorkerOptions, V as VitePluginOptions, g as VitePluginOptionsInput } from './shared/mokup.CWQ8woZc.cjs';
+import { M as MokupPluginOptions } from './shared/mokup.DeotZ0g8.cjs';
+export { H as HttpMethod, b as MiddlewarePosition, c as MiddlewareRegistry, d as RequestHandler, e as RouteDirectoryConfig, f as RouteResponse, g as RouteRule, h as RuntimeMode, S as ServiceWorkerOptions, V as VitePluginOptions, i as VitePluginOptionsInput } from './shared/mokup.DeotZ0g8.cjs';
 import { IncomingMessage, ServerResponse } from 'node:http';
 export { Context, MiddlewareHandler } from '@mokup/shared/hono';
 export { PlaygroundOptionsInput } from '@mokup/shared';
+import '@mokup/runtime';
 
 interface WebpackPluginInstance {
     apply: (compiler: WebpackCompiler) => void;

package/dist/webpack.d.mts

@@ -1,8 +1,9 @@
-import { M as MokupPluginOptions } from './shared/mokup.CWQ8woZc.mjs';
-export { H as HttpMethod, a as MiddlewarePosition, b as MiddlewareRegistry, R as RequestHandler, c as RouteDirectoryConfig, d as RouteResponse, e as RouteRule, f as RuntimeMode, S as ServiceWorkerOptions, V as VitePluginOptions, g as VitePluginOptionsInput } from './shared/mokup.CWQ8woZc.mjs';
+import { M as MokupPluginOptions } from './shared/mokup.DeotZ0g8.mjs';
+export { H as HttpMethod, b as MiddlewarePosition, c as MiddlewareRegistry, d as RequestHandler, e as RouteDirectoryConfig, f as RouteResponse, g as RouteRule, h as RuntimeMode, S as ServiceWorkerOptions, V as VitePluginOptions, i as VitePluginOptionsInput } from './shared/mokup.DeotZ0g8.mjs';
 import { IncomingMessage, ServerResponse } from 'node:http';
 export { Context, MiddlewareHandler } from '@mokup/shared/hono';
 export { PlaygroundOptionsInput } from '@mokup/shared';
+import '@mokup/runtime';
 
 interface WebpackPluginInstance {
     apply: (compiler: WebpackCompiler) => void;

package/dist/webpack.d.ts

@@ -1,8 +1,9 @@
-import { M as MokupPluginOptions } from './shared/mokup.CWQ8woZc.js';
-export { H as HttpMethod, a as MiddlewarePosition, b as MiddlewareRegistry, R as RequestHandler, c as RouteDirectoryConfig, d as RouteResponse, e as RouteRule, f as RuntimeMode, S as ServiceWorkerOptions, V as VitePluginOptions, g as VitePluginOptionsInput } from './shared/mokup.CWQ8woZc.js';
+import { M as MokupPluginOptions } from './shared/mokup.DeotZ0g8.js';
+export { H as HttpMethod, b as MiddlewarePosition, c as MiddlewareRegistry, d as RequestHandler, e as RouteDirectoryConfig, f as RouteResponse, g as RouteRule, h as RuntimeMode, S as ServiceWorkerOptions, V as VitePluginOptions, i as VitePluginOptionsInput } from './shared/mokup.DeotZ0g8.js';
 import { IncomingMessage, ServerResponse } from 'node:http';
 export { Context, MiddlewareHandler } from '@mokup/shared/hono';
 export { PlaygroundOptionsInput } from '@mokup/shared';
+import '@mokup/runtime';
 
 interface WebpackPluginInstance {
     apply: (compiler: WebpackCompiler) => void;

package/dist/webpack.mjs

@@ -1,11 +1,12 @@
 import { cwd } from 'node:process';
-import { b as buildSwScript, t as toPosix, r as resolveDirs, s as scanRoutes, a as sortRoutes, c as createHonoApp, i as isInDirs, d as createDebouncer, e as resolvePlaygroundOptions, f as resolveSwConfig, g as resolveSwUnregisterConfig, h as createPlaygroundMiddleware, j as createMiddleware } from './shared/mokup.ghra3mzH.mjs';
+import { b as buildSwScript, s as scanRoutes, a as sortRoutes, c as createHonoApp, r as resolvePlaygroundOptions, d as resolveSwConfig, e as resolveSwUnregisterConfig, f as createPlaygroundMiddleware, g as createMiddleware } from './shared/mokup.CtSctWaa.mjs';
+import 'node:fs';
+import { isAbsolute, resolve } from '@mokup/shared/pathe';
 import { createLogger } from '@mokup/shared/logger';
+import { t as toPosix, r as resolveDirs, i as isInDirs, c as createDebouncer } from './shared/mokup.JBCzv4xR.mjs';
 import { build } from '@mokup/shared/esbuild';
 import { createRequire } from 'node:module';
-import { isAbsolute, resolve } from '@mokup/shared/pathe';
 import chokidar from '@mokup/shared/chokidar';
-import 'node:fs';
 import 'node:buffer';
 import '@mokup/shared/hono';
 import 'node:url';

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "mokup",
   "type": "module",
-  "version": "2.1.1",
+  "version": "2.2.1",
   "description": "Mock utilities and Vite plugin for mokup.",
   "license": "MIT",
   "homepage": "https://mokup.icebreaker.top",
@@ -21,6 +21,11 @@
       "import": "./dist/cli.mjs",
       "require": "./dist/cli.cjs"
     },
+    "./bundle": {
+      "types": "./dist/bundle.d.ts",
+      "import": "./dist/bundle.mjs",
+      "require": "./dist/bundle.cjs"
+    },
     "./server": {
       "types": "./dist/server.d.ts",
       "import": "./dist/server.mjs",
@@ -92,11 +97,11 @@
   },
   "dependencies": {
     "picocolors": "^1.1.1",
-    "@mokup/cli": "1.0.7",
-    "@mokup/playground": "0.0.12",
-    "@mokup/runtime": "1.0.3",
-    "@mokup/server": "1.1.4",
-    "@mokup/shared": "1.0.2"
+    "@mokup/cli": "1.0.9",
+    "@mokup/playground": "0.0.13",
+    "@mokup/runtime": "1.0.5",
+    "@mokup/server": "1.1.6",
+    "@mokup/shared": "1.1.0"
   },
   "devDependencies": {
     "@types/node": "^25.0.10",