sveltekit-auth-example 1.0.15 → 1.0.16

package/CHANGELOG.md

@@ -1,9 +1,11 @@
 # Backlog
-* [Bug] Address TypeScript issues found during `npm run check` (11 errors) - most related to use of Action type
 * Consider not setting defaultUser in loginSession as it would simplify +layout.svelte.
 * Refactor $env/dynamic/private and public
 * Add password complexity checking on /register and /profile pages (only checks for length currently despite what the pages say)
 
+# 1.0.16
+* [Bug] Fixed LayoutServerLoad typing
+
 # 1.0.15
 * [Bug] Replaced use of Action type in +server.ts files (only works for +page.server.ts)
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "sveltekit-auth-example",
   "description": "SvelteKit Authentication Example",
-  "version": "1.0.15",
+  "version": "1.0.16",
   "private": false,
   "author": "Nate Stuyvesant",
   "license": "https://github.com/nstuyvesant/sveltekit-auth-example/blob/master/LICENSE",
@@ -63,7 +63,7 @@
     "prettier-plugin-svelte": "^2.7.0",
     "sass": "^1.54.5",
     "svelte": "^3.49.0",
-    "svelte-check": "^2.8.1",
+    "svelte-check": "^2.9.0",
     "svelte-preprocess": "^4.10.7",
     "tslib": "^2.4.0",
     "typescript": "^4.7.4",

package/src/routes/+layout.server.ts

@@ -1,6 +1,7 @@
 import type { LayoutServerLoad } from './$types'
 
-export function load({ locals }): LayoutServerLoad {
+export const load: LayoutServerLoad = (event) => {
+  const locals = event.locals
   const { user }: { user: User } = locals // locals.user set by hooks.ts/handle(), undefined if not logged in
   return {
     user

package/src/routes/+layout.svelte

@@ -1,13 +1,13 @@
 <script lang="ts">
   import { onMount } from 'svelte'
-  import type { LayoutData } from './$types'
+  import type { LayoutServerData } from './$types'
   import { goto } from '$app/navigation'
   import { page } from '$app/stores'
   import { loginSession, toast } from '../stores'
   import useAuth from '$lib/auth'
   import 'bootstrap/scss/bootstrap.scss' // preferred way to load Bootstrap SCSS for hot module reloading
 
-	export let data: LayoutData
+	export let data: LayoutServerData
 
   // If returning from different website, runs once (as it's an SPA) to restore user session if session cookie is still valid
   const { user } = data

package/src/routes/api/v1/user/+server.ts

@@ -1,4 +1,5 @@
-import { error, json, type RequestHandler } from '@sveltejs/kit'
+import { error, json} from '@sveltejs/kit'
+import type { RequestHandler } from './$types'
 import { query } from '../../../_db'
 
 export const PUT: RequestHandler = async event => {

package/src/routes/auth/[slug]/+server.ts

@@ -1,4 +1,5 @@
-import { error, json, type RequestHandler } from '@sveltejs/kit'
+import { error, json } from '@sveltejs/kit'
+import type { RequestHandler } from './$types'
 import { query } from '../../_db'
 
 export const POST: RequestHandler = async (event) => {

package/src/routes/auth/forgot/+server.ts

@@ -1,4 +1,4 @@
-import type { RequestHandler } from '@sveltejs/kit'
+import type { RequestHandler } from './$types'
 import type { Secret } from 'jsonwebtoken'
 import jwt from 'jsonwebtoken'
 import dotenv from 'dotenv'

package/src/routes/auth/google/+server.ts

@@ -1,4 +1,5 @@
-import { error, type RequestHandler } from '@sveltejs/kit'
+import { error } from '@sveltejs/kit'
+import type { RequestHandler } from './$types'
 import { OAuth2Client } from 'google-auth-library'
 import { query } from '../../_db';
 import { config } from '$lib/config'

package/src/routes/auth/reset/+server.ts

@@ -1,6 +1,6 @@
 import { json as json$1 } from '@sveltejs/kit';
 import dotenv from 'dotenv'
-import type { RequestHandler } from '@sveltejs/kit'
+import type { RequestHandler } from './$types'
 import type  { JwtPayload } from 'jsonwebtoken'
 import jwt from 'jsonwebtoken'
 import { query } from '../../_db'