Skip to content

Commit

Permalink
Merge branch 'main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
phoenix-ru authored Dec 19, 2024
2 parents 98f7aee + 985c497 commit a498537
Show file tree
Hide file tree
Showing 31 changed files with 3,978 additions and 4,467 deletions.
7 changes: 5 additions & 2 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
branches: [main]

env:
NODE_VER: 22.5
NODE_VER: 22.11
CI: true

jobs:
Expand Down Expand Up @@ -37,6 +37,9 @@ jobs:
# Check linting and typing
- run: pnpm lint
- run: pnpm typecheck

# Run unit tests
- run: pnpm test:unit

# Check building
- run: pnpm build
Expand Down Expand Up @@ -131,5 +134,5 @@ jobs:
# start prod-app and curl from it
- run: "timeout 60 pnpm start & (sleep 45 && curl --fail localhost:$PORT)"
env:
AUTH_ORIGIN: "http://localhost:3001"
AUTH_ORIGIN: "http://localhost:3001/api/auth"
PORT: 3001
2 changes: 1 addition & 1 deletion .github/workflows/deploy-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
workflow_dispatch:

env:
NODE_VER: 22.5
NODE_VER: 22.11
CI: true

# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pkg.pr.new.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
pull_request:

env:
NODE_VER: 22.5
NODE_VER: 22.11

jobs:
build:
Expand Down
2 changes: 1 addition & 1 deletion docs/guide/application-side/protecting-pages.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ If the global middleware is disabled, you can manually add the middleware to ind
```vue
<script lang="ts" setup>
definePageMeta({
middleware: 'auth'
middleware: 'sidebase-auth'
})
</script>
Expand Down
32 changes: 17 additions & 15 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@sidebase/nuxt-auth",
"version": "0.9.4",
"version": "0.10.0-rc.2",
"license": "MIT",
"type": "module",
"description": "Authentication built for Nuxt 3! Easily add authentication via OAuth providers, credentials or Email Magic URLs!",
Expand Down Expand Up @@ -33,14 +33,15 @@
"dev:prepare": "nuxt-module-build build --stub",
"docs:dev": "vitepress dev docs",
"docs:build": "vitepress build docs",
"docs:preview": "vitepress preview docs"
"docs:preview": "vitepress preview docs",
"test:unit": "vitest"
},
"dependencies": {
"@nuxt/kit": "^3.12.4",
"@nuxt/kit": "^3.14.1592",
"defu": "^6.1.4",
"h3": "^1.12.0",
"h3": "^1.13.0",
"knitwork": "^1.1.0",
"nitropack": "^2.9.7",
"nitropack": "^2.10.4",
"requrl": "^3.0.2",
"scule": "^1.3.0",
"ufo": "^1.5.4"
Expand All @@ -49,19 +50,20 @@
"next-auth": "~4.21.1"
},
"devDependencies": {
"@antfu/eslint-config": "^2.25.0",
"@nuxt/module-builder": "^0.8.3",
"@nuxt/schema": "^3.12.4",
"@antfu/eslint-config": "^2.27.3",
"@nuxt/module-builder": "^0.8.4",
"@nuxt/schema": "^3.14.1592",
"@nuxtjs/eslint-config-typescript": "^12.1.0",
"@types/node": "^18.19.42",
"eslint": "^8.57.0",
"nuxt": "^3.12.4",
"ofetch": "^1.3.4",
"oxlint": "^0.7.0",
"@types/node": "^18.19.68",
"eslint": "^8.57.1",
"nuxt": "^3.14.1592",
"ofetch": "^1.4.1",
"oxlint": "^0.7.2",
"ts-essentials": "^9.4.2",
"typescript": "^5.5.4",
"vitepress": "^1.3.1",
"vue-tsc": "^2.0.29"
"vitepress": "^1.5.0",
"vitest": "^1.6.0",
"vue-tsc": "^2.1.10"
},
"packageManager": "[email protected]+sha512.38dc6fba8dba35b39340b9700112c2fe1e12f10b17134715a4aa98ccf7bb035e76fd981cf0bb384dfa98f8d6af5481c2bef2f4266a24bfa20c34eb7147ce0b5e"
}
2 changes: 1 addition & 1 deletion playground-authjs/nuxt.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ export default defineNuxtConfig({
globalAppMiddleware: {
isEnabled: true
},
baseURL: `http://localhost:${process.env.PORT || 3000}`
baseURL: `http://localhost:${process.env.PORT || 3000}/api/auth`
},
routeRules: {
'/with-caching': {
Expand Down
4 changes: 2 additions & 2 deletions playground-authjs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
"postinstall": "nuxt prepare"
},
"devDependencies": {
"nuxt": "^3.12.4",
"nuxt": "^3.14.1592",
"typescript": "^5.5.4",
"vue-tsc": "^2.0.29"
"vue-tsc": "^2.1.10"
}
}
12 changes: 6 additions & 6 deletions playground-local/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@
"zod": "^3.23.8"
},
"devDependencies": {
"@nuxt/test-utils": "^3.14.1",
"@playwright/test": "^1.46.0",
"@types/jsonwebtoken": "^9.0.6",
"@types/node": "^18.19.44",
"@nuxt/test-utils": "^3.15.1",
"@playwright/test": "^1.49.1",
"@types/jsonwebtoken": "^9.0.7",
"@types/node": "^18.19.68",
"@vue/test-utils": "^2.4.6",
"nuxt": "^3.12.4",
"nuxt": "^3.14.1592",
"typescript": "^5.5.4",
"vitest": "^1.6.0",
"vue-tsc": "^2.0.29"
"vue-tsc": "^2.1.10"
}
}
Loading

0 comments on commit a498537

Please sign in to comment.