Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: opt in to import.meta.* properties #475

Merged
merged 2 commits into from
Apr 3, 2024
Merged

fix: opt in to import.meta.* properties #475

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6cf099c
fix: opt in to `import.meta.*` properties
danielroe Mar 25, 2024
02b3fbd
Merge branch 'main' into process-client
Diizzayy Apr 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/runtime/composables/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ export function useGqlHeaders (...args: any[]) {
if (respectDefaults && !Object.keys(headers).length) {
const defaultHeaders = (useRuntimeConfig()?.public?.['graphql-client'] as GqlConfig)?.clients?.[client || 'default']?.headers

const serverHeaders = (process.server && (typeof defaultHeaders?.serverOnly === 'object' && defaultHeaders?.serverOnly)) || undefined
const serverHeaders = (import.meta.server && (typeof defaultHeaders?.serverOnly === 'object' && defaultHeaders?.serverOnly)) || undefined
if (defaultHeaders?.serverOnly) { delete defaultHeaders.serverOnly }

headers = { ...(defaultHeaders as Record<string, string>), ...serverHeaders }
Expand Down Expand Up @@ -150,7 +150,7 @@ export function useGqlToken (...args: any[]) {
cookie.value = token
}

if (process.client && tokenStorage.mode === 'localStorage') {
if (import.meta.client && tokenStorage.mode === 'localStorage') {
if (token !== null) {
localStorage.setItem(tokenStorage.name!, token)
} else {
Expand Down Expand Up @@ -268,7 +268,7 @@ export function useGql () {
* */
export const useGqlError = (onError: OnGqlError) => {
// proactive measure to prevent context reliant calls
useGqlState().value.onError = process.client
useGqlState().value.onError = import.meta.client
? onError
: (process.env.NODE_ENV !== 'production' && (e => console.error('[nuxt-graphql-client] [GraphQL error]', e))) || undefined

Expand Down
10 changes: 5 additions & 5 deletions src/runtime/plugin.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,15 @@ export default defineNuxtPlugin((nuxtApp) => {
const proxyHeaders = Object.values(clients || {}).flatMap(v => v?.proxyHeaders).filter((v, i, a) => Boolean(v) && a.indexOf(v) === i) as string[]
if (!proxyHeaders.includes('cookie')) { proxyHeaders.push('cookie') }

const requestHeaders = ((process.server && useRequestHeaders(proxyHeaders)) as Record<string, string>) || undefined
const requestHeaders = ((import.meta.server && useRequestHeaders(proxyHeaders)) as Record<string, string>) || undefined

for (const [name, v] of Object.entries(clients || {})) {
const host = (process.client && v?.clientHost) || v.host
const host = (import.meta.client && v?.clientHost) || v.host

const proxyCookie = v?.proxyCookies && !!requestHeaders?.cookie

let headers = v?.headers as Record<string, string> | undefined
const serverHeaders = (process.server && (typeof headers?.serverOnly === 'object' && headers?.serverOnly)) || {}
const serverHeaders = (import.meta.server && (typeof headers?.serverOnly === 'object' && headers?.serverOnly)) || {}

if (headers?.serverOnly) {
headers = { ...headers }
Expand Down Expand Up @@ -65,13 +65,13 @@ export default defineNuxtPlugin((nuxtApp) => {

if (token.value === undefined && typeof v.tokenStorage === 'object') {
if (v.tokenStorage?.mode === 'cookie') {
if (process.client) {
if (import.meta.client) {
token.value = useCookie(v.tokenStorage.name!).value
} else if (requestHeaders?.cookie) {
const cookieName = `${v.tokenStorage.name}=`
token.value = requestHeaders?.cookie.split(';').find(c => c.trim().startsWith(cookieName))?.split('=')?.[1]
}
} else if (process.client && v.tokenStorage?.mode === 'localStorage') {
} else if (import.meta.client && v.tokenStorage?.mode === 'localStorage') {
const storedToken = localStorage.getItem(v.tokenStorage.name!)

if (storedToken) { token.value = storedToken }
Expand Down
Loading