@nitrogenbuilder/connector-payload 0.1.37 → 0.1.39

package/dist/components/NitrogenPackageVersionsField.d.ts

@@ -0,0 +1,3 @@
+import type { UIFieldServerComponent } from 'payload';
+declare const NitrogenPackageVersionsField: UIFieldServerComponent;
+export default NitrogenPackageVersionsField;

package/dist/components/NitrogenPackageVersionsField.js

@@ -0,0 +1,138 @@
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import fs from 'node:fs/promises';
+import path from 'node:path';
+import { createRequire } from 'node:module';
+import { NITROGEN_PACKAGE_NAMES, } from '../constants.js';
+async function readJsonFile(filePath) {
+    try {
+        const contents = await fs.readFile(filePath, 'utf8');
+        return JSON.parse(contents);
+    }
+    catch {
+        return undefined;
+    }
+}
+async function fileExists(filePath) {
+    try {
+        await fs.access(filePath);
+        return true;
+    }
+    catch {
+        return false;
+    }
+}
+function getDeclaredSpec(packageJson, packageName) {
+    return (packageJson.dependencies?.[packageName] ||
+        packageJson.devDependencies?.[packageName] ||
+        packageJson.optionalDependencies?.[packageName] ||
+        packageJson.peerDependencies?.[packageName]);
+}
+async function findNearestPackageJson(packageName, startPath) {
+    let directory = path.dirname(startPath);
+    while (directory !== path.dirname(directory)) {
+        const packageJsonPath = path.join(directory, 'package.json');
+        const packageJson = await readJsonFile(packageJsonPath);
+        if (packageJson?.name === packageName) {
+            return { packageJson, packageJsonPath };
+        }
+        directory = path.dirname(directory);
+    }
+    return undefined;
+}
+async function resolveInstalledPackageVersion(appRoot, packageName) {
+    try {
+        const requireFromApp = createRequire(path.join(appRoot, 'package.json'));
+        const entryPath = requireFromApp.resolve(packageName);
+        const resolvedPackage = await findNearestPackageJson(packageName, entryPath);
+        return {
+            installedVersion: resolvedPackage?.packageJson.version,
+            resolvedPackageJsonPath: resolvedPackage?.packageJsonPath,
+        };
+    }
+    catch {
+        return {};
+    }
+}
+async function findPackageJsonPath(candidates) {
+    for (const candidate of candidates) {
+        if (!candidate)
+            continue;
+        const packageJsonPath = candidate.endsWith('package.json')
+            ? candidate
+            : path.join(candidate, 'package.json');
+        if (await fileExists(packageJsonPath)) {
+            return packageJsonPath;
+        }
+    }
+    return undefined;
+}
+function buildFrontendRootCandidates(cwd) {
+    return [
+        process.env.NITROGEN_FRONTEND_PACKAGE_JSON,
+        process.env.NITROGEN_FRONTEND_ROOT,
+        path.resolve(cwd, '../frontend'),
+        path.resolve(cwd, '../../apps/frontend'),
+        path.resolve(cwd, 'apps/frontend'),
+        path.resolve(cwd, '../apps/frontend'),
+    ];
+}
+async function getAppVersionSummary(app, label, packageJsonCandidates) {
+    const packageJsonPath = await findPackageJsonPath(packageJsonCandidates);
+    const packageJson = packageJsonPath
+        ? await readJsonFile(packageJsonPath)
+        : undefined;
+    const rootPath = packageJsonPath ? path.dirname(packageJsonPath) : undefined;
+    const packages = rootPath && packageJson
+        ? await Promise.all(NITROGEN_PACKAGE_NAMES.map(async (packageName) => {
+            const installed = await resolveInstalledPackageVersion(rootPath, packageName);
+            return {
+                declaredSpec: getDeclaredSpec(packageJson, packageName),
+                packageName,
+                ...installed,
+            };
+        }))
+        : [];
+    return {
+        app,
+        label,
+        packageJsonPath,
+        packages: packages.filter((pkg) => pkg.declaredSpec || pkg.installedVersion),
+        rootPath,
+    };
+}
+function versionCell(version) {
+    return version ? (_jsx("code", { style: { color: '#111827', fontSize: 12 }, children: version })) : (_jsx("span", { style: { color: '#9ca3af' }, children: "Not resolved" }));
+}
+function renderAppSummary(summary) {
+    return (_jsxs("section", { style: {
+            border: '1px solid #e5e7eb',
+            borderRadius: 8,
+            overflow: 'hidden',
+        }, children: [_jsxs("div", { style: { background: '#f9fafb', padding: '12px 14px' }, children: [_jsx("h3", { style: { fontSize: 15, margin: 0 }, children: summary.label }), summary.packageJsonPath ? (_jsx("p", { style: { color: '#6b7280', fontSize: 12, margin: '4px 0 0' }, children: summary.packageJsonPath })) : (_jsx("p", { style: { color: '#991b1b', fontSize: 12, margin: '4px 0 0' }, children: "Could not find package.json." }))] }), summary.packages.length ? (_jsx("div", { style: { overflowX: 'auto' }, children: _jsxs("table", { style: { borderCollapse: 'collapse', fontSize: 13, width: '100%' }, children: [_jsx("thead", { children: _jsxs("tr", { children: [_jsx("th", { style: tableHeaderStyle, children: "Package" }), _jsx("th", { style: tableHeaderStyle, children: "Declared spec" }), _jsx("th", { style: tableHeaderStyle, children: "Installed version" })] }) }), _jsx("tbody", { children: summary.packages.map((pkg) => (_jsxs("tr", { children: [_jsx("td", { style: tableCellStyle, children: _jsx("code", { style: { fontSize: 12 }, children: pkg.packageName }) }), _jsx("td", { style: tableCellStyle, children: pkg.declaredSpec ? (_jsx("code", { style: { color: '#374151', fontSize: 12 }, children: pkg.declaredSpec })) : (_jsx("span", { style: { color: '#9ca3af' }, children: "Not declared" })) }), _jsx("td", { style: tableCellStyle, children: versionCell(pkg.installedVersion) })] }, pkg.packageName))) })] }) })) : (_jsx("p", { style: { color: '#6b7280', fontSize: 13, margin: 0, padding: 14 }, children: "No @nitrogenbuilder packages found for this app." }))] }, summary.app));
+}
+const tableHeaderStyle = {
+    borderTop: '1px solid #e5e7eb',
+    color: '#4b5563',
+    fontSize: 12,
+    fontWeight: 700,
+    padding: '10px 12px',
+    textAlign: 'left',
+};
+const tableCellStyle = {
+    borderTop: '1px solid #e5e7eb',
+    padding: '10px 12px',
+    verticalAlign: 'top',
+};
+const NitrogenPackageVersionsField = async () => {
+    const cwd = process.cwd();
+    const [backend, frontend] = await Promise.all([
+        getAppVersionSummary('backend', 'Backend', [
+            process.env.NITROGEN_BACKEND_PACKAGE_JSON,
+            process.env.NITROGEN_BACKEND_ROOT,
+            cwd,
+        ]),
+        getAppVersionSummary('frontend', 'Frontend', buildFrontendRootCandidates(cwd)),
+    ]);
+    return (_jsxs("div", { style: { display: 'grid', gap: 14, marginBottom: 24 }, children: [renderAppSummary(backend), renderAppSummary(frontend)] }));
+};
+export default NitrogenPackageVersionsField;

