mokup 0.2.1 → 0.2.2

package/dist/vite.cjs

@@ -1,15 +1,15 @@
 'use strict';
 
+const node_fs = require('node:fs');
 const node_process = require('node:process');
+const node_url = require('node:url');
 const chokidar = require('chokidar');
 const node_buffer = require('node:buffer');
 const hono = require('hono');
 const patternRouter = require('hono/router/pattern-router');
 const pathe = require('pathe');
-const node_fs = require('node:fs');
 const node_module = require('node:module');
 const runtime = require('@mokup/runtime');
-const node_url = require('node:url');
 const esbuild = require('esbuild');
 const jsoncParser = require('jsonc-parser');
 
@@ -595,6 +595,7 @@ function createPlaygroundMiddleware(params) {
       const routes = params.getRoutes();
       sendJson(res, {
         basePath: matchedPath,
+        root: baseRoot,
         count: routes.length,
         groups: groups.map((group) => ({ key: group.key, label: group.label })),
         routes: routes.map((route) => toPlaygroundRoute(route, baseRoot, groups))
@@ -1488,6 +1489,19 @@ function resolveSwRuntimeImportPath(base) {
   const normalizedBase = normalizeBase(base);
   return `${normalizedBase}@id/mokup/runtime`;
 }
+const swModuleCandidates = [
+  new URL("../sw.ts", (typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('vite.cjs', document.baseURI).href))),
+  new URL("../sw.js", (typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('vite.cjs', document.baseURI).href)))
+];
+const localSwModulePath = (() => {
+  for (const candidate of swModuleCandidates) {
+    const filePath = node_url.fileURLToPath(candidate);
+    if (node_fs.existsSync(filePath)) {
+      return filePath;
+    }
+  }
+  return node_url.fileURLToPath(swModuleCandidates[0] ?? new URL("../sw.ts", (typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('vite.cjs', document.baseURI).href))));
+})();
 function hasMiddlewareStack(middlewares) {
   const candidate = middlewares;
   return Array.isArray(candidate.stack);
@@ -1503,6 +1517,7 @@ function createMokupPlugin(options = {}) {
   let root = node_process.cwd();
   let base = "/";
   let command = "serve";
+  let assetsDir = "assets";
   let routes = [];
   let serverRoutes = [];
   let swRoutes = [];
@@ -1535,8 +1550,38 @@ function createMokupPlugin(options = {}) {
   const hasSwRoutes = () => !!swConfig && swRoutes.length > 0;
   const resolveSwRequestPath = (path) => resolveRegisterPath(base, path);
   const resolveSwRegisterScope = (scope) => resolveRegisterScope(base, scope);
+  const resolveHtmlAssetPath = (fileName) => {
+    const normalizedFileName = fileName.startsWith("/") ? fileName.slice(1) : fileName;
+    if (base && base.startsWith(".")) {
+      return normalizedFileName;
+    }
+    const normalizedBase = normalizeBase(base);
+    return `${normalizedBase}${normalizedFileName}`;
+  };
+  const resolveAssetsFileName = (fileName) => {
+    const trimmed = assetsDir.replace(/^\/+|\/+$/g, "");
+    if (!trimmed) {
+      return fileName;
+    }
+    return `${trimmed}/${fileName}`;
+  };
   const swVirtualId = "virtual:mokup-sw";
   const resolvedSwVirtualId = `\0${swVirtualId}`;
+  const swLifecycleVirtualId = "virtual:mokup-sw-lifecycle";
+  const resolvedSwLifecycleVirtualId = `\0${swLifecycleVirtualId}`;
+  let swLifecycleFileName = null;
+  let swLifecycleScript = null;
+  async function resolveSwModuleImport(context) {
+    const resolved = await context.resolve("mokup/sw");
+    if (resolved?.id) {
+      return resolved.id;
+    }
+    const fallbackResolved = await context.resolve(localSwModulePath);
+    if (fallbackResolved?.id) {
+      return fallbackResolved.id;
+    }
+    return localSwModulePath;
+  }
   function buildSwLifecycleScript(importPath = "mokup/sw") {
     const shouldUnregister = unregisterConfig.unregister === true || !hasSwEntries;
     if (shouldUnregister) {
@@ -1631,11 +1676,24 @@ function createMokupPlugin(options = {}) {
       if (id === swVirtualId) {
         return resolvedSwVirtualId;
       }
+      if (id === swLifecycleVirtualId) {
+        return resolvedSwLifecycleVirtualId;
+      }
       return null;
     },
     async load(id) {
       if (id !== resolvedSwVirtualId) {
-        return null;
+        if (id !== resolvedSwLifecycleVirtualId) {
+          return null;
+        }
+        if (!swLifecycleScript) {
+          if (swRoutes.length === 0) {
+            await refreshRoutes();
+          }
+          const importPath = await resolveSwModuleImport(this);
+          swLifecycleScript = buildSwLifecycleScript(importPath);
+        }
+        return swLifecycleScript ?? "";
       }
       if (swRoutes.length === 0) {
         await refreshRoutes();
@@ -1647,11 +1705,23 @@ function createMokupPlugin(options = {}) {
       });
     },
     async buildStart() {
-      if (!swConfig || command !== "build") {
+      if (command !== "build") {
         return;
       }
       await refreshRoutes();
-      if (!hasSwRoutes()) {
+      const shouldInject = buildSwLifecycleScript() !== null;
+      swLifecycleScript = null;
+      if (shouldInject) {
+        swLifecycleFileName = resolveAssetsFileName("mokup-sw-lifecycle.js");
+        this.emitFile({
+          type: "chunk",
+          id: swLifecycleVirtualId,
+          fileName: swLifecycleFileName
+        });
+      } else {
+        swLifecycleFileName = null;
+      }
+      if (!swConfig || !hasSwRoutes()) {
         return;
       }
       const fileName = swConfig.path.startsWith("/") ? swConfig.path.slice(1) : swConfig.path;
@@ -1669,6 +1739,22 @@ function createMokupPlugin(options = {}) {
       if (!script) {
         return html;
       }
+      if (command === "build") {
+        if (!swLifecycleFileName) {
+          return html;
+        }
+        const src = resolveHtmlAssetPath(swLifecycleFileName);
+        return {
+          html,
+          tags: [
+            {
+              tag: "script",
+              attrs: { type: "module", src },
+              injectTo: "head"
+            }
+          ]
+        };
+      }
       return {
         html,
         tags: [
@@ -1685,6 +1771,7 @@ function createMokupPlugin(options = {}) {
       root = config.root;
       base = config.base ?? "/";
       command = config.command;
+      assetsDir = config.build.assetsDir ?? "assets";
     },
     async configureServer(server) {
       currentServer = server;

package/dist/vite.mjs

@@ -1,13 +1,13 @@
+import { promises, existsSync } from 'node:fs';
 import { cwd } from 'node:process';
+import { pathToFileURL, fileURLToPath } from 'node:url';
 import chokidar from 'chokidar';
 import { Buffer } from 'node:buffer';
 import { Hono } from 'hono';
 import { PatternRouter } from 'hono/router/pattern-router';
 import { resolve, isAbsolute, join, normalize, extname, dirname, relative, basename } from 'pathe';
-import { promises } from 'node:fs';
 import { createRequire } from 'node:module';
 import { compareRouteScore, parseRouteTemplate } from '@mokup/runtime';
-import { pathToFileURL } from 'node:url';
 import { build } from 'esbuild';
 import { parse } from 'jsonc-parser';
 
@@ -588,6 +588,7 @@ function createPlaygroundMiddleware(params) {
       const routes = params.getRoutes();
       sendJson(res, {
         basePath: matchedPath,
+        root: baseRoot,
         count: routes.length,
         groups: groups.map((group) => ({ key: group.key, label: group.label })),
         routes: routes.map((route) => toPlaygroundRoute(route, baseRoot, groups))
@@ -1481,6 +1482,19 @@ function resolveSwRuntimeImportPath(base) {
   const normalizedBase = normalizeBase(base);
   return `${normalizedBase}@id/mokup/runtime`;
 }
+const swModuleCandidates = [
+  new URL("../sw.ts", import.meta.url),
+  new URL("../sw.js", import.meta.url)
+];
+const localSwModulePath = (() => {
+  for (const candidate of swModuleCandidates) {
+    const filePath = fileURLToPath(candidate);
+    if (existsSync(filePath)) {
+      return filePath;
+    }
+  }
+  return fileURLToPath(swModuleCandidates[0] ?? new URL("../sw.ts", import.meta.url));
+})();
 function hasMiddlewareStack(middlewares) {
   const candidate = middlewares;
   return Array.isArray(candidate.stack);
@@ -1496,6 +1510,7 @@ function createMokupPlugin(options = {}) {
   let root = cwd();
   let base = "/";
   let command = "serve";
+  let assetsDir = "assets";
   let routes = [];
   let serverRoutes = [];
   let swRoutes = [];
@@ -1528,8 +1543,38 @@ function createMokupPlugin(options = {}) {
   const hasSwRoutes = () => !!swConfig && swRoutes.length > 0;
   const resolveSwRequestPath = (path) => resolveRegisterPath(base, path);
   const resolveSwRegisterScope = (scope) => resolveRegisterScope(base, scope);
+  const resolveHtmlAssetPath = (fileName) => {
+    const normalizedFileName = fileName.startsWith("/") ? fileName.slice(1) : fileName;
+    if (base && base.startsWith(".")) {
+      return normalizedFileName;
+    }
+    const normalizedBase = normalizeBase(base);
+    return `${normalizedBase}${normalizedFileName}`;
+  };
+  const resolveAssetsFileName = (fileName) => {
+    const trimmed = assetsDir.replace(/^\/+|\/+$/g, "");
+    if (!trimmed) {
+      return fileName;
+    }
+    return `${trimmed}/${fileName}`;
+  };
   const swVirtualId = "virtual:mokup-sw";
   const resolvedSwVirtualId = `\0${swVirtualId}`;
+  const swLifecycleVirtualId = "virtual:mokup-sw-lifecycle";
+  const resolvedSwLifecycleVirtualId = `\0${swLifecycleVirtualId}`;
+  let swLifecycleFileName = null;
+  let swLifecycleScript = null;
+  async function resolveSwModuleImport(context) {
+    const resolved = await context.resolve("mokup/sw");
+    if (resolved?.id) {
+      return resolved.id;
+    }
+    const fallbackResolved = await context.resolve(localSwModulePath);
+    if (fallbackResolved?.id) {
+      return fallbackResolved.id;
+    }
+    return localSwModulePath;
+  }
   function buildSwLifecycleScript(importPath = "mokup/sw") {
     const shouldUnregister = unregisterConfig.unregister === true || !hasSwEntries;
     if (shouldUnregister) {
@@ -1624,11 +1669,24 @@ function createMokupPlugin(options = {}) {
       if (id === swVirtualId) {
         return resolvedSwVirtualId;
       }
+      if (id === swLifecycleVirtualId) {
+        return resolvedSwLifecycleVirtualId;
+      }
       return null;
     },
     async load(id) {
       if (id !== resolvedSwVirtualId) {
-        return null;
+        if (id !== resolvedSwLifecycleVirtualId) {
+          return null;
+        }
+        if (!swLifecycleScript) {
+          if (swRoutes.length === 0) {
+            await refreshRoutes();
+          }
+          const importPath = await resolveSwModuleImport(this);
+          swLifecycleScript = buildSwLifecycleScript(importPath);
+        }
+        return swLifecycleScript ?? "";
       }
       if (swRoutes.length === 0) {
         await refreshRoutes();
@@ -1640,11 +1698,23 @@ function createMokupPlugin(options = {}) {
       });
     },
     async buildStart() {
-      if (!swConfig || command !== "build") {
+      if (command !== "build") {
         return;
       }
       await refreshRoutes();
-      if (!hasSwRoutes()) {
+      const shouldInject = buildSwLifecycleScript() !== null;
+      swLifecycleScript = null;
+      if (shouldInject) {
+        swLifecycleFileName = resolveAssetsFileName("mokup-sw-lifecycle.js");
+        this.emitFile({
+          type: "chunk",
+          id: swLifecycleVirtualId,
+          fileName: swLifecycleFileName
+        });
+      } else {
+        swLifecycleFileName = null;
+      }
+      if (!swConfig || !hasSwRoutes()) {
         return;
       }
       const fileName = swConfig.path.startsWith("/") ? swConfig.path.slice(1) : swConfig.path;
@@ -1662,6 +1732,22 @@ function createMokupPlugin(options = {}) {
       if (!script) {
         return html;
       }
+      if (command === "build") {
+        if (!swLifecycleFileName) {
+          return html;
+        }
+        const src = resolveHtmlAssetPath(swLifecycleFileName);
+        return {
+          html,
+          tags: [
+            {
+              tag: "script",
+              attrs: { type: "module", src },
+              injectTo: "head"
+            }
+          ]
+        };
+      }
       return {
         html,
         tags: [
@@ -1678,6 +1764,7 @@ function createMokupPlugin(options = {}) {
       root = config.root;
       base = config.base ?? "/";
       command = config.command;
+      assetsDir = config.build.assetsDir ?? "assets";
     },
     async configureServer(server) {
       currentServer = server;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "mokup",
   "type": "module",
-  "version": "0.2.1",
+  "version": "0.2.2",
   "description": "Mock utilities and Vite plugin for mokup.",
   "license": "MIT",
   "homepage": "https://mokup.icebreaker.top",
@@ -68,10 +68,10 @@
     "hono": "^4.11.4",
     "jsonc-parser": "^3.3.1",
     "pathe": "^2.0.3",
+    "@mokup/playground": "0.0.4",
+    "@mokup/server": "0.0.2",
     "@mokup/cli": "0.2.0",
-    "@mokup/playground": "0.0.3",
-    "@mokup/runtime": "0.1.0",
-    "@mokup/server": "0.0.2"
+    "@mokup/runtime": "0.1.0"
   },
   "devDependencies": {
     "@types/node": "^25.0.9",