Merge branch 'main' into patch-1

solidjs · Jun 17, 2024 · 91d4ca6 · 91d4ca6
2 parents 3ca9484 + ac3c504
commit 91d4ca6
Show file tree

Hide file tree

Showing 7 changed files with 46 additions and 67 deletions.
diff --git a/.github/workflows/doc-checks.yml b/.github/workflows/doc-checks.yml
diff --git a/.github/workflows/deploy-docs.yml → .github/workflows/docs.yml b/.github/workflows/deploy-docs.yml → .github/workflows/docs.yml
@@ -4,13 +4,19 @@ on:
   push:
     branches:
       - main
+  merge_group:
+  pull_request:
+    paths:
+      - "docs/**"
+      - "package.json"
+      - "pnpm-lock.yaml"
 
 env:
   CLOUDFLARE_API_TOKEN: ${{ secrets.CLOUDFLARE_API_TOKEN }}
 
 jobs:
   docs:
-    name: "📜 Deploy Docs"
+    name: "📜 Docs"
 
     strategy:
       fail-fast: false
@@ -41,6 +47,7 @@ jobs:
         env:
           TARGET: cloudflare_module
 
-      - run: npx wrangler deploy
+      - if: github.event_name == 'push' && github.ref == 'refs/heads/main'
+        run: npx wrangler deploy
         env:
           WRANGLER_LOG: debug
diff --git a/examples/with-auth/src/lib/index.ts b/examples/with-auth/src/lib/index.ts
@@ -1,6 +1,13 @@
 import { action, cache, redirect } from "@solidjs/router";
 import { db } from "./db";
-import { getSession, login, logout as logoutSession, register, validatePassword, validateUsername } from "./server";
+import {
+  getSession,
+  login,
+  logout as logoutSession,
+  register,
+  validatePassword,
+  validateUsername
+} from "./server";
 
 export const getUser = cache(async () => {
   "use server";
@@ -30,7 +37,9 @@ export const loginOrRegister = action(async (formData: FormData) => {
       ? register(username, password)
       : login(username, password));
     const session = await getSession();
-    await session.update(d => (d.userId = user!.id));
+    await session.update(d => {
+      d.userId = user.id;
+    });
   } catch (err) {
     return err as Error;
   }
@@ -41,4 +50,4 @@ export const logout = action(async () => {
   "use server";
   await logoutSession();
   return redirect("/login");
-});
+});
diff --git a/examples/with-auth/src/lib/server.ts b/examples/with-auth/src/lib/server.ts
@@ -21,7 +21,9 @@ export async function login(username: string, password: string) {
 
 export async function logout() {
   const session = await getSession();
-  await session.update(d => (d.userId = undefined));
+  await session.update(d => {
+    d.userId = undefined;
+  });
 }
 
 export async function register(username: string, password: string) {

diff --git a/examples/with-drizzle/src/api/server.ts b/examples/with-drizzle/src/api/server.ts
@@ -24,23 +24,14 @@ async function login(username: string, password: string) {
 }
 
 async function register(username: string, password: string) {
-  const existingUser = db
-    .select()
-    .from(Users)
-    .where(eq(Users.username, username))
-    .get();
+  const existingUser = db.select().from(Users).where(eq(Users.username, username)).get();
   if (existingUser) throw new Error("User already exists");
-  return db
-    .insert(Users)
-    .values({ username, password })
-    .returning()
-    .get();
+  return db.insert(Users).values({ username, password }).returning().get();
 }
 
 function getSession() {
   return useSession({
-    password:
-      process.env.SESSION_SECRET ?? "areallylongsecretthatyoushouldreplace",
+    password: process.env.SESSION_SECRET ?? "areallylongsecretthatyoushouldreplace"
   });
 }
 
@@ -56,7 +47,9 @@ export async function loginOrRegister(formData: FormData) {
       ? register(username, password)
       : login(username, password));
     const session = await getSession();
-    await session.update(d => (d.userId = user!.id));
+    await session.update(d => {
+      d.userId = user.id;
+    });
   } catch (err) {
     return err as Error;
   }
@@ -65,7 +58,7 @@ export async function loginOrRegister(formData: FormData) {
 
 export async function logout() {
   const session = await getSession();
-  await session.update((d) => (d.userId = undefined));
+  await session.update(d => (d.userId = undefined));
   throw redirect("/login");
 }
 

diff --git a/examples/with-prisma/src/lib/index.ts b/examples/with-prisma/src/lib/index.ts
@@ -1,6 +1,13 @@
 import { action, cache, redirect } from "@solidjs/router";
 import { db } from "./db";
-import { getSession, login, logout as logoutSession, register, validatePassword, validateUsername } from "./server";
+import {
+  getSession,
+  login,
+  logout as logoutSession,
+  register,
+  validatePassword,
+  validateUsername
+} from "./server";
 
 export const getUser = cache(async () => {
   "use server";
@@ -30,7 +37,9 @@ export const loginOrRegister = action(async (formData: FormData) => {
       ? register(username, password)
       : login(username, password));
     const session = await getSession();
-    await session.update(d => (d.userId = user!.id));
+    await session.update(d => {
+      d.userId = user.id;
+    });
   } catch (err) {
     return err as Error;
   }
@@ -41,4 +50,4 @@ export const logout = action(async () => {
   "use server";
   await logoutSession();
   return redirect("/login");
-});
+});
diff --git a/examples/with-prisma/src/lib/server.ts b/examples/with-prisma/src/lib/server.ts
@@ -21,7 +21,9 @@ export async function login(username: string, password: string) {
 
 export async function logout() {
   const session = await getSession();
-  await session.update(d => (d.userId = undefined));
+  await session.update(d => {
+    d.userId = undefined;
+  });
 }
 
 export async function register(username: string, password: string) {