chore: Update solidstart example

pingdotgg · Sep 24, 2024 · 82611ef · 82611ef
1 parent 073c4ec
commit 82611ef
Show file tree

Hide file tree

Showing 13 changed files with 7,849 additions and 9,206 deletions.
diff --git a/examples/minimal-solidstart/package.json b/examples/minimal-solidstart/package.json
@@ -4,23 +4,18 @@
   "private": true,
   "scripts": {
     "dev": "NODE_ENV=development vinxi dev",
-    "clean": "git clean -xdf .solid node_modules",
     "build": "vinxi build",
-    "start": "vinxi start"
+    "start": "vinxi start",
+    "version": "vinxi version",
+    "clean": "git clean -xdf .solid node_modules"
   },
   "dependencies": {
-    "@solidjs/meta": "^0.29.3",
-    "@solidjs/router": "^0.12.4",
-    "@solidjs/start": "^0.6.0",
-    "@uploadthing/solid": "7.0.2",
-    "solid-js": "^1.8.15",
-    "uploadthing": "7.0.2",
-    "vinxi": "0.3.11"
-  },
-  "devDependencies": {
-    "@types/node": "^20.14.0",
-    "postcss": "8.4.38",
-    "tailwindcss": "^3.4.1",
-    "typescript": "^5.5.2"
+    "@solidjs/meta": "^0.29.4",
+    "@solidjs/router": "^0.14.5",
+    "@solidjs/start": "^1.0.6",
+    "@uploadthing/solid": "^7.0.2",
+    "solid-js": "^1.8.23",
+    "uploadthing": "^7.0.2",
+    "vinxi": "^0.4.3"
   }
 }
diff --git a/examples/minimal-solidstart/postcss.config.cjs b/examples/minimal-solidstart/postcss.config.cjs
diff --git a/examples/minimal-solidstart/src/app.tsx b/examples/minimal-solidstart/src/app.tsx
@@ -1,19 +1,15 @@
-// @refresh reload
-import "./global.css";
-
-import { MetaProvider, Title } from "@solidjs/meta";
+import { MetaProvider } from "@solidjs/meta";
 import { Router } from "@solidjs/router";
-import { FileRoutes } from "@solidjs/start";
+import { FileRoutes } from "@solidjs/start/router";
 import { Suspense } from "solid-js";
 
