@nitrogenbuilder/connector-payload 1.2.0 → 1.2.2

package/dist/editor/NitrogenEditorAssetsRoute.js

@@ -1,10 +1,31 @@
+import { existsSync } from "node:fs";
 import fs from "node:fs/promises";
+import { createRequire } from "node:module";
 import path from "node:path";
 import { fileURLToPath } from "node:url";
 import { NextResponse } from "next/server";
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
-const ASSETS_DIR = path.resolve(__dirname, "..", "editor-assets");
+// Next bundles npm packages into server chunks, so in a production build
+// __dirname points into .next/server and the relative lookup fails. Resolve
+// the installed package on disk through Node's resolver instead (works from
+// inside a bundle because createRequire resolves against the host app's real
+// node_modules), and keep the relative path as a fallback for unbundled /
+// linked-dev execution where the package specifier may not resolve.
+function resolveAssetsDir() {
+    try {
+        const nodeRequire = createRequire(import.meta.url);
+        const pkgRoot = path.dirname(nodeRequire.resolve("@nitrogenbuilder/connector-payload/package.json"));
+        const dir = path.join(pkgRoot, "dist", "editor-assets");
+        if (existsSync(dir))
+            return dir;
+    }
+    catch {
+        // fall through to the relative fallback
+    }
+    return path.resolve(__dirname, "..", "editor-assets");
+}
+const ASSETS_DIR = resolveAssetsDir();
 function getContentType(filePath) {
     switch (path.extname(filePath).toLowerCase()) {
         case ".css":

package/dist/endpoints/ctrlLinkResolver.js

@@ -106,6 +106,35 @@ function resolveMediaUrl(url, settings) {
     const relativeUrl = url.startsWith('/') ? url : `/${url}`;
     return baseUrl ? `${baseUrl}${relativeUrl}` : relativeUrl;
 }
+const MEDIA_PATH_MARKER = 'api/media/file/';
+// The editor's wysiwyg (TinyMCE) rewrites same-origin media URLs to relative
+// paths on save (e.g. `../../api/media/file/x.pdf`), which 404 on the frontend
+// host. Re-anchor anything that is only `./`/`../` hops away from the media
+// path back to the Payload origin; other relative URLs are left untouched.
+function resolveInlineMediaUrl(url, settings) {
+    if (/^https?:\/\//i.test(url))
+        return url;
+    const index = url.indexOf(MEDIA_PATH_MARKER);
+    if (index === -1)
+        return url;
+    const prefix = url.slice(0, index);
+    if (!/^[./]*$/.test(prefix))
+        return url;
+    return resolveMediaUrl(`/${url.slice(index)}`, settings);
+}
+function resolveInlineMediaUrls(value, settings) {
+    if (!value.includes(MEDIA_PATH_MARKER))
+        return value;
+    if (!value.includes('<')) {
+        const trimmed = value.trim();
+        const resolved = resolveInlineMediaUrl(trimmed, settings);
+        return resolved === trimmed ? value : resolved;
+    }
+    return value.replace(/((?:href|src)=)(["'])([^"']*)\2/gi, (match, attr, quote, url) => {
+        const resolved = resolveInlineMediaUrl(url, settings);
+        return resolved === url ? match : `${attr}${quote}${resolved}${quote}`;
+    });
+}
 async function findInternalTarget(context, link, internalRef) {
     const entryId = getId(internalRef.entryId);
     if (entryId === null)
@@ -205,13 +234,25 @@ async function resolveLinkRecord(context, link) {
 }
 async function walk(context, value) {
     if (Array.isArray(value)) {
-        await Promise.all(value.map((item) => walk(context, item)));
+        await Promise.all(value.map(async (item, index) => {
+            if (typeof item === 'string') {
+                value[index] = resolveInlineMediaUrls(item, context.settings);
+                return;
+            }
+            await walk(context, item);
+        }));
         return;
     }
     if (!isRecord(value))
         return;
     await resolveLinkRecord(context, value);
-    await Promise.all(Object.values(value).map((item) => walk(context, item)));
+    await Promise.all(Object.entries(value).map(async ([key, item]) => {
+        if (typeof item === 'string') {
+            value[key] = resolveInlineMediaUrls(item, context.settings);
+            return;
+        }
+        await walk(context, item);
+    }));
 }
 export async function resolveCtrlLinksInNitrogenData(payload, value, settings) {
     if (!value)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nitrogenbuilder/connector-payload",
-  "version": "1.2.0",
+  "version": "1.2.2",
   "description": "Nitrogen page builder connector plugin for Payload CMS 3.x",
   "author": "Leonardo Dentzien <leo@torchmedia.ca>",
   "type": "module",
@@ -23,7 +23,8 @@
       "types": "./dist/editor/NitrogenEditorAssetsRoute.d.ts",
       "default": "./dist/editor/NitrogenEditorAssetsRoute.js"
     },
-    "./components/*": "./dist/components/*"
+    "./components/*": "./dist/components/*",
+    "./package.json": "./package.json"
   },
   "files": [
     "dist"