Skip to content

Commit 58b1ff1

Browse files
committed
Merge remote-tracking branch 'origin/main' into upgrade_nitro_to_2.10
2 parents c72268d + b1e4aba commit 58b1ff1

File tree

29 files changed

+1197
-554
lines changed

29 files changed

+1197
-554
lines changed

.github/workflows/ci.yaml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77
branches: [main]
88

99
env:
10-
NODE_VER: 22.5
10+
NODE_VER: 22.11
1111
CI: true
1212

1313
jobs:
@@ -37,6 +37,9 @@ jobs:
3737
# Check linting and typing
3838
- run: pnpm lint
3939
- run: pnpm typecheck
40+
41+
# Run unit tests
42+
- run: pnpm test:unit
4043

4144
# Check building
4245
- run: pnpm build
@@ -131,5 +134,5 @@ jobs:
131134
# start prod-app and curl from it
132135
- run: "timeout 60 pnpm start & (sleep 45 && curl --fail localhost:$PORT)"
133136
env:
134-
AUTH_ORIGIN: "http://localhost:3001"
137+
AUTH_ORIGIN: "http://localhost:3001/api/auth"
135138
PORT: 3001

.github/workflows/deploy-docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88
workflow_dispatch:
99

1010
env:
11-
NODE_VER: 22.5
11+
NODE_VER: 22.11
1212
CI: true
1313

1414
# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages

.github/workflows/pkg.pr.new.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88
pull_request:
99

1010
env:
11-
NODE_VER: 22.5
11+
NODE_VER: 22.11
1212

1313
jobs:
1414
build:

docs/guide/application-side/protecting-pages.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ If the global middleware is disabled, you can manually add the middleware to ind
3232
```vue
3333
<script lang="ts" setup>
3434
definePageMeta({
35-
middleware: 'auth'
35+
middleware: 'sidebase-auth'
3636
})
3737
</script>
3838

package.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,8 @@
3333
"dev:prepare": "nuxt-module-build build --stub",
3434
"docs:dev": "vitepress dev docs",
3535
"docs:build": "vitepress build docs",
36-
"docs:preview": "vitepress preview docs"
36+
"docs:preview": "vitepress preview docs",
37+
"test:unit": "vitest"
3738
},
3839
"dependencies": {
3940
"@nuxt/kit": "^3.12.4",
@@ -61,6 +62,7 @@
6162
"ts-essentials": "^9.4.2",
6263
"typescript": "^5.5.4",
6364
"vitepress": "^1.3.1",
65+
"vitest": "^1.6.0",
6466
"vue-tsc": "^2.0.29"
6567
},
6668
"packageManager": "pnpm@9.6.0+sha512.38dc6fba8dba35b39340b9700112c2fe1e12f10b17134715a4aa98ccf7bb035e76fd981cf0bb384dfa98f8d6af5481c2bef2f4266a24bfa20c34eb7147ce0b5e"

playground-authjs/nuxt.config.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ export default defineNuxtConfig({
88
globalAppMiddleware: {
99
isEnabled: true
1010
},
11-
baseURL: `http://localhost:${process.env.PORT || 3000}`
11+
baseURL: `http://localhost:${process.env.PORT || 3000}/api/auth`
1212
},
1313
routeRules: {
1414
'/with-caching': {

0 commit comments

Comments
 (0)