@inglorious/ssx 1.3.1 → 1.3.3

package/README.md

@@ -52,13 +52,13 @@ npm install @inglorious/ssx @inglorious/web
 
 ### Create Your First Site
 
-<!-- ```bash
-npx @inglorious/create-app my-site --template ssx
+```bash
+npx @inglorious/create-app my-site --template ssx-js
 cd my-site
 npm run dev
 ```
 
-Or manually: -->
+Or manually:
 
 ### Create Your First Site (TypeScript)
 
@@ -224,7 +224,7 @@ export const about = {
 ```
 
 ```javascript
-// src/entities.js
+// src/store/entities.js
 export const entities = {
   about: {
     type: "about",
@@ -452,7 +452,8 @@ my-site/
 │   │   └── posts/
 │   │       ├── index.js    # /posts
 │   │       └── _id.js      # /posts/:id
-│   ├── entities.js     # Entity definitions
+│   ├── store/          # Store configuration
+│   │   └── entities.js     # Entity definitions
 │   └── types/          # Custom entity types (optional)
 ├── dist/               # Build output
 ├── package.json
@@ -571,7 +572,7 @@ export const metadata = {
 Register it in your router:
 
 ```javascript
-// src/entities.js
+// src/store/entities.js
 import { setRoutes } from "@inglorious/web/router"
 
 setRoutes({

package/bin/ssx.js

@@ -1,4 +1,5 @@
 #!/usr/bin/env node
+import { existsSync } from "node:fs"
 import { readFile } from "node:fs/promises"
 import path from "node:path"
 import { fileURLToPath } from "node:url"
@@ -26,15 +27,19 @@ program
 program
   .command("dev")
   .description("Start development server with hot reload")
-  .option("-c, --config <file>", "config file", "site.config.js")
+  .option("-c, --config <file>", "config file path", "site.config.js")
   .option("-r, --root <dir>", "source root directory", "src")
   .option("-p, --port <port>", "dev server port", 3000)
   .action(async (options) => {
     const cwd = process.cwd()
+    const configPath = resolveConfigFile(options.config)
 
     try {
       await dev({
         ...options,
+        config: undefined,
+        root: undefined,
+        configPath,
         rootDir: path.resolve(cwd, options.root),
         port: Number(options.port),
       })
@@ -47,21 +52,24 @@ program
 program
   .command("build")
   .description("Build site from pages directory")
-  .option("-c, --config <file>", "config file", "site.config.js")
+  .option("-c, --config <file>", "config file path", "site.config.js")
   .option("-r, --root <dir>", "source root directory", "src")
   .option("-o, --out <dir>", "output directory", "dist")
   .option("-i, --incremental", "enable incremental builds", true)
   .option("-f, --force", "force clean build (ignore cache)", false)
   .action(async (options) => {
     const cwd = process.cwd()
+    const configPath = resolveConfigFile(options.config)
 
     try {
       await build({
         ...options,
+        config: undefined,
+        root: undefined,
+        out: undefined,
+        configPath,
         rootDir: path.resolve(cwd, options.root),
         outDir: path.resolve(cwd, options.out),
-        incremental: options.incremental, // Enabled by default
-        clean: options.force,
       })
 
       // if (result.skipped) {
@@ -76,3 +84,15 @@ program
   })
 
 program.parse()
+
+function resolveConfigFile(configFile) {
+  if (configFile === "site.config.js") {
+    const jsPath = path.resolve(process.cwd(), "site.config.js")
+    const tsPath = path.resolve(process.cwd(), "site.config.ts")
+
+    if (!existsSync(jsPath) && existsSync(tsPath)) {
+      return "site.config.ts"
+    }
+  }
+  return configFile
+}

package/package.json

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

package/src/build/manifest.js

@@ -57,7 +57,7 @@ export async function hashFile(filePath) {
  * @returns {Promise<string|null>} Hash of entities.js.
  */
 export async function hashEntities(rootDir) {
-  const entitiesPath = path.join(rootDir, "entities.js")
+  const entitiesPath = path.join(rootDir, "store", "entities.js")
   return await hashFile(entitiesPath)
 }
 

package/src/store/index.js

@@ -32,7 +32,7 @@ export async function generateStore(pages = [], options = {}, loader) {
 
   for (const ext of extensions) {
     try {
-      const module = await load(path.join(rootDir, `entities.${ext}`))
+      const module = await load(path.join(rootDir, "store", `entities.${ext}`))
       entities = module.entities
       break
     } catch {

package/src/store/store.test.js

@@ -68,7 +68,11 @@ describe("generateStore", () => {
     await generateStore([page], { rootDir: "src" }, loader)
 
     expect(loader).toHaveBeenCalledWith(page.filePath)
-    expect(loader).toHaveBeenCalledWith(path.join("src", "entities.js"))
-    expect(loader).toHaveBeenCalledWith(path.join("src", "entities.ts"))
+    expect(loader).toHaveBeenCalledWith(
+      path.join("src", "store", "entities.js"),
+    )
+    expect(loader).toHaveBeenCalledWith(
+      path.join("src", "store", "entities.ts"),
+    )
   })
 })