Skip to content

Commit

Permalink
Merge branch 'main' into feat/json-pointer-extractor
Browse files Browse the repository at this point in the history
  • Loading branch information
phoenix-ru authored Feb 22, 2024
2 parents 24d165c + 2098f39 commit f7fde1f
Show file tree
Hide file tree
Showing 24 changed files with 4,836 additions and 2,624 deletions.
19 changes: 11 additions & 8 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,20 @@ on:
pull_request:
branches: [main]

env:
NODE_VER: 18.19.1

jobs:
test-module:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3

- name: Use Node.js 16.14.2
- name: Use Node.js ${{ env.NODE_VER }}
uses: actions/setup-node@v3
with:
node-version: 16.14.2
node-version: ${{ env.NODE_VER }}

- uses: pnpm/action-setup@v2
name: Install pnpm
Expand Down Expand Up @@ -47,10 +50,10 @@ jobs:
steps:
- uses: actions/checkout@v3

- name: Use Node.js 16.14.2
- name: Use Node.js ${{ env.NODE_VER }}
uses: actions/setup-node@v3
with:
node-version: 16.14.2
node-version: ${{ env.NODE_VER }}

- uses: pnpm/action-setup@v2
name: Install pnpm
Expand All @@ -75,10 +78,10 @@ jobs:
steps:
- uses: actions/checkout@v3

- name: Use Node.js 16.14.2
- name: Use Node.js ${{ env.NODE_VER }}
uses: actions/setup-node@v3
with:
node-version: 16.14.2
node-version: ${{ env.NODE_VER }}

- uses: pnpm/action-setup@v2
name: Install pnpm
Expand Down Expand Up @@ -106,10 +109,10 @@ jobs:
steps:
- uses: actions/checkout@v3

- name: Use Node.js 16.14.2
- name: Use Node.js ${{ env.NODE_VER }}
uses: actions/setup-node@v3
with:
node-version: 16.14.2
node-version: ${{ env.NODE_VER }}

- uses: pnpm/action-setup@v2
name: Install pnpm
Expand Down
37 changes: 18 additions & 19 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,38 +15,37 @@
"dist"
],
"scripts": {
"prepack": "nuxt-module-build",
"prepack": "nuxt-module-build build",
"build": "nuxi build",
"lint": "eslint . --max-warnings=0",
"clean": "rm -rf playground-authjs/.nuxt playground-local/.nuxt playground-refresh/.nuxt dist .nuxt",
"typecheck": "nuxi prepare playground-local && tsc --noEmit",
"typecheck:refresh": "nuxi prepare playground-refresh && tsc --noEmit",
"dev:prepare": "nuxt-module-build --stub"
"dev:prepare": "nuxt-module-build build --stub"
},
"dependencies": {
"@nuxt/kit": "^3.4.2",
"@vueuse/core": "^9.13.0",
"defu": "^6.1.2",
"h3": "^1.6.4",
"@nuxt/kit": "^3.10.2",
"defu": "^6.1.4",
"h3": "^1.10.1",
"knitwork": "^1.0.0",
"nitropack": "^2.3.2",
"nitropack": "^2.8.1",
"requrl": "^3.0.2",
"ufo": "^1.1.1"
"ufo": "^1.4.0"
},
"peerDependencies": {
"next-auth": "^4.21.1"
"next-auth": "~4.21.1"
},
"devDependencies": {
"@nuxt/module-builder": "^0.3.0",
"@nuxt/schema": "^3.4.2",
"@nuxtjs/eslint-config-typescript": "^12.0.0",
"@types/node": "^18.15.11",
"eslint": "^8.37.0",
"nuxt": "^3.4.2",
"ofetch": "^1.0.1",
"ts-essentials": "^9.3.1",
"typescript": "^5.0.3",
"vue-tsc": "^1.2.0"
"@nuxt/module-builder": "^0.5.5",
"@nuxt/schema": "^3.10.2",
"@nuxtjs/eslint-config-typescript": "^12.1.0",
"@types/node": "^18.19.14",
"eslint": "^8.56.0",
"nuxt": "^3.10.2",
"ofetch": "^1.3.3",
"ts-essentials": "^9.4.1",
"typescript": "^5.3.3",
"vue-tsc": "^1.8.27"
},
"overrides": {
"@nuxt/kit": {
Expand Down
8 changes: 4 additions & 4 deletions playground-authjs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
"postinstall": "nuxt prepare"
},
"devDependencies": {
"eslint": "^8.37.0",
"nuxt": "^3.4.2",
"typescript": "^5.0.3",
"vue-tsc": "^1.2.0"
"eslint": "^8.56.0",
"nuxt": "^3.10.1",
"typescript": "^5.3.3",
"vue-tsc": "^1.8.27"
}
}
1 change: 1 addition & 0 deletions playground-authjs/server/middleware/auth.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { eventHandler } from 'h3'
import { getServerSession } from '#auth'

export default eventHandler(async (event) => {
Expand Down
14 changes: 7 additions & 7 deletions playground-local/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@
"postinstall": "nuxt prepare"
},
"dependencies": {
"jsonwebtoken": "^9.0.0",
"zod": "^3.21.4"
"jsonwebtoken": "^9.0.2",
"zod": "^3.22.4"
},
"devDependencies": {
"@types/jsonwebtoken": "^9.0.1",
"eslint": "^8.37.0",
"nuxt": "^3.4.2",
"typescript": "^5.0.3",
"vue-tsc": "^1.2.0"
"@types/jsonwebtoken": "^9.0.5",
"eslint": "^8.56.0",
"nuxt": "^3.10.1",
"typescript": "^5.3.3",
"vue-tsc": "^1.8.27"
}
}
2 changes: 1 addition & 1 deletion playground-local/server/api/auth/login.post.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import z from 'zod'
import { z } from 'zod'
import { sign } from 'jsonwebtoken'

const refreshTokens: Record<number, Record<string, any>> = {}
Expand Down
14 changes: 7 additions & 7 deletions playground-refresh/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@
"postinstall": "nuxt prepare"
},
"dependencies": {
"jsonwebtoken": "^9.0.0",
"zod": "^3.21.4"
"jsonwebtoken": "^9.0.2",
"zod": "^3.22.4"
},
"devDependencies": {
"@types/jsonwebtoken": "^9.0.1",
"eslint": "^8.37.0",
"nuxt": "^3.4.2",
"typescript": "^5.0.3",
"vue-tsc": "^1.2.0"
"@types/jsonwebtoken": "^9.0.5",
"eslint": "^8.56.0",
"nuxt": "^3.10.1",
"typescript": "^5.3.3",
"vue-tsc": "^1.8.27"
}
}
2 changes: 1 addition & 1 deletion playground-refresh/server/api/auth/login.post.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import z from 'zod'
import { z } from 'zod'
import { sign } from 'jsonwebtoken'

export const SECRET = 'dummy'
Expand Down
Loading

0 comments on commit f7fde1f

Please sign in to comment.