alinea 2.0.0-preview.0 → 2.0.0-preview.2

package/dist/next.cjs

@@ -33,12 +33,13 @@ function createCMS() {
   );
 }
 function withAlinea(config = {}) {
-  const adminPath = resolveAdminPath();
-  if (!adminPath) {
+  const settings = resolveSettings(config);
+  if (!settings) {
     console.warn(
-      "Alinea dashboard settings could not be loaded; dashboard routing is disabled. Run Next.js through the Alinea CLI and deploy @alinea/generated."
+      "Alinea dashboard settings were not provided; dashboard routing is disabled. Run Next.js through the Alinea CLI."
     );
   }
+  const adminPath = settings?.adminPath;
   let nextVersion = 15;
   try {
     const require2 = (0, import_node_module.createRequire)((0, import_node_path.resolve)("./index.js"));
@@ -62,6 +63,10 @@ function withAlinea(config = {}) {
   };
   const redirects = adminPath ? createRedirects(config, adminPath) : config.redirects;
   const rewrites = adminPath ? createRewrites(config, adminPath) : config.rewrites;
+  const env = settings ? {
+    ...config.env,
+    ALINEA_ADMIN_PATH: settings.adminPath
+  } : config.env;
   if (nextVersion < 15)
     return {
       ...config,
@@ -74,7 +79,8 @@ function withAlinea(config = {}) {
       },
       images,
       redirects,
-      rewrites
+      rewrites,
+      env
     };
   return {
     ...config,
@@ -84,7 +90,8 @@ function withAlinea(config = {}) {
     ],
     images,
     redirects,
-    rewrites
+    rewrites,
+    env
   };
 }
 function createRedirects(config, adminPath) {
@@ -147,17 +154,12 @@ function createRewrites(config, adminPath) {
     };
   };
 }
-function resolveAdminPath() {
-  try {
-    const require2 = (0, import_node_module.createRequire)((0, import_node_path.resolve)("./index.js"));
-    const location = require2.resolve("@alinea/generated/settings.json");
-    const settings = JSON.parse(
-      (0, import_node_fs.readFileSync)(location, "utf-8")
-    );
-    if (typeof settings.adminPath === "string" && settings.adminPath)
-      return normalizeBasePath(settings.adminPath);
-  } catch {
-  }
+function resolveSettings(config) {
+  const adminPath = config.env?.ALINEA_ADMIN_PATH ?? process.env.ALINEA_ADMIN_PATH;
+  if (!adminPath) return;
+  return {
+    adminPath: normalizeBasePath(adminPath)
+  };
 }
 function normalizeBasePath(value) {
   return value.startsWith("/") ? value : `/${value}`;

package/dist/next.d.ts

@@ -1,3 +1,4 @@
 export { createCMS } from 'alinea/adapter/next/cms';
-export { createHandler } from 'alinea/adapter/next/handler';
+export { createHandler, type NextHandlerOptions } from 'alinea/adapter/next/handler';
+export type { AfterCommitContext, BeforeCommitContext } from 'alinea/backend/Handler';
 export { withAlinea } from 'alinea/adapter/next/with-alinea';

package/dist/next.edge.d.ts

@@ -1,2 +1,3 @@
 export { createCMS } from 'alinea/adapter/next/cms';
-export { createHandler } from 'alinea/adapter/next/handler';
+export { createHandler, type NextHandlerOptions } from 'alinea/adapter/next/handler';
+export type { AfterCommitContext, BeforeCommitContext } from 'alinea/backend/Handler';

package/dist/picker/entry/EntryPicker.js

@@ -1,9 +1,6 @@
 import "../../chunks/chunk-CQ52GEHY.js";
 
 // src/picker/entry/EntryPicker.ts
-import { Entry } from "alinea/core/Entry";
-import { MediaLocation } from "alinea/core/media/MediaLocation";
-import { MediaFile } from "alinea/core/media/MediaTypes";
 import { Reference } from "alinea/core/Reference";
 import { Root } from "alinea/core/Root";
 import { Type, type } from "alinea/core/Type";
@@ -38,65 +35,42 @@ function entryPicker(options) {
       }
       const linkIds = [entryId];
       if (!options.selection) return;
-      const selection = {
-        ...options.selection,
-        _media: {
-          entryUrl: Entry.url,
-          extension: MediaFile.extension,
-          location: MediaFile.location,
-          path: Entry.path,
-          root: Entry.root,
-          workspace: Entry.workspace
-        }
-      };
-      const [extra] = await loader.resolveLinks(selection, linkIds);
+      const [extra] = await loader.resolveLinks(options.selection, linkIds);
       if (!extra) {
         row[unresolvedEntryMarker] = true;
         return;
       }
-      const { _media: media, ...selected } = extra;
       if (type2 === "file") {
-        const {
-          extension: extension2,
-          href: _href,
-          root: _root2,
-          url,
-          workspace: _workspace2,
-          ...rest2
-        } = selected;
-        const mediaUrl2 = MediaLocation.publicUrl(loader.resolver.config, media);
+        const { extension: extension2, root: _root2, workspace: _workspace2, ...rest2 } = extra;
         assign(row, rest2, { extension: extension2 });
-        row.href = mediaUrl2;
-        if (typeof url === "string") row.url = mediaUrl2;
         return;
       }
       if (type2 !== "image") {
-        assign(row, selected);
+        assign(row, extra);
         applyUrlSuffixToRow(row, suffix, anchor);
         return;
       }
       const {
         extension,
-        src: _location,
+        src,
         previewUrl,
         filePath,
         alt,
         root: _root,
         workspace: _workspace,
         ...rest
-      } = selected;
-      const mediaUrl = MediaLocation.publicUrl(loader.resolver.config, media);
+      } = extra;
       const selectedAlt = selectImageAlt(alt, loader, {
-        root: media.root,
-        workspace: media.workspace
+        root: _root,
+        workspace: _workspace
       });
       if (!previewUrl) {
-        assign(row, rest, { extension, src: mediaUrl });
+        assign(row, rest, { extension, src });
         if (typeof selectedAlt === "string") row.alt = selectedAlt;
         return;
       }
       const locationAvailable = loader.includedAtBuild(filePath);
-      row.src = locationAvailable ? mediaUrl : previewUrl;
+      row.src = locationAvailable ? src : previewUrl;
       row.extension = extension;
       if (typeof selectedAlt === "string") row.alt = selectedAlt;
       assign(row, rest);

package/dist/preview/PreviewPayload.js

@@ -1,260 +1,45 @@
+import {
+  decode,
+  encode
+} from "../chunks/chunk-6UT4N4CO.js";
 import "../chunks/chunk-CQ52GEHY.js";
 
 // src/preview/PreviewPayload.ts
-import { decode, encode } from "alinea/core/util/BufferToBase64";
-
-// node_modules/lib0/binary.js
-var BIT8 = 128;
-var BIT18 = 1 << 17;
-var BIT19 = 1 << 18;
-var BIT20 = 1 << 19;
-var BIT21 = 1 << 20;
-var BIT22 = 1 << 21;
-var BIT23 = 1 << 22;
-var BIT24 = 1 << 23;
-var BIT25 = 1 << 24;
-var BIT26 = 1 << 25;
-var BIT27 = 1 << 26;
-var BIT28 = 1 << 27;
-var BIT29 = 1 << 28;
-var BIT30 = 1 << 29;
-var BIT31 = 1 << 30;
-var BIT32 = 1 << 31;
-var BITS7 = 127;
-var BITS17 = BIT18 - 1;
-var BITS18 = BIT19 - 1;
-var BITS19 = BIT20 - 1;
-var BITS20 = BIT21 - 1;
-var BITS21 = BIT22 - 1;
-var BITS22 = BIT23 - 1;
-var BITS23 = BIT24 - 1;
-var BITS24 = BIT25 - 1;
-var BITS25 = BIT26 - 1;
-var BITS26 = BIT27 - 1;
-var BITS27 = BIT28 - 1;
-var BITS28 = BIT29 - 1;
-var BITS29 = BIT30 - 1;
-var BITS30 = BIT31 - 1;
-
-// node_modules/lib0/math.js
-var floor = Math.floor;
-var min = (a, b) => a < b ? a : b;
-var max = (a, b) => a > b ? a : b;
-var isNaN = Number.isNaN;
-
-// node_modules/lib0/number.js
-var MAX_SAFE_INTEGER = Number.MAX_SAFE_INTEGER;
-var MIN_SAFE_INTEGER = Number.MIN_SAFE_INTEGER;
-var LOWEST_INT32 = 1 << 31;
-var isInteger = Number.isInteger || ((num) => typeof num === "number" && isFinite(num) && floor(num) === num);
-var isNaN2 = Number.isNaN;
-var parseInt = Number.parseInt;
-
-// node_modules/lib0/string.js
-var fromCharCode = String.fromCharCode;
-var fromCodePoint = String.fromCodePoint;
-var MAX_UTF16_CHARACTER = fromCharCode(65535);
-var _encodeUtf8Polyfill = (str) => {
-  const encodedString = unescape(encodeURIComponent(str));
-  const len = encodedString.length;
-  const buf = new Uint8Array(len);
-  for (let i = 0; i < len; i++) {
-    buf[i] = /** @type {number} */
-    encodedString.codePointAt(i);
-  }
-  return buf;
-};
-var utf8TextEncoder = (
-  /** @type {TextEncoder} */
-  typeof TextEncoder !== "undefined" ? new TextEncoder() : null
-);
-var _encodeUtf8Native = (str) => utf8TextEncoder.encode(str);
-var encodeUtf8 = utf8TextEncoder ? _encodeUtf8Native : _encodeUtf8Polyfill;
-var utf8TextDecoder = typeof TextDecoder === "undefined" ? null : new TextDecoder("utf-8", { fatal: true, ignoreBOM: true });
-if (utf8TextDecoder && utf8TextDecoder.decode(new Uint8Array()).length === 1) {
-  utf8TextDecoder = null;
-}
-
-// node_modules/lib0/error.js
-var create = (s) => new Error(s);
-
-// node_modules/lib0/encoding.js
-var Encoder = class {
-  constructor() {
-    this.cpos = 0;
-    this.cbuf = new Uint8Array(100);
-    this.bufs = [];
-  }
-};
-var createEncoder = () => new Encoder();
-var length = (encoder) => {
-  let len = encoder.cpos;
-  for (let i = 0; i < encoder.bufs.length; i++) {
-    len += encoder.bufs[i].length;
-  }
-  return len;
-};
-var toUint8Array = (encoder) => {
-  const uint8arr = new Uint8Array(length(encoder));
-  let curPos = 0;
-  for (let i = 0; i < encoder.bufs.length; i++) {
-    const d = encoder.bufs[i];
-    uint8arr.set(d, curPos);
-    curPos += d.length;
-  }
-  uint8arr.set(new Uint8Array(encoder.cbuf.buffer, 0, encoder.cpos), curPos);
-  return uint8arr;
-};
-var write = (encoder, num) => {
-  const bufferLen = encoder.cbuf.length;
-  if (encoder.cpos === bufferLen) {
-    encoder.bufs.push(encoder.cbuf);
-    encoder.cbuf = new Uint8Array(bufferLen * 2);
-    encoder.cpos = 0;
-  }
-  encoder.cbuf[encoder.cpos++] = num;
-};
-var writeVarUint = (encoder, num) => {
-  while (num > BITS7) {
-    write(encoder, BIT8 | BITS7 & num);
-    num = floor(num / 128);
-  }
-  write(encoder, BITS7 & num);
-};
-var _strBuffer = new Uint8Array(3e4);
-var _maxStrBSize = _strBuffer.length / 3;
-var _writeVarStringNative = (encoder, str) => {
-  if (str.length < _maxStrBSize) {
-    const written = utf8TextEncoder.encodeInto(str, _strBuffer).written || 0;
-    writeVarUint(encoder, written);
-    for (let i = 0; i < written; i++) {
-      write(encoder, _strBuffer[i]);
-    }
-  } else {
-    writeVarUint8Array(encoder, encodeUtf8(str));
-  }
-};
-var _writeVarStringPolyfill = (encoder, str) => {
-  const encodedString = unescape(encodeURIComponent(str));
-  const len = encodedString.length;
-  writeVarUint(encoder, len);
-  for (let i = 0; i < len; i++) {
-    write(
-      encoder,
-      /** @type {number} */
-      encodedString.codePointAt(i)
-    );
-  }
-};
-var writeVarString = utf8TextEncoder && /** @type {any} */
-utf8TextEncoder.encodeInto ? _writeVarStringNative : _writeVarStringPolyfill;
-var writeUint8Array = (encoder, uint8Array) => {
-  const bufferLen = encoder.cbuf.length;
-  const cpos = encoder.cpos;
-  const leftCopyLen = min(bufferLen - cpos, uint8Array.length);
-  const rightCopyLen = uint8Array.length - leftCopyLen;
-  encoder.cbuf.set(uint8Array.subarray(0, leftCopyLen), cpos);
-  encoder.cpos += leftCopyLen;
-  if (rightCopyLen > 0) {
-    encoder.bufs.push(encoder.cbuf);
-    encoder.cbuf = new Uint8Array(max(bufferLen * 2, rightCopyLen));
-    encoder.cbuf.set(uint8Array.subarray(leftCopyLen));
-    encoder.cpos = rightCopyLen;
-  }
-};
-var writeVarUint8Array = (encoder, uint8Array) => {
-  writeVarUint(encoder, uint8Array.byteLength);
-  writeUint8Array(encoder, uint8Array);
-};
-var floatTestBed = new DataView(new ArrayBuffer(4));
-
-// node_modules/lib0/decoding.js
-var errorUnexpectedEndOfArray = create("Unexpected end of array");
-var errorIntegerOutOfRange = create("Integer out of Range");
-var Decoder = class {
-  /**
-   * @param {Uint8Array} uint8Array Binary data to decode
-   */
-  constructor(uint8Array) {
-    this.arr = uint8Array;
-    this.pos = 0;
-  }
-};
-var createDecoder = (uint8Array) => new Decoder(uint8Array);
-var readUint8Array = (decoder, len) => {
-  const view = new Uint8Array(decoder.arr.buffer, decoder.pos + decoder.arr.byteOffset, len);
-  decoder.pos += len;
-  return view;
-};
-var readVarUint8Array = (decoder) => readUint8Array(decoder, readVarUint(decoder));
-var readUint8 = (decoder) => decoder.arr[decoder.pos++];
-var readVarUint = (decoder) => {
-  let num = 0;
-  let mult = 1;
-  const len = decoder.arr.length;
-  while (decoder.pos < len) {
-    const r = decoder.arr[decoder.pos++];
-    num = num + (r & BITS7) * mult;
-    mult *= 128;
-    if (r < BIT8) {
-      return num;
-    }
-    if (num > MAX_SAFE_INTEGER) {
-      throw errorIntegerOutOfRange;
-    }
-  }
-  throw errorUnexpectedEndOfArray;
-};
-var _readVarStringPolyfill = (decoder) => {
-  let remainingLen = readVarUint(decoder);
-  if (remainingLen === 0) {
-    return "";
-  } else {
-    let encodedString = String.fromCodePoint(readUint8(decoder));
-    if (--remainingLen < 100) {
-      while (remainingLen--) {
-        encodedString += String.fromCodePoint(readUint8(decoder));
-      }
-    } else {
-      while (remainingLen > 0) {
-        const nextLen = remainingLen < 1e4 ? remainingLen : 1e4;
-        const bytes = decoder.arr.subarray(decoder.pos, decoder.pos + nextLen);
-        decoder.pos += nextLen;
-        encodedString += String.fromCodePoint.apply(
-          null,
-          /** @type {any} */
-          bytes
-        );
-        remainingLen -= nextLen;
-      }
-    }
-    return decodeURIComponent(escape(encodedString));
-  }
-};
-var _readVarStringNative = (decoder) => (
-  /** @type any */
-  utf8TextDecoder.decode(readVarUint8Array(decoder))
-);
-var readVarString = utf8TextDecoder ? _readVarStringNative : _readVarStringPolyfill;
-
-// src/preview/PreviewPayload.ts
+import { assert } from "alinea/core/util/Assert";
+import {
+  decode as decodeBase64,
+  encode as encodeBase64
+} from "alinea/core/util/BufferToBase64";
 function encodePreviewPayload(update) {
-  const encoder = createEncoder();
-  writeVarString(encoder, update.locale ?? "");
-  writeVarString(encoder, update.entryId);
-  writeVarString(encoder, update.contentHash);
-  writeVarString(encoder, update.status);
-  writeVarUint8Array(encoder, update.patch);
-  return encode(toUint8Array(encoder));
+  return encodeBase64(
+    encode([
+      update.locale,
+      update.entryId,
+      update.contentHash,
+      update.status,
+      update.patch
+    ])
+  );
 }
 async function decodePreviewPayload(payload) {
-  const decoder = createDecoder(new Uint8Array(await decode(payload)));
+  const value = decode(new Uint8Array(await decodeBase64(payload)));
+  assert(Array.isArray(value), "Invalid preview payload");
+  assert(value.length === 5, "Invalid preview payload");
+  const [locale, entryId, contentHash, status, patch] = value;
+  assert(
+    locale === null || typeof locale === "string",
+    "Invalid preview locale"
+  );
+  assert(typeof entryId === "string", "Invalid preview entry id");
+  assert(typeof contentHash === "string", "Invalid preview content hash");
+  assert(typeof status === "string", "Invalid preview status");
+  assert(patch instanceof Uint8Array, "Invalid preview patch");
   return {
-    locale: readVarString(decoder) || null,
-    entryId: readVarString(decoder),
-    contentHash: readVarString(decoder),
-    status: readVarString(decoder),
-    patch: readVarUint8Array(decoder)
+    locale,
+    entryId,
+    contentHash,
+    status,
+    patch
   };
 }
 export {

package/dist/ui/RichText.d.ts

@@ -26,6 +26,7 @@ interface RichTextElementViews {
     li?: ComponentType<JSX.IntrinsicElements['li']> | ReactElement;
     blockquote?: ComponentType<JSX.IntrinsicElements['blockquote']> | ReactElement;
     hr?: ComponentType<JSX.IntrinsicElements['hr']> | ReactElement;
+    img?: ComponentType<JSX.IntrinsicElements['img']> | ReactElement;
     br?: ComponentType<JSX.IntrinsicElements['br']> | ReactElement;
     small?: ComponentType<JSX.IntrinsicElements['small']> | ReactElement;
     sub?: ComponentType<JSX.IntrinsicElements['sub']> | ReactElement;

package/dist/ui/RichText.js

@@ -8,8 +8,10 @@ import {
   Node,
   TextNode
 } from "alinea/core/TextDoc";
+import { entries, fromEntries } from "alinea/core/util/Objects";
 import { slugify } from "alinea/core/util/Slugs";
 import {
+  cloneElement,
   Fragment,
   isValidElement
 } from "react";
@@ -22,10 +24,18 @@ function textContent(doc) {
     return text;
   }, "");
 }
-function Table({ children }) {
-  return /* @__PURE__ */ jsx("table", { children: /* @__PURE__ */ jsx("tbody", { children }) });
+function Table({ children, ...props }) {
+  return /* @__PURE__ */ jsx("table", { ...props, children: /* @__PURE__ */ jsx("tbody", { children }) });
 }
 function nodeElement(type, attributes, content) {
+  const element = defaultNodeElement(type, attributes, content);
+  if (!element || !attributes) return element;
+  const dataAttributes = fromEntries(
+    entries(attributes).filter(([key]) => key.startsWith("data-"))
+  );
+  return cloneElement(element, dataAttributes);
+}
+function defaultNodeElement(type, attributes, content) {
   const textAlign = textAlignAttribute(attributes?.textAlign);
   const style = {
     textAlign: textAlign === "left" ? void 0 : textAlign
@@ -53,6 +63,23 @@ function nodeElement(type, attributes, content) {
       return /* @__PURE__ */ jsx("blockquote", { style });
     case "horizontalRule":
       return /* @__PURE__ */ jsx("hr", {});
+    case "image": {
+      const src = attributes?.src;
+      const alt = attributes?.alt;
+      const title = attributes?.title;
+      const width = attributes?.width;
+      const height = attributes?.height;
+      return /* @__PURE__ */ jsx(
+        "img",
+        {
+          src: typeof src === "string" ? src : void 0,
+          alt: typeof alt === "string" ? alt : "",
+          title: typeof title === "string" ? title : void 0,
+          width: numberAttribute(width),
+          height: numberAttribute(height)
+        }
+      );
+    }
     case "hardBreak":
       return /* @__PURE__ */ jsx("br", {});
     case "small":

package/package.json

@@ -1,9 +1,12 @@
 {
   "name": "alinea",
-  "version": "2.0.0-preview.0",
+  "version": "2.0.0-preview.2",
   "description": "Headless git-based CMS",
   "repository": "github:alineacms/alinea",
   "license": "MIT",
+  "engines": {
+    "node": ">=24.0.0"
+  },
   "sideEffects": false,
   "type": "module",
   "imports": {
@@ -68,7 +71,7 @@
     "esbuild": "^0.28.0"
   },
   "peerDependencies": {
-    "react": "*",
-    "react-dom": "*"
+    "react": ">=19.0.0",
+    "react-dom": ">=19.0.0"
   }
 }

package/dist/cli/util/ExternalPlugin.d.ts

@@ -1,2 +0,0 @@
-import type { Plugin } from 'esbuild';
-export declare function externalPlugin(cwd: string): Plugin;