@easy-cms/nuxt 0.41.0 → 0.43.0

package/dist/runtime/cms.d.ts

@@ -2,8 +2,8 @@ import { Config, EasyCMS, AuthUser } from '@easy-cms/core';
 import { H3Event } from 'h3';
 
 /**
- * Returns the Easy CMS instance for this server, creating it on first use.
- * When the config module is reloaded (dev HMR) the old instance is closed.
+ * Returns the Easy CMS instance for this server, creating it on first use. A config that changed
+ * (dev HMR) closes the old instance and makes a new one.
  */
 declare function getEasyCMS(config: Config): Promise<EasyCMS>;
 /** The logged-in Easy CMS user for a request (session cookie or Bearer token), or `null`. */

package/dist/runtime/cms.js

@@ -1,30 +1,11 @@
-import {
-  createEasyCMS,
-  readCookie,
-  SESSION_COOKIE
-} from "@easy-cms/core";
+import { sharedEasyCMS } from "@easy-cms/core";
 import { getRequestHeader } from "h3";
-const KEY = /* @__PURE__ */ Symbol.for("easy-cms.nuxt");
-const store = globalThis;
 function getEasyCMS(config) {
-  const cached = store[KEY];
-  if (cached?.config === config) return cached.promise;
-  if (cached) void cached.promise.then((cms) => cms.destroy()).catch(() => {
-  });
-  const promise = createEasyCMS(config);
-  store[KEY] = { config, promise };
-  promise.catch(() => {
-    if (store[KEY]?.promise === promise) delete store[KEY];
-  });
-  return promise;
+  return sharedEasyCMS(config);
 }
 async function getEasyCMSUser(config, event) {
   const cms = await getEasyCMS(config);
-  const authorization = getRequestHeader(event, "authorization");
-  if (authorization?.startsWith("Bearer ")) return cms.auth.verify(authorization.slice(7).trim());
-  const cookie = getRequestHeader(event, "cookie");
-  const token = cookie ? readCookie(new Request("http://x", { headers: { cookie } }), SESSION_COOKIE) : void 0;
-  return cms.auth.verify(token);
+  return cms.auth.userFromHeaders({ get: (name) => getRequestHeader(event, name) });
 }
 export {
   getEasyCMS,

package/dist/runtime/handler.js

@@ -1,22 +1,15 @@
-import { createRestHandler } from "@easy-cms/core";
+import { createApiHandler } from "@easy-cms/core";
 import { defineEventHandler, getRequestIP, sendWebResponse, toWebRequest } from "h3";
-import { getEasyCMS } from "./cms.js";
 function createHandler(config, options) {
-  const handlers = /* @__PURE__ */ new WeakMap();
   const clientIps = /* @__PURE__ */ new WeakMap();
+  const api = createApiHandler(config, {
+    basePath: options.basePath,
+    getClientIp: (request) => clientIps.get(request)
+  });
   return defineEventHandler(async (event) => {
-    const cms = await getEasyCMS(config);
-    let handler = handlers.get(cms);
-    if (!handler) {
-      handler = createRestHandler(cms, {
-        basePath: options.basePath,
-        getClientIp: (r) => clientIps.get(r)
-      });
-      handlers.set(cms, handler);
-    }
     const request = toWebRequest(event);
     clientIps.set(request, getRequestIP(event, { xForwardedFor: options.trustProxy }));
-    return sendWebResponse(event, await handler(request));
+    return sendWebResponse(event, await api(request));
   });
 }
 export {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@easy-cms/nuxt",
-  "version": "0.41.0",
+  "version": "0.43.0",
   "description": "Nuxt module for Easy CMS",
   "license": "MIT",
   "type": "module",
@@ -20,19 +20,19 @@
   "dependencies": {
     "@nuxt/kit": "^4.5.2",
     "h3": "^1.15.11",
-    "@easy-cms/admin": "^0.41.0"
+    "@easy-cms/admin": "^0.43.0"
   },
   "peerDependencies": {
     "nuxt": "^4.0.0",
-    "@easy-cms/core": "^0.41.0"
+    "@easy-cms/core": "^0.43.0"
   },
   "devDependencies": {
     "@nuxt/schema": "^4.5.2",
     "@nuxt/test-utils": "^4.3.2",
     "nuxt": "^4.5.2",
     "vue": "^3.5.0",
-    "@easy-cms/core": "^0.41.0",
-    "@easy-cms/db-sqlite": "^0.41.0"
+    "@easy-cms/core": "^0.43.0",
+    "@easy-cms/db-sqlite": "^0.43.0"
   },
   "publishConfig": {
     "access": "public"