@jk2908/solas 0.3.8 → 0.4.0

package/dist/utils/base-path.js

@@ -0,0 +1,85 @@
+export { BasePath };
+var BasePath;
+(function (BasePath) {
+    /**
+     * Normalise a base path so every check uses the same shape
+     */
+    function normalise(value) {
+        // no base means the app lives at the site root
+        if (!value)
+            return '/';
+        if (value === '/' || value === '.' || value === './')
+            return '/';
+        let pathname = value.trim();
+        if (!pathname)
+            return '/';
+        // plain path bases are the common case, so keep them cheap
+        if (!pathname.startsWith('http://') && !pathname.startsWith('https://')) {
+            const hashIndex = pathname.indexOf('#');
+            const searchIndex = pathname.indexOf('?');
+            const end = hashIndex === -1
+                ? searchIndex
+                : searchIndex === -1
+                    ? hashIndex
+                    : Math.min(hashIndex, searchIndex);
+            if (end >= 0)
+                pathname = pathname.slice(0, end);
+        }
+        else {
+            try {
+                // full urls can still show up here, but we only need the path part
+                pathname = new URL(pathname).pathname;
+            }
+            catch {
+                // if parsing fails, fall back to the raw value below
+            }
+        }
+        if (!pathname || pathname === '.' || pathname === './')
+            return '/';
+        // keep one stable shape: leading slash, trailing slash
+        if (!pathname.startsWith('/'))
+            pathname = `/${pathname}`;
+        return pathname.endsWith('/') ? pathname : `${pathname}/`;
+    }
+    BasePath.normalise = normalise;
+    /**
+     * Strip the base path from a request path
+     */
+    function strip(pathname, base) {
+        const normalisedBase = normalise(base);
+        // root base means there is nothing to strip
+        if (normalisedBase === '/')
+            return pathname || '/';
+        const basePath = normalisedBase.slice(0, -1);
+        // treat both '/docs' and '/docs/' as the app root
+        if (pathname === basePath || pathname === normalisedBase)
+            return '/';
+        // paths outside the base do not belong to this app
+        if (!pathname.startsWith(`${basePath}/`))
+            return null;
+        // return the path as the app should see it
+        return pathname.slice(basePath.length) || '/';
+    }
+    BasePath.strip = strip;
+    /**
+     * Add the base path to a path when needed
+     */
+    function apply(pathname, base) {
+        const normalisedBase = normalise(base);
+        // always work with a path-like value
+        const target = pathname.startsWith('/') ? pathname : `/${pathname}`;
+        // root base means the path can pass through unchanged
+        if (normalisedBase === '/')
+            return target;
+        const basePath = normalisedBase.slice(0, -1);
+        // leave it alone if the base is already there
+        if (target === basePath || target.startsWith(`${basePath}/`))
+            return target;
+        // the app root maps to the base path itself
+        if (target === '/')
+            return normalisedBase;
+        // everything else sits underneath the base path
+        return `${basePath}${target}`;
+    }
+    BasePath.apply = apply;
+})(BasePath || (BasePath = {}));

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@jk2908/solas",
-	"version": "0.3.8",
-	"description": "A React Server Components meta-framework powered by Vite",
+	"version": "0.4.0",
+	"description": "A Vite + React meta-framework exploring streaming, Server Components, and partial prerendering. Designed for simplicity and lightness",
 	"keywords": [
 		"framework",
 		"ppr",
@@ -19,9 +19,6 @@
 		"type": "git",
 		"url": "https://github.com/jk2908/solas.git"
 	},
