Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/warm-cats-juggle.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@solidjs/start": patch
---

Support JavaScript projects whose app and client/server entries use `.jsx`.
18 changes: 18 additions & 0 deletions apps/fixtures/bare-js/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"name": "fixture-bare-js",
"private": true,
"type": "module",
"scripts": {
"dev": "vite dev",
"build": "vite build"
},
"dependencies": {
"@solidjs/start": "workspace:*",
"nitro": "^3.0.260610-beta",
"solid-js": "^1.9.11",
"vite": "^8.0.0"
},
"engines": {
"node": ">=24"
}
}
14 changes: 14 additions & 0 deletions apps/fixtures/bare-js/src/app.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
import { createSignal } from "solid-js";

export default function App() {
const [count, setCount] = createSignal(0);

return (
<main>
<h1>Hello world!</h1>
<button onClick={() => setCount(count() + 1)} type="button">
Clicks: {count()}
</button>
</main>
);
}
4 changes: 4 additions & 0 deletions apps/fixtures/bare-js/src/entry-client.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
// @refresh reload
import { mount, StartClient } from "@solidjs/start/client";

mount(() => <StartClient />, document.getElementById("app"));
20 changes: 20 additions & 0 deletions apps/fixtures/bare-js/src/entry-server.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
// @refresh reload
import { createHandler, StartServer } from "@solidjs/start/server";

export default createHandler(() => (
<StartServer
document={({ assets, children, scripts }) => (
<html lang="en">
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
{assets}
</head>
<body>
<div id="app">{children}</div>
{scripts}
</body>
</html>
)}
/>
));
7 changes: 7 additions & 0 deletions apps/fixtures/bare-js/vite.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
import { nitro } from "nitro/vite";
import { defineConfig } from "vite";
import { solidStart } from "../../../packages/start/src/config/index.ts";

export default defineConfig({
plugins: [solidStart(), nitro()],
});
4 changes: 2 additions & 2 deletions packages/start/src/config/dev-server.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import {
} from "vite";
import { VITE_ENVIRONMENTS } from "./constants.ts";

export function devServer(): Array<PluginOption> {
export function devServer(serverEntryPath: string): Array<PluginOption> {
return [
{
name: "solid-start-dev-server",
Expand Down Expand Up @@ -62,7 +62,7 @@ export function devServer(): Array<PluginOption> {
try {
const serverEntry: {
default: { fetch: (req: Request) => Promise<Response> };
} = await serverEnv.runner.import("./src/entry-server.tsx");
} = await serverEnv.runner.import(serverEntryPath);

const webRes = await serverEntry.default.fetch(webReq);

Expand Down
8 changes: 4 additions & 4 deletions packages/start/src/config/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,8 @@ export function solidStart(options?: SolidStartOptions): Array<PluginOption> {
serverFunctionsPlugin({
manifest: VIRTUAL_MODULES.serverFnManifest,
runtime: {
server: '@solidjs/start/fns/server',
client: '@solidjs/start/fns/client',
server: "@solidjs/start/fns/server",
client: "@solidjs/start/fns/client",
},
filter: options?.serverFunctions?.filter,
}),
Expand Down Expand Up @@ -136,7 +136,7 @@ export function solidStart(options?: SolidStartOptions): Array<PluginOption> {
manifest: true,
copyPublicDir: false,
rollupOptions: {
input: "~/entry-server.tsx",
input: handlers.server,
},
outDir: "dist/server",
commonjsOptions: {
Expand Down Expand Up @@ -236,7 +236,7 @@ export function solidStart(options?: SolidStartOptions): Array<PluginOption> {
(globalThis as any).START_CLIENT_OUT_DIR = options.dir;
},
},
devServer(),
devServer(handlers.server),
solid({
...start.solid,
ssr: true,
Expand Down
15 changes: 15 additions & 0 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading