@csedl/svelte-on-rails 12.3.0 → 12.3.1

package/bin/svelte-ssr-server.js

@@ -1,10 +1,7 @@
 import http from 'node:http';
 import fs from 'node:fs';
-import path, {dirname, resolve} from 'node:path';
+import path from 'node:path';
 import {render} from 'svelte/server';
-import {loadComponentModule} from "../src/ssr/loadComponent.js";
-import {componentRenderError} from "../src/utils.js";
-import {fileURLToPath} from "node:url";
 
 const SOCKET_PATH = process.argv[2];
 const PORT = (/^\d+$/.test(SOCKET_PATH) ? SOCKET_PATH : null);
@@ -91,8 +88,6 @@ const server = http.createServer(async (req, res) => {
                 res.writeHead(500, {'Content-Type': 'application/json'});
                 res.end(JSON.stringify({
                     status: 'FAILED',
-                    html: componentRenderError(basename, err, true),
-                    head: '',
                     errorLog: errorLog
                 }));
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@csedl/svelte-on-rails",
-  "version": "12.3.0",
+  "version": "12.3.1",
   "description": "Client-side runtime for svelte-on-rails: hydration, SSR build support & Turbo Stream actions",
   "main": "index.js",
   "type": "module",

package/src/ssr/render.js

@@ -1,7 +1,5 @@
 import {render} from 'svelte/server';
 import {readPropsFromStdin} from "./readStdin.js";
-import {loadComponentModule} from "./loadComponent.js";
-import {componentRenderError} from "../utils.js";
 
 const compiledComponentPath = process.argv[2];
 
@@ -9,10 +7,13 @@ const compiledComponentPath = process.argv[2];
 (async () => {
 
     try {
-        console.log(`Awaiting load component: «${compiledComponentPath}»`);
-        const compiledComponent = await import(`file://${compiledComponentPath}`);
+        console.log(`Awaiting load component: ${compiledComponentPath}`);
+        const module = await import(`file://${compiledComponentPath}`);
 
-        console.log(`Component loaded: «${compiledComponent}»`);
+        const compiledComponent = module.default;
+        if (!compiledComponent) {
+            throw new Error(`Module at ${compiledComponentPath} does not export a default component`);
+        }
 
         const props = await readPropsFromStdin();
         console.log(`Props read: «${JSON.stringify(props)}»`);
@@ -32,8 +33,6 @@ const compiledComponentPath = process.argv[2];
 
         const res = {
             status: 'FAILED',
-            html: componentRenderError(compiledComponentPath, error, true),
-            head: '',
         };
 
         console.log('$$ResponseSeparator$$' + JSON.stringify(res));

package/src/utils.js

@@ -4,7 +4,7 @@ export function componentRenderError(component, error, ssr = false) {
     const ssrHint = 'This is Server Side rendered. When Hydrated, you will see a more detailed error message.'
 
     return (`
-    <div class="svelte-on-rails-render-error ${ssr ? 'server-side-error' : 'client-side-error'}"
+    <div class="client-side-svelte-render-error"
     style="
       padding: 1.5rem;
       margin: 1rem 0;
@@ -14,7 +14,7 @@ export function componentRenderError(component, error, ssr = false) {
       border-radius: 0.5rem;
       font-family: system-ui, sans-serif;
     ">
-      <strong style="font-size: 1.2em;">Component failed to render${ssr ? ' server-side' : ' client-side'}</strong>
+      <strong style="font-size: 1.2em;">Component failed to render${ssr ? ' server-side' : ''}</strong>
     
       <p class="error-message"
         style="margin: 0.4rem 0 0.4rem;"

package/src/ssr/loadComponent.js

@@ -1,25 +0,0 @@
-import {fileURLToPath} from 'node:url';
-import {dirname, resolve} from 'node:path';
-
-
-export async function loadComponentModule(compiledFile) {
-    // Get the directory of the current script
-    const __filename = fileURLToPath(import.meta.url);
-    const __dirname = dirname(__filename);
-
-    try {
-        // Convert relative path to absolute path
-        const absolutePath = resolve(__dirname, compiledFile);
-
-        // Convert absolute path to a file URL
-        const modulePath = `file://${absolutePath}`;
-
-        // Import the module
-        const module = await import(modulePath);
-        return module.default;
-    } catch (error) {
-        console.error(`=> compiledFile: «${compiledFile}»`);
-        console.error(`[loadComponentModule] Error loading component from ${compiledFile}:`, error);
-        process.exit(1);
-    }
-}