package/dist/components/NitrogenPackageVersionsHeaderField.d.ts

@@ -0,0 +1,3 @@
+import type { UIFieldServerComponent } from 'payload';
+declare const NitrogenPackageVersionsHeaderField: UIFieldServerComponent;
+export default NitrogenPackageVersionsHeaderField;

package/dist/components/NitrogenPackageVersionsHeaderField.js

@@ -0,0 +1,5 @@
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+const NitrogenPackageVersionsHeaderField = () => {
+    return (_jsxs("div", { style: { marginBottom: 16 }, children: [_jsx("h2", { style: { fontSize: 18, margin: '0 0 6px' }, children: "Nitrogen Versions" }), _jsx("p", { style: { color: '#6b7280', fontSize: 13, margin: 0, maxWidth: 920 }, children: "Declared spec is read from package.json. Installed version is resolved from node_modules, so dev link/file dependencies and production installs are shown separately." })] }));
+};
+export default NitrogenPackageVersionsHeaderField;

package/dist/constants.d.ts

@@ -0,0 +1,2 @@
+export declare const DEFAULT_EDITOR_CDN_VERSION = "0.5.30";
+export declare const NITROGEN_PACKAGE_NAMES: readonly ["@nitrogenbuilder/client", "@nitrogenbuilder/client-core", "@nitrogenbuilder/client-preact", "@nitrogenbuilder/client-react", "@nitrogenbuilder/connector-payload", "@nitrogenbuilder/editor", "@nitrogenbuilder/types"];

package/dist/constants.js

@@ -0,0 +1,10 @@
+export const DEFAULT_EDITOR_CDN_VERSION = '0.5.30';
+export const NITROGEN_PACKAGE_NAMES = [
+    '@nitrogenbuilder/client',
+    '@nitrogenbuilder/client-core',
+    '@nitrogenbuilder/client-preact',
+    '@nitrogenbuilder/client-react',
+    '@nitrogenbuilder/connector-payload',
+    '@nitrogenbuilder/editor',
+    '@nitrogenbuilder/types',
+];

package/dist/editor/NitrogenEditorPage.js

@@ -2,7 +2,7 @@ import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-run
 import { getPayload } from "payload";
 import { headers } from "next/headers";
 import { redirect } from "next/navigation";
