@solidjs/start 2.0.0-alpha.0 → 2.0.0-alpha.2

package/CHANGELOG.md

@@ -0,0 +1,28 @@
+# @solidjs/start
+
+## 2.0.0-alpha.2
+
+### Minor Changes
+
+- 10bf932: Fix path resolution on Windows
+- 40d5a27: fix onBeforeResponse
+- 9201e71: fix text/html missing when ssr is false
+- a9cd2cc: add `vite preview` support
+
+### Patch Changes
+
+- 7077a49: Fixed CSS from shared chunks not being collected via the chunk name.
+- a620eeb: Fixed virtual module CSS not being collected in vite dev.
+
+## 2.0.0-alpha.1
+
+### Patch Changes
+
+- 8256190: Rework `@solidjs/start/env`
+- 6cbba24: Fix multiple Set-Cookie headers being lost on redirect responses
+- d4cc548: ## Bump Seroval
+
+  - version `1.4.1`
+
+- dd40610: Handle base url in api routes
+- 0c8a5e2: export server types from /server

package/dist/client/mount.d.ts

@@ -1,7 +1 @@
-import type { JSX } from "solid-js";
-import { type MountableElement } from "solid-js/web";
-/**
- *
- * Read more: https://docs.solidjs.com/solid-start/reference/client/mount
- */
-export declare function mount(fn: () => JSX.Element, el: MountableElement): (() => void) | undefined;
+export { hydrate as mount } from "solid-js/web";

package/dist/client/mount.js

@@ -1,99 +1 @@
-var __rewriteRelativeImportExtension = (this && this.__rewriteRelativeImportExtension) || function (path, preserveJsx) {
-    if (typeof path === "string" && /^\.\.?\//.test(path)) {
-        return path.replace(/\.(tsx)$|((?:\.d)?)((?:\.[^./]+?)?)\.([cm]?)ts$/i, function (m, tsx, d, ext, cm) {
-            return tsx ? preserveJsx ? ".jsx" : ".js" : d && (!ext || !cm) ? m : (d + ext + "." + cm.toLowerCase() + "js");
-        });
-    }
-    return path;
-};
-import { createStore } from "solid-js/store";
-import { createComponent, getHydrationKey, getOwner, hydrate } from "solid-js/web";
-/**
- *
- * Read more: https://docs.solidjs.com/solid-start/reference/client/mount
- */
-export function mount(fn, el) {
-    if (import.meta.env.START_ISLANDS) {
-        const map = new WeakMap();
-        async function mountIsland(el) {
-            if (el.dataset.css) {
-                let css = JSON.parse(el.dataset.css);
-                for (let href of css) {
-                    if (!document.querySelector(`link[href="${href}"]`)) {
-                        let link = document.createElement("link");
-                        link.rel = "stylesheet";
-                        link.href = href;
-                        document.head.appendChild(link);
-                    }
-                }
-            }
-            let mod = await import(__rewriteRelativeImportExtension(
-            /* @vite-ignore */
-            import.meta.env.MANIFEST["client"].chunks[el.dataset.id.split("#")[0]].output
-                .path, true));
-            if (!mod || !el.dataset.hk)
-                return;
-            let Component = mod[el.dataset.id.split("#")[1]];
-            let hk = el.dataset.hk;
-            // _$DEBUG("hydrating island", el.dataset.island, hk.slice(0, hk.length - 1) + `1-`, el);
-            let props = createStore({
-                ...JSON.parse(el.dataset.props),
-                get children() {
-                    const p = el.getElementsByTagName("solid-children");
-                    getHydrationKey();
-                    [...p].forEach(a => {
-                        a.__$owner = getOwner();
-                    });
-                    return;
-                }
-            });
-            map.set(el, props);
-            hydrate(() => createComponent(Component, props[0]), el, {
-                renderId: hk.slice(0, hk.length - 1) + `${1 + Number(el.dataset.offset)}-`,
-                owner: lookupOwner(el)
-            });
-            delete el.dataset.hk;
-            el.dataset.hkk = hk;
-        }
-        let queue = [];
-        let queued = false;
-        function runTaskQueue(info) {
-            while (info.timeRemaining() > 0 && queue.length) {
-                mountIsland(queue.shift());
-            }
-            if (queue.length) {
-                requestIdleCallback(runTaskQueue);
-            }
-            else
-                queued = false;
-        }
-        const hydrateIslands = () => {
-            const islands = document.querySelectorAll("solid-island[data-hk]");
-            const assets = new Set();
-            islands.forEach((el) => el.dataset.id && assets.add(el.dataset.id));
-            Promise.all([...assets].map(asset => import(
-            /* @vite-ignore */ import.meta.env.MANIFEST["client"].chunks[asset.split("#")[0]].output.path)))
-                .then(() => {
-                islands.forEach((el) => {
-                    if (el.dataset.when === "idle" && "requestIdleCallback" in window) {
-                        if (!queued) {
-                            queued = true;
-                            requestIdleCallback(runTaskQueue);
-                        }
-                        queue.push(el);
-                    }
-                    else
-                        mountIsland(el);
-                });
-            })
-                .catch(e => console.error(e));
-        };
-        function lookupOwner(el) {
-            const parent = el.closest("solid-children");
-            return parent && parent.__$owner;
-        }
-        hydrateIslands();
-        return;
-    }
-    return hydrate(fn, el);
-}
+export { hydrate as mount } from "solid-js/web";

