@cedarjs/vite 6.0.0-canary.2812 → 6.0.0-canary.2814

package/dist/apiDevMiddleware.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"apiDevMiddleware.d.ts","sourceRoot":"","sources":["../src/apiDevMiddleware.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAsB,aAAa,EAAE,MAAM,MAAM,CAAA;AAkE7D,wBAAsB,gBAAgB,CAAC,UAAU,EAAE,aAAa,iBAe/D;AA+GD,wBAAsB,mBAAmB,IAAI,OAAO,CAAC,aAAa,CAAC,CAoMlE;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":"AASA,OAAO,KAAK,EAAsB,aAAa,EAAE,MAAM,MAAM,CAAA;AA4E7D,wBAAsB,gBAAgB,CAAC,UAAU,EAAE,aAAa,iBAe/D;AA+GD,wBAAsB,mBAAmB,IAAI,OAAO,CAAC,aAAa,CAAC,CAoMlE;AA0BD,wBAAgB,gBAAgB,CAAC,UAAU,EAAE,aAAa,GAAG,IAAI,CA0EhE;AAED;;;GAGG;AACH,wBAAgB,qBAAqB,KAIrB,SAAS,OAAO,KAAG,OAAO,CAAC,QAAQ,CAAC,CAmGnD;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

@@ -43,7 +43,7 @@ function resolveWithExtensions(id) {
   return id;
 }
 const LAMBDA_FUNCTIONS = {};
-let graphqlYoga = null;
+let loadedGraphqlServer = null;
 let loadApiFunctionsInFlight = null;
 let needsReloadAfterInFlight = false;
 async function loadApiFunctions(viteServer) {
@@ -134,9 +134,9 @@ async function internalLoadApiFunctions(viteServer) {
   await Promise.all(imports);
   if (extractedGraphqlOptions) {
     const { yoga } = await createGraphQLYoga(extractedGraphqlOptions);
-    graphqlYoga = yoga;
+    loadedGraphqlServer = { yoga, options: extractedGraphqlOptions };
   } else {
-    graphqlYoga = null;
+    loadedGraphqlServer = null;
   }
   console.log(
     ansis.dim.italic("...Done importing in " + (Date.now() - tsImport) + " ms")
@@ -360,16 +360,22 @@ function createApiFetchHandler() {
       pathname = "/";
     }
     if (pathname === "/graphql" || pathname.startsWith("/graphql/")) {
-      if (!graphqlYoga) {
+      const graphqlServer = loadedGraphqlServer;
+      if (!graphqlServer) {
         return new Response(
           JSON.stringify({ error: "GraphQL Yoga instance not initialized" }),
           { status: 503, headers: { "Content-Type": "application/json" } }
         );
       }
-      const yoga = graphqlYoga;
       return getAsyncStoreInstance().run(/* @__PURE__ */ new Map(), async () => {
         try {
-          return await yoga.handle(request, { request });
+          const cedarContext = await buildCedarContext(request, {
+            authDecoder: graphqlServer.options.authDecoder
+          });
+          return await graphqlServer.yoga.handle(request, {
+            request,
+            cedarContext
+          });
         } catch (e) {
           if (!!e && typeof e === "object" && "code" in e && e.code === "ERR_STREAM_PREMATURE_CLOSE") {
             return new Response(null, { status: 499 });

package/dist/plugins/vite-plugin-cedar-universal-deploy.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"vite-plugin-cedar-universal-deploy.d.ts","sourceRoot":"","sources":["../../src/plugins/vite-plugin-cedar-universal-deploy.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAMlC,MAAM,WAAW,iCAAiC;IAChD,WAAW,CAAC,EAAE,MAAM,CAAA;CACrB;AA6GD,wBAAgB,0BAA0B,CACxC,OAAO,GAAE,iCAAsC,GAC9C,MAAM,CA0GR"}
+{"version":3,"file":"vite-plugin-cedar-universal-deploy.d.ts","sourceRoot":"","sources":["../../src/plugins/vite-plugin-cedar-universal-deploy.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAalC,MAAM,WAAW,iCAAiC;IAChD,WAAW,CAAC,EAAE,MAAM,CAAA;CACrB;AA6GD,wBAAgB,0BAA0B,CACxC,OAAO,GAAE,iCAAsC,GAC9C,MAAM,CA0GR"}

package/dist/plugins/vite-plugin-cedar-universal-deploy.js

@@ -190,66 +190,15 @@ async function generateGraphQLModule(distPath) {
     include: ["__cedar_graphqlOptions"]
   });
   return `
-    import { buildCedarContext, noopAuthDecoder, requestToLegacyEvent } from '@cedarjs/api/runtime';
+    import { buildCedarContext, requestToLegacyEvent } from '@cedarjs/api/runtime';
     import { createGraphQLYoga } from '@cedarjs/graphql-server';
 
     // Inlined bundle of ${path.basename(distPath)} (node_modules kept external)
     ${bundledCode}
 
-    let yogaInitPromise = null;
+    ${createGraphQLFetch.toString()}
 
-    function getYoga() {
-      if (!yogaInitPromise) {
-        yogaInitPromise = createGraphQLYoga(__cedar_graphqlOptions).then(
-          ({ yoga }) => ({ yoga, graphqlOptions: __cedar_graphqlOptions })
-        );
-      }
-      return yogaInitPromise;
-    }
-
-    export default {
-      async fetch(request) {
-        const { yoga, graphqlOptions } = await getYoga();
-        const cedarContext = await buildCedarContext(request, {
-          authDecoder: graphqlOptions?.authDecoder ?? noopAuthDecoder,
-        });
-        const event = await requestToLegacyEvent(request, cedarContext);
-        // Wrap yoga.handle in an AsyncLocalStorage run so directive
-        // validators can read from the global @cedarjs/context. Without
-        // this, the auth plugin's setContext() call writes to a store
-        // that's only visible inside the plugin's own callback \u2014 not
-        // during directive validation.
-        const { getAsyncStoreInstance } = await import('@cedarjs/context/dist/store')
-        const store = getAsyncStoreInstance()
-
-        return store.run(new Map(), () => {
-          return yoga.handle(request, {
-            request,
-            cedarContext,
-            event,
-            requestContext: undefined,
-          })
-        }).then((response) => {
-          // GraphQL Yoga returns a PonyfillResponse from @whatwg-node/fetch
-          // which is not an instanceof the native Response class. Netlify's
-          // bootstrap checks instanceof Response, so we wrap it.
-          return new Response(response.body, {
-            status: response.status,
-            statusText: response.statusText,
-            headers: response.headers,
-          })
-        }).catch((e) => {
-          if (e?.code === 'ERR_STREAM_PREMATURE_CLOSE') {
-            // Client disconnected while the request was being processed (e.g.,
-            // page navigation, tab close). Return a 499 so the runtime doesn't
-            // treat this as a 500.
-            return new Response(null, { status: 499 })
-          }
-
-          throw e
-        })
-      }
-    };
+    export default { fetch: createGraphQLFetch(__cedar_graphqlOptions) };
   `;
 }
 async function generateFunctionModule(distPath) {
@@ -263,50 +212,103 @@ async function generateFunctionModule(distPath) {
     // Inlined bundle of ${path.basename(distPath)} (node_modules kept external)
     ${bundledCode}
 
-    const nativeHandler = (() => {
-      // Prefer named handleRequest export
-      if (typeof handleRequest !== 'undefined') { return handleRequest; }
-      // Handle export default { handleRequest } pattern
-      if (typeof __cedar_default !== 'undefined' && __cedar_default && typeof __cedar_default.handleRequest === 'function') {
-        return __cedar_default.handleRequest;
-      }
-      // Handle plain default-exported async function: export default async (req) => Response
-      if (typeof __cedar_default !== 'undefined' && typeof __cedar_default === 'function') {
-        return __cedar_default;
-      }
-      return undefined;
-    })();
+    ${resolveNativeHandler.toString()}
 
-    const legacyFn = (() => {
-      if (typeof handler !== 'undefined') { return handler; }
-      if (typeof __cedar_default !== 'undefined' && __cedar_default && typeof __cedar_default.handler === 'function') {
-        return __cedar_default.handler;
-      }
-      return undefined;
-    })();
+    ${resolveLegacyHandler.toString()}
 
-    if (!nativeHandler && !legacyFn) {
-      throw new Error(${notFoundMsg});
-    }
+    ${resolveCedarHandler.toString()}
 
-    const _handler = nativeHandler ?? wrapLegacyHandler(legacyFn);
+    ${createFunctionFetch.toString()}
 
     export default {
-      async fetch(request) {
-        const ctx = await buildCedarContext(request);
-        // Wrap the handler in an AsyncLocalStorage run so the global
-        // @cedarjs/context is available inside it (and isolated per request).
-        // Mirrors the GraphQL module above and the handlerAlsWrappingPlugin
-        // used for non-UD builds.
-        const { getAsyncStoreInstance } = await import(
-          '@cedarjs/context/dist/store'
-        );
-        const store = getAsyncStoreInstance();
-        return store.run(new Map(), () => _handler(request, ctx));
-      }
+      fetch: createFunctionFetch(resolveCedarHandler(${notFoundMsg})),
     };
   `;
 }
+function resolveNativeHandler() {
+  if (typeof handleRequest !== "undefined") {
+    return handleRequest;
+  }
+  if (typeof __cedar_default === "undefined" || !__cedar_default) {
+    return void 0;
+  }
+  if (typeof __cedar_default === "object" && typeof __cedar_default.handleRequest === "function") {
+    return __cedar_default.handleRequest;
+  }
+  if (typeof __cedar_default === "function") {
+    return __cedar_default;
+  }
+  return void 0;
+}
+function resolveLegacyHandler() {
+  if (typeof handler !== "undefined") {
+    return handler;
+  }
+  if (typeof __cedar_default === "undefined" || !__cedar_default) {
+    return void 0;
+  }
+  if (typeof __cedar_default === "object" && typeof __cedar_default.handler === "function") {
+    return __cedar_default.handler;
+  }
+  return void 0;
+}
+function resolveCedarHandler(notFoundMessage) {
+  const nativeHandler = resolveNativeHandler();
+  if (nativeHandler) {
+    return nativeHandler;
+  }
+  const legacyFn = resolveLegacyHandler();
+  if (!legacyFn) {
+    throw new Error(notFoundMessage);
+  }
+  return wrapLegacyHandler(legacyFn);
+}
+function createFunctionFetch(cedarHandler) {
+  return async function fetch(request) {
+    const ctx = await buildCedarContext(request);
+    const { getAsyncStoreInstance } = await import("@cedarjs/context/dist/store");
+    const store = getAsyncStoreInstance();
+    return store.run(/* @__PURE__ */ new Map(), () => cedarHandler(request, ctx));
+  };
+}
+function createGraphQLFetch(graphqlOptions) {
+  let yogaInitPromise = null;
+  function getYoga() {
+    if (!yogaInitPromise) {
+      yogaInitPromise = createGraphQLYoga(graphqlOptions);
+    }
+    return yogaInitPromise;
+  }
+  return async function fetch(request) {
+    const { yoga } = await getYoga();
+    const cedarContext = await buildCedarContext(request, {
+      authDecoder: graphqlOptions?.authDecoder
+    });
+    const event = await requestToLegacyEvent(request, cedarContext);
+    const { getAsyncStoreInstance } = await import("@cedarjs/context/dist/store");
+    const store = getAsyncStoreInstance();
+    try {
+      const response = await store.run(/* @__PURE__ */ new Map(), () => {
+        return yoga.handle(request, {
+          request,
+          cedarContext,
+          event,
+          requestContext: void 0
+        });
+      });
+      return new Response(response.body, {
+        status: response.status,
+        statusText: response.statusText,
+        headers: response.headers
+      });
+    } catch (e) {
+      if (!!e && typeof e === "object" && "code" in e && e.code === "ERR_STREAM_PREMATURE_CLOSE") {
+        return new Response(null, { status: 499 });
+      }
+      throw e;
+    }
+  };
+}
 export {
   cedarUniversalDeployPlugin
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/vite",
-  "version": "6.0.0-canary.2812",
+  "version": "6.0.0-canary.2814",
   "description": "Vite configuration package for CedarJS",
   "repository": {
     "type": "git",
@@ -52,16 +52,16 @@
     "@babel/parser": "7.29.7",
     "@babel/traverse": "7.29.7",
     "@babel/types": "7.29.7",
-    "@cedarjs/api": "6.0.0-canary.2812",
-    "@cedarjs/api-server": "6.0.0-canary.2812",
-    "@cedarjs/babel-config": "6.0.0-canary.2812",
-    "@cedarjs/context": "6.0.0-canary.2812",
-    "@cedarjs/graphql-server": "6.0.0-canary.2812",
-    "@cedarjs/internal": "6.0.0-canary.2812",
-    "@cedarjs/project-config": "6.0.0-canary.2812",
-    "@cedarjs/server-store": "6.0.0-canary.2812",
-    "@cedarjs/structure": "6.0.0-canary.2812",
-    "@cedarjs/testing": "6.0.0-canary.2812",
+    "@cedarjs/api": "6.0.0-canary.2814",
+    "@cedarjs/api-server": "6.0.0-canary.2814",
+    "@cedarjs/babel-config": "6.0.0-canary.2814",
+    "@cedarjs/context": "6.0.0-canary.2814",
+    "@cedarjs/graphql-server": "6.0.0-canary.2814",
+    "@cedarjs/internal": "6.0.0-canary.2814",
+    "@cedarjs/project-config": "6.0.0-canary.2814",
+    "@cedarjs/server-store": "6.0.0-canary.2814",
+    "@cedarjs/structure": "6.0.0-canary.2814",
+    "@cedarjs/testing": "6.0.0-canary.2814",
     "@swc/core": "1.15.46",
     "@universal-deploy/store": "^0.2.1",
     "@universal-deploy/vite": "^0.1.9",
@@ -92,10 +92,10 @@
     "yargs-parser": "21.1.1"
   },
   "devDependencies": {
-    "@cedarjs/auth": "6.0.0-canary.2812",
-    "@cedarjs/framework-tools": "6.0.0-canary.2812",
-    "@cedarjs/router": "6.0.0-canary.2812",
-    "@cedarjs/web": "6.0.0-canary.2812",
+    "@cedarjs/auth": "6.0.0-canary.2814",
+    "@cedarjs/framework-tools": "6.0.0-canary.2814",
+    "@cedarjs/router": "6.0.0-canary.2814",
+    "@cedarjs/web": "6.0.0-canary.2814",
     "@dr.pogodin/react-helmet": "2.0.4",
     "@hyrious/esbuild-plugin-commonjs": "0.2.6",
     "@jridgewell/trace-mapping": "0.3.31",
@@ -115,9 +115,9 @@
     "vitest": "4.1.10"
   },
   "peerDependencies": {
-    "@cedarjs/auth": "6.0.0-canary.2812",
-    "@cedarjs/router": "6.0.0-canary.2812",
-    "@cedarjs/web": "6.0.0-canary.2812"
+    "@cedarjs/auth": "6.0.0-canary.2814",
+    "@cedarjs/router": "6.0.0-canary.2814",
+    "@cedarjs/web": "6.0.0-canary.2814"
   },
   "engines": {
     "node": ">=24"