-const EDITOR_CDN_VERSION = "0.5.30";
+import { DEFAULT_EDITOR_CDN_VERSION } from "../constants.js";
 function getNitrogenApiUrl(isDevelopment) {
     if (isDevelopment) {
         return "/api/nitrogen/v1";
@@ -111,7 +111,11 @@ export function createNitrogenEditorPage(config) {
         const editorAssetsBase = isEditorDev
             ? editorOrigin
             : "/nitrogen-editor/assets";
-        const cdnBase = `https://cdn.jsdelivr.net/npm/@nitrogenbuilder/editor@${EDITOR_CDN_VERSION}`;
+        const editorCdnVersion = typeof settings.editorCdnVersion === "string" &&
+            settings.editorCdnVersion.trim()
+            ? settings.editorCdnVersion.trim()
+            : DEFAULT_EDITOR_CDN_VERSION;
+        const cdnBase = `https://cdn.jsdelivr.net/npm/@nitrogenbuilder/editor@${editorCdnVersion}`;
         return (_jsxs(_Fragment, { children: [!isEditorDev && (_jsxs(_Fragment, { children: [_jsx("link", { rel: "preconnect", href: "https://cdn.jsdelivr.net" }), _jsx("link", { rel: "preconnect", href: "https://fonts.gstatic.com", crossOrigin: "" })] })), isEditorDev ? (_jsxs(_Fragment, { children: [_jsx("link", { rel: "stylesheet", crossOrigin: "", href: `${editorAssetsBase}/fa620pro/css/all.css` }), _jsx("link", { rel: "stylesheet", crossOrigin: "", href: `${editorAssetsBase}/fa620pro/css/sharp-solid.css` }), _jsx("link", { rel: "stylesheet", crossOrigin: "", href: `${editorOrigin}/src/index.scss` })] })) : (_jsxs(_Fragment, { children: [_jsx("link", { rel: "stylesheet", crossOrigin: "", href: `${editorAssetsBase}/fa620pro/css/all.css` }), _jsx("link", { rel: "stylesheet", crossOrigin: "", href: `${editorAssetsBase}/fa620pro/css/sharp-solid.css` }), _jsx("link", { rel: "stylesheet", crossOrigin: "", href: `${cdnBase}/index.css` })] })), _jsx("script", { dangerouslySetInnerHTML: {
                         __html: [
                             `window.nitrogenConfig = ${JSON.stringify(builderConfig)};`,

package/dist/globals/NitrogenSettings.js

@@ -1,3 +1,12 @@
+import { DEFAULT_EDITOR_CDN_VERSION } from '../constants.js';
+function validateEditorCdnVersion(value) {
+    if (typeof value !== 'string' || value.trim() === '') {
+        return true;
+    }
+    return /^[0-9A-Za-z][0-9A-Za-z._+-]*$/.test(value.trim())
+        ? true
+        : 'Use an npm version or dist tag, such as 0.5.30, latest, or beta.';
+}
 export const NitrogenSettings = {
     slug: 'nitrogen-settings',
     admin: {
@@ -43,5 +52,33 @@ export const NitrogenSettings = {
                 },
             },
         },
+        {
+            name: 'packageVersionsHeader',
+            type: 'ui',
+            admin: {
+                components: {
+                    Field: '@nitrogenbuilder/connector-payload/components/NitrogenPackageVersionsHeaderField',
+                },
+            },
+        },
+        {
+            name: 'editorCdnVersion',
+            label: 'Editor CDN Version',
+            type: 'text',
+            defaultValue: DEFAULT_EDITOR_CDN_VERSION,
+            validate: validateEditorCdnVersion,
+            admin: {
+                description: 'Version or npm dist tag used for @nitrogenbuilder/editor on jsDelivr when not using editor development mode.',
+            },
+        },
+        {
+            name: 'packageVersions',
+            type: 'ui',
+            admin: {
+                components: {
+                    Field: '@nitrogenbuilder/connector-payload/components/NitrogenPackageVersionsField',
+                },
+            },
+        },
     ],
 };

package/dist/types.d.ts

@@ -36,6 +36,7 @@ export interface NitrogenSettingsGlobal {
     instanceUrl?: string;
     frontendUrl?: string;
     developmentUrl?: string;
+    editorCdnVersion?: string;
     nitrogenConfig?: NitrogenConfig;
 }
 export interface NitrogenConfig {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nitrogenbuilder/connector-payload",
-  "version": "0.1.37",
+  "version": "0.1.39",
   "description": "Nitrogen page builder connector plugin for Payload CMS 3.x",
   "author": "Leonardo Dentzien <leo@torchmedia.ca>",
   "type": "module",
@@ -38,9 +38,9 @@
     "next": "^15.0.0 || ^16.0.0",
     "react": "^19.0.0",
     "@payloadcms/ui": "^3.0.0",
-    "@nitrogenbuilder/client-react": ">=0.3.0",
-    "@nitrogenbuilder/client-core": ">=0.3.0",
-    "@nitrogenbuilder/types": ">=0.3.0"
+    "@nitrogenbuilder/client-react": ">=1.0.0",
+    "@nitrogenbuilder/client-core": ">=1.0.0",
+    "@nitrogenbuilder/types": ">=1.0.0"
   },
   "devDependencies": {
     "@payloadcms/ui": "3.83.0",