nitro-graphql 2.0.0-beta.7 → 2.0.0-beta.9

package/dist/index.d.ts

@@ -1,8 +1,8 @@
 import { StandardSchemaV1 } from "./types/standard-schema.js";
 import { ClientUtilsConfig, CodegenClientConfig, CodegenServerConfig, ExternalGraphQLService, ExternalServicePaths, FederationConfig, FileGenerationConfig, GenImport, GenericSdkConfig, NitroGraphQLOptions, PathsConfig, ScaffoldConfig, SdkConfig, TypesConfig } from "./types/index.js";
-import * as nitropack_types0 from "nitropack/types";
+import * as nitro_types0 from "nitro/types";
 
 //#region src/index.d.ts
-declare const _default: nitropack_types0.NitroModule;
+declare const _default: nitro_types0.NitroModule;
 //#endregion
 export { ClientUtilsConfig, CodegenClientConfig, CodegenServerConfig, ExternalGraphQLService, ExternalServicePaths, FederationConfig, FileGenerationConfig, GenImport, GenericSdkConfig, NitroGraphQLOptions, PathsConfig, ScaffoldConfig, SdkConfig, StandardSchemaV1, TypesConfig, _default as default };

package/dist/index.js

@@ -1,7 +1,7 @@
 import { generateDirectiveSchemas } from "./utils/directive-parser.js";
 import { generateLayerIgnorePatterns, getLayerAppDirectories, getLayerServerDirectories, relativeWithDot, scanDirectives, scanDocs, scanResolvers, scanSchemas, validateExternalServices } from "./utils/index.js";
 import { writeFileIfNotExists } from "./utils/file-generator.js";
-import { getDefaultPaths, getScaffoldConfig, resolveFilePath, shouldGenerateScaffold } from "./utils/path-resolver.js";
+import { getScaffoldConfig, resolveFilePath, shouldGenerateScaffold } from "./utils/path-resolver.js";
 import { clientTypeGeneration, serverTypeGeneration } from "./utils/type-generation.js";
 import { rollupConfig } from "./rollup.js";
 import { existsSync, mkdirSync } from "node:fs";
@@ -25,11 +25,13 @@ var src_default = defineNitroModule({
 			}
 			consola.info(`Configured ${nitro.options.graphql.externalServices.length} external GraphQL services`);
 		}
