Skip to content

Commit

Permalink
chore: migrate to eslint v9
Browse files Browse the repository at this point in the history
* chore: migrate to eslint v9

* chore: remove playground eslint config

* perf: use cache

* chore: fix lint errors and add todos

* Revert "perf: use cache"

This reverts commit 9f3c803.
  • Loading branch information
danielroe authored Apr 15, 2024
1 parent 6a7bb14 commit 964b67b
Show file tree
Hide file tree
Showing 42 changed files with 980 additions and 398 deletions.
2 changes: 0 additions & 2 deletions .eslintignore

This file was deleted.

16 changes: 0 additions & 16 deletions .eslintrc.cjs

This file was deleted.

14 changes: 14 additions & 0 deletions eslint.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
// @ts-check
import { createConfigForNuxt } from '@nuxt/eslint-config/flat'

export default createConfigForNuxt({
features: {
tooling: true,
stylistic: true,
},
dirs: {
src: [
'./playground',
],
},
})
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,15 +41,15 @@
"devDependencies": {
"@iconify-json/simple-icons": "^1.1.96",
"@nuxt/devtools": "latest",
"@nuxt/eslint-config": "^0.2.0",
"@nuxt/eslint-config": "^0.3.6",
"@nuxt/module-builder": "^0.5.5",
"@nuxt/schema": "^3.11.1",
"@nuxt/test-utils": "^3.12.0",
"@nuxt/ui": "^2.14.2",
"@nuxt/ui-pro": "^1.0.2",
"@types/node": "^20.11.30",
"changelogen": "^0.5.5",
"eslint": "^8.57.0",
"eslint": "^9.0.0",
"nuxt": "^3.11.1",
"typescript": "^5.4.3",
"vitest": "^1.4.0",
Expand Down
16 changes: 0 additions & 16 deletions playground/.eslintrc.cjs

This file was deleted.

4 changes: 2 additions & 2 deletions playground/app.vue
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ const providers = computed(() => [
label: user.value?.keycloak || 'Keycloak',
to: '/auth/keycloak',
disabled: Boolean(user.value?.keycloak),
icon: 'i-simple-icons-redhat'
icon: 'i-simple-icons-redhat',
},
{
label: user.value?.linkedin || 'LinkedIn',
Expand All @@ -67,7 +67,7 @@ const providers = computed(() => [
to: '/auth/cognito',
disabled: Boolean(user.value?.cognito),
icon: 'i-simple-icons-amazonaws',
}
},
].map(p => ({
...p,
prefetch: false,
Expand Down
1 change: 1 addition & 0 deletions playground/auth.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ declare module '#auth-utils' {
}

interface UserSession {
// eslint-disable-next-line @typescript-eslint/no-explicit-any
extended?: any
loggedInAt: number
}
Expand Down
8 changes: 4 additions & 4 deletions playground/nuxt.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@ export default defineNuxtConfig({
extends: ['@nuxt/ui-pro'],
modules: [
'nuxt-auth-utils',
'@nuxt/ui'
'@nuxt/ui',
],
auth: {},
ui: {
icons: ['simple-icons']
icons: ['simple-icons'],
},
devtools: { enabled: true },
imports: {
autoImport: true
}
autoImport: true,
},
})
2 changes: 1 addition & 1 deletion playground/server/api/test.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
export default eventHandler(async (event) => {
const session = await requireUserSession(event)
const _session = await requireUserSession(event)

// console.log(session.user.auth0)
return {}
Expand Down
5 changes: 2 additions & 3 deletions playground/server/plugins/session.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,12 @@ export default defineNitroPlugin(() => {
// Extend User Session
// Or throw createError({ ... }) if session is invalid
session.extended = {
fromHooks: true
fromHooks: true,
}
})

sessionHooks.hook('clear', async (session) => {
sessionHooks.hook('clear', async (_session) => {
// Log that user logged out
console.log('User logged out')
})
})

6 changes: 3 additions & 3 deletions playground/server/routes/auth/auth0.get.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ export default oauth.auth0EventHandler({
async onSuccess(event, { user }) {
await setUserSession(event, {
user: {
auth0: user.email
auth0: user.email,
},
loggedInAt: Date.now()
loggedInAt: Date.now(),
})

return sendRedirect(event, '/')
}
},
})
6 changes: 3 additions & 3 deletions playground/server/routes/auth/battledotnet.get.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ export default oauth.battledotnetEventHandler({
async onSuccess(event, { user }) {
await setUserSession(event, {
user: {
battledotnet: user.battletag
battledotnet: user.battletag,
},
loggedInAt: Date.now()
loggedInAt: Date.now(),
})

return sendRedirect(event, '/')
}
},
})
6 changes: 3 additions & 3 deletions playground/server/routes/auth/cognito.get.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ export default oauth.cognitoEventHandler({
async onSuccess(event, { user }) {
await setUserSession(event, {
user: {
cognito: user.email
cognito: user.email,
},
loggedInAt: Date.now()
loggedInAt: Date.now(),
})

return sendRedirect(event, '/')
}
},
})
6 changes: 3 additions & 3 deletions playground/server/routes/auth/discord.get.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ export default oauth.discordEventHandler({
async onSuccess(event, { user }) {
await setUserSession(event, {
user: {
discord: user.username
discord: user.username,
},
loggedInAt: Date.now()
loggedInAt: Date.now(),
})

return sendRedirect(event, '/')
}
},
})
6 changes: 3 additions & 3 deletions playground/server/routes/auth/github.get.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ export default oauth.githubEventHandler({
async onSuccess(event, { user }) {
await setUserSession(event, {
user: {
github: user.login
github: user.login,
},
loggedInAt: Date.now()
loggedInAt: Date.now(),
})

return sendRedirect(event, '/')
}
},
})
10 changes: 5 additions & 5 deletions playground/server/routes/auth/google.get.ts
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
export default oauth.googleEventHandler({
config: {
authorizationParams: {
access_type: 'offline'
}
access_type: 'offline',
},
},
async onSuccess(event, { user }) {
await setUserSession(event, {
user: {
google: user.email
google: user.email,
},
loggedInAt: Date.now()
loggedInAt: Date.now(),
})

return sendRedirect(event, '/')
}
},
})
2 changes: 1 addition & 1 deletion playground/server/routes/auth/keycloak.get.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ export default oauth.keycloakEventHandler({
async onSuccess(event, { user }) {
await setUserSession(event, {
user: {
keycloak: user.preferred_username
keycloak: user.preferred_username,
},
loggedInAt: Date.now(),
})
Expand Down
8 changes: 4 additions & 4 deletions playground/server/routes/auth/linkedin.get.ts
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
export default oauth.linkedinEventHandler({
config: {
emailRequired: true
emailRequired: true,
},
async onSuccess(event, { user }) {
await setUserSession(event, {
user: {
linkedin: user.email
linkedin: user.email,
},
loggedInAt: Date.now()
loggedInAt: Date.now(),
})

return sendRedirect(event, '/')
}
},
})
20 changes: 10 additions & 10 deletions playground/server/routes/auth/microsoft.get.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
export default oauth.microsoftEventHandler({
async onSuccess(event, { user }) {
await setUserSession(event, {
user: {
microsoft: user.email
},
loggedInAt: Date.now()
})
async onSuccess(event, { user }) {
await setUserSession(event, {
user: {
microsoft: user.email,
},
loggedInAt: Date.now(),
})

return sendRedirect(event, '/')
}
})
return sendRedirect(event, '/')
},
})
6 changes: 3 additions & 3 deletions playground/server/routes/auth/spotify.get.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ export default oauth.spotifyEventHandler({
async onSuccess(event, { user }) {
await setUserSession(event, {
user: {
spotify: user.id
spotify: user.id,
},
loggedInAt: Date.now()
loggedInAt: Date.now(),
})

return sendRedirect(event, '/')
}
},
})
6 changes: 3 additions & 3 deletions playground/server/routes/auth/twitch.get.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ export default oauth.twitchEventHandler({
async onSuccess(event, { user }) {
await setUserSession(event, {
user: {
twitch: user.login
twitch: user.login,
},
loggedInAt: Date.now()
loggedInAt: Date.now(),
})

return sendRedirect(event, '/')
}
},
})
Loading

0 comments on commit 964b67b

Please sign in to comment.