Merge branch 'main' into vite-8-compat

Author: katywings

.changeset/purple-taxes-join.md

@@ -0,0 +1,5 @@
+---
+"@solidjs/start": patch
+---
+
+reload ssr server when new route files are created in dev

.changeset/rare-canyons-travel.md

@@ -0,0 +1,5 @@
+---
+"@solidjs/start": minor
+---
+
+Add new directives plugin with shorter function IDs and inner declaration support

apps/tests/src/e2e/server-function.test.ts

@@ -81,6 +81,10 @@ test.describe("server-function", () => {
     await page.goto("http://localhost:3000/server-function-blob");
     await expect(page.locator("#server-fn-test")).toContainText('{"result":true}');
   });
+  test("should remove exports for non-function values when top-level use server is used", async ({ page }) => {
+    await page.goto("http://localhost:3000/server-function-query-toplevel");
+    await expect(page.locator("#server-fn-test")).toContainText('false');
+  });
 
   // TODO not sure if this is the correct place
   test("should build with a env:server", async ({ page }) => {

apps/tests/src/functions/solid-router-query.ts

@@ -0,0 +1,7 @@
+"use server";
+
+import { query } from "@solidjs/router";
+import { isServer } from "solid-js/web";
+
+export const testQuery = query(() => isServer, 'testQuery');
+

apps/tests/src/routes/server-function-query-toplevel.tsx

@@ -0,0 +1,16 @@
+import { createEffect, createSignal } from "solid-js";
+import * as testModule from "~/functions/solid-router-query";
+
+export default function App() {
+  const [output, setOutput] = createSignal<boolean | null>();
+
+  createEffect(() => {
+    setOutput('testQuery' in testModule);
+  });
+
+  return (
+    <main>
+      <span id="server-fn-test">{JSON.stringify(output())}</span>
+    </main>
+  );
+}

apps/tests/test-results/.last-run.json

@@ -41,7 +41,6 @@
     "@babel/traverse": "^7.29.0",
     "@babel/types": "^7.29.0",
     "@solidjs/meta": "^0.29.4",
-    "@tanstack/server-functions-plugin": "1.134.5",
     "@types/babel__traverse": "^7.28.0",
     "@types/micromatch": "^4.0.10",
     "cookie-es": "^2.0.0",

packages/start/package.json

@@ -1,11 +1,10 @@
 import type {
   EnvironmentModuleNode,
   FSWatcher,
-  ModuleGraph,
-  ModuleNode,
   PluginOption,
   ViteDevServer,
 } from "vite";
+import { VITE_ENVIRONMENTS } from "../constants.ts";
 import { moduleId } from "./index.ts";
 import type { BaseFileSystemRouter } from "./router.ts";
 
@@ -32,30 +31,24 @@ function createRoutesReloader(
   return () => routes.removeEventListener("reload", handleRoutesReload);
 
   function handleRoutesReload(): void {
-    if (environment === "ssr") {
-      // Handle server environment HMR reload
-      const serverEnv = server.environments.server;
-      if (serverEnv && serverEnv.moduleGraph) {
-        const mod: EnvironmentModuleNode | undefined =
-          serverEnv.moduleGraph.getModuleById(moduleId);
-        if (mod) {
-          const seen = new Set<EnvironmentModuleNode>();
-          serverEnv.moduleGraph.invalidateModule(mod, seen);
-        }
-      }
-    } else {
-      // Handle client environment HMR reload
-      const { moduleGraph }: { moduleGraph: ModuleGraph } = server;
-      const mod: ModuleNode | undefined = moduleGraph.getModuleById(moduleId);
-      if (mod) {
-        const seen = new Set<ModuleNode>();
-        moduleGraph.invalidateModule(mod, seen);
-        server.reloadModule(mod);
-      }
+    const envName =
+      environment === "ssr" ? VITE_ENVIRONMENTS.server : VITE_ENVIRONMENTS.client;
+    const devEnv = server.environments[envName];
+    if (!devEnv?.moduleGraph) return;
+
+    const mod: EnvironmentModuleNode | undefined =
+      devEnv.moduleGraph.getModuleById(moduleId);
+    if (mod) {
+      const seen = new Set<EnvironmentModuleNode>();
+      devEnv.moduleGraph.invalidateModule(mod, seen);
     }
 
-    if (!server.hot) {
-      server.ws.send({ type: "full-reload" });
+    if (environment !== "ssr") {
+      if (mod) {
+        devEnv.reloadModule(mod);
+      } else if (devEnv.hot) {
+        devEnv.hot.send({ type: "full-reload" });
+      }
     }
   }
 }

packages/start/src/config/fs-routes/fs-watcher.ts

@@ -1,11 +1,10 @@
-import { TanStackServerFnPlugin } from "@tanstack/server-functions-plugin";
 import { defu } from "defu";
 import { globSync } from "node:fs";
 import { extname, isAbsolute, join } from "node:path";
 import { fileURLToPath } from "node:url";
 import { normalizePath, type PluginOption } from "vite";
 import solid, { type Options as SolidOptions } from "vite-plugin-solid";
-
+import { serverFunctionsPlugin } from "../directives/index.ts";
 import { DEFAULT_EXTENSIONS, VIRTUAL_MODULES, VITE_ENVIRONMENTS } from "./constants.ts";
 import { devServer } from "./dev-server.ts";
 import { type EnvPluginOptions, envPlugin } from "./env.ts";
@@ -190,38 +189,15 @@ export function solidStart(options?: SolidStartOptions): Array<PluginOption> {
     envPlugin(options?.env),
     // Must be placed after fsRoutes, as treeShake will remove the
     // server fn exports added in by this plugin
-    TanStackServerFnPlugin({
-      // This is the ID that will be available to look up and import
-      // our server function manifest and resolve its module
-      manifestVirtualImportId: VIRTUAL_MODULES.serverFnManifest,
-      directive: "use server",
-      callers: [
-        {
-          envConsumer: "client",
-          envName: VITE_ENVIRONMENTS.client,
-          getRuntimeCode: () =>
-            `import { createServerReference } from "${normalizePath(
-              fileURLToPath(new URL("../server/server-runtime", import.meta.url)),
-            )}"`,
-          replacer: opts => `createServerReference('${opts.functionId}')`,
-        },
-        {
-          envConsumer: "server",
-          envName: VITE_ENVIRONMENTS.server,
-          getRuntimeCode: () =>
-            `import { createServerReference } from '${normalizePath(
-              fileURLToPath(new URL("../server/server-fns-runtime", import.meta.url)),
-            )}'`,
-          replacer: opts => `createServerReference(${opts.fn}, '${opts.functionId}')`,
-        },
-      ],
-      provider: {
-        envName: VITE_ENVIRONMENTS.server,
-        getRuntimeCode: () =>
-          `import { createServerReference } from '${normalizePath(
-            fileURLToPath(new URL("../server/server-fns-runtime", import.meta.url)),
-          )}'`,
-        replacer: opts => `createServerReference(${opts.fn}, '${opts.functionId}')`,
+    serverFunctionsPlugin({
+      manifest: VIRTUAL_MODULES.serverFnManifest,
+      runtime: {
+        server: normalizePath(
+          fileURLToPath(new URL("../server/server-fns-runtime.ts", import.meta.url)),
+        ),
+        client: normalizePath(
+          fileURLToPath(new URL("../server/server-runtime.ts", import.meta.url)),
+        ),
       },
     }),
     {

packages/start/src/config/index.ts

@@ -0,0 +1,33 @@
+import type * as babel from "@babel/core";
+import * as t from "@babel/types";
+
+export function bubbleFunctionDeclaration(path: babel.NodePath<t.FunctionDeclaration>): void {
+  const decl = path.node;
+  // Check if declaration is FunctionDeclaration
+  if (decl.id) {
+    const block = (path.findParent(current => current.isBlockStatement()) ||
+      path.scope.getProgramParent().path) as babel.NodePath<t.BlockStatement>;
+
+    if (path.parentPath.isExportNamedDeclaration()) {
+      path.parentPath.replaceWith(
+        t.exportNamedDeclaration(undefined, [t.exportSpecifier(decl.id, decl.id)]),
+      );
+    } else if (path.parentPath.isExportDefaultDeclaration()) {
+      path.replaceWith(decl.id);
+    } else {
+      path.remove();
+    }
+
+    const [tmp] = block.unshiftContainer(
+      "body",
+      t.variableDeclaration("const", [
+        t.variableDeclarator(
+          decl.id,
+          t.functionExpression(decl.id, decl.params, decl.body, decl.generator, decl.async),
+        ),
+      ]),
+    );
+    block.scope.registerDeclaration(tmp);
+    tmp.skip();
+  }
+}