Merge branch 'main' of https://github.com/ryansolid/solid-start into dev

solidjs · Aug 8, 2023 · 08d5f9c · 08d5f9c
2 parents 96d1edb + 443955f
commit 08d5f9c
Show file tree

Hide file tree

Showing 24 changed files with 36 additions and 35 deletions.
diff --git a/examples/bare/package.json b/examples/bare/package.json
@@ -18,7 +18,7 @@
     "@solidjs/meta": "^0.28.5",
     "@solidjs/router": "^0.8.2",
     "solid-js": "^1.7.9",
-    "solid-start": "^0.2.30",
+    "solid-start": "^0.2.31",
     "undici": "^5.22.1"
   },
   "engines": {

diff --git a/examples/hackernews/package.json b/examples/hackernews/package.json
@@ -19,7 +19,7 @@
     "@solidjs/meta": "^0.28.5",
     "@solidjs/router": "^0.8.2",
     "solid-js": "^1.7.9",
-    "solid-start": "^0.2.30",
+    "solid-start": "^0.2.31",
     "undici": "^5.22.1"
   },
   "engines": {

diff --git a/examples/todomvc/package.json b/examples/todomvc/package.json
@@ -20,7 +20,7 @@
     "@solidjs/meta": "^0.28.5",
     "@solidjs/router": "^0.8.2",
     "solid-js": "^1.7.9",
-    "solid-start": "^0.2.30",
+    "solid-start": "^0.2.31",
     "undici": "^5.22.1"
   },
   "engines": {

diff --git a/examples/with-auth/package.json b/examples/with-auth/package.json
@@ -20,7 +20,7 @@
     "@solidjs/meta": "^0.28.5",
     "@solidjs/router": "^0.8.2",
     "solid-js": "^1.7.9",
-    "solid-start": "^0.2.30",
+    "solid-start": "^0.2.31",
     "undici": "^5.22.1"
   },
   "engines": {

diff --git a/examples/with-authjs/package.json b/examples/with-authjs/package.json
@@ -21,7 +21,7 @@
     "@solidjs/meta": "^0.28.5",
     "@solidjs/router": "^0.8.2",
     "solid-js": "^1.7.9",
-    "solid-start": "^0.2.30",
+    "solid-start": "^0.2.31",
     "undici": "^5.22.1"
   },
   "engines": {

diff --git a/examples/with-mdx/package.json b/examples/with-mdx/package.json
@@ -17,7 +17,7 @@
     "@solidjs/router": "^0.8.2",
     "solid-js": "^1.7.9",
     "solid-mdx": "^0.0.6",
-    "solid-start": "^0.2.30",
+    "solid-start": "^0.2.31",
     "undici": "^5.22.1"
   },
   "engines": {

diff --git a/examples/with-prisma/package.json b/examples/with-prisma/package.json
@@ -17,7 +17,7 @@
     "@solidjs/router": "^0.8.2",
     "prisma": "^4.16.2",
     "solid-js": "^1.7.9",
-    "solid-start": "^0.2.30",
+    "solid-start": "^0.2.31",
     "undici": "^5.22.1"
   },
   "engines": {

diff --git a/examples/with-solid-styled/package.json b/examples/with-solid-styled/package.json
@@ -17,7 +17,7 @@
     "@solidjs/meta": "^0.28.5",
     "@solidjs/router": "^0.8.2",
     "solid-js": "^1.7.9",
-    "solid-start": "^0.2.30",
+    "solid-start": "^0.2.31",
     "solid-styled": "^0.8.2",
     "undici": "^5.22.1"
   },

diff --git a/examples/with-tailwindcss/package.json b/examples/with-tailwindcss/package.json
@@ -18,7 +18,7 @@
     "@solidjs/meta": "^0.28.5",
     "@solidjs/router": "^0.8.2",
     "solid-js": "^1.7.9",
