From b5e225a2385ffed1778802292d4d455fbe64c31a Mon Sep 17 00:00:00 2001 From: Daniel Roe Date: Thu, 28 Mar 2024 05:16:46 +0000 Subject: [PATCH] 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 --- packages/nuxt/src/runtime/modules/drizzle/index.ts | 3 ++- .../modules/graphqlYoga/utils/generateGraphqlTemplate.ts | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/nuxt/src/runtime/modules/drizzle/index.ts b/packages/nuxt/src/runtime/modules/drizzle/index.ts index 22c26b9c..52ea6223 100644 --- 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({ 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 index 078e7385..8c5a8fbb 100644 --- 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