@cedarjs/vite 6.0.0-canary.2632 → 6.0.0-canary.2635

package/dist/apiDevMiddleware.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"apiDevMiddleware.d.ts","sourceRoot":"","sources":["../src/apiDevMiddleware.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAc,aAAa,EAAE,MAAM,MAAM,CAAA;AA8BrD,wBAAsB,gBAAgB,CAAC,UAAU,EAAE,aAAa,iBAe/D;AA+GD,wBAAsB,mBAAmB,IAAI,OAAO,CAAC,aAAa,CAAC,CAsGlE;AA0BD,wBAAgB,gBAAgB,CAAC,UAAU,EAAE,aAAa,GAAG,IAAI,CA0EhE;AAED;;;GAGG;AACH,wBAAgB,qBAAqB,KAIrB,SAAS,OAAO,KAAG,OAAO,CAAC,QAAQ,CAAC,CAoFnD;AAED,wBAAsB,qBAAqB,IAAI,OAAO,CAAC;IACrD,UAAU,EAAE,aAAa,CAAA;IACzB,KAAK,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAA;IAC1B,OAAO,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,OAAO,CAAC,QAAQ,CAAC,CAAA;CACjD,CAAC,CAcD"}
+{"version":3,"file":"apiDevMiddleware.d.ts","sourceRoot":"","sources":["../src/apiDevMiddleware.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAsB,aAAa,EAAE,MAAM,MAAM,CAAA;AAgC7D,wBAAsB,gBAAgB,CAAC,UAAU,EAAE,aAAa,iBAe/D;AA+GD,wBAAsB,mBAAmB,IAAI,OAAO,CAAC,aAAa,CAAC,CA8GlE;AA0BD,wBAAgB,gBAAgB,CAAC,UAAU,EAAE,aAAa,GAAG,IAAI,CA0EhE;AAED;;;GAGG;AACH,wBAAgB,qBAAqB,KAIrB,SAAS,OAAO,KAAG,OAAO,CAAC,QAAQ,CAAC,CAoFnD;AAED,wBAAsB,qBAAqB,IAAI,OAAO,CAAC;IACrD,UAAU,EAAE,aAAa,CAAA;IACzB,KAAK,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAA;IAC1B,OAAO,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,OAAO,CAAC,QAAQ,CAAC,CAAA;CACjD,CAAC,CAcD"}

package/dist/apiDevMiddleware.js

@@ -3,6 +3,7 @@ import path from "node:path";
 import { pathToFileURL } from "node:url";
 import ansis from "ansis";
 import { normalizePath } from "vite";
+import { gqlPlugin as gqlTagPlugin } from "vite-plugin-graphql-tag";
 import { buildCedarContext, wrapLegacyHandler } from "@cedarjs/api/runtime";
 import {
   getApiSideBabelPlugins,
@@ -13,6 +14,7 @@ import { createGraphQLYoga } from "@cedarjs/graphql-server";
 import { applyGqlormInject } from "@cedarjs/internal/dist/build/api-graphql-transforms.js";
 import { getConfig, getPaths, projectSideIsEsm } from "@cedarjs/project-config";
 import { getWorkspacePackageAliases } from "./lib/workspacePackageAliases.js";
+import { cedarAutoImportsPlugin } from "./plugins/vite-plugin-cedar-auto-import.js";
 import { applyGraphqlOptionsExtract } from "./plugins/vite-plugin-cedar-graphql-options-extract.js";
 import { applyOtelWrapping } from "./plugins/vite-plugin-cedar-otel-wrapping.js";
 const LAMBDA_FUNCTIONS = {};
@@ -121,6 +123,7 @@ async function createApiViteServer() {
   const isEsm = projectSideIsEsm("api");
   const normalizedBase = normalizePath(cedarPaths.base);
   const babelPlugins = getApiSideBabelPlugins({
+    forVite: true,
     projectIsEsm: isEsm
   });
   const workspacePkgSourceMap = Object.fromEntries(
@@ -142,6 +145,12 @@ async function createApiViteServer() {
       alias: workspacePkgSourceMap
     },
     plugins: [
+      cedarAutoImportsPlugin(),
+      (() => {
+        const p = gqlTagPlugin();
+        p.enforce = "post";
+        return p;
+      })(),
       {
         name: "cedar-api-babel-transform",
         enforce: "pre",
@@ -158,7 +167,8 @@ async function createApiViteServer() {
           try {
             let sourceCode = code;
             if (normalizePath(id).endsWith("/graphql.ts") || normalizePath(id).endsWith("/graphql.js")) {
-              sourceCode = applyGraphqlOptionsExtract(sourceCode) ?? sourceCode;
+              const extracted = applyGraphqlOptionsExtract(sourceCode);
+              sourceCode = extracted?.code ?? sourceCode;
               sourceCode = applyGqlormInject(sourceCode, id) ?? sourceCode;
             }
             if (cedarConfig.experimental?.opentelemetry?.enabled && cedarConfig.experimental?.opentelemetry?.wrapApi) {

package/dist/buildApp.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"buildApp.d.ts","sourceRoot":"","sources":["../src/buildApp.ts"],"names":[],"mappings":"AA6CA,MAAM,WAAW,oBAAoB;IACnC,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,SAAS,CAAC,EAAE,MAAM,EAAE,CAAA;IACpB,EAAE,CAAC,EAAE,OAAO,CAAA;CACb;AAED;;;;;;;;GAQG;AACH,wBAAsB,aAAa,CAAC,EAClC,OAAe,EACf,SAA0B,EAC1B,EAAU,GACX,GAAE,oBAAyB,iBAiV3B"}
+{"version":3,"file":"buildApp.d.ts","sourceRoot":"","sources":["../src/buildApp.ts"],"names":[],"mappings":"AA+CA,MAAM,WAAW,oBAAoB;IACnC,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,SAAS,CAAC,EAAE,MAAM,EAAE,CAAA;IACpB,EAAE,CAAC,EAAE,OAAO,CAAA;CACb;AAED;;;;;;;;GAQG;AACH,wBAAsB,aAAa,CAAC,EAClC,OAAe,EACf,SAA0B,EAC1B,EAAU,GACX,GAAE,oBAAyB,iBAwV3B"}

package/dist/buildApp.js

@@ -3,6 +3,7 @@ import path from "node:path";
 import { catchAllEntry, getAllEntries } from "@universal-deploy/store";
 import { catchAll } from "@universal-deploy/vite";
 import { createBuilder, normalizePath } from "vite";
+import { gqlPlugin as gqlTagPlugin } from "vite-plugin-graphql-tag";
 import tsPathsMod from "vite-tsconfig-paths";
 const tsconfigPaths = (
   // @ts-expect-error – .default only exists at runtime in CJS double-wrap
@@ -16,6 +17,7 @@ import {
 import { findApiFiles } from "@cedarjs/internal/dist/files.js";
 import { getConfig, getPaths, projectSideIsEsm } from "@cedarjs/project-config";
 import { getWorkspacePackageAliases } from "./lib/workspacePackageAliases.js";
+import { cedarAutoImportsPlugin } from "./plugins/vite-plugin-cedar-auto-import.js";
 import { cedarGqlormInjectPlugin } from "./plugins/vite-plugin-cedar-gqlorm-inject.js";
 import { cedarGraphqlOptionsExtractPlugin } from "./plugins/vite-plugin-cedar-graphql-options-extract.js";
 import { cedarMockCellDataPlugin } from "./plugins/vite-plugin-cedar-mock-cell-data.js";
@@ -110,6 +112,7 @@ async function buildCedarApp({
     }
   }
   const babelPlugins = workspace.includes("api") ? getApiSideBabelPlugins({
+    forVite: true,
     projectIsEsm: projectSideIsEsm("api")
   }) : null;
   const workspacePkgSourceMap = workspace.includes("api") ? Object.fromEntries(
@@ -119,6 +122,12 @@ async function buildCedarApp({
   ) : {};
   const plugins = [
     tsconfigPaths(),
+    cedarAutoImportsPlugin(),
+    (() => {
+      const p = gqlTagPlugin();
+      p.enforce = "post";
+      return p;
+    })(),
     // Suppress noisy warnings from third-party dependencies across all
     // environments by injecting onwarn into every environment's rollupOptions.
     {

package/dist/buildRouteHooks.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"buildRouteHooks.d.ts","sourceRoot":"","sources":["../src/buildRouteHooks.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAA;AAGpD,wBAAsB,eAAe,CACnC,OAAO,EAAE,OAAO,GAAG,SAAS,EAC5B,OAAO,EAAE,KAAK,iBAgDf"}
+{"version":3,"file":"buildRouteHooks.d.ts","sourceRoot":"","sources":["../src/buildRouteHooks.ts"],"names":[],"mappings":"AAYA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAA;AA2BpD,wBAAsB,eAAe,CACnC,OAAO,EAAE,OAAO,GAAG,SAAS,EAC5B,OAAO,EAAE,KAAK,iBA+Ef"}

package/dist/buildRouteHooks.js

@@ -1,27 +1,55 @@
 import fs from "node:fs";
 import path from "node:path";
 import { build as esbuildBuild } from "esbuild";
+import { gqlPlugin } from "vite-plugin-graphql-tag";
 import {
   getRouteHookBabelPlugins,
   transformWithBabel
 } from "@cedarjs/babel-config";
 import { findRouteHooksSrc } from "@cedarjs/internal/dist/files.js";
 import { getPaths } from "@cedarjs/project-config";
+const GQL_TAG_PLUGIN_NAME = "rwjs-babel-graphql-tag";
+const gqlPluginResult = gqlPlugin();
+if (!gqlPluginResult || Array.isArray(gqlPluginResult) || !("transform" in gqlPluginResult) || !gqlPluginResult.transform) {
+  throw new Error("vite-plugin-graphql-tag did not return the expected shape");
+}
+const transform = gqlPluginResult.transform;
+if (typeof transform !== "object" || !("handler" in transform)) {
+  throw new Error("vite-plugin-graphql-tag did not return the expected shape");
+}
+const gqlTransform = transform.handler;
 async function buildRouteHooks(verbose, rwPaths) {
   const allRouteHooks = findRouteHooksSrc();
   const runRwBabelTransformsPlugin = {
-    name: "rw-esbuild-babel-transform",
+    name: "cedar-esbuild-babel-transform",
     setup(build) {
       build.onLoad({ filter: /\.(js|ts|tsx|jsx)$/ }, async (args) => {
         const fileContents = await fs.promises.readFile(args.path, "utf-8");
+        const babelPlugins = getRouteHookBabelPlugins().filter(
+          (p) => !(Array.isArray(p) && p[2] === GQL_TAG_PLUGIN_NAME)
+        );
         const transformedCode = await transformWithBabel(
           fileContents,
           args.path,
-          [...getRouteHookBabelPlugins()]
+          babelPlugins
         );
         if (transformedCode?.code) {
+          const mockCtx = {
+            warn(msg) {
+              console.warn(`[gql-plugin] ${msg}`);
+            },
+            error(err) {
+              throw new Error(String(err));
+            }
+          };
+          const gqlResult = await gqlTransform.call(
+            mockCtx,
+            transformedCode.code,
+            args.path
+          );
+          const gqlCode = gqlResult && typeof gqlResult === "object" && "code" in gqlResult ? gqlResult.code : void 0;
           return {
-            contents: transformedCode.code,
+            contents: gqlCode ?? transformedCode.code,
             loader: "js"
           };
         }
@@ -44,9 +72,6 @@ async function buildRouteHooks(verbose, rwPaths) {
     logLevel: verbose ? "info" : "error",
     outdir: rwPaths.web.distRouteHooks,
     alias: {
-      // Lift the `api/src` → real api src resolution that was previously
-      // handled by `babel-plugin-module-resolver`. The Babel plugin has been
-      // removed from `getRouteHookBabelPlugins`; esbuild handles this now.
       "api/src": path.join(getPaths().api.base, "src")
     }
   });

package/dist/cjs/apiDevMiddleware.js

@@ -40,6 +40,7 @@ var import_node_path = __toESM(require("node:path"), 1);
 var import_node_url = require("node:url");
 var import_ansis = __toESM(require("ansis"), 1);
 var import_vite = require("vite");
+var import_vite_plugin_graphql_tag = require("vite-plugin-graphql-tag");
 var import_runtime = require("@cedarjs/api/runtime");
 var import_babel_config = require("@cedarjs/babel-config");
 var import_store = require("@cedarjs/context/dist/store");
@@ -47,6 +48,7 @@ var import_graphql_server = require("@cedarjs/graphql-server");
 var import_api_graphql_transforms = require("@cedarjs/internal/dist/build/api-graphql-transforms.js");
 var import_project_config = require("@cedarjs/project-config");
 var import_workspacePackageAliases = require("./lib/workspacePackageAliases.js");
+var import_vite_plugin_cedar_auto_import = require("./plugins/vite-plugin-cedar-auto-import.js");
 var import_vite_plugin_cedar_graphql_options_extract = require("./plugins/vite-plugin-cedar-graphql-options-extract.js");
 var import_vite_plugin_cedar_otel_wrapping = require("./plugins/vite-plugin-cedar-otel-wrapping.js");
 const LAMBDA_FUNCTIONS = {};
@@ -155,6 +157,7 @@ async function createApiViteServer() {
   const isEsm = (0, import_project_config.projectSideIsEsm)("api");
   const normalizedBase = (0, import_vite.normalizePath)(cedarPaths.base);
   const babelPlugins = (0, import_babel_config.getApiSideBabelPlugins)({
+    forVite: true,
     projectIsEsm: isEsm
   });
   const workspacePkgSourceMap = Object.fromEntries(
@@ -176,6 +179,12 @@ async function createApiViteServer() {
       alias: workspacePkgSourceMap
     },
     plugins: [
+      (0, import_vite_plugin_cedar_auto_import.cedarAutoImportsPlugin)(),
+      (() => {
+        const p = (0, import_vite_plugin_graphql_tag.gqlPlugin)();
+        p.enforce = "post";
+        return p;
+      })(),
       {
         name: "cedar-api-babel-transform",
         enforce: "pre",
@@ -192,7 +201,8 @@ async function createApiViteServer() {
           try {
             let sourceCode = code;
             if ((0, import_vite.normalizePath)(id).endsWith("/graphql.ts") || (0, import_vite.normalizePath)(id).endsWith("/graphql.js")) {
-              sourceCode = (0, import_vite_plugin_cedar_graphql_options_extract.applyGraphqlOptionsExtract)(sourceCode) ?? sourceCode;
+              const extracted = (0, import_vite_plugin_cedar_graphql_options_extract.applyGraphqlOptionsExtract)(sourceCode);
+              sourceCode = extracted?.code ?? sourceCode;
               sourceCode = (0, import_api_graphql_transforms.applyGqlormInject)(sourceCode, id) ?? sourceCode;
             }
             if (cedarConfig.experimental?.opentelemetry?.enabled && cedarConfig.experimental?.opentelemetry?.wrapApi) {

package/dist/cjs/buildApp.js

@@ -36,11 +36,13 @@ var import_node_path = __toESM(require("node:path"), 1);
 var import_store = require("@universal-deploy/store");
 var import_vite = require("@universal-deploy/vite");
 var import_vite2 = require("vite");
+var import_vite_plugin_graphql_tag = require("vite-plugin-graphql-tag");
 var import_vite_tsconfig_paths = __toESM(require("vite-tsconfig-paths"), 1);
 var import_babel_config = require("@cedarjs/babel-config");
 var import_files = require("@cedarjs/internal/dist/files.js");
 var import_project_config = require("@cedarjs/project-config");
 var import_workspacePackageAliases = require("./lib/workspacePackageAliases.js");
+var import_vite_plugin_cedar_auto_import = require("./plugins/vite-plugin-cedar-auto-import.js");
 var import_vite_plugin_cedar_gqlorm_inject = require("./plugins/vite-plugin-cedar-gqlorm-inject.js");
 var import_vite_plugin_cedar_graphql_options_extract = require("./plugins/vite-plugin-cedar-graphql-options-extract.js");
 var import_vite_plugin_cedar_mock_cell_data = require("./plugins/vite-plugin-cedar-mock-cell-data.js");
@@ -140,6 +142,7 @@ async function buildCedarApp({
     }
   }
   const babelPlugins = workspace.includes("api") ? (0, import_babel_config.getApiSideBabelPlugins)({
+    forVite: true,
     projectIsEsm: (0, import_project_config.projectSideIsEsm)("api")
   }) : null;
   const workspacePkgSourceMap = workspace.includes("api") ? Object.fromEntries(
@@ -149,6 +152,12 @@ async function buildCedarApp({
   ) : {};
   const plugins = [
     tsconfigPaths(),
+    (0, import_vite_plugin_cedar_auto_import.cedarAutoImportsPlugin)(),
+    (() => {
+      const p = (0, import_vite_plugin_graphql_tag.gqlPlugin)();
+      p.enforce = "post";
+      return p;
+    })(),
     // Suppress noisy warnings from third-party dependencies across all
     // environments by injecting onwarn into every environment's rollupOptions.
     {

package/dist/cjs/buildRouteHooks.js

@@ -34,24 +34,52 @@ module.exports = __toCommonJS(buildRouteHooks_exports);
 var import_node_fs = __toESM(require("node:fs"), 1);
 var import_node_path = __toESM(require("node:path"), 1);
 var import_esbuild = require("esbuild");
+var import_vite_plugin_graphql_tag = require("vite-plugin-graphql-tag");
 var import_babel_config = require("@cedarjs/babel-config");
 var import_files = require("@cedarjs/internal/dist/files.js");
 var import_project_config = require("@cedarjs/project-config");
+const GQL_TAG_PLUGIN_NAME = "rwjs-babel-graphql-tag";
+const gqlPluginResult = (0, import_vite_plugin_graphql_tag.gqlPlugin)();
+if (!gqlPluginResult || Array.isArray(gqlPluginResult) || !("transform" in gqlPluginResult) || !gqlPluginResult.transform) {
+  throw new Error("vite-plugin-graphql-tag did not return the expected shape");
+}
+const transform = gqlPluginResult.transform;
+if (typeof transform !== "object" || !("handler" in transform)) {
+  throw new Error("vite-plugin-graphql-tag did not return the expected shape");
+}
+const gqlTransform = transform.handler;
 async function buildRouteHooks(verbose, rwPaths) {
   const allRouteHooks = (0, import_files.findRouteHooksSrc)();
   const runRwBabelTransformsPlugin = {
-    name: "rw-esbuild-babel-transform",
+    name: "cedar-esbuild-babel-transform",
     setup(build) {
       build.onLoad({ filter: /\.(js|ts|tsx|jsx)$/ }, async (args) => {
         const fileContents = await import_node_fs.default.promises.readFile(args.path, "utf-8");
+        const babelPlugins = (0, import_babel_config.getRouteHookBabelPlugins)().filter(
+          (p) => !(Array.isArray(p) && p[2] === GQL_TAG_PLUGIN_NAME)
+        );
         const transformedCode = await (0, import_babel_config.transformWithBabel)(
           fileContents,
           args.path,
-          [...(0, import_babel_config.getRouteHookBabelPlugins)()]
+          babelPlugins
         );
         if (transformedCode?.code) {
+          const mockCtx = {
+            warn(msg) {
+              console.warn(`[gql-plugin] ${msg}`);
+            },
+            error(err) {
+              throw new Error(String(err));
+            }
+          };
+          const gqlResult = await gqlTransform.call(
+            mockCtx,
+            transformedCode.code,
+            args.path
+          );
+          const gqlCode = gqlResult && typeof gqlResult === "object" && "code" in gqlResult ? gqlResult.code : void 0;
           return {
-            contents: transformedCode.code,
+            contents: gqlCode ?? transformedCode.code,
             loader: "js"
           };
         }
@@ -74,9 +102,6 @@ async function buildRouteHooks(verbose, rwPaths) {
     logLevel: verbose ? "info" : "error",
     outdir: rwPaths.web.distRouteHooks,
     alias: {
-      // Lift the `api/src` → real api src resolution that was previously
-      // handled by `babel-plugin-module-resolver`. The Babel plugin has been
-      // removed from `getRouteHookBabelPlugins`; esbuild handles this now.
       "api/src": import_node_path.default.join((0, import_project_config.getPaths)().api.base, "src")
     }
   });

package/dist/cjs/index.js

@@ -56,6 +56,7 @@ __export(index_exports, {
 });
 module.exports = __toCommonJS(index_exports);
 var import_plugin_react = __toESM(require("@vitejs/plugin-react"), 1);
+var import_vite_plugin_graphql_tag = require("vite-plugin-graphql-tag");
 var import_vite_tsconfig_paths = __toESM(require("vite-tsconfig-paths"), 1);
 var import_babel_config = require("@cedarjs/babel-config");
 var import_project_config = require("@cedarjs/project-config");
@@ -112,6 +113,7 @@ function cedar({ mode } = {}) {
   };
   return [
     tsconfigPaths(),
+    (0, import_vite_plugin_graphql_tag.gqlPlugin)(),
     mode === "test" && (0, import_vitest.cedarJsRouterImportTransformPlugin)(),
     mode === "test" && (0, import_vitest.createAuthImportTransformPlugin)(),
     mode === "test" && (0, import_vitest.autoImportsPlugin)(),

package/dist/cjs/plugins/vite-plugin-cedar-graphql-options-extract.js

@@ -1,7 +1,9 @@
 "use strict";
+var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -15,6 +17,14 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var vite_plugin_cedar_graphql_options_extract_exports = {};
 __export(vite_plugin_cedar_graphql_options_extract_exports, {
@@ -22,6 +32,7 @@ __export(vite_plugin_cedar_graphql_options_extract_exports, {
   cedarGraphqlOptionsExtractPlugin: () => cedarGraphqlOptionsExtractPlugin
 });
 module.exports = __toCommonJS(vite_plugin_cedar_graphql_options_extract_exports);
+var import_magic_string = __toESM(require("magic-string"), 1);
 var import_oxc_parser = require("oxc-parser");
 function cedarGraphqlOptionsExtractPlugin() {
   return {
@@ -33,12 +44,13 @@ function cedarGraphqlOptionsExtractPlugin() {
       if (!code.includes("createGraphQLHandler")) {
         return null;
       }
-      const transformed = applyGraphqlOptionsExtract(code);
-      if (!transformed || transformed === code) {
+      const result = applyGraphqlOptionsExtract(code);
+      if (!result) {
         return null;
       }
       return {
-        code: transformed
+        code: result.code,
+        map: result.map
       };
     }
   };
@@ -101,10 +113,13 @@ function applyGraphqlOptionsExtract(code) {
     optionsEnd
   )}
 `;
-  const before = code.slice(0, lineStart);
-  const between = code.slice(lineStart, optionsStart);
-  const after = code.slice(optionsEnd);
-  return before + optionsConst + between + "__cedar_graphqlOptions" + after;
+  const s = new import_magic_string.default(code);
+  s.prependLeft(lineStart, optionsConst);
+  s.overwrite(optionsStart, optionsEnd, "__cedar_graphqlOptions");
+  return {
+    code: s.toString(),
+    map: s.generateMap({ hires: true })
+  };
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,MAAM,CAAA;AAmCxC,OAAO,EAAE,sBAAsB,EAAE,MAAM,4CAA4C,CAAA;AACnF,OAAO,EAAE,oBAAoB,EAAE,MAAM,2CAA2C,CAAA;AAChF,OAAO,EAAE,kBAAkB,EAAE,MAAM,qCAAqC,CAAA;AACxE,OAAO,EAAE,uBAAuB,EAAE,MAAM,8CAA8C,CAAA;AACtF,OAAO,EAAE,gCAAgC,EAAE,MAAM,wDAAwD,CAAA;AACzG,OAAO,EAAE,uBAAuB,EAAE,MAAM,8CAA8C,CAAA;AACtF,OAAO,EACL,uBAAuB,EACvB,wBAAwB,GACzB,MAAM,+CAA+C,CAAA;AACtD,OAAO,EAAE,yBAAyB,EAAE,MAAM,gDAAgD,CAAA;AAC1F,OAAO,EAAE,kBAAkB,EAAE,MAAM,yCAAyC,CAAA;AAC5E,OAAO,EAAE,oBAAoB,EAAE,MAAM,2CAA2C,CAAA;AAChF,OAAO,EAAE,gBAAgB,EAAE,MAAM,8CAA8C,CAAA;AAC/E,OAAO,EAAE,4BAA4B,EAAE,MAAM,4DAA4D,CAAA;AACzG,OAAO,EAAE,2BAA2B,EAAE,MAAM,mDAAmD,CAAA;AAC/F,OAAO,EAAE,qBAAqB,EAAE,MAAM,mDAAmD,CAAA;AACzF,OAAO,EAAE,qCAAqC,EAAE,MAAM,8DAA8D,CAAA;AACpH,OAAO,EAAE,4BAA4B,EAAE,MAAM,oDAAoD,CAAA;AACjG,OAAO,EAAE,uBAAuB,EAAE,MAAM,+CAA+C,CAAA;AACvF,OAAO,EAAE,qBAAqB,EAAE,MAAM,qCAAqC,CAAA;AAC3E,OAAO,EAAE,iBAAiB,EAAE,MAAM,wCAAwC,CAAA;AAC1E,OAAO,EAAE,uBAAuB,EAAE,MAAM,+CAA+C,CAAA;AACvF,OAAO,EAAE,0BAA0B,EAAE,MAAM,iDAAiD,CAAA;AAC5F,OAAO,EAAE,qBAAqB,EAAE,MAAM,oDAAoD,CAAA;AAE1F,KAAK,aAAa,GAAG;IACnB,IAAI,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;CAC1B,CAAA;AAED;;GAEG;AACH,wBAAgB,KAAK,CAAC,EAAE,IAAI,EAAE,GAAE,aAAkB,GAAG,YAAY,EAAE,CAmClE;AAED,8DAA8D;AAC9D,eAAe,KAAK,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,MAAM,CAAA;AAoCxC,OAAO,EAAE,sBAAsB,EAAE,MAAM,4CAA4C,CAAA;AACnF,OAAO,EAAE,oBAAoB,EAAE,MAAM,2CAA2C,CAAA;AAChF,OAAO,EAAE,kBAAkB,EAAE,MAAM,qCAAqC,CAAA;AACxE,OAAO,EAAE,uBAAuB,EAAE,MAAM,8CAA8C,CAAA;AACtF,OAAO,EAAE,gCAAgC,EAAE,MAAM,wDAAwD,CAAA;AACzG,OAAO,EAAE,uBAAuB,EAAE,MAAM,8CAA8C,CAAA;AACtF,OAAO,EACL,uBAAuB,EACvB,wBAAwB,GACzB,MAAM,+CAA+C,CAAA;AACtD,OAAO,EAAE,yBAAyB,EAAE,MAAM,gDAAgD,CAAA;AAC1F,OAAO,EAAE,kBAAkB,EAAE,MAAM,yCAAyC,CAAA;AAC5E,OAAO,EAAE,oBAAoB,EAAE,MAAM,2CAA2C,CAAA;AAChF,OAAO,EAAE,gBAAgB,EAAE,MAAM,8CAA8C,CAAA;AAC/E,OAAO,EAAE,4BAA4B,EAAE,MAAM,4DAA4D,CAAA;AACzG,OAAO,EAAE,2BAA2B,EAAE,MAAM,mDAAmD,CAAA;AAC/F,OAAO,EAAE,qBAAqB,EAAE,MAAM,mDAAmD,CAAA;AACzF,OAAO,EAAE,qCAAqC,EAAE,MAAM,8DAA8D,CAAA;AACpH,OAAO,EAAE,4BAA4B,EAAE,MAAM,oDAAoD,CAAA;AACjG,OAAO,EAAE,uBAAuB,EAAE,MAAM,+CAA+C,CAAA;AACvF,OAAO,EAAE,qBAAqB,EAAE,MAAM,qCAAqC,CAAA;AAC3E,OAAO,EAAE,iBAAiB,EAAE,MAAM,wCAAwC,CAAA;AAC1E,OAAO,EAAE,uBAAuB,EAAE,MAAM,+CAA+C,CAAA;AACvF,OAAO,EAAE,0BAA0B,EAAE,MAAM,iDAAiD,CAAA;AAC5F,OAAO,EAAE,qBAAqB,EAAE,MAAM,oDAAoD,CAAA;AAE1F,KAAK,aAAa,GAAG;IACnB,IAAI,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;CAC1B,CAAA;AAED;;GAEG;AACH,wBAAgB,KAAK,CAAC,EAAE,IAAI,EAAE,GAAE,aAAkB,GAAG,YAAY,EAAE,CAoClE;AAED,8DAA8D;AAC9D,eAAe,KAAK,CAAA"}

package/dist/index.js

@@ -1,4 +1,5 @@
 import react from "@vitejs/plugin-react";
+import { gqlPlugin as gqlTagPlugin } from "vite-plugin-graphql-tag";
 import tsPathsMod from "vite-tsconfig-paths";
 const tsconfigPaths = (
   // @ts-expect-error – .default only exists at runtime in CJS double-wrap
@@ -62,6 +63,7 @@ function cedar({ mode } = {}) {
   };
   return [
     tsconfigPaths(),
+    gqlTagPlugin(),
     mode === "test" && cedarJsRouterImportTransformPlugin(),
     mode === "test" && createAuthImportTransformPlugin(),
     mode === "test" && autoImportsPlugin(),

package/dist/plugins/vite-plugin-cedar-graphql-options-extract.d.ts

@@ -1,3 +1,4 @@
+import type { SourceMap } from 'magic-string';
 import type { Plugin } from 'vite';
 /**
  * Vite plugin that extracts options passed to createGraphQLHandler into an
@@ -21,8 +22,8 @@ import type { Plugin } from 'vite';
 export declare function cedarGraphqlOptionsExtractPlugin(): Plugin;
 /**
  * Extracts the options argument from createGraphQLHandler calls and stores
- * them in an exported variable. Returns the transformed code, or null if no
- * transformation was needed.
+ * them in an exported variable. Returns the transformed code with a sourcemap,
+ * or null if no transformation was needed.
  *
  * Transforms:
  *   export const handler = createGraphQLHandler({ options })
@@ -34,5 +35,8 @@ export declare function cedarGraphqlOptionsExtractPlugin(): Plugin;
  * logic can run inside the Vite plugin pipeline without depending on internal's
  * build output.
  */
-export declare function applyGraphqlOptionsExtract(code: string): string | null;
+export declare function applyGraphqlOptionsExtract(code: string): {
+    code: string;
+    map: SourceMap;
+} | null;
 //# sourceMappingURL=vite-plugin-cedar-graphql-options-extract.d.ts.map

package/dist/plugins/vite-plugin-cedar-graphql-options-extract.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"vite-plugin-cedar-graphql-options-extract.d.ts","sourceRoot":"","sources":["../../src/plugins/vite-plugin-cedar-graphql-options-extract.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAElC;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAgB,gCAAgC,IAAI,MAAM,CA0BzD;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,0BAA0B,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CA6FtE"}
+{"version":3,"file":"vite-plugin-cedar-graphql-options-extract.d.ts","sourceRoot":"","sources":["../../src/plugins/vite-plugin-cedar-graphql-options-extract.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAA;AAG7C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAElC;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAgB,gCAAgC,IAAI,MAAM,CA2BzD;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,0BAA0B,CACxC,IAAI,EAAE,MAAM,GACX;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,SAAS,CAAA;CAAE,GAAG,IAAI,CAgGzC"}

package/dist/plugins/vite-plugin-cedar-graphql-options-extract.js

@@ -1,3 +1,4 @@
+import MagicString from "magic-string";
 import { parseSync, Visitor } from "oxc-parser";
 function cedarGraphqlOptionsExtractPlugin() {
   return {
@@ -9,12 +10,13 @@ function cedarGraphqlOptionsExtractPlugin() {
       if (!code.includes("createGraphQLHandler")) {
         return null;
       }
-      const transformed = applyGraphqlOptionsExtract(code);
-      if (!transformed || transformed === code) {
+      const result = applyGraphqlOptionsExtract(code);
+      if (!result) {
         return null;
       }
       return {
-        code: transformed
+        code: result.code,
+        map: result.map
       };
     }
   };
@@ -77,10 +79,13 @@ function applyGraphqlOptionsExtract(code) {
     optionsEnd
   )}
 `;
-  const before = code.slice(0, lineStart);
-  const between = code.slice(lineStart, optionsStart);
-  const after = code.slice(optionsEnd);
-  return before + optionsConst + between + "__cedar_graphqlOptions" + after;
+  const s = new MagicString(code);
+  s.prependLeft(lineStart, optionsConst);
+  s.overwrite(optionsStart, optionsEnd, "__cedar_graphqlOptions");
+  return {
+    code: s.toString(),
+    map: s.generateMap({ hires: true })
+  };
 }
 export {
   applyGraphqlOptionsExtract,

package/dist/rsc/rscBuildClient.d.ts

@@ -3,5 +3,5 @@
  * buildFeServer -> buildRscFeServer -> rscBuildClient
  * Generate the client bundle
  */
-export declare function rscBuildClient(clientEntryFiles: Record<string, string>): Promise<[import("rollup").OutputChunk, ...(import("rollup").OutputChunk | import("rollup").OutputAsset)[]]>;
+export declare function rscBuildClient(clientEntryFiles: Record<string, string>): Promise<[import("rollup").OutputChunk, ...(import("rollup").OutputAsset | import("rollup").OutputChunk)[]]>;
 //# sourceMappingURL=rscBuildClient.d.ts.map

package/dist/rsc/rscBuildForServer.d.ts

@@ -3,5 +3,5 @@
  * buildFeServer -> buildRscFeServer -> rscBuildForServer
  * Generate the output to be used by the rsc worker (not the actual server!)
  */
-export declare function rscBuildForServer(clientEntryFiles: Record<string, string>, serverEntryFiles: Record<string, string>, customModules: Record<string, string>): Promise<[import("rollup").OutputChunk, ...(import("rollup").OutputChunk | import("rollup").OutputAsset)[]]>;
+export declare function rscBuildForServer(clientEntryFiles: Record<string, string>, serverEntryFiles: Record<string, string>, customModules: Record<string, string>): Promise<[import("rollup").OutputChunk, ...(import("rollup").OutputAsset | import("rollup").OutputChunk)[]]>;
 //# sourceMappingURL=rscBuildForServer.d.ts.map

package/dist/rsc/rscBuildForSsr.d.ts

@@ -5,5 +5,5 @@
 export declare function rscBuildForSsr({ clientEntryFiles, verbose, }: {
     clientEntryFiles: Record<string, string>;
     verbose?: boolean;
-}): Promise<[import("rollup").OutputChunk, ...(import("rollup").OutputChunk | import("rollup").OutputAsset)[]]>;
+}): Promise<[import("rollup").OutputChunk, ...(import("rollup").OutputAsset | import("rollup").OutputChunk)[]]>;
 //# sourceMappingURL=rscBuildForSsr.d.ts.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/vite",
-  "version": "6.0.0-canary.2632",
+  "version": "6.0.0-canary.2635",
   "description": "Vite configuration package for CedarJS",
   "repository": {
     "type": "git",
@@ -63,15 +63,15 @@
     "@babel/parser": "7.29.7",
     "@babel/traverse": "7.29.7",
     "@babel/types": "7.29.7",
-    "@cedarjs/api": "6.0.0-canary.2632",
-    "@cedarjs/babel-config": "6.0.0-canary.2632",
-    "@cedarjs/context": "6.0.0-canary.2632",
-    "@cedarjs/cookie-jar": "6.0.0-canary.2632",
-    "@cedarjs/graphql-server": "6.0.0-canary.2632",
-    "@cedarjs/internal": "6.0.0-canary.2632",
-    "@cedarjs/project-config": "6.0.0-canary.2632",
-    "@cedarjs/server-store": "6.0.0-canary.2632",
-    "@cedarjs/testing": "6.0.0-canary.2632",
+    "@cedarjs/api": "6.0.0-canary.2635",
+    "@cedarjs/babel-config": "6.0.0-canary.2635",
+    "@cedarjs/context": "6.0.0-canary.2635",
+    "@cedarjs/cookie-jar": "6.0.0-canary.2635",
+    "@cedarjs/graphql-server": "6.0.0-canary.2635",
+    "@cedarjs/internal": "6.0.0-canary.2635",
+    "@cedarjs/project-config": "6.0.0-canary.2635",
+    "@cedarjs/server-store": "6.0.0-canary.2635",
+    "@cedarjs/testing": "6.0.0-canary.2635",
     "@fastify/url-data": "6.0.3",
     "@swc/core": "1.15.41",
     "@universal-deploy/store": "^0.2.1",
@@ -92,6 +92,7 @@
     "find-my-way": "8.2.2",
     "http-proxy-middleware": "3.0.7",
     "isbot": "5.1.43",
+    "magic-string": "0.30.21",
     "oxc-parser": "0.137.0",
     "react": "19.2.3",
     "react-server-dom-webpack": "19.2.4",
@@ -99,15 +100,16 @@
     "rou3": "^0.8.1",
     "vite": "7.3.5",
     "vite-plugin-cjs-interop": "2.4.4",
+    "vite-plugin-graphql-tag": "0.1.1",
     "vite-tsconfig-paths": "^6.1.1",
     "ws": "8.20.0",
     "yargs-parser": "21.1.1"
   },
   "devDependencies": {
     "@arethetypeswrong/cli": "0.18.5",
-    "@cedarjs/auth": "6.0.0-canary.2632",
-    "@cedarjs/router": "6.0.0-canary.2632",
-    "@cedarjs/web": "6.0.0-canary.2632",
+    "@cedarjs/auth": "6.0.0-canary.2635",
+    "@cedarjs/router": "6.0.0-canary.2635",
+    "@cedarjs/web": "6.0.0-canary.2635",
     "@hyrious/esbuild-plugin-commonjs": "0.2.6",
     "@jridgewell/trace-mapping": "0.3.31",
     "@types/aws-lambda": "8.10.162",