@jk2908/solas 0.8.2 → 0.8.3

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 0.8.3
+
+### Changed
+
+- `url` and `trustedOrigins` now accept plain strings, so `process.env` values can be passed directly without a cast. The resolved `url` is validated (it must be an `http(s)` origin) and normalised to its origin.
+
 ## 0.8.2
 
 ### Fixes

package/dist/index.js

@@ -22,6 +22,25 @@ const DEFAULT_CONFIG = {
     trustedOrigins: [],
     trailingSlash: 'never',
 };
+/**
+ * Validate a configured url and return its canonical origin (scheme and host,
+ * without a trailing slash or path). Throws when it is not a http(s) origin.
+ */
+function resolveOrigin(value) {
+    if (!value)
+        return undefined;
+    let url;
+    try {
+        url = new URL(value);
+    }
+    catch {
+        throw new Error(`[solas] Invalid url: "${value}"`);
+    }
+    if (url.protocol !== 'http:' && url.protocol !== 'https:') {
+        throw new Error(`[solas] url must use http:// or https://: "${value}"`);
+    }
+    return url.origin;
+}
 function solas(c) {
     const validatedConfig = Config.validate(c);
     const config = {
@@ -29,7 +48,7 @@ function solas(c) {
         ...validatedConfig,
     };
     const envUrl = process.env.VITE_APP_URL?.toString();
-    let resolvedUrl = c?.url ?? (envUrl && envUrl.length > 0 ? envUrl : undefined);
+    let resolvedUrl = resolveOrigin(c?.url) ?? resolveOrigin(envUrl);
     if (config.logger?.level)
         Logger.defaultLevel = config.logger.level;
     const logger = new Logger();

package/dist/types.d.ts

@@ -25,14 +25,14 @@ type PluginConfigBase = {
     prerender?: Route.Prerender;
     metadata?: Metadata.Item;
     trailingSlash?: (typeof Config.TRAILING_SLASH_MODES)[number];
-    trustedOrigins?: readonly Origin[];
+    trustedOrigins?: readonly string[];
     adapter?: Adapter;
     readonly logger?: {
         level?: LogLevel;
     };
 };
 export type PluginConfig = PluginConfigBase & {
-    url?: Origin;
+    url?: string;
     sitemap?: boolean | {
         routes: (existing: string[]) => string[] | Promise<string[]>;
     };
@@ -116,7 +116,7 @@ export type BuildManifest = {
     sitemapRoutes: string[];
     precompress: boolean;
     trailingSlash: (typeof Config.TRAILING_SLASH_MODES)[number];
-    url?: Origin;
+    url?: string;
 };
 export declare namespace Route {
     type ParamsOf<TRoute> = TRoute extends {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@jk2908/solas",
-	"version": "0.8.2",
+	"version": "0.8.3",
 	"description": "A Vite + React meta-framework exploring streaming, Server Components, and partial prerendering. Designed for simplicity and lightness",
 	"keywords": [
 		"framework",