nextjs-cms 0.9.42 → 0.10.0

package/dist/core/fields/photo.d.ts

@@ -140,10 +140,10 @@ declare const configSchema: z.ZodObject<{
      * @hint 'jpg' is an alias for 'jpeg'
      */
     fileType: z.ZodOptional<z.ZodArray<z.ZodEnum<{
-        jpeg: "jpeg";
+        webp: "webp";
         jpg: "jpg";
+        jpeg: "jpeg";
         png: "png";
-        webp: "webp";
     }>>>;
     /**
      * Remove the extension from the file name
@@ -353,10 +353,10 @@ declare const optionsSchema: z.ZodObject<{
      * @hint 'jpg' is an alias for 'jpeg'
      */
     fileType: z.ZodOptional<z.ZodArray<z.ZodEnum<{
-        jpeg: "jpeg";
+        webp: "webp";
         jpg: "jpg";
+        jpeg: "jpeg";
         png: "png";
-        webp: "webp";
     }>>>;
     /**
      * Remove the extension from the file name
@@ -467,10 +467,10 @@ declare const photoFieldConfigSchema: z.ZodObject<{
      * @hint 'jpg' is an alias for 'jpeg'
      */
     fileType: z.ZodOptional<z.ZodArray<z.ZodEnum<{
-        jpeg: "jpeg";
+        webp: "webp";
         jpg: "jpg";
+        jpeg: "jpeg";
         png: "png";
-        webp: "webp";
     }>>>;
     /**
      * Remove the extension from the file name

package/dist/core/fields/photo.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"photo.d.ts","sourceRoot":"","sources":["../../../src/core/fields/photo.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"photo.d.ts","sourceRoot":"","sources":["../../../src/core/fields/photo.ts"],"names":[],"mappings":"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"}

package/dist/core/fields/photo.js

@@ -6,17 +6,9 @@ import * as z from 'zod';
 import getString from '../../translations/index.js';
 import { humanReadableFileSize } from '../../utils/index.js';
 import { getCMSConfig } from '../config/index.js';
-import { entityKind, resolveWatermark, watermarkConfigSchema } from '../helpers/index.js';
+import { backgroundSchema, entityKind, resolveWatermark, watermarkConfigSchema } from '../helpers/index.js';
 import { baseFieldConfigSchema } from './field.js';
 import { FileField } from './fileField.js';
-const backgroundSchema = z
-    .strictObject({
-    r: z.number().min(0).max(255).describe('Red channel (0-255)'),
-    g: z.number().min(0).max(255).describe('Green channel (0-255)'),
-    b: z.number().min(0).max(255).describe('Blue channel (0-255)'),
-    alpha: z.number().min(0).max(1).describe('Alpha channel (0-1)'),
-})
-    .describe('Background color for image padding (used with fit: contain)');
 /**
  * Size schema — discriminated union of three variants:
  * - strict: true — user must upload exact dimensions, no server resize

package/dist/core/fields/richText.d.ts

@@ -1,20 +1,54 @@
+import * as z from 'zod';
 import type { BaseFieldConfig, FieldClientConfig } from './field.js';
-import { Field } from './field.js';
 import { entityKind } from '../helpers/index.js';
-import * as z from 'zod';
+import { Field } from './field.js';
 declare const allowImageUploadsSchema: z.ZodObject<{
     /**
-     * The public URL prefix for inline photos.
+     * The public URL template for inline photos.
      * This url should be handled by the website app, not the NextJS-CMS app
      * This is the URL that will be used to access the photos publicly on the website
-     * The name of the photo will be appended to this URL
+     *
+     * `{name}` marks where the generated filename goes, so it can sit anywhere in the URL —
+     * a path segment (`https://site.com/photos/{name}`) or a query parameter
+     * (`https://site.com/api/photo?folder=posts&name={name}`).
      */
-    publicURLPrefix: z.ZodURL;
-    size: z.ZodOptional<z.ZodObject<{
+    publicURL: z.ZodURL;
+    /**
+     * Bounds applied to each inline image before it is written to disk.
+     * Defaults to {@link DEFAULT_INLINE_IMAGE_SIZE}.
+     *
+     * `fit: 'inside'` scales the image down to fit within the box, keeping its aspect ratio and
+     * never enlarging a smaller image. `fit: 'cover'` fills the box exactly, cropping the overflow.
+     * `fit: 'contain'` pads the image out to the full box with `background`.
+     */
+    size: z.ZodOptional<z.ZodDiscriminatedUnion<[z.ZodObject<{
         width: z.ZodNumber;
         height: z.ZodNumber;
-        crop: z.ZodDefault<z.ZodBoolean>;
-    }, z.core.$strict>>;
+        fit: z.ZodLiteral<"inside">;
+    }, z.core.$strict>, z.ZodObject<{
+        width: z.ZodNumber;
+        height: z.ZodNumber;
+        fit: z.ZodLiteral<"cover">;
+    }, z.core.$strict>, z.ZodObject<{
+        width: z.ZodNumber;
+        height: z.ZodNumber;
+        fit: z.ZodLiteral<"contain">;
+        /**
+         * Falls back to `media.images.background` from the CMS config, which is transparent by
+         * default. Transparency needs an alpha-capable `format` (webp or png) — jpeg flattens it
+         * to black, so set an opaque colour when writing jpeg.
+         */
+        background: z.ZodOptional<z.ZodObject<{
+            r: z.ZodNumber;
+            g: z.ZodNumber;
+            b: z.ZodNumber;
+            alpha: z.ZodNumber;
+        }, z.core.$strict>>;
+    }, z.core.$strict>], "fit">>;
+    /**
+     * Largest accepted inline image, measured on the decoded image rather than the base64 text.
+     * Rejected during submission, before the item is saved. Defaults to {@link DEFAULT_MAX_FILE_SIZE}.
+     */
     maxFileSize: z.ZodOptional<z.ZodObject<{
         size: z.ZodNumber;
         unit: z.ZodEnum<{
@@ -22,19 +56,15 @@ declare const allowImageUploadsSchema: z.ZodObject<{
             mb: "mb";
         }>;
     }, z.core.$strict>>;
-    handleMethod: z.ZodOptional<z.ZodEnum<{
-        base64: "base64";
-        tempSave: "tempSave";
-    }>>;
     /**
      * Omit the extension of the image when saving it to disk
      */
     omitExtension: z.ZodOptional<z.ZodBoolean>;
     format: z.ZodOptional<z.ZodEnum<{
-        jpeg: "jpeg";
+        webp: "webp";
         jpg: "jpg";
+        jpeg: "jpeg";
         png: "png";
-        webp: "webp";
     }>>;
 }, z.core.$strict>;
 declare const configSchema: z.ZodDiscriminatedUnion<[z.ZodObject<{
@@ -46,17 +76,51 @@ declare const configSchema: z.ZodDiscriminatedUnion<[z.ZodObject<{
     allowMedia: z.ZodLiteral<true>;
     allowImageUploads: z.ZodOptional<z.ZodObject<{
         /**
-         * The public URL prefix for inline photos.
+         * The public URL template for inline photos.
          * This url should be handled by the website app, not the NextJS-CMS app
          * This is the URL that will be used to access the photos publicly on the website
-         * The name of the photo will be appended to this URL
+         *
+         * `{name}` marks where the generated filename goes, so it can sit anywhere in the URL —
+         * a path segment (`https://site.com/photos/{name}`) or a query parameter
+         * (`https://site.com/api/photo?folder=posts&name={name}`).
+         */
+        publicURL: z.ZodURL;
+        /**
+         * Bounds applied to each inline image before it is written to disk.
+         * Defaults to {@link DEFAULT_INLINE_IMAGE_SIZE}.
+         *
+         * `fit: 'inside'` scales the image down to fit within the box, keeping its aspect ratio and
+         * never enlarging a smaller image. `fit: 'cover'` fills the box exactly, cropping the overflow.
+         * `fit: 'contain'` pads the image out to the full box with `background`.
          */
-        publicURLPrefix: z.ZodURL;
-        size: z.ZodOptional<z.ZodObject<{
+        size: z.ZodOptional<z.ZodDiscriminatedUnion<[z.ZodObject<{
             width: z.ZodNumber;
             height: z.ZodNumber;
-            crop: z.ZodDefault<z.ZodBoolean>;
-        }, z.core.$strict>>;
+            fit: z.ZodLiteral<"inside">;
+        }, z.core.$strict>, z.ZodObject<{
+            width: z.ZodNumber;
+            height: z.ZodNumber;
+            fit: z.ZodLiteral<"cover">;
+        }, z.core.$strict>, z.ZodObject<{
+            width: z.ZodNumber;
+            height: z.ZodNumber;
+            fit: z.ZodLiteral<"contain">;
+            /**
+             * Falls back to `media.images.background` from the CMS config, which is transparent by
+             * default. Transparency needs an alpha-capable `format` (webp or png) — jpeg flattens it
+             * to black, so set an opaque colour when writing jpeg.
+             */
+            background: z.ZodOptional<z.ZodObject<{
+                r: z.ZodNumber;
+                g: z.ZodNumber;
+                b: z.ZodNumber;
+                alpha: z.ZodNumber;
+            }, z.core.$strict>>;
+        }, z.core.$strict>], "fit">>;
+        /**
+         * Largest accepted inline image, measured on the decoded image rather than the base64 text.
+         * Rejected during submission, before the item is saved. Defaults to {@link DEFAULT_MAX_FILE_SIZE}.
+         */
         maxFileSize: z.ZodOptional<z.ZodObject<{
             size: z.ZodNumber;
             unit: z.ZodEnum<{
@@ -64,19 +128,15 @@ declare const configSchema: z.ZodDiscriminatedUnion<[z.ZodObject<{
                 mb: "mb";
             }>;
         }, z.core.$strict>>;
-        handleMethod: z.ZodOptional<z.ZodEnum<{
-            base64: "base64";
-            tempSave: "tempSave";
-        }>>;
         /**
          * Omit the extension of the image when saving it to disk
          */
         omitExtension: z.ZodOptional<z.ZodBoolean>;
         format: z.ZodOptional<z.ZodEnum<{
-            jpeg: "jpeg";
+            webp: "webp";
             jpg: "jpg";
+            jpeg: "jpeg";
             png: "png";
-            webp: "webp";
         }>>;
     }, z.core.$strict>>;
 }, z.core.$strict>, z.ZodObject<{
@@ -144,17 +204,51 @@ declare const optionsSchema: z.ZodDiscriminatedUnion<[z.ZodObject<{
     allowMedia: z.ZodLiteral<true>;
     allowImageUploads: z.ZodOptional<z.ZodObject<{
         /**
-         * The public URL prefix for inline photos.
+         * The public URL template for inline photos.
          * This url should be handled by the website app, not the NextJS-CMS app
          * This is the URL that will be used to access the photos publicly on the website
-         * The name of the photo will be appended to this URL
+         *
+         * `{name}` marks where the generated filename goes, so it can sit anywhere in the URL —
+         * a path segment (`https://site.com/photos/{name}`) or a query parameter
+         * (`https://site.com/api/photo?folder=posts&name={name}`).
+         */
+        publicURL: z.ZodURL;
+        /**
+         * Bounds applied to each inline image before it is written to disk.
+         * Defaults to {@link DEFAULT_INLINE_IMAGE_SIZE}.
+         *
+         * `fit: 'inside'` scales the image down to fit within the box, keeping its aspect ratio and
+         * never enlarging a smaller image. `fit: 'cover'` fills the box exactly, cropping the overflow.
+         * `fit: 'contain'` pads the image out to the full box with `background`.
          */
-        publicURLPrefix: z.ZodURL;
-        size: z.ZodOptional<z.ZodObject<{
+        size: z.ZodOptional<z.ZodDiscriminatedUnion<[z.ZodObject<{
             width: z.ZodNumber;
             height: z.ZodNumber;
-            crop: z.ZodDefault<z.ZodBoolean>;
-        }, z.core.$strict>>;
+            fit: z.ZodLiteral<"inside">;
+        }, z.core.$strict>, z.ZodObject<{
+            width: z.ZodNumber;
+            height: z.ZodNumber;
+            fit: z.ZodLiteral<"cover">;
+        }, z.core.$strict>, z.ZodObject<{
+            width: z.ZodNumber;
+            height: z.ZodNumber;
+            fit: z.ZodLiteral<"contain">;
+            /**
+             * Falls back to `media.images.background` from the CMS config, which is transparent by
+             * default. Transparency needs an alpha-capable `format` (webp or png) — jpeg flattens it
+             * to black, so set an opaque colour when writing jpeg.
+             */
+            background: z.ZodOptional<z.ZodObject<{
+                r: z.ZodNumber;
+                g: z.ZodNumber;
+                b: z.ZodNumber;
+                alpha: z.ZodNumber;
+            }, z.core.$strict>>;
+        }, z.core.$strict>], "fit">>;
+        /**
+         * Largest accepted inline image, measured on the decoded image rather than the base64 text.
+         * Rejected during submission, before the item is saved. Defaults to {@link DEFAULT_MAX_FILE_SIZE}.
+         */
         maxFileSize: z.ZodOptional<z.ZodObject<{
             size: z.ZodNumber;
             unit: z.ZodEnum<{
@@ -162,19 +256,15 @@ declare const optionsSchema: z.ZodDiscriminatedUnion<[z.ZodObject<{
                 mb: "mb";
             }>;
         }, z.core.$strict>>;
-        handleMethod: z.ZodOptional<z.ZodEnum<{
-            base64: "base64";
-            tempSave: "tempSave";
-        }>>;
         /**
          * Omit the extension of the image when saving it to disk
          */
         omitExtension: z.ZodOptional<z.ZodBoolean>;
         format: z.ZodOptional<z.ZodEnum<{
-            jpeg: "jpeg";
+            webp: "webp";
             jpg: "jpg";
+            jpeg: "jpeg";
             png: "png";
-            webp: "webp";
         }>>;
     }, z.core.$strict>>;
     name: z.ZodString;
@@ -210,17 +300,51 @@ declare const richTextFieldConfigSchema: z.ZodIntersection<z.ZodDiscriminatedUni
     allowMedia: z.ZodLiteral<true>;
     allowImageUploads: z.ZodOptional<z.ZodObject<{
         /**
-         * The public URL prefix for inline photos.
+         * The public URL template for inline photos.
          * This url should be handled by the website app, not the NextJS-CMS app
          * This is the URL that will be used to access the photos publicly on the website
-         * The name of the photo will be appended to this URL
+         *
+         * `{name}` marks where the generated filename goes, so it can sit anywhere in the URL —
+         * a path segment (`https://site.com/photos/{name}`) or a query parameter
+         * (`https://site.com/api/photo?folder=posts&name={name}`).
+         */
+        publicURL: z.ZodURL;
+        /**
+         * Bounds applied to each inline image before it is written to disk.
+         * Defaults to {@link DEFAULT_INLINE_IMAGE_SIZE}.
+         *
+         * `fit: 'inside'` scales the image down to fit within the box, keeping its aspect ratio and
+         * never enlarging a smaller image. `fit: 'cover'` fills the box exactly, cropping the overflow.
+         * `fit: 'contain'` pads the image out to the full box with `background`.
          */
-        publicURLPrefix: z.ZodURL;
-        size: z.ZodOptional<z.ZodObject<{
+        size: z.ZodOptional<z.ZodDiscriminatedUnion<[z.ZodObject<{
             width: z.ZodNumber;
             height: z.ZodNumber;
-            crop: z.ZodDefault<z.ZodBoolean>;
-        }, z.core.$strict>>;
+            fit: z.ZodLiteral<"inside">;
+        }, z.core.$strict>, z.ZodObject<{
+            width: z.ZodNumber;
+            height: z.ZodNumber;
+            fit: z.ZodLiteral<"cover">;
+        }, z.core.$strict>, z.ZodObject<{
+            width: z.ZodNumber;
+            height: z.ZodNumber;
+            fit: z.ZodLiteral<"contain">;
+            /**
+             * Falls back to `media.images.background` from the CMS config, which is transparent by
+             * default. Transparency needs an alpha-capable `format` (webp or png) — jpeg flattens it
+             * to black, so set an opaque colour when writing jpeg.
+             */
+            background: z.ZodOptional<z.ZodObject<{
+                r: z.ZodNumber;
+                g: z.ZodNumber;
+                b: z.ZodNumber;
+                alpha: z.ZodNumber;
+            }, z.core.$strict>>;
+        }, z.core.$strict>], "fit">>;
+        /**
+         * Largest accepted inline image, measured on the decoded image rather than the base64 text.
+         * Rejected during submission, before the item is saved. Defaults to {@link DEFAULT_MAX_FILE_SIZE}.
+         */
         maxFileSize: z.ZodOptional<z.ZodObject<{
             size: z.ZodNumber;
             unit: z.ZodEnum<{
@@ -228,19 +352,15 @@ declare const richTextFieldConfigSchema: z.ZodIntersection<z.ZodDiscriminatedUni
                 mb: "mb";
             }>;
         }, z.core.$strict>>;
-        handleMethod: z.ZodOptional<z.ZodEnum<{
-            base64: "base64";
-            tempSave: "tempSave";
-        }>>;
         /**
          * Omit the extension of the image when saving it to disk
          */
         omitExtension: z.ZodOptional<z.ZodBoolean>;
         format: z.ZodOptional<z.ZodEnum<{
-            jpeg: "jpeg";
+            webp: "webp";
             jpg: "jpg";
+            jpeg: "jpeg";
             png: "png";
-            webp: "webp";
         }>>;
     }, z.core.$strict>>;
     name: z.ZodString;

package/dist/core/fields/richText.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"richText.d.ts","sourceRoot":"","sources":["../../../src/core/fields/richText.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"richText.d.ts","sourceRoot":"","sources":["../../../src/core/fields/richText.ts"],"names":[],"mappings":"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"}

package/dist/core/fields/richText.js

@@ -1,39 +1,113 @@
-import { Field, baseFieldConfigSchema } from './field.js';
-import { entityKind } from '../helpers/index.js';
-import * as z from 'zod';
+import fs from 'fs';
+import path from 'path';
+import { and, eq, sql } from 'drizzle-orm';
 import { customAlphabet } from 'nanoid';
 import sharp from 'sharp';
-import path from 'path';
+import * as z from 'zod';
 import { db } from '../../db/client.js';
 import { EditorPhotosTable } from '../../db/schema.js';
-import fs from 'fs';
-import { and, eq, sql } from 'drizzle-orm';
+import getString from '../../translations/index.js';
+import { humanReadableFileSize } from '../../utils/index.js';
 import { getCMSConfig } from '../config/index.js';
+import { backgroundSchema, entityKind } from '../helpers/index.js';
 import { sanitizeRichText } from '../security/dom.js';
+import { baseFieldConfigSchema, Field } from './field.js';
 const positiveInt = z.number().int().positive();
 const nonNegativeInt = z.number().int().nonnegative();
+/**
+ * Bounds each inline image is fitted into, discriminated on `fit` so `background` only exists
+ * where it means something. Mirrors the `fit` vocabulary of the photo field, using sharp's own
+ * names so the behaviour is not renamed in translation.
+ */
+const inlineImageSizeSchema = z.discriminatedUnion('fit', [
+    z.strictObject({
+        width: positiveInt,
+        height: positiveInt,
+        fit: z.literal('inside').describe('Scale down to fit within the box, keeping aspect ratio (sharp fit: inside)'),
+    }),
+    z.strictObject({
+        width: positiveInt,
+        height: positiveInt,
+        fit: z.literal('cover').describe('Crop to fill dimensions (sharp fit: cover)'),
+    }),
+    z.strictObject({
+        width: positiveInt,
+        height: positiveInt,
+        fit: z.literal('contain').describe('Pad with background to fill dimensions (sharp fit: contain)'),
+        /**
+         * Falls back to `media.images.background` from the CMS config, which is transparent by
+         * default. Transparency needs an alpha-capable `format` (webp or png) — jpeg flattens it
+         * to black, so set an opaque colour when writing jpeg.
+         */
+        background: backgroundSchema.optional().describe('Background color for padding'),
+    }),
+]);
+/**
+ * Bounds every inline image is fitted into unless the field overrides `size`.
+ * 1200x675 is 16:9 at a width that covers typical article body content, scaled down to fit so a
+ * body image is never cropped or padded unless the field asks for it.
+ */
+const DEFAULT_INLINE_IMAGE_SIZE = {
+    width: 1200,
+    height: 675,
+    fit: 'inside',
+};
+/** Largest accepted inline image unless the field overrides `maxFileSize`. */
+const DEFAULT_MAX_FILE_SIZE = { size: 1, unit: 'mb' };
+const BYTES_PER_UNIT = { kb: 1024, mb: 1024 * 1024 };
+/**
+ * Decoded byte length of a base64 payload, without allocating the buffer — inline images are
+ * rejected before anything is decoded or written.
+ */
+function base64ByteLength(base64) {
+    const padding = base64.endsWith('==') ? 2 : base64.endsWith('=') ? 1 : 0;
+    return Math.floor((base64.length * 3) / 4) - padding;
+}
+/**
+ * Matches the `{name}` placeholder (whitespace tolerated: `{ name }`).
+ *
+ * Built on demand rather than shared as a single global regex: a `/g` regex is stateful via
+ * `lastIndex`, so reusing one instance across `test()` calls silently alternates its result.
+ */
+const NAME_PLACEHOLDER = String.raw `\{\s*name\s*\}`;
+const hasNamePlaceholder = (value) => new RegExp(NAME_PLACEHOLDER).test(value);
+const resolvePublicURL = (template, name) => template.replace(new RegExp(NAME_PLACEHOLDER, 'g'), name);
 const allowImageUploadsSchema = z.strictObject({
     /**
-     * The public URL prefix for inline photos.
+     * The public URL template for inline photos.
      * This url should be handled by the website app, not the NextJS-CMS app
      * This is the URL that will be used to access the photos publicly on the website
-     * The name of the photo will be appended to this URL
+     *
+     * `{name}` marks where the generated filename goes, so it can sit anywhere in the URL —
+     * a path segment (`https://site.com/photos/{name}`) or a query parameter
+     * (`https://site.com/api/photo?folder=posts&name={name}`).
      */
-    publicURLPrefix: z.url().describe('The public URL prefix for inline photos'),
-    size: z
-        .strictObject({
-        width: positiveInt,
-        height: positiveInt,
-        crop: z.boolean().default(false),
+    publicURL: z
+        .url()
+        .refine(hasNamePlaceholder, {
+        message: 'publicURL must contain the {name} placeholder, e.g. https://site.com/photos/{name}',
     })
-        .optional(),
+        .describe('The public URL template for inline photos; {name} is replaced with the generated filename'),
+    /**
+     * Bounds applied to each inline image before it is written to disk.
+     * Defaults to {@link DEFAULT_INLINE_IMAGE_SIZE}.
+     *
+     * `fit: 'inside'` scales the image down to fit within the box, keeping its aspect ratio and
+     * never enlarging a smaller image. `fit: 'cover'` fills the box exactly, cropping the overflow.
+     * `fit: 'contain'` pads the image out to the full box with `background`.
+     */
+    size: inlineImageSizeSchema.optional(),
+    /**
+     * Largest accepted inline image, measured on the decoded image rather than the base64 text.
+     * Rejected during submission, before the item is saved. Defaults to {@link DEFAULT_MAX_FILE_SIZE}.
+     */
     maxFileSize: z
         .strictObject({
         size: positiveInt,
         unit: z.enum(['kb', 'mb']),
     })
         .optional(),
-    handleMethod: z.enum(['base64', 'tempSave']).optional(),
+    // handleMethod: z.enum(['base64', 'tempSave']).optional(),
     /**
      * Omit the extension of the image when saving it to disk
      */
@@ -96,13 +170,13 @@ export class RichTextField extends Field {
         this.placeholder = config.placeholder;
         this.sanitize = config.sanitize ?? true;
         this.rtl = config.rtl;
-        if (config.allowMedia && config.allowImageUploads?.publicURLPrefix) {
+        if (config.allowMedia && config.allowImageUploads?.publicURL) {
             this.allowMedia = true;
             this.allowImageUploads = {
-                publicURLPrefix: config.allowImageUploads.publicURLPrefix,
-                size: config.allowImageUploads.size ?? { width: 400, height: 400, crop: false },
-                maxFileSize: config.allowImageUploads.maxFileSize ?? { size: 1, unit: 'mb' },
-                handleMethod: config.allowImageUploads.handleMethod ?? 'base64',
+                // handleMethod: config.allowImageUploads.handleMethod ?? 'base64',
+                publicURL: config.allowImageUploads.publicURL,
+                size: config.allowImageUploads.size ?? DEFAULT_INLINE_IMAGE_SIZE,
+                maxFileSize: config.allowImageUploads.maxFileSize ?? DEFAULT_MAX_FILE_SIZE,
                 omitExtension: config.allowImageUploads.omitExtension ?? true,
                 format: config.allowImageUploads.format ?? 'webp',
             };
@@ -164,9 +238,24 @@ export class RichTextField extends Field {
             return;
         const regex = /<img.*?src="(data:image\/.*?;base64,.*?)".*?>/g;
         const matches = this.value.matchAll(regex);
+        const maxFileSize = this.allowImageUploads.maxFileSize ?? DEFAULT_MAX_FILE_SIZE;
+        const maxBytes = maxFileSize.size * BYTES_PER_UNIT[maxFileSize.unit];
         for (const match of matches) {
             const base64String = match[1];
             const extension = base64String.split(';')[0].split('/')[1];
+            /**
+             * Reject oversized images here rather than in `writeInlineImages`: extraction runs
+             * during submission, so throwing prevents the item from being saved at all, whereas
+             * the write step runs afterwards and the row would already exist.
+             */
+            const byteLength = base64ByteLength(base64String.split(',')[1] ?? '');
+            if (byteLength > maxBytes) {
+                throw new Error(getString('fileSizeExceedsMax', this.language, {
+                    field: this.getLocalizedLabel(),
+                    actual: humanReadableFileSize(byteLength),
+                    max: `${maxFileSize.size} ${maxFileSize.unit}`,
+                }));
+            }
             const randomString = customAlphabet('1234567890abcdef', 21)();
             const name = `${randomString}${this.allowImageUploads.omitExtension ? '' : `.${extension}`}`;
             this._inlinePhotos.push({
@@ -175,9 +264,9 @@ export class RichTextField extends Field {
                 name: name,
             });
             /**
-             * Replace the inline image src with the name of the image
+             * Replace the inline image src with the public URL of the image
              */
-            this.value = this.value.replace(base64String, `${this.allowImageUploads?.publicURLPrefix}/${name}`);
+            this.value = this.value.replace(base64String, resolvePublicURL(this.allowImageUploads.publicURL, name));
         }
     }
     async writeInlineImages(sectionName, itemId, locale) {
@@ -203,7 +292,20 @@ export class RichTextField extends Field {
             sharp.cache({ files: 0 });
             sharp.cache(false);
             const image = sharp(buffer);
+            const size = this.allowImageUploads.size ?? DEFAULT_INLINE_IMAGE_SIZE;
             await image
+                .resize({
+                width: size.width,
+                height: size.height,
+                fit: size.fit,
+                // `inside` only ever scales down — enlarging a smaller image to fill the box
+                // would cost quality for nothing. `cover` and `contain` produce the exact box,
+                // so they are allowed to enlarge.
+                withoutEnlargement: size.fit === 'inside',
+                ...(size.fit === 'contain'
+                    ? { background: size.background ?? cmsConfig.media.images.background }
+                    : {}),
+            })
                 .toFormat(this.allowImageUploads.format ?? 'webp')
                 .toFile(path.join(uploadsFolder, '.photos', sectionName, photo.name));
             /**
@@ -237,7 +339,7 @@ export class RichTextField extends Field {
         /**
          * Sanitize the value
          */
-        this.sanitizeValue();
+        await this.sanitizeValue();
         if (!this.value)
             return;
         /**
@@ -291,19 +393,17 @@ export class RichTextField extends Field {
         if (tablePhotos.length === 0)
             return;
         /**
-         * Extract the photos from the value (only photos that has the publicURLPrefix)
-         */
-        const regex = new RegExp(`${this.allowImageUploads.publicURLPrefix}/(.*?)`, 'g');
-        const matches = this.value.matchAll(regex);
-        const photosInValue = [];
-        for (const match of matches) {
-            photosInValue.push(match[1]);
-        }
-        /**
-         * Check if the photos in the database are still present in the value
+         * Check if the photos in the database are still present in the value.
+         *
+         * Matched on the generated filename rather than the full public URL: the name is a unique
+         * random token, while the URL is presentation. It can be re-encoded by the sanitizer
+         * (`&` -> `&amp;`), or change wholesale when `publicURL` or the site's domain changes —
+         * none of which mean the admin removed the image. A stale match here deletes a file that
+         * is still in use, so the check errs towards keeping (an orphan file is recoverable, a
+         * deleted one is not).
          */
         for (const tablePhoto of tablePhotos) {
-            if (!photosInValue.includes(tablePhoto.name)) {
+            if (!this.value.includes(tablePhoto.name)) {
                 /**
                  * Delete the photo from the database
                  */