-	"bin": {
-		"solas": "./dist/cli.js"
-	},
 	"files": [
 		"dist",
 		"CHANGELOG.md",
@@ -74,7 +71,7 @@
 		}
 	},
 	"scripts": {
-		"build": "rm -rf dist && tsgo && chmod +x dist/cli.js",
+		"build": "rm -rf dist && tsgo",
 		"lint": "bunx oxlint .",
 		"lint:fix": "bunx oxlint --fix .",
 		"format": "bunx oxfmt --write .",

package/dist/cli/build.d.ts

@@ -1,7 +0,0 @@
-/**
- * The build command does more than just run vite build - it also handles prerendering and
- * precompressing assets. This is because prerendering needs to run against the built
- * server entry to ensure the same code paths as preview, and precompressing needs
- * to include the prerendered html and json files
- */
-export declare function build(): Promise<void>;

package/dist/cli/dev.d.ts

@@ -1,4 +0,0 @@
-/**
- * Start the vite development server
- */
-export declare function dev(): Promise<void>;

package/dist/cli/dev.js

@@ -1,13 +0,0 @@
-/**
- * Start the vite development server
- */
-export async function dev() {
-    const proc = Bun.spawn(['bunx', '--bun', 'vite', 'dev'], {
-        cwd: process.cwd(),
-        stdout: 'inherit',
-        stderr: 'inherit',
-        stdin: 'inherit',
-        env: { ...process.env, NODE_ENV: 'development' },
-    });
-    await proc.exited;
-}

package/dist/cli/preview.d.ts

@@ -1 +0,0 @@
-export declare function preview(): Promise<void>;

package/dist/cli/preview.js

@@ -1,47 +0,0 @@
-import fs from 'node:fs/promises';
-import path from 'node:path';
-import { Logger } from '../utils/logger.js';
-import { Solas } from '../solas.js';
-const logger = new Logger();
-const DEFAULT_PREVIEW_PORT = 4173;
-const [, , , ...args] = process.argv;
-export async function preview() {
-    // preview should behave like production, not like vite dev
-    process.env.NODE_ENV = 'production';
-    const cwd = process.cwd();
-    const outDir = path.resolve(cwd, Solas.Config.OUT_DIR);
-    const rscDir = path.join(outDir, 'rsc');
-    const rscEntry = path.join(rscDir, 'index.js');
-    const portFlagIndex = args.findIndex(arg => arg === '--port' || arg === '-p');
-    const parsedPort = portFlagIndex >= 0 && args[portFlagIndex + 1]
-        ? Number(args[portFlagIndex + 1])
-        : DEFAULT_PREVIEW_PORT;
-    // fail fast if the port is invalid
-    if (!Number.isInteger(parsedPort) || parsedPort <= 0 || parsedPort > 65535) {
-        logger.error(`[preview] invalid port: ${args[portFlagIndex + 1] ?? 'undefined'}`);
-        process.exit(1);
-    }
-    // the built server entry handles routing, prerendered html, and ssr here
-    try {
-        await fs.access(rscEntry);
-    }
-    catch (err) {
-        logger.error(`[preview] missing ${path.relative(cwd, rscEntry)} - run \`${Solas.Config.SLUG} build\` from this project directory first`, err);
-        process.exit(1);
-    }
-    const { default: app } = await import(/* @vite-ignore */ rscEntry);
-    try {
-        // keep the preview server thin and let the app handle requests
-        Bun.serve({
-            port: parsedPort,
-            fetch: app.fetch,
-        });
-    }
-    catch (err) {
-        logger.error(`[preview] failed to start on port ${parsedPort}: ${err}`);
-        process.exit(1);
-    }
-    logger.info('[preview]', `server running at http://localhost:${parsedPort}`);
-    // keep the process running after the server starts
-    await new Promise(() => { });
-}

package/dist/cli.d.ts

@@ -1,2 +0,0 @@
-#!/usr/bin/env bun
-export {};

package/dist/cli.js

@@ -1,28 +0,0 @@
-#!/usr/bin/env bun
-import { build } from './cli/build.js';
-import { dev } from './cli/dev.js';
-import { preview } from './cli/preview.js';
-import { Solas } from './solas.js';
-// read the subcommand once and dispatch below
-const [, , command] = process.argv;
-switch (command) {
-    case 'build':
-        await build();
-        break;
-    case 'dev':
-        await dev();
-        break;
-    case 'preview':
-        await preview();
-        break;
-    default:
-        console.log(`
-			${Solas.Config.NAME} - cli
-
-			Commands:
-				build    Build for production (vite build + prerender + compress)
-				dev      Start development server
-				preview  Preview production build (serves prerendered HTML with SSR fallback)
-		`);
-        process.exit(command ? 1 : 0);
-}