+		const { getDefaultPaths: getDefaultPaths$1 } = await import("./utils/path-resolver.js");
+		const defaultPaths = getDefaultPaths$1(nitro);
 		nitro.graphql ||= {
 			buildDir: "",
 			watchDirs: [],
-			clientDir: "",
-			serverDir: resolve(nitro.options.rootDir, "server", "graphql"),
+			clientDir: defaultPaths.clientGraphql,
+			serverDir: defaultPaths.serverGraphql,
 			dir: {
 				build: relative(nitro.options.rootDir, nitro.options.buildDir),
 				client: "graphql",
@@ -61,11 +63,8 @@ var src_default = defineNitroModule({
 		const watchDirs = [];
 		switch (nitro.options.framework.name) {
 			case "nuxt": {
-				if (!nitro.graphql.clientDir) {
-					nitro.graphql.clientDir = resolve(nitro.options.rootDir, "app", "graphql");
-					nitro.graphql.dir.client = "app/graphql";
-				}
-				if (!nitro.options.graphql?.serverDir) nitro.graphql.serverDir = resolve(nitro.options.rootDir, "server", "graphql");
+				nitro.graphql.dir.client = relative(nitro.options.rootDir, nitro.graphql.clientDir);
+				nitro.graphql.dir.server = relative(nitro.options.rootDir, nitro.graphql.serverDir);
 				watchDirs.push(nitro.graphql.clientDir);
 				const layerServerDirs = getLayerServerDirectories(nitro);
 				const layerAppDirs = getLayerAppDirectories(nitro);
@@ -74,9 +73,8 @@ var src_default = defineNitroModule({
 				break;
 			}
 			case "nitro":
-				if (!nitro.options.graphql?.serverDir) nitro.graphql.serverDir = resolve(nitro.options.rootDir, "server", "graphql");
-				nitro.graphql.clientDir = resolve(nitro.options.rootDir, "graphql");
-				nitro.graphql.dir.client = "graphql";
+				nitro.graphql.dir.client = relative(nitro.options.rootDir, nitro.graphql.clientDir);
+				nitro.graphql.dir.server = relative(nitro.options.rootDir, nitro.graphql.serverDir);
 				watchDirs.push(nitro.graphql.clientDir);
 				watchDirs.push(nitro.graphql.serverDir);
 				break;
@@ -245,7 +243,7 @@ var src_default = defineNitroModule({
 			if (nuxtOptions) nuxtOptions.nitroGraphqlExternalServices = nitro.options.graphql?.externalServices || [];
 		});
 		if (shouldGenerateScaffold(nitro)) {
-			const placeholders = getDefaultPaths(nitro);
+			const placeholders = getDefaultPaths$1(nitro);
 			const scaffoldConfig = getScaffoldConfig(nitro);
 			const graphqlConfigPath = resolveFilePath(scaffoldConfig.graphqlConfig, scaffoldConfig.enabled, true, "graphql.config.ts", placeholders);
 			if (graphqlConfigPath) writeFileIfNotExists(graphqlConfigPath, `

package/dist/routes/apollo-server.d.ts

@@ -1,6 +1,6 @@
-import * as h30 from "h3";
+import * as h33 from "h3";
 
 //#region src/routes/apollo-server.d.ts
-declare const _default: h30.EventHandlerWithFetch<h30.EventHandlerRequest, Promise<any>>;
+declare const _default: h33.EventHandlerWithFetch<h33.EventHandlerRequest, Promise<any>>;
 //#endregion
 export { _default as default };

package/dist/routes/debug.d.ts

@@ -1,4 +1,4 @@
-import * as h31 from "h3";
+import * as h30 from "h3";
 
 //#region src/routes/debug.d.ts
 
@@ -10,7 +10,7 @@ import * as h31 from "h3";
  * - /_nitro/graphql/debug - HTML dashboard
  * - /_nitro/graphql/debug?format=json - JSON API
  */
-declare const _default: h31.EventHandlerWithFetch<h31.EventHandlerRequest, Promise<string | {
+declare const _default: h30.EventHandlerWithFetch<h30.EventHandlerRequest, Promise<string | {
   timestamp: string;
   environment: {
     dev: any;

package/dist/routes/graphql-yoga.d.ts

@@ -1,6 +1,6 @@
-import * as h33 from "h3";
+import * as h31 from "h3";
 
 //#region src/routes/graphql-yoga.d.ts
-declare const _default: h33.EventHandlerWithFetch<h33.EventHandlerRequest, Promise<Response>>;
+declare const _default: h31.EventHandlerWithFetch<h31.EventHandlerRequest, Promise<Response>>;
 //#endregion
 export { _default as default };

package/package.json

@@ -1,8 +1,7 @@
 {
   "name": "nitro-graphql",
   "type": "module",
-  "version": "2.0.0-beta.7",
-  "packageManager": "pnpm@10.20.0",
+  "version": "2.0.0-beta.9",
   "description": "GraphQL integration for Nitro",
   "license": "MIT",
   "sideEffects": false,
@@ -87,21 +86,6 @@
   "files": [
     "dist"
   ],
-  "scripts": {
-    "prepack": "pnpm build",
-    "build": "tsdown",
-    "dev": "tsdown --watch",
-    "bumpp": "bumpp package.json",
-    "release": "pnpm build && pnpm bumpp && pnpm publish --no-git-checks --access public",
-    "playground:nitro": "cd playgrounds/nitro && pnpm install && pnpm dev",
-    "playground:nuxt": "cd playgrounds/nuxt && pnpm install && pnpm dev",
-    "playground:federation": "cd playgrounds/federation && pnpm install && pnpm dev",
-    "docs:dev": "cd .docs && pnpm install && pnpm dev",
-    "docs:build": "cd .docs && pnpm install && pnpm build",
-    "docs:preview": "cd .docs && pnpm preview",
-    "lint": "eslint .",
-    "lint:fix": "eslint . --fix"
-  },
   "peerDependencies": {
     "@apollo/server": "^5.0.0",
     "@apollo/utils.withrequired": "^3.0.0",
@@ -122,49 +106,63 @@
     }
   },
   "dependencies": {
-    "@apollo/subgraph": "catalog:",
-    "@graphql-codegen/core": "catalog:",
-    "@graphql-codegen/import-types-preset": "catalog:",
-    "@graphql-codegen/typescript": "catalog:",
-    "@graphql-codegen/typescript-generic-sdk": "catalog:",
-    "@graphql-codegen/typescript-operations": "catalog:",
-    "@graphql-codegen/typescript-resolvers": "catalog:",
-    "@graphql-tools/graphql-file-loader": "catalog:",
-    "@graphql-tools/load": "catalog:",
-    "@graphql-tools/load-files": "catalog:",
-    "@graphql-tools/merge": "catalog:",
-    "@graphql-tools/schema": "catalog:",
-    "@graphql-tools/url-loader": "catalog:",
-    "@graphql-tools/utils": "catalog:",
-    "chokidar": "catalog:",
-    "consola": "catalog:",
-    "defu": "catalog:",
-    "graphql-config": "catalog:",
-    "graphql-scalars": "catalog:",
-    "knitwork": "catalog:",
-    "ohash": "catalog:",
-    "oxc-parser": "catalog:",
-    "pathe": "catalog:",
-    "tinyglobby": "catalog:"
+    "@apollo/subgraph": "^2.11.3",
+    "@graphql-codegen/core": "^5.0.0",
+    "@graphql-codegen/import-types-preset": "^3.0.1",
+    "@graphql-codegen/typescript": "^5.0.2",
+    "@graphql-codegen/typescript-generic-sdk": "^4.0.2",
+    "@graphql-codegen/typescript-operations": "^5.0.2",
+    "@graphql-codegen/typescript-resolvers": "^5.1.0",
+    "@graphql-tools/graphql-file-loader": "^8.1.3",
+    "@graphql-tools/load": "^8.1.3",
+    "@graphql-tools/load-files": "^7.0.1",
+    "@graphql-tools/merge": "^9.1.2",
+    "@graphql-tools/schema": "^10.0.26",
+    "@graphql-tools/url-loader": "^9.0.1",
+    "@graphql-tools/utils": "^10.10.0",
+    "chokidar": "^4.0.3",
+    "consola": "^3.4.2",
+    "defu": "^6.1.4",
+    "graphql-config": "^5.1.5",
+    "graphql-scalars": "^1.25.0",
+    "knitwork": "^1.2.0",
+    "ohash": "^2.0.11",
+    "oxc-parser": "^0.96.0",
+    "pathe": "^2.0.3",
+    "tinyglobby": "^0.2.15"
   },
   "devDependencies": {
-    "@antfu/eslint-config": "catalog:",
-    "@nuxt/kit": "catalog:",
-    "@nuxt/schema": "catalog:",
-    "@types/node": "catalog:",
-    "bumpp": "catalog:",
-    "changelogen": "catalog:",
-    "crossws": "catalog:",
-    "eslint": "catalog:",
-    "graphql": "catalog:",
-    "graphql-yoga": "catalog:",
-    "h3": "catalog:",
-    "nitro": "catalog:",
-    "tsdown": "catalog:",
-    "typescript": "catalog:",
+    "@antfu/eslint-config": "^6.2.0",
+    "@nuxt/kit": "^4.2.0",
+    "@nuxt/schema": "^4.2.0",
+    "@types/node": "^24.10.0",
+    "bumpp": "^10.3.1",
+    "changelogen": "^0.6.2",
+    "crossws": "0.3.5",
+    "eslint": "^9.39.0",
+    "graphql": "16.11.0",
+    "graphql-yoga": "^5.16.0",
+    "h3": "^2.0.1-rc.5",
+    "nitro": "^3.0.1-alpha.0",
+    "tsdown": "^0.15.12",
+    "typescript": "^5.9.3",
     "vitepress-plugin-llms": "^1.8.1"
   },
   "resolutions": {
     "nitro-graphql": "link:."
+  },
+  "scripts": {
+    "build": "tsdown",
+    "dev": "tsdown --watch",
+    "bumpp": "bumpp package.json",
+    "release": "pnpm build && pnpm bumpp && pnpm publish --no-git-checks --access public",
+    "playground:nitro": "cd playgrounds/nitro && pnpm install && pnpm dev",
+    "playground:nuxt": "cd playgrounds/nuxt && pnpm install && pnpm dev",
+    "playground:federation": "cd playgrounds/federation && pnpm install && pnpm dev",
+    "docs:dev": "cd .docs && pnpm install && pnpm dev",
+    "docs:build": "cd .docs && pnpm install && pnpm build",
+    "docs:preview": "cd .docs && pnpm preview",
+    "lint": "eslint .",
+    "lint:fix": "eslint . --fix"
   }
-}
+}