sveltekit-auth-example 2.0.2 → 2.0.3

package/.eslintignore

@@ -1,5 +1,6 @@
 .DS_Store
 node_modules
+.yarn
 /build
 /.svelte-kit
 /package

package/.vscode/settings.json

@@ -0,0 +1,7 @@
+{
+	"prettier.configPath": "prettier.config.mjs",
+	"prettier.ignorePath": ".eslintignore",
+	"editor.defaultFormatter": "esbenp.prettier-vscode",
+	"eslint.debug": false,
+	"eslint.experimental.useFlatConfig": true
+}

package/CHANGELOG.md

@@ -2,8 +2,13 @@
 
 - Add password complexity checking on /register and /profile pages (only checks for length currently despite what the pages say)
 
+# 2.0.3
+- Move to eslint's new eslint.config.js
+- Convert vite.config to TypeScript
+
 # 2.0.2
-- fix prettier
+
+- Fix prettier
 
 # 2.0.1
 

package/{.eslintrc.cjs → eslint.config.js}

@@ -1,4 +1,4 @@
-module.exports = {
+export default {
 	root: true,
 	parser: '@typescript-eslint/parser',
 	extends: [
@@ -9,7 +9,6 @@ module.exports = {
 	],
 	plugins: ['@typescript-eslint'],
 	ignorePatterns: ['*.cjs'],
-	overrides: [{ files: ['*.svelte'], processor: 'svelte3/svelte3' }],
 	parserOptions: {
 		sourceType: 'module',
 		ecmaVersion: 2020,

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "sveltekit-auth-example",
 	"description": "SvelteKit Authentication Example",
-	"version": "2.0.2",
+	"version": "2.0.3",
 	"author": "Nate Stuyvesant",
 	"license": "https://github.com/nstuyvesant/sveltekit-auth-example/blob/master/LICENSE",
 	"repository": {
@@ -27,8 +27,8 @@
 		"preview": "vite preview",
 		"check": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json",
 		"check:watch": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json --watch",
-		"lint": "prettier --check . && eslint .",
-		"format": "prettier --write ."
+		"lint": "prettier --check . && eslint . --ignore-path ./.eslintignore",
+		"format": "prettier --write . --ignore-path ./.eslintignore"
 	},
 	"engines": {
 		"node": "^18.19.0"

package/prettier.config.mjs

@@ -1,7 +1,9 @@
 export default {
 	$schema: 'https://json.schemastore.org/prettierrc',
 	useTabs: true,
+	tabWidth: 2,
 	semi: false,
+	arrowParens: 'avoid',
 	singleQuote: true,
 	trailingComma: 'none',
 	printWidth: 100,

package/src/lib/google.ts

@@ -17,7 +17,7 @@ export function renderGoogleButton() {
 
 export function initializeGoogleAccounts() {
 	let initialized = false
-	const unsubscribe = googleInitialized.subscribe((value) => {
+	const unsubscribe = googleInitialized.subscribe(value => {
 		initialized = value
 	})
 
@@ -46,7 +46,7 @@ export function initializeGoogleAccounts() {
 			const { role } = fromEndpoint.user
 
 			let referrer
-			const unsubscribe = page.subscribe((p) => {
+			const unsubscribe = page.subscribe(p => {
 				referrer = p.url.searchParams.get('referrer')
 			})
 			unsubscribe()

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

@@ -2,7 +2,7 @@ import { error, json } from '@sveltejs/kit'
 import type { RequestHandler } from './$types'
 import { query } from '$lib/server/db'
 
-export const PUT: RequestHandler = async (event) => {
+export const PUT: RequestHandler = async event => {
 	const { user } = event.locals
 
 	if (!user) error(401, 'Unauthorized - must be logged-in.')

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

@@ -2,7 +2,7 @@ import { error, json } from '@sveltejs/kit'
 import type { RequestHandler } from './$types'
 import { query } from '$lib/server/db'
 
-export const POST: RequestHandler = async (event) => {
+export const POST: RequestHandler = async event => {
 	const { cookies } = event
 	const { slug } = event.params
 

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

@@ -6,7 +6,7 @@ import { JWT_SECRET, DOMAIN, SENDGRID_SENDER } from '$env/static/private'
 import { query } from '$lib/server/db'
 import { sendMessage } from '$lib/server/sendgrid'
 
-export const POST: RequestHandler = async (event) => {
+export const POST: RequestHandler = async event => {
 	const body = await event.request.json()
 	const sql = `SELECT id as "userId" FROM users WHERE email = $1 LIMIT 1;`
 	const { rows } = await query(sql, [body.email])

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

@@ -41,7 +41,7 @@ async function upsertGoogleUser(user: Partial<User>): Promise<UserSession> {
 }
 
 // Returns local user if Google user authenticated (and authorized our app)
-export const POST: RequestHandler = async (event) => {
+export const POST: RequestHandler = async event => {
 	const { cookies } = event
 
 	try {

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

@@ -5,7 +5,7 @@ import jwt from 'jsonwebtoken'
 import { JWT_SECRET } from '$env/static/private'
 import { query } from '$lib/server/db'
 
-export const PUT: RequestHandler = async (event) => {
+export const PUT: RequestHandler = async event => {
 	const body = await event.request.json()
 	const { token, password } = body
 

package/src/routes/auth/reset/[token]/+page.ts

@@ -1,6 +1,6 @@
 import type { PageLoad } from './$types'
 
-export const load: PageLoad = async (event) => {
+export const load: PageLoad = async event => {
 	return {
 		token: event.params.token
 	}

package/src/service-worker.ts

@@ -15,7 +15,7 @@ const ASSETS = [
 	...files // everything in `static`
 ]
 
-sw.addEventListener('install', (event) => {
+sw.addEventListener('install', event => {
 	// Create a new cache and add all files to it
 	async function addFilesToCache() {
 		const cache = await caches.open(CACHE)
@@ -25,7 +25,7 @@ sw.addEventListener('install', (event) => {
 	event.waitUntil(addFilesToCache())
 })
 
-sw.addEventListener('activate', (event) => {
+sw.addEventListener('activate', event => {
 	// Remove previous cached data from disk
 	async function deleteOldCaches() {
 		for (const key of await caches.keys()) {
@@ -36,7 +36,7 @@ sw.addEventListener('activate', (event) => {
 	event.waitUntil(deleteOldCaches())
 })
 
-sw.addEventListener('fetch', (event) => {
+sw.addEventListener('fetch', event => {
 	// ignore POST requests etc
 	if (event.request.method !== 'GET') return
 

package/vite.config.ts

@@ -0,0 +1,11 @@
+import { sveltekit } from '@sveltejs/kit/vite'
+import { defineConfig } from 'vite'
+
+export default defineConfig({
+	plugins: [sveltekit()],
+	server: {
+		host: 'localhost',
+		port: 3000,
+		open: 'http://localhost:3000'
+	}
+})

package/.prettierignore

@@ -1,14 +0,0 @@
-.DS_Store
-node_modules
-.yarn
-/build
-/.svelte-kit
-/package
-.env
-.env.*
-!.env.example
-
-# Ignore files for PNPM, NPM and YARN
-pnpm-lock.yaml
-package-lock.json
-yarn.lock

package/vite.config.js

@@ -1,16 +0,0 @@
-import { sveltekit } from '@sveltejs/kit/vite'
-
-/** @type {import('vite').UserConfig} */
-const config = {
-	plugins: [sveltekit()],
-	serviceWorker: {
-		files: (filepath) => !/\.DS_Store/.test(filepath)
-	},
-	server: {
-		host: 'localhost',
-		port: 3000,
-		open: 'http://localhost:3000'
-	}
-}
-
-export default config