@solidjs/start 2.0.0-beta.8 → 2.0.0-rc.1

package/dist/shared/dev-overlay/createStackFrame.js

@@ -1,8 +1,20 @@
 import { createMemo, createResource } from "solid-js";
 import getSourceMap from "./get-source-map.js";
+const HTTP_URL_REGEX = /^https?:\/\//;
+const LEADING_SLASH_REGEX = /^\/+/;
+// Frames from an SSR error carry filesystem paths (or file:// URLs) rather
+// than the http URL the module is served from. Their positions are already
+// mapped back to the original source by the Vite module runner, unlike
+// client frames whose positions refer to the compiled module.
+function isServerSource(path) {
+    return !HTTP_URL_REGEX.test(path);
+}
 function getActualFileSource(path) {
     if (path.startsWith("file://")) {
-        return "/_build/@fs" + path.substring("file://".length);
+        return "/@fs/" + path.substring("file://".length).replace(LEADING_SLASH_REGEX, "");
+    }
+    if (isServerSource(path)) {
+        return "/@fs/" + path.replace(LEADING_SLASH_REGEX, "");
     }
     return path;
 }
@@ -16,16 +28,18 @@ export function createStackFrame(stackframe, isCompiled) {
         if (!source.fileName) {
             return null;
         }
-        const response = await fetch(getActualFileSource(source.fileName));
+        const url = getActualFileSource(source.fileName);
+        const response = await fetch(url);
         if (!response.ok) {
             return null;
         }
         const content = await response.text();
-        const sourceMap = await getSourceMap(source.fileName, content);
+        const sourceMap = await getSourceMap(url, content);
         return {
             source,
             content,
             sourceMap,
+            isServer: isServerSource(source.fileName),
         };
     });
     const info = createMemo(() => {
@@ -33,16 +47,36 @@ export function createStackFrame(stackframe, isCompiled) {
         if (!current) {
             return undefined;
         }
-        const { source, content, sourceMap } = current;
+        const { source, content, sourceMap, isServer } = current;
         if (!isCompiled() && source.line && source.column && sourceMap) {
-            const result = sourceMap.originalPositionFor({
-                line: source.line,
-                column: source.column,
-            });
-            return {
-                ...result,
-                content: sourceMap.sourceContentFor(result.source),
-            };
+            if (isServer) {
+                // The position is already original; only the original content needs
+                // to be pulled out of the source map.
+                const originalContent = sourceMap.sources.length
+                    ? sourceMap.sourceContentFor(sourceMap.sources[0], true)
+                    : null;
+                if (originalContent) {
+                    return {
+                        source: source.fileName,
+                        line: source.line,
+                        column: source.column,
+                        name: source.functionName,
+                        content: originalContent,
+                    };
+                }
+            }
+            else {
+                const result = sourceMap.originalPositionFor({
+                    line: source.line,
+                    column: source.column,
+                });
+                if (result.source) {
+                    return {
+                        ...result,
+                        content: sourceMap.sourceContentFor(result.source, true),
+                    };
+                }
+            }
         }
         return {
             source: source.fileName,

package/env.d.ts

@@ -7,3 +7,15 @@ declare namespace App {
     [key: string | symbol]: any;
   }
 }
+
+/**
+ * Import `server-only` to ensure this module is never bundled for the client.
+ * Importing it in a client module will throw a build error.
+ */
+declare module "server-only" {}
+
+/**
+ * Import `client-only` to ensure this module is never bundled for the server.
+ * Importing it in a server module will throw a build error.
+ */
+declare module "client-only" {}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solidjs/start",
-  "version": "2.0.0-beta.8",
+  "version": "2.0.0-rc.1",
   "type": "module",
   "files": [
     "dist",