@inglorious/ssx 1.5.0 → 1.5.1

package/bin/ssx.js

@@ -27,8 +27,8 @@ program
 program
   .command("dev")
   .description("Start development server with hot reload")
-  .option("-c, --config <file>", "config file path", "site.config.js")
-  .option("-r, --root <dir>", "source root directory", "src")
+  .option("-c, --config <file>", "config file name", "site.config.js")
+  .option("-r, --root <dir>", "root directory", ".")
   .option("-p, --port <port>", "dev server port", 3000)
   .action(async (options) => {
     const cwd = process.cwd()
@@ -54,8 +54,8 @@ program
 program
   .command("build")
   .description("Build site from pages directory")
-  .option("-c, --config <file>", "config file path", "site.config.js")
-  .option("-r, --root <dir>", "source root directory", "src")
+  .option("-c, --config <file>", "config file name", "site.config.js")
+  .option("-r, --root <dir>", "root directory", ".")
   .option("-o, --out <dir>", "output directory", "dist")
   .option("-i, --incremental", "enable incremental builds", true)
   .option("-f, --force", "force clean build (ignore cache)", false)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@inglorious/ssx",
-  "version": "1.5.0",
+  "version": "1.5.1",
   "description": "Server-Side-X. Xecution? Xperience? Who knows.",
   "author": "IceOnFire <antony.mistretta@gmail.com> (https://ingloriouscoderz.it)",
   "license": "MIT",

package/src/build/index.js

@@ -37,7 +37,7 @@ export async function build(options = {}) {
 
   const mergedOptions = { ...config, ...options }
   const {
-    rootDir = "src",
+    rootDir = ".",
     outDir = "dist",
     incremental = true,
     clean = false,
@@ -45,6 +45,8 @@ export async function build(options = {}) {
     rss,
   } = mergedOptions
 
+  const pagesDir = path.join(rootDir, "src", "pages")
+
   console.log("🔨 Starting build...\n")
 
   // Create a temporary Vite server to load modules (supports TS)
@@ -56,7 +58,7 @@ export async function build(options = {}) {
   const loader = (p) => vite.ssrLoadModule(p)
 
   // 0. Get all pages to build (Fail fast if source is broken)
-  const allPages = await getPages(path.join(rootDir, "pages"), loader)
+  const allPages = await getPages(pagesDir, loader)
   console.log(`📄 Found ${allPages.length} pages\n`)
 
   // Load previous build manifest

package/src/build/vite-config.js

@@ -11,18 +11,15 @@ import { markdownPlugin } from "../utils/markdown.js"
  * Generate Vite config for building the client bundle
  */
 export function createViteConfig(options = {}) {
-  const {
-    rootDir = "src",
-    outDir = "dist",
-    publicDir = "public",
-    vite = {},
-    markdown = {},
-  } = options
+  const { rootDir = ".", outDir = "dist", vite = {}, markdown = {} } = options
+
+  const srcDir = path.resolve(process.cwd(), rootDir, "src")
+  const publicDir = path.resolve(process.cwd(), rootDir, "public")
 
   return mergeConfig(
     {
-      root: rootDir,
-      publicDir: path.resolve(process.cwd(), rootDir, publicDir),
+      root: process.cwd(),
+      publicDir: publicDir,
       plugins: [
         // minifyTemplateLiterals(), // TODO: minification breaks hydration. The footprint difference is minimal after all
         ViteImageOptimizer({
@@ -52,7 +49,7 @@ export function createViteConfig(options = {}) {
       },
       resolve: {
         alias: {
-          "@": path.resolve(process.cwd(), rootDir),
+          "@": srcDir,
         },
       },
     },

package/src/dev/index.js

@@ -21,7 +21,9 @@ export async function dev(options = {}) {
   const config = await loadConfig(options)
 
   const mergedOptions = { ...config, ...options }
-  const { rootDir = "src" } = mergedOptions
+  const { rootDir = "." } = mergedOptions
+
+  const pagesDir = path.join(rootDir, "src", "pages")
 
   console.log("🚀 Starting dev server...\n")
 
@@ -30,16 +32,8 @@ export async function dev(options = {}) {
   const viteServer = await createServer(viteConfig)
   const loader = (p) => viteServer.ssrLoadModule(p)
 
-  // Get all pages once at startup
-  const pages = await getPages(path.join(rootDir, "pages"), loader)
-  console.log(`📄 Found ${pages.length} pages\n`)
-
-  // Generate store config once for all pages
-  const store = await generateStore(pages, mergedOptions, loader)
-
   // Use Vite's middleware first (handles HMR, static files, etc.)
   const connectServer = connect()
-
   connectServer.use(viteServer.middlewares)
 
   // Add SSR middleware
@@ -56,6 +50,9 @@ export async function dev(options = {}) {
         return next() // Let Vite serve it
       }
 
+      // Get all pages on each request (in dev mode, pages might be added/removed)
+      const pages = await getPages(pagesDir, loader)
+
       // Find matching page
       const page = pages.find((p) => matchRoute(p.path, url))
       if (!page) return next()
@@ -63,19 +60,30 @@ export async function dev(options = {}) {
       const module = await loader(page.filePath)
       page.module = module
 
+      // Generate store for THIS request (to pick up changes)
+      const store = await generateStore(pages, mergedOptions, loader)
+
       const entity = store._api.getEntity(page.moduleName)
       if (module.load) {
         await module.load(entity, page)
       }
+
+      // Generate and update the virtual app file BEFORE rendering
+      const app = generateApp(store, pages)
+      virtualFiles.set("/main.js", app)
+
+      // Invalidate the virtual module to ensure Vite picks up changes
+      const virtualModule = viteServer.moduleGraph.getModuleById("/main.js")
+      if (virtualModule) {
+        viteServer.moduleGraph.invalidateModule(virtualModule)
+      }
+
       const html = await renderPage(store, page, entity, {
         ...mergedOptions,
         wrap: true,
         isDev: true,
       })
 
-      const app = generateApp(store, pages)
-      virtualFiles.set("/main.js", app)
-
       res.setHeader("Content-Type", "text/html")
       res.end(html)
     } catch (error) {

package/src/dev/vite-config.js

@@ -15,24 +15,22 @@ import { markdownPlugin } from "../utils/markdown.js"
  * @returns {Object} The merged Vite configuration.
  */
 export function createViteConfig(options = {}) {
-  const {
-    rootDir = "src",
-    publicDir = "public",
-    vite = {},
-    markdown = {},
-  } = options
+  const { rootDir = ".", vite = {}, markdown = {} } = options
   const { port = 3000 } = vite.dev ?? {}
 
+  const srcDir = path.resolve(process.cwd(), rootDir, "src")
+  const publicDir = path.resolve(process.cwd(), rootDir, "public")
+
   return mergeConfig(
     {
       root: process.cwd(),
-      publicDir: path.resolve(process.cwd(), rootDir, publicDir),
+      publicDir,
       server: { port, middlewareMode: true },
       appType: "custom",
       plugins: [virtualPlugin(), markdownPlugin(markdown)],
       resolve: {
         alias: {
-          "@": path.resolve(process.cwd(), rootDir),
+          "@": srcDir,
         },
       },
     },

package/src/dev/vite-config.test.js

@@ -14,7 +14,9 @@ describe("createViteConfig", () => {
 
   it("should respect custom rootDir", () => {
     const config = createViteConfig({ rootDir: "app" })
-    expect(config.resolve.alias["@"]).toBe(path.resolve(process.cwd(), "app"))
+    expect(config.resolve.alias["@"]).toBe(
+      path.resolve(process.cwd(), "app", "src"),
+    )
   })
 
   it("should merge custom vite config", () => {

package/src/render/render.test.js

@@ -7,7 +7,7 @@ import { describe, expect, it } from "vitest"
 import { renderPage } from "."
 
 const ROOT_DIR = path.join(import.meta.dirname, "..", "__fixtures__")
-const PAGES_DIR = path.join(ROOT_DIR, "pages")
+const PAGES_DIR = path.join(ROOT_DIR, "src", "pages")
 
 const DEFAULT_OPTIONS = { stripLitMarkers: true }
 

package/src/router/router.test.js

@@ -5,7 +5,7 @@ import { afterEach, describe, expect, it, vi } from "vitest"
 import { getPages, getRoutes, matchRoute, resolvePage } from "./index.js"
 
 const ROOT_DIR = path.join(import.meta.dirname, "..", "__fixtures__")
-const PAGES_DIR = path.join(ROOT_DIR, "pages")
+const PAGES_DIR = path.join(ROOT_DIR, "src", "pages")
 
 describe("router", () => {
   afterEach(() => {

package/src/scripts/app.test.js

@@ -5,7 +5,8 @@ import { describe, expect, it } from "vitest"
 import { generateStore } from "../store"
 import { generateApp } from "./app"
 
-const ROOT_DIR = path.join(__dirname, "..", "__fixtures__")
+const ROOT_DIR = path.join(import.meta.dirname, "..", "__fixtures__")
+const PAGES_DIR = path.join(ROOT_DIR, "src", "pages")
 
 describe("generateApp", () => {
   it("should generate the app script for a static page", async () => {
@@ -13,7 +14,7 @@ describe("generateApp", () => {
       pattern: "/",
       path: "/",
       modulePath: "index.js",
-      filePath: path.join(ROOT_DIR, "pages", "index.js"),
+      filePath: PAGES_DIR,
     }
     const store = await generateStore([page], { rootDir: ROOT_DIR })
 
@@ -27,7 +28,7 @@ describe("generateApp", () => {
       pattern: "/about",
       path: "/about",
       modulePath: "about.js",
-      filePath: path.join(ROOT_DIR, "pages", "about.js"),
+      filePath: path.join(PAGES_DIR, "about.js"),
     }
     const store = await generateStore([page], { rootDir: ROOT_DIR })
 
@@ -41,7 +42,7 @@ describe("generateApp", () => {
       pattern: "/blog",
       path: "/blog",
       modulePath: "blog.js",
-      filePath: path.join(ROOT_DIR, "pages", "blog.js"),
+      filePath: path.join(PAGES_DIR, "blog.js"),
     }
     const store = await generateStore([page], { rootDir: ROOT_DIR })
 
@@ -55,7 +56,7 @@ describe("generateApp", () => {
       pattern: "/posts/:slug",
       path: "/posts/my-first-post",
       modulePath: "post.js",
-      filePath: path.join(ROOT_DIR, "pages", "posts", "_slug.js"),
+      filePath: path.join(PAGES_DIR, "posts", "_slug.js"),
     }
     const store = await generateStore([page], { rootDir: ROOT_DIR })
 

package/src/store/index.js

@@ -17,7 +17,9 @@ import { getModuleName } from "../utils/module.js"
  * @returns {Promise<Object>} The initialized store instance.
  */
 export async function generateStore(pages = [], options = {}, loader) {
-  const { rootDir = "src" } = options
+  const { rootDir = "." } = options
+  const srcDir = path.join(rootDir, "src")
+
   const load = loader || ((p) => import(pathToFileURL(p)))
 
   const types = {}
@@ -32,7 +34,7 @@ export async function generateStore(pages = [], options = {}, loader) {
 
   for (const ext of extensions) {
     try {
-      const module = await load(path.join(rootDir, "store", `entities.${ext}`))
+      const module = await load(path.join(srcDir, "store", `entities.${ext}`))
       entities = module.entities
       break
     } catch {

package/src/store/store.test.js

@@ -5,11 +5,12 @@ import { describe, expect, it, vi } from "vitest"
 import { generateStore } from "."
 
 const ROOT_DIR = path.join(import.meta.dirname, "..", "__fixtures__")
+const PAGES_DIR = path.join(ROOT_DIR, "src", "pages")
 
 describe("generateStore", () => {
   it("should generate the proper types and entities from a static page", async () => {
     const page = {
-      filePath: path.join(ROOT_DIR, "pages", "index.js"),
+      filePath: path.join(PAGES_DIR, "index.js"),
     }
 
     const store = await generateStore([page], { rootDir: ROOT_DIR })
@@ -20,7 +21,7 @@ describe("generateStore", () => {
 
   it("should generate the proper types and entities from a page with an entity", async () => {
     const page = {
-      filePath: path.join(ROOT_DIR, "pages", "about.js"),
+      filePath: path.join(PAGES_DIR, "about.js"),
     }
 
     const store = await generateStore([page], { rootDir: ROOT_DIR })
@@ -31,7 +32,7 @@ describe("generateStore", () => {
 
   it("should generate the proper types and entities from a page that has metadata", async () => {
     const page = {
-      filePath: path.join(ROOT_DIR, "pages", "blog.js"),
+      filePath: path.join(PAGES_DIR, "blog.js"),
     }
 
     const store = await generateStore([page], { rootDir: ROOT_DIR })
@@ -42,7 +43,7 @@ describe("generateStore", () => {
 
   it("should handle missing entities.js gracefully", async () => {
     const page = {
-      filePath: path.join(ROOT_DIR, "pages", "index.js"),
+      filePath: path.join(PAGES_DIR, "index.js"),
     }
 
     // Point to a directory that doesn't contain entities.js
@@ -64,8 +65,8 @@ describe("generateStore", () => {
       throw new Error("MODULE_NOT_FOUND")
     })
 
-    const page = { filePath: path.join(ROOT_DIR, "pages", "index.js") }
-    await generateStore([page], { rootDir: "src" }, loader)
+    const page = { filePath: path.join(PAGES_DIR, "index.js") }
+    await generateStore([page], { rootDir: "." }, loader)
 
     expect(loader).toHaveBeenCalledWith(page.filePath)
     expect(loader).toHaveBeenCalledWith(

package/src/utils/config.js

@@ -2,10 +2,11 @@ import path from "node:path"
 import { pathToFileURL } from "node:url"
 
 export async function loadConfig(options) {
-  const { rootDir = "src", configPath = "site.config.js" } = options
+  const { rootDir = ".", configPath = "site.config.js" } = options
+  const srcDir = path.join(rootDir, "src")
 
   try {
-    const config = await import(pathToFileURL(path.join(rootDir, configPath)))
+    const config = await import(pathToFileURL(path.join(srcDir, configPath)))
     return config.default || config
   } catch (error) {
     if (error.code === "MODULE_NOT_FOUND") {