package/dist/config/constants.js

@@ -8,9 +8,9 @@ export const VIRTUAL_MODULES = {
     serverFnManifest: "solidstart:server-fn-manifest",
     clientEntry: "solid-start:client-entry",
     serverEntry: "solid-start:server-entry",
-    app: "solid-start:app"
+    app: "solid-start:app",
 };
 export const VITE_ENVIRONMENTS = {
     client: "client",
-    server: "ssr"
+    server: "ssr",
 };

package/dist/config/dev-server.js

@@ -5,6 +5,16 @@ export function devServer() {
     return [
         {
             name: "solid-start-dev-server",
+            configurePreviewServer(server) {
+                return () => {
+                    server.middlewares.use(async (req, res) => {
+                        res.setHeader("content-encoding", "identity");
+                        const webReq = new NodeRequest({ req, res });
+                        const def = await import(process.cwd() + "/dist/server/entry-server.js");
+                        sendNodeResponse(res, await def.default.fetch(webReq));
+                    });
+                };
+            },
             configureServer(viteDevServer) {
                 globalThis.VITE_DEV_SERVER = viteDevServer;
                 return async () => {

package/dist/config/fs-router.js

@@ -31,17 +31,15 @@ export class SolidStartClientFileRouter extends BaseFileSystemRouter {
             };
         }
         const [_, exports] = analyzeModule(src);
-        const hasDefault = !!exports.find((e) => e.n === "default");
-        const hasRouteConfig = !!exports.find((e) => e.n === "route");
+        const hasDefault = !!exports.find(e => e.n === "default");
+        const hasRouteConfig = !!exports.find(e => e.n === "route");
         if (hasDefault) {
             return {
                 page: true,
                 $component: {
                     src: src,
                     pick: [
-                        ...exports
-                            .filter((e) => e.n === e.ln && e.n !== "route")
-                            .map((e) => e.n),
+                        ...exports.filter(e => e.n === e.ln && e.n !== "route").map(e => e.n),
                         "default",
                         "$css",
                     ],
@@ -58,15 +56,7 @@ export class SolidStartClientFileRouter extends BaseFileSystemRouter {
         }
     }
 }
-const HTTP_METHODS = [
-    "HEAD",
-    "GET",
-    "POST",
-    "PUT",
-    "DELETE",
-    "PATCH",
-    "OPTIONS",
-];
+const HTTP_METHODS = ["HEAD", "GET", "POST", "PUT", "DELETE", "PATCH", "OPTIONS"];
 function createHTTPHandlers(src, exports) {
     const handlers = {};
     for (const exp of exports) {
@@ -75,7 +65,7 @@ function createHTTPHandlers(src, exports) {
                 src: src,
                 pick: [exp.n],
             };
-            if (exp.n === "GET" && !exports.find((exp) => exp.n === "HEAD")) {
+            if (exp.n === "GET" && !exports.find(exp => exp.n === "HEAD")) {
                 handlers.$HEAD = {
                     src: src,
                     pick: [exp.n],
@@ -119,9 +109,9 @@ export class SolidStartServerFileRouter extends BaseFileSystemRouter {
             };
         }
         const [_, exports] = analyzeModule(src);
-        const hasRouteConfig = exports.find((e) => e.n === "route");
-        const hasDefault = !!exports.find((e) => e.n === "default");
-        const hasAPIRoutes = !!exports.find((exp) => HTTP_METHODS.includes(exp.n));
+        const hasRouteConfig = exports.find(e => e.n === "route");
+        const hasDefault = !!exports.find(e => e.n === "default");
+        const hasAPIRoutes = !!exports.find(exp => HTTP_METHODS.includes(exp.n));
         if (hasDefault || hasAPIRoutes) {
             return {
                 page: hasDefault,
@@ -130,10 +120,8 @@ export class SolidStartServerFileRouter extends BaseFileSystemRouter {
                         src: src,
                         pick: [
                             ...exports
-                                .filter((e) => e.n === e.ln &&
-                                e.n !== "route" &&
-                                !HTTP_METHODS.includes(e.n))
-                                .map((e) => e.n),
+                                .filter(e => e.n === e.ln && e.n !== "route" && !HTTP_METHODS.includes(e.n))
+                                .map(e => e.n),
                             "default",
                             "$css",
                         ],

package/dist/config/fs-routes/fs-watcher.js

@@ -1,8 +1,8 @@
 import { moduleId } from "./index.js";
 function setupWatcher(watcher, routes) {
-    watcher.on("unlink", (path) => routes.removeRoute(path));
-    watcher.on("add", (path) => routes.addRoute(path));
-    watcher.on("change", (path) => routes.updateRoute(path));
+    watcher.on("unlink", path => routes.removeRoute(path));
+    watcher.on("add", path => routes.addRoute(path));
+    watcher.on("change", path => routes.updateRoute(path));
 }
 function createRoutesReloader(server, routes, environment) {
     routes.addEventListener("reload", handleRoutesReload);
@@ -38,7 +38,7 @@ export const fileSystemWatcher = (routers) => {
     const plugin = {
         name: "fs-watcher",
         async configureServer(server) {
-            Object.keys(routers).forEach((environment) => {
+            Object.keys(routers).forEach(environment => {
                 const router = globalThis.ROUTERS[environment];
                 setupWatcher(server.watcher, router);
                 createRoutesReloader(server, router, environment);

package/dist/config/fs-routes/index.js

@@ -43,10 +43,8 @@ export function fsRoutes({ routers }) {
                         const buildId = `${v.src}?${v.pick.map((p) => `pick=${p}`).join("&")}`;
                         return {
                             src: relative(root, buildId),
-                            build: isBuild
-                                ? `_$() => import(/* @vite-ignore */ '${buildId}')$_`
-                                : undefined,
-                            import: `_$() => import(/* @vite-ignore */ '${buildId}')$_`
+                            build: isBuild ? `_$() => import(/* @vite-ignore */ '${buildId}')$_` : undefined,
+                            import: `_$() => import(/* @vite-ignore */ '${buildId}')$_`,
                         };
                     }
                     return v;
@@ -90,13 +88,13 @@ function jsCode() {
         delete id["default"];
         return Object.keys(id).length > 0
             ? `{ ${Object.keys(id)
-                .map((k) => `${k} as ${id[k]}`)
+                .map(k => `${k} as ${id[k]}`)
                 .join(", ")} }`
             : "";
     };
     const getImportStatements = () => {
         return `${[...imports.keys()]
-            .map((i) => `import ${imports.get(i).default
+            .map(i => `import ${imports.get(i).default
             ? `${imports.get(i).default}${Object.keys(imports.get(i)).length > 1 ? ", " : ""}`
             : ""} ${getNamedExport(i)} from '${i}';`)
             .join("\n")}`;

package/dist/config/fs-routes/router.js

@@ -1,12 +1,11 @@
-import { init } from "es-module-lexer";
-import { parse } from "es-module-lexer";
+import { init, parse } from "es-module-lexer";
 import esbuild from "esbuild";
 import fg from "fast-glob";
 import fs from "fs";
 import micromatch from "micromatch";
 import { posix } from "path";
 import { pathToRegexp } from "path-to-regexp";
-import { normalize } from "node:path";
+import { normalizePath } from "vite";
 export { pathToRegexp };
 export const glob = (path) => fg.sync(path, { absolute: true });
 export function cleanPath(src, config) {
@@ -18,7 +17,7 @@ export function analyzeModule(src) {
     return parse(esbuild.transformSync(fs.readFileSync(src, "utf-8"), {
         jsx: "transform",
         format: "esm",
-        loader: "tsx"
+        loader: "tsx",
     }).code, src);
 }
 export class BaseFileSystemRouter extends EventTarget {
@@ -61,9 +60,9 @@ export class BaseFileSystemRouter extends EventTarget {
         return {
             $component: {
                 src: src,
-                pick: ["default", "$css"]
+                pick: ["default", "$css"],
             },
-            path
+            path,
             // filePath: src
         };
     }
@@ -76,7 +75,7 @@ export class BaseFileSystemRouter extends EventTarget {
         this.routes.push(route);
     }
     async addRoute(src) {
-        src = normalize(src);
+        src = normalizePath(src);
         if (this.isRoute(src)) {
             try {
                 const route = this.toRoute(src);
@@ -94,12 +93,12 @@ export class BaseFileSystemRouter extends EventTarget {
         this.dispatchEvent(new Event("reload", {
             // @ts-ignore
             detail: {
-                route
-            }
+                route,
+            },
         }));
     }
     async updateRoute(src) {
-        src = normalize(src);
+        src = normalizePath(src);
         if (this.isRoute(src)) {
             try {
                 const route = this.toRoute(src);
@@ -115,7 +114,7 @@ export class BaseFileSystemRouter extends EventTarget {
         }
     }
     removeRoute(src) {
-        src = normalize(src);
+        src = normalizePath(src);
         if (this.isRoute(src)) {
             const path = this.toPath(src);
             if (path === undefined) {

package/dist/config/fs-routes/tree-shake.js

@@ -18,9 +18,7 @@ function treeShakeTransform({ types: t }) {
         if (path.node.type === "ArrowFunctionExpression") {
             return null;
         }
-        return path.node.id && path.node.id.type === "Identifier"
-            ? path.get("id")
-            : null;
+        return path.node.id && path.node.id.type === "Identifier" ? path.get("id") : null;
     }
     function isIdentifierReferenced(ident) {
         const b = ident.scope.getBinding(ident.node.name);
@@ -28,7 +26,7 @@ function treeShakeTransform({ types: t }) {
             if (b.path.type === "FunctionDeclaration") {
                 return !b.constantViolations
                     .concat(b.referencePaths)
-                    .every((ref) => ref.findParent((p) => p === b.path));
+                    .every(ref => ref.findParent(p => p === b.path));
             }
             return true;
         }
@@ -63,7 +61,7 @@ function treeShakeTransform({ types: t }) {
                             else if (variablePath.node.id.type === "ObjectPattern") {
                                 const pattern = variablePath.get("id");
                                 const properties = pattern.get("properties");
-                                properties.forEach((p) => {
+                                properties.forEach(p => {
                                     const local = p.get(p.node.type === "ObjectProperty"
                                         ? "value"
                                         : p.node.type === "RestElement"
@@ -79,7 +77,7 @@ function treeShakeTransform({ types: t }) {
                             else if (variablePath.node.id.type === "ArrayPattern") {
                                 const pattern = variablePath.get("id");
                                 const elements = pattern.get("elements");
-                                elements.forEach((e) => {
+                                elements.forEach(e => {
                                     let local;
                                     if (e.node && e.node.type === "Identifier") {
                                         local = e;
@@ -109,7 +107,7 @@ function treeShakeTransform({ types: t }) {
                             }
                             const specifiers = exportNamedPath.get("specifiers");
                             if (specifiers.length) {
-                                specifiers.forEach((s) => {
+                                specifiers.forEach(s => {
                                     if (t.isIdentifier(s.node.exported)
                                         ? s.node.exported.name
                                         : state.opts.pick.includes(s.node.exported.value)) {
@@ -128,16 +126,14 @@ function treeShakeTransform({ types: t }) {
                             switch (decl.node.type) {
                                 case "FunctionDeclaration": {
                                     const name = decl.node.id?.name;
-                                    if (name &&
-                                        state.opts.pick &&
-                                        !state.opts.pick.includes(name)) {
+                                    if (name && state.opts.pick && !state.opts.pick.includes(name)) {
                                         exportNamedPath.remove();
                                     }
                                     break;
                                 }
                                 case "VariableDeclaration": {
                                     const inner = decl.get("declarations");
-                                    inner.forEach((d) => {
+                                    inner.forEach(d => {
                                         if (d.node.id.type !== "Identifier") {
                                             return;
                                         }
@@ -171,10 +167,7 @@ function treeShakeTransform({ types: t }) {
                     let count = 0;
                     const sweepFunction = (sweepPath) => {
                         const ident = getIdentifier(sweepPath);
-                        if (ident &&
-                            ident.node &&
-                            refs.has(ident) &&
-                            !isIdentifierReferenced(ident)) {
+                        if (ident && ident.node && refs.has(ident) && !isIdentifierReferenced(ident)) {
                             ++count;
                             if (t.isAssignmentExpression(sweepPath.parentPath) ||
                                 t.isVariableDeclarator(sweepPath.parentPath)) {
@@ -211,7 +204,7 @@ function treeShakeTransform({ types: t }) {
                                     const pattern = variablePath.get("id");
                                     const beforeCount = count;
                                     const properties = pattern.get("properties");
-                                    properties.forEach((p) => {
+                                    properties.forEach(p => {
                                         const local = p.get(p.node.type === "ObjectProperty"
                                             ? "value"
                                             : p.node.type === "RestElement"
@@ -224,8 +217,7 @@ function treeShakeTransform({ types: t }) {
                                             p.remove();
                                         }
                                     });
-                                    if (beforeCount !== count &&
-                                        pattern.get("properties").length < 1) {
+                                    if (beforeCount !== count && pattern.get("properties").length < 1) {
                                         variablePath.remove();
                                     }
                                 }
@@ -233,7 +225,7 @@ function treeShakeTransform({ types: t }) {
                                     const pattern = variablePath.get("id");
                                     const beforeCount = count;
                                     const elements = pattern.get("elements");
-                                    elements.forEach((e) => {
+                                    elements.forEach(e => {
                                         let local;
                                         if (e.node && e.node.type === "Identifier") {
                                             local = e;
@@ -249,8 +241,7 @@ function treeShakeTransform({ types: t }) {
                                             e.remove();
                                         }
                                     });
-                                    if (beforeCount !== count &&
-                                        pattern.get("elements").length < 1) {
+                                    if (beforeCount !== count && pattern.get("elements").length < 1) {
                                         variablePath.remove();
                                     }
                                 }