-import { generateUploadButton } from "@uploadthing/solid";
+import "@uploadthing/solid/styles.css";
 
 export default function App() {
   return (
     <Router
       root={(props) => (
         <MetaProvider>
-          <Title>SolidStart - Basic</Title>
           <Suspense>{props.children}</Suspense>
         </MetaProvider>
       )}

diff --git a/examples/minimal-solidstart/src/entry-client.tsx b/examples/minimal-solidstart/src/entry-client.tsx
@@ -1,3 +1,4 @@
+// @refresh reload
 import { mount, StartClient } from "@solidjs/start/client";
 
 mount(() => <StartClient />, document.getElementById("app")!);
diff --git a/examples/minimal-solidstart/src/entry-server.tsx b/examples/minimal-solidstart/src/entry-server.tsx
@@ -1,3 +1,4 @@
+// @refresh reload
 import { createHandler, StartServer } from "@solidjs/start/server";
 
 export default createHandler(() => (
@@ -7,7 +8,6 @@ export default createHandler(() => (
         <head>
           <meta charset="utf-8" />
           <meta name="viewport" content="width=device-width, initial-scale=1" />
-          <link rel="icon" href="/favicon.ico" />
           {assets}
         </head>
         <body>

diff --git a/examples/minimal-solidstart/src/global.css b/examples/minimal-solidstart/src/global.css
diff --git a/examples/minimal-solidstart/src/routes/api/uploadthing.ts b/examples/minimal-solidstart/src/routes/api/uploadthing.ts
@@ -1,8 +1,12 @@
+import type { APIEvent } from "@solidjs/start/server";
+
 import { createRouteHandler } from "uploadthing/server";
 
 import { uploadRouter } from "~/server/uploadthing";
 
 const handler = createRouteHandler({
   router: uploadRouter,
 });
-export { handler as GET, handler as POST };
+
+export const GET = (event: APIEvent) => handler(event.request);
+export const POST = (event: APIEvent) => handler(event.request);
diff --git a/examples/minimal-solidstart/src/routes/index.tsx b/examples/minimal-solidstart/src/routes/index.tsx
@@ -9,7 +9,11 @@ export default function Home() {
     /**
      * @see https://docs.uploadthing.com/api-reference/react#useuploadthing
      */
-    onClientUploadComplete: () => {
+    onUploadBegin: (fileName) => {
+      console.log("onUploadBegin", fileName);
+    },
+    onClientUploadComplete: (res) => {
+      console.log(`onClientUploadComplete`, res);
       alert("Upload Completed");
     },
   });
@@ -21,26 +25,32 @@ export default function Home() {
          * @see https://docs.uploadthing.com/api-reference/react#uploadbutton
          */
         endpoint="videoAndImage"
+        onUploadBegin={(fileName) => {
+          console.log("onUploadBegin", fileName);
+        }}
+        onUploadAborted={() => {
+          alert("Upload Aborted");
+        }}
         onClientUploadComplete={(res) => {
           console.log(`onClientUploadComplete`, res);
           alert("Upload Completed");
         }}
-        onUploadBegin={() => {
-          console.log("upload begin");
-        }}
       />
       <UploadDropzone
         /**
          * @see https://docs.uploadthing.com/api-reference/react#uploaddropzone
          */
         endpoint="videoAndImage"
+        onUploadBegin={(fileName) => {
+          console.log("onUploadBegin", fileName);
+        }}
+        onUploadAborted={() => {
+          alert("Upload Aborted");
+        }}
         onClientUploadComplete={(res) => {
           console.log(`onClientUploadComplete`, res);
           alert("Upload Completed");
         }}
-        onUploadBegin={() => {
-          console.log("upload begin");
-        }}
       />
       <input
         type="file"

diff --git a/examples/minimal-solidstart/src/server/uploadthing.ts b/examples/minimal-solidstart/src/server/uploadthing.ts
@@ -46,4 +46,4 @@ export const uploadRouter = {
     }),
 } satisfies FileRouter;
 
-export type OurFileRouter = typeof uploadRouter;
+export type UploadRouter = typeof uploadRouter;
diff --git a/examples/minimal-solidstart/src/utils/uploadthing.ts b/examples/minimal-solidstart/src/utils/uploadthing.ts
@@ -4,7 +4,7 @@ import {
   generateUploadDropzone,
 } from "@uploadthing/solid";
 
-import { OurFileRouter } from "~/server/uploadthing";
+import { UploadRouter } from "~/server/uploadthing";
 
 const initOpts = {
   /**
@@ -13,7 +13,7 @@ const initOpts = {
   url: "http://localhost:3000",
 };
 
-export const UploadButton = generateUploadButton<OurFileRouter>(initOpts);
-export const UploadDropzone = generateUploadDropzone<OurFileRouter>(initOpts);
+export const UploadButton = generateUploadButton<UploadRouter>(initOpts);
+export const UploadDropzone = generateUploadDropzone<UploadRouter>(initOpts);
 export const { createUploadThing } =
-  generateSolidHelpers<OurFileRouter>(initOpts);
+  generateSolidHelpers<UploadRouter>(initOpts);
diff --git a/examples/minimal-solidstart/tailwind.config.ts b/examples/minimal-solidstart/tailwind.config.ts
diff --git a/examples/minimal-solidstart/tsconfig.json b/examples/minimal-solidstart/tsconfig.json
@@ -2,15 +2,15 @@
   "compilerOptions": {
     "target": "ESNext",
     "module": "ESNext",
-    "moduleResolution": "node",
+    "moduleResolution": "Bundler",
     "allowSyntheticDefaultImports": true,
     "esModuleInterop": true,
     "jsx": "preserve",
     "jsxImportSource": "solid-js",
     "allowJs": true,
     "strict": true,
     "noEmit": true,
-    "types": ["vinxi/client"],
+    "types": ["vinxi/types/client"],
     "isolatedModules": true,
     "paths": {
       "~/*": ["./src/*"]