fix: adopt forward-compatible approach to builder:watch (#247)

* fix: adopt forward-compatible approach to `builder:watch` * fix: lint issues * Apply suggestions from code review
oku-ui · Mar 28, 2024 · b5e225a · b5e225a
1 parent 78dc6b8
commit b5e225a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/packages/nuxt/src/runtime/modules/drizzle/index.ts b/packages/nuxt/src/runtime/modules/drizzle/index.ts
@@ -1,4 +1,4 @@
-import { join } from 'node:path'
+import { join, relative, resolve } from 'node:path'
 import { execSync } from 'node:child_process'
 import { addServerImportsDir, createResolver } from '@nuxt/kit'
 import { camelCase } from 'scule'
@@ -169,6 +169,7 @@ export default definePergelModule<DrizzleConfig, ResolvedDrizzleConfig>({
     if (nuxt.options.dev) {
     // Watch for changes
       nuxt.hook('builder:watch', async (event, path) => {
+        path = relative(nuxt.options.srcDir, resolve(nuxt.options.srcDir, path))
         const match = globsBuilderWatch(
           nuxt,
           path,

diff --git a/packages/nuxt/src/runtime/modules/graphqlYoga/utils/generateGraphqlTemplate.ts b/packages/nuxt/src/runtime/modules/graphqlYoga/utils/generateGraphqlTemplate.ts
@@ -1,4 +1,4 @@
-import { join } from 'node:path'
+import { join, relative, resolve } from 'node:path'
 import { matchGlobs } from '../utils'
 import type { ResolvedGraphQLYogaConfig } from '../types'
 import type { NuxtPergel } from '../../../core/types/nuxtModule'
@@ -22,6 +22,7 @@ export function generateGraphQLTemplate(data: {
 
   if (data.nuxt.options.dev) {
     data.nuxt.hook('builder:watch', async (event, path) => {
+      path = relative(data.nuxt.options.srcDir, resolve(data.nuxt.options.srcDir, path))
       const test = globsBuilderWatch(data.nuxt, path, '.graphql')
       if (!test)
         return