Skip to content

Commit ed3dccb

Browse files
authored
feat: single export for server modules under alias '#edgedb/server' (#7)
1 parent d18d1ed commit ed3dccb

15 files changed

Lines changed: 26 additions & 19 deletions

File tree

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,9 @@ Network Trash Folder
5555
Temporary Items
5656
.apdisk
5757

58+
# Asdf
59+
.tool-versions
60+
5861
# EdgeDB
5962
**/*.edgeql.ts
6063
**/dbschema/queries.*

playground/server/api/blogpost/[id].ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import { H3Error, defineEventHandler, getRouterParams } from 'h3'
2+
import { useEdgeDb } from '#edgedb/server'
23
import type { BlogPost } from '#edgedb/interfaces'
34

45
export default defineEventHandler(async (req) => {

playground/server/api/blogpost/index.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import { defineEventHandler, isMethod, readBody } from 'h3'
2+
import { useEdgeDbQueries } from '#edgedb/server'
23

34
export default defineEventHandler(async (req) => {
45
if (isMethod(req, 'POST')) {

src/module.ts

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -405,11 +405,12 @@ export default defineNuxtModule<ModuleOptions>({
405405
nuxt.hook(
406406
'nitro:config',
407407
(config) => {
408-
if (!config.imports)
409-
config.imports = {}
410-
if (!config.imports.dirs)
411-
config.imports.dirs = []
412-
config.imports.dirs.push(resolveLocal('./runtime/server'))
408+
config.externals ??= {}
409+
config.externals.inline ??= []
410+
config.externals.inline.push(resolveLocal('./runtime'))
411+
412+
config.alias ??= { }
413+
config.alias['#edgedb/server'] = resolveLocal('./runtime/server')
413414
},
414415
)
415416
}

src/runtime/api/auth/authorize.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import { H3Error, defineEventHandler, getRequestURL } from 'h3'
2-
import { useEdgeDbEnv } from '../../server/useEdgeDbEnv'
3-
import { useEdgeDbPKCE } from '../../server/useEdgeDbPKCE'
2+
import { useEdgeDbEnv, useEdgeDbPKCE } from '../../server'
43

54
/**
65
* Redirects OAuth requests to EdgeDB Auth OAuth authorize redirect

src/runtime/api/auth/callback.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { H3Error, defineEventHandler, getCookie, getRequestURL, setHeaders } from 'h3'
2-
import { useEdgeDbEnv } from '../../server/useEdgeDbEnv'
2+
import { useEdgeDbEnv } from '../../server'
33

44
/**
55
* Handles the PKCE callback and exchanges the `code` and `verifier`

src/runtime/api/auth/identity.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { defineEventHandler, deleteCookie, getCookie } from 'h3'
2-
import { useEdgeDb } from '../../server/useEdgeDb'
2+
import { useEdgeDb } from '../../server'
33

44
export default defineEventHandler(async (req) => {
55
const token = getCookie(req, 'edgedb-auth-token')

src/runtime/api/auth/login.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import { H3Error, defineEventHandler, readBody, setHeaders } from 'h3'
2-
import { useEdgeDbEnv } from '../../server/useEdgeDbEnv'
3-
import { useEdgeDbPKCE } from '../../server/useEdgeDbPKCE'
2+
import { useEdgeDbEnv, useEdgeDbPKCE } from '../../server'
43

54
export default defineEventHandler(async (req) => {
65
const pkce = useEdgeDbPKCE()

src/runtime/api/auth/providers.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { defineEventHandler } from 'h3'
2-
import { useEdgeDb } from '../../server/useEdgeDb'
2+
import { useEdgeDb } from '../../server'
33

44
export default defineEventHandler(async () => {
55
const client = useEdgeDb()

src/runtime/api/auth/reset-password-ui.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { defineEventHandler, getQuery } from 'h3'
2-
import { useEdgeDbEnv } from '../../server/useEdgeDbEnv'
2+
import { useEdgeDbEnv } from '../../server'
33

44
/**
55
* Render a simple reset password UI

0 commit comments

Comments
 (0)