-    "solid-start": "^0.2.30",
+    "solid-start": "^0.2.31",
     "undici": "^5.22.1"
   },
   "engines": {

diff --git a/examples/with-trpc/package.json b/examples/with-trpc/package.json
@@ -21,7 +21,7 @@
     "@trpc/client": "^10.34.0",
     "@trpc/server": "^10.34.0",
     "solid-js": "^1.7.9",
-    "solid-start": "^0.2.30",
+    "solid-start": "^0.2.31",
     "solid-start-trpc": "^0.0.16",
     "solid-trpc": "0.1.0-sssr.7",
     "undici": "^5.22.1",

diff --git a/examples/with-websocket/package.json b/examples/with-websocket/package.json
@@ -17,7 +17,7 @@
     "@solidjs/meta": "^0.28.5",
     "@solidjs/router": "^0.8.2",
     "solid-js": "^1.7.9",
-    "solid-start": "^0.2.30",
+    "solid-start": "^0.2.31",
     "undici": "^5.22.1"
   },
   "engines": {

diff --git a/packages/create-solid/package.json b/packages/create-solid/package.json
@@ -1,6 +1,6 @@
 {
   "name": "create-solid",
-  "version": "0.2.30",
+  "version": "0.2.31",
   "description": "Create Solid apps with low configuration",
   "author": "Ryan Carniato",
   "license": "MIT",

diff --git a/packages/mdx/package.json b/packages/mdx/package.json
@@ -1,6 +1,6 @@
 {
   "name": "solid-start-mdx",
-  "version": "0.2.30",
+  "version": "0.2.31",
   "description": "",
   "main": "./index.js",
   "type": "module",

diff --git a/packages/start-aws/package.json b/packages/start-aws/package.json
@@ -1,6 +1,6 @@
 {
   "name": "solid-start-aws",
-  "version": "0.2.30",
+  "version": "0.2.31",
   "main": "./index.mjs",
   "type": "module",
   "solid": {

diff --git a/packages/start-cloudflare-pages/package.json b/packages/start-cloudflare-pages/package.json
@@ -1,6 +1,6 @@
 {
   "name": "solid-start-cloudflare-pages",
-  "version": "0.2.30",
+  "version": "0.2.31",
   "main": "./index.js",
   "type": "module",
   "solid": {

diff --git a/packages/start-cloudflare-workers/package.json b/packages/start-cloudflare-workers/package.json
@@ -1,6 +1,6 @@
 {
   "name": "solid-start-cloudflare-workers",
-  "version": "0.2.30",
+  "version": "0.2.31",
   "main": "./index.js",
   "types": "./index.d.ts",
   "type": "module",

diff --git a/packages/start-deno/package.json b/packages/start-deno/package.json
@@ -1,6 +1,6 @@
 {
   "name": "solid-start-deno",
-  "version": "0.2.30",
+  "version": "0.2.31",
   "main": "./index.js",
   "type": "module",
   "solid": {

diff --git a/packages/start-netlify/package.json b/packages/start-netlify/package.json
@@ -1,6 +1,6 @@
 {
   "name": "solid-start-netlify",
-  "version": "0.2.30",
+  "version": "0.2.31",
   "main": "./index.js",
   "type": "module",
   "solid": {

diff --git a/packages/start-node/package.json b/packages/start-node/package.json
@@ -1,6 +1,6 @@
 {
   "name": "solid-start-node",
-  "version": "0.2.30",
+  "version": "0.2.31",
   "main": "./index.js",
   "type": "module",
   "solid": {

diff --git a/packages/start-static/package.json b/packages/start-static/package.json
@@ -1,6 +1,6 @@
 {
   "name": "solid-start-static",
-  "version": "0.2.30",
+  "version": "0.2.31",
   "main": "./index.js",
   "types": "./index.d.ts",
   "type": "module",

diff --git a/packages/start-vercel/package.json b/packages/start-vercel/package.json
@@ -1,6 +1,6 @@
 {
   "name": "solid-start-vercel",
-  "version": "0.2.30",
+  "version": "0.2.31",
   "main": "./index.js",
   "types": "./index.d.ts",
   "type": "module",

diff --git a/packages/start/node/fetch.js b/packages/start/node/fetch.js
@@ -2,7 +2,7 @@ import { once } from "events";
 import multipart from "parse-multipart-data";
 import { splitCookiesString } from "set-cookie-parser";
 import { Readable } from "stream";
-import { Request as BaseNodeRequest, File, FormData, Headers } from "undici";
+import { File, FormData, Headers, Request as BaseNodeRequest } from "undici";
 
 function nodeToWeb(/** @type {NodeJS.ReadStream} */ nodeStream) {
   var destroyed = false;
@@ -143,9 +143,10 @@ export class NodeRequest extends BaseNodeRequest {
 }
 
 export function createRequest(/** @type {import('http').IncomingMessage} */ req) {
+  let protocol = req.headers["x-forwarded-proto"] || "https";
   let origin = req.headers.origin && 'null' !== req.headers.origin
       ? req.headers.origin
-      : `http://${req.headers.host}`;
+      : `${protocol}://${req.headers.host}`;
   let url = new URL(req.url, origin);
 
   let init = {

diff --git a/packages/start/package.json b/packages/start/package.json
@@ -1,6 +1,6 @@
 {
   "name": "solid-start",
-  "version": "0.2.30",
+  "version": "0.2.31",
   "description": "Create Solid apps with low configuration",
   "license": "MIT",
   "author": "Ryan Carniato",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml