@solidjs/start 1.2.0 → 2.0.0-alpha.0

package/dist/shared/dev-overlay/DevOverlayDialog.jsx

@@ -1,17 +1,18 @@
 // @refresh skip
-import ErrorStackParser from 'error-stack-parser';
-import * as htmlToImage from 'html-to-image';
-import { ErrorBoundary, For, Show, Suspense, createMemo, createSignal } from 'solid-js';
-import { Portal } from 'solid-js/web';
-import { Dialog, DialogOverlay, DialogPanel, Select, SelectOption } from 'terracotta';
-import info from '../../../package.json';
-import { CodeView } from './CodeView';
-import { createStackFrame } from './createStackFrame';
-import download from './download';
-import { ArrowLeftIcon, ArrowRightIcon, CameraIcon, DiscordIcon, GithubIcon, RefreshIcon, SolidStartIcon, ViewCompiledIcon, ViewOriginalIcon } from './icons';
-import './styles.css';
+import ErrorStackParser from "error-stack-parser";
+import * as htmlToImage from "html-to-image";
+import { ErrorBoundary, For, Show, Suspense, createMemo, createSignal } from "solid-js";
+import { Portal } from "solid-js/web";
+// @ts-ignore - terracotta module resolution issue with NodeNext
+import { Dialog, DialogOverlay, DialogPanel, Select, SelectOption } from "terracotta";
+import info from "../../../package.json" with { type: "json" };
+import { CodeView } from "./CodeView.jsx";
+import { createStackFrame } from "./createStackFrame.js";
+import download from "./download.js";
+import { ArrowLeftIcon, ArrowRightIcon, CameraIcon, DiscordIcon, GithubIcon, RefreshIcon, SolidStartIcon, ViewCompiledIcon, ViewOriginalIcon } from "./icons.jsx";
+import "./styles.css";
 export function classNames(...classes) {
-    return classes.filter(Boolean).join(' ');
+    return classes.filter(Boolean).join(" ");
 }
 function ErrorInfo(props) {
     const error = createMemo(() => {
@@ -31,8 +32,8 @@ function ErrorInfo(props) {
 }
 function getFileName(source) {
     try {
-        const path = source.startsWith('/') ? new URL(source, 'file://') : new URL(source);
-        const paths = path.pathname.split('/');
+        const path = source.startsWith("/") ? new URL(source, "file://") : new URL(source);
+        const paths = path.pathname.split("/");
         return paths[paths.length - 1];
     }
     catch (error) {
@@ -40,71 +41,77 @@ function getFileName(source) {
     }
 }
 function getFilePath(source) {
-    const line = source.line ? `:${source.line}` : '';
-    const column = source.column ? `:${source.column}` : '';
+    const line = source.line ? `:${source.line}` : "";
+    const column = source.column ? `:${source.column}` : "";
     return `${getFileName(source.source)}${line}${column}`;
 }
 function CodeFallback() {
-    return <div class="dev-overlay-stack-frames-code-fallback">
-    <span>Source not available.</span>
-  </div>;
+    return (<div class="dev-overlay-stack-frames-code-fallback">
+      <span>Source not available.</span>
+    </div>);
 }
 function StackFramesContent(props) {
     const stackframes = ErrorStackParser.parse(props.error);
     const [selectedFrame, setSelectedFrame] = createSignal(stackframes[0]);
     return (<div class="dev-overlay-stack-frames-content">
-        <div class="dev-overlay-stack-frames-code">
-            <ErrorBoundary fallback={null}>
-              {(() => {
+      <div class="dev-overlay-stack-frames-code">
+        <ErrorBoundary fallback={null}>
+          {(() => {
             const data = createStackFrame(selectedFrame(), () => props.isCompiled);
             return (<Suspense fallback={<CodeFallback />}>
-                    <Show when={data()} keyed fallback={<CodeFallback />}>
-                      {(source) => (<>
-                          <span class="dev-overlay-stack-frames-code-source">{source.source}</span>
-                          <div class="dev-overlay-stack-frames-code-container">
-                            <CodeView fileName={source.source} line={source.line} content={source.content}/>
-                          </div>
-                        </>)}
-                    </Show>
-                  </Suspense>);
+                <Show when={data()} keyed fallback={<CodeFallback />}>
+                  {source => (<>
+                      <span class="dev-overlay-stack-frames-code-source">{source.source}</span>
+                      <div class="dev-overlay-stack-frames-code-container">
+                        <CodeView fileName={source.source} line={source.line} content={source.content}/>
+                      </div>
+                    </>)}
+                </Show>
+              </Suspense>);
         })()}
-            </ErrorBoundary>
-        </div>
-        <Select class="dev-overlay-stack-frames" value={selectedFrame()} onChange={setSelectedFrame}>
-          <For each={stackframes}>
-            {(current) => (<ErrorBoundary fallback={(<div class="dev-overlay-stack-frame">
-                <span class="dev-overlay-stack-frame-function">{current.functionName ?? '<anonymous>'}</span>
-                <span class="dev-overlay-stack-frame-file">{getFilePath({
+        </ErrorBoundary>
+      </div>
+      <Select class="dev-overlay-stack-frames" value={selectedFrame()} onChange={setSelectedFrame}>
+        <For each={stackframes}>
+          {current => (<ErrorBoundary fallback={<div class="dev-overlay-stack-frame">
+                  <span class="dev-overlay-stack-frame-function">
+                    {current.functionName ?? "<anonymous>"}
+                  </span>
+                  <span class="dev-overlay-stack-frame-file">
+                    {getFilePath({
                     source: current.getFileName(),
-                    content: '',
+                    content: "",
                     line: current.getLineNumber(),
                     column: current.getColumnNumber(),
-                    name: current.getFunctionName(),
-                })}</span>
-              </div>)}>
+                    name: current.getFunctionName()
+                })}
+                  </span>
+                </div>}>
               {(() => {
                 const data = createStackFrame(current, () => props.isCompiled);
                 return (<Suspense>
                     <Show when={data()} keyed>
-                      {(source) => (<SelectOption class="dev-overlay-stack-frame" value={current}>
-                          <span class="dev-overlay-stack-frame-function">{source.name ?? '<anonymous>'}</span>
+                      {source => (<SelectOption class="dev-overlay-stack-frame" value={current}>
+                          <span class="dev-overlay-stack-frame-function">
+                            {source.name ?? "<anonymous>"}
+                          </span>
                           <span class="dev-overlay-stack-frame-file">{getFilePath(source)}</span>
                         </SelectOption>)}
                     </Show>
                   </Suspense>);
             })()}
             </ErrorBoundary>)}
-          </For>
-        </Select>
-      </div>);
+        </For>
+      </Select>
+    </div>);
 }
 function StackFrames(props) {
     return (<Show when={props.error instanceof Error && props.error} keyed>
-      {(current) => (<StackFramesContent error={current} isCompiled={props.isCompiled}/>)}
+      {current => <StackFramesContent error={current} isCompiled={props.isCompiled}/>}
     </Show>);
 }
-const ISSUE_THREAD = 'https://github.com/solidjs/solid-start/issues/new';
-const DISCORD_INVITE = 'https://discord.com/invite/solidjs';
+const ISSUE_THREAD = "https://github.com/solidjs/solid-start/issues/new";
+const DISCORD_INVITE = "https://discord.com/invite/solidjs";
 export default function DevOverlayDialog(props) {
     const [currentPage, setCurrentPage] = createSignal(1);
     const [isCompiled, setIsCompiled] = createSignal(false);
@@ -113,7 +120,7 @@ export default function DevOverlayDialog(props) {
         return Math.min(currentPage(), length());
     });
     function goPrev() {
-        setCurrentPage((c) => {
+        setCurrentPage(c => {
             if (c > 1) {
                 return c - 1;
             }
@@ -121,7 +128,7 @@ export default function DevOverlayDialog(props) {
         });
     }
     function goNext() {
-        setCurrentPage((c) => {
+        setCurrentPage(c => {
             if (c < length()) {
                 return c + 1;
             }
@@ -129,31 +136,33 @@ export default function DevOverlayDialog(props) {
         });
     }
     function toggleIsCompiled() {
-        setIsCompiled((c) => !c);
+        setIsCompiled(c => !c);
     }
     const [panel, setPanel] = createSignal();
     function downloadScreenshot() {
         const current = panel();
         if (current) {
-            htmlToImage.toPng(current, {
+            htmlToImage
+                .toPng(current, {
                 style: {
-                    transform: 'scale(0.75)',
-                },
-            }).then((url) => {
-                download(url, 'start-screenshot.png');
+                    transform: "scale(0.75)"
+                }
+            })
+                .then(url => {
+                download(url, "start-screenshot.png");
             });
         }
     }
     function redirectToGithub() {
         const url = new URL(ISSUE_THREAD);
-        url.searchParams.append('labels', 'bug');
-        url.searchParams.append('labels', 'needs+triage');
-        url.searchParams.append('template', 'bug.yml');
-        url.searchParams.append('title', `[Bug?]:` + props.errors[truncated() - 1].toString());
-        window.open(url, '_blank').focus();
+        url.searchParams.append("labels", "bug");
+        url.searchParams.append("labels", "needs+triage");
+        url.searchParams.append("template", "bug.yml");
+        url.searchParams.append("title", `[Bug?]:` + props.errors[truncated() - 1].toString());
+        window.open(url, "_blank").focus();
     }
     function redirectToDiscord() {
-        window.open(DISCORD_INVITE, '_blank').focus();
+        window.open(DISCORD_INVITE, "_blank").focus();
     }
     return (<Portal>
       <Dialog class="dev-overlay" isOpen>
@@ -194,7 +203,7 @@ export default function DevOverlayDialog(props) {
                     <CameraIcon title="Capture Error Overlay"/>
                   </button>
                   <button class="dev-overlay-button" onClick={toggleIsCompiled} type="button">
-                    <Show when={isCompiled()} fallback={(<ViewOriginalIcon title="View Original Source"/>)}>
+                    <Show when={isCompiled()} fallback={<ViewOriginalIcon title="View Original Source"/>}>
                       <ViewCompiledIcon title="View Compiled Source"/>
                     </Show>
                   </button>
@@ -204,7 +213,7 @@ export default function DevOverlayDialog(props) {
                 </div>
               </div>
               <Show when={props.errors[truncated() - 1]} keyed>
-                {(current) => (<div class="dev-overlay-content">
+                {current => (<div class="dev-overlay-content">
                     <ErrorInfo error={current}/>
                     <StackFrames error={current} isCompiled={isCompiled()}/>
                   </div>)}

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

@@ -1,8 +1,8 @@
 import { createMemo, createResource } from "solid-js";
-import getSourceMap from "./get-source-map";
+import getSourceMap from "./get-source-map.js";
 function getActualFileSource(path) {
-    if (path.startsWith('file://')) {
-        return '/_build/@fs' + path.substring('file://'.length);
+    if (path.startsWith("file://")) {
+        return "/_build/@fs" + path.substring("file://".length);
     }
     return path;
 }

package/dist/shared/dev-overlay/index.jsx

@@ -1,13 +1,10 @@
 // @refresh skip
 import { ErrorBoundary, Show, createEffect, createSignal, onCleanup, resetErrorBoundaries } from "solid-js";
-import { HttpStatusCode } from "../HttpStatusCode";
-import clientOnly from "../clientOnly";
-const DevOverlayDialog = 
-/* #__PURE__ */ process.env.NODE_ENV === "production"
-    ? () => {
-        return <></>;
-    }
-    : /* #__PURE__ */ clientOnly(() => import("./DevOverlayDialog"), { lazy: true });
+import { HttpStatusCode } from "../HttpStatusCode.js";
+import clientOnly from "../clientOnly.js";
+const DevOverlayDialog = import.meta.env.PROD
+    ? () => <></>
+    : clientOnly(() => import("./DevOverlayDialog"), { lazy: true });
 export function DevOverlay(props) {
     const [errors, setErrors] = createSignal([]);
     function resetError() {

package/dist/shared/lazy.d.ts

@@ -0,0 +1,3 @@
+import { lazy as solidLazy } from "solid-js";
+declare const lazy: typeof solidLazy;
+export default lazy;

package/dist/shared/lazy.js

@@ -0,0 +1,40 @@
+import { lazy as solidLazy } from "solid-js";
+import { getRequestEvent, isServer } from "solid-js/web";
+import { getManifest } from "solid-start:get-manifest";
+import { useAssets } from "../server/assets/index.js";
+const assetsById = {};
+const getAssets = async (id) => {
+    if (assetsById[id])
+        return assetsById[id];
+    const manifest = getManifest(import.meta.env.SSR && import.meta.env.DEV ? "ssr" : "client");
+    const assets = await manifest.getAssets(id);
+    if (import.meta.env.PROD)
+        assetsById[id] = assets;
+    return assets;
+};
+const withAssets = function (fn) {
+    const wrapper = async () => {
+        const mod = await fn();
+        // This id$$ export is generated by the lazy vite plugin
+        const id = mod.id$$;
+        if (!id)
+            return mod;
+        if (!mod.default) {
+            console.error(`Module ${id} does not export default`);
+            return { default: () => [] };
+        }
+        const assets = await getAssets(id);
+        if (!assets.length)
+            return mod;
+        return {
+            default: (props) => {
+                const { nonce } = getRequestEvent();
+                useAssets(assets, nonce);
+                return mod.default(props);
+            }
+        };
+    };
+    return wrapper;
+};
+const lazy = !isServer ? solidLazy : (fn) => solidLazy(withAssets(fn));
+export default lazy;

package/dist/shared/serverFunction.d.ts

@@ -1,4 +1,4 @@
-import type { ServerFunctionMeta } from "../server/types";
+import type { ServerFunctionMeta } from "../server/types.ts";
 /**
  *
  * Read more: https://docs.solidjs.com/solid-start/reference/server/get-server-function-meta

package/package.json

@@ -1,88 +1,66 @@
 {
   "name": "@solidjs/start",
-  "version": "1.2.0",
+  "version": "2.0.0-alpha.0",
   "type": "module",
-  "author": "Ryan Carniato",
-  "license": "MIT",
-  "homepage": "https://start.solidjs.com/",
-  "bugs": "https://github.com/solidjs/solid-start/issues",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/solidjs/solid-start.git",
-    "directory": "packages/start"
-  },
-  "publishConfig": {
-    "access": "public"
-  },
-  "files": [
-    "config",
-    "dist",
-    "env.d.ts"
-  ],
-  "types": "./dist/index.d.ts",
   "exports": {
     ".": "./dist/index.jsx",
-    "./config": "./config/index.js",
-    "./middleware": "./dist/middleware/index.jsx",
-    "./router": "./dist/router/index.jsx",
+    "./config": "./dist/config/index.js",
     "./server": "./dist/server/index.jsx",
-    "./server/spa": "./dist/server/spa/index.jsx",
     "./client": "./dist/client/index.jsx",
-    "./client/islands": "./dist/client/islands.jsx",
+    "./router": "./dist/router.jsx",
+    "./server/spa": "./dist/server/spa/index.jsx",
     "./client/spa": "./dist/client/spa/index.jsx",
-    "./env": {
-      "types": "./env.d.ts",
-      "import": null
-    }
-  },
-  "typesVersions": {
-    "*": {
-      ".": [
-        "./dist/index.d.ts"
-      ],
-      "middleware": [
-        "./dist/middleware/index.d.ts"
-      ],
-      "router": [
-        "./dist/router/index.d.ts"
-      ],
-      "server": [
-        "./dist/server/index.d.ts"
-      ],
-      "client": [
-        "./dist/client/index.d.ts"
-      ]
-    }
+    "./middleware": "./dist/middleware/index.js",
+    "./http": "./dist/http/index.js"
   },
-  "devDependencies": {
-    "solid-js": "^1.9.5",
-    "vinxi": "^0.5.7",
-    "vitest": "3.0.5"
+  "publishConfig": {
+    "access": "public"
   },
   "dependencies": {
-    "@tanstack/server-functions-plugin": "1.121.21",
-    "@vinxi/plugin-directives": "^0.5.0",
-    "@vinxi/server-components": "^0.5.0",
+    "@babel/core": "^7.28.3",
+    "@babel/traverse": "^7.28.3",
+    "@babel/types": "^7.28.5",
+    "@solidjs/meta": "^0.29.4",
+    "@tanstack/server-functions-plugin": "1.134.5",
+    "@types/babel__traverse": "^7.28.0",
+    "@types/micromatch": "^4.0.9",
     "cookie-es": "^2.0.0",
-    "defu": "^6.1.2",
+    "defu": "^6.1.4",
     "error-stack-parser": "^2.1.4",
-    "html-to-image": "^1.11.11",
-    "radix3": "^1.1.0",
-    "seroval": "^1.0.2",
-    "seroval-plugins": "^1.0.2",
+    "es-module-lexer": "^1.7.0",
+    "esbuild": "^0.25.3",
+    "fast-glob": "^3.3.3",
+    "h3": "npm:h3@2.0.1-rc.4",
+    "html-to-image": "^1.11.13",
+    "micromatch": "^4.0.8",
+    "path-to-regexp": "^8.2.0",
+    "pathe": "^2.0.3",
+    "radix3": "^1.1.2",
+    "seroval": "^1.3.2",
+    "seroval-plugins": "^1.2.1",
     "shiki": "^1.26.1",
-    "source-map-js": "^1.0.2",
-    "terracotta": "^1.0.4",
-    "tinyglobby": "^0.2.2",
-    "vite-plugin-solid": "^2.11.1"
+    "solid-js": "^1.9.9",
+    "source-map-js": "^1.2.1",
+    "srvx": "^0.9.1",
+    "terracotta": "^1.0.6",
+    "vite-plugin-solid": "^2.11.9"
+  },
+  "engines": {
+    "node": ">=22"
+  },
+  "devDependencies": {
+    "@types/babel__core": "^7.20.5",
+    "vite": "^7.1.10",
+    "vitest": "^4.0.10"
   },
   "peerDependencies": {
-    "vinxi": "^0.5.7"
+    "vite": "^7"
   },
   "scripts": {
-    "typecheck": "tsc --noEmit",
-    "build": "node build && pnpm tsc",
+    "build": "pnpm validate-imports && tsc && node scripts/build.js",
+    "dev": "tsc --watch",
     "test": "vitest",
-    "test:ci": "vitest run"
+    "test:ci": "vitest run",
+    "validate-imports": "node scripts/validate-imports.js"
   }
 }

package/scripts/build.js

@@ -0,0 +1,15 @@
+import * as fs from "node:fs/promises";
+import * as path from "node:path";
+import glob from "fast-glob";
+
+const files = await glob("**/*.{js,css}", { cwd: `${process.cwd()}/src` });
+
+await Promise.all(
+  files.map(file =>
+    fs.cp(
+      path.join(import.meta.dirname, "../src", file),
+      path.join(import.meta.dirname, "../dist", file),
+      { recursive: true }
+    )
+  )
+);