Merge remote-tracking branch 'origin/main' into pro-8230-improve-schema

Author: ValJed

CHANGELOG.md

@@ -2,6 +2,12 @@
 
 ## UNRELEASED
 
+### Changes
+
+* Refactors complex logic from `AposSchema` that handle data updates to simplifies it.
+
+## 4.22.0 (2025-10-01)
+
 ### Adds
 
 * Custom operations registered with `addCreateWidgetOperation` can now specify an `ifTypesIntersect` property containing an array of widget type names. If the area in question allows at least one, the operation is offered.
@@ -14,13 +20,14 @@
 * Fixes a bug in the login `uponSubmit` filter where a user could login without meeting the requirement.
 * Fixes pieces filters when values from optional fields are falsy.
 * Resolve inline image URLs correctly when in edit mode and not in the default locale.
+* Using `CTRL+F` or `CMD+F` in the page manager now works.
 
 ### Changes
 
 * Redirects to URLs containing accent marks and other non-ascii characters now behave as expected with Astro. Pre-encoding the URLs exactly the way `res.redirect` would before passing them to Astro prevents an error in Astro and allows the redirect to succeed.
 * Removes the non-functional `uniqueUsername` route from the `user` module
+* Modifies the `annotateAreaForExternalFront()` method of the `@apostrophecms/template` module to accept a per-module `annotateWidgetForExternalFront()` method. This allows widgets to send project-level options alongside the per-area options to external frontends.
 * Updated dependencies to address deprecation warnings.
-* Refactors complex logic from `AposSchema` that handle data updates to simplifies it.
 
 ## 4.21.0 (2025-09-03)
 

index.js

@@ -350,7 +350,16 @@ async function apostrophe(options, telemetry, rootSpan) {
 
     return self;
   } catch (e) {
-    if (options.exit !== false) {
+    if (options.exit === false) {
+      console.error('apostrophe: error occurred during startup, continuing:');
+      console.error(e);
+      // returns undefined, for legacy reasons
+    } else if (options.exit === 'throw') {
+      // A more sensible approach for those who want to do something
+      // if initialization fails
+      throw e;
+    } else {
+      // Longstanding default behavior
       console.error(e);
       await self._exit(1, e);
     }

modules/@apostrophecms/page/index.js

@@ -179,14 +179,15 @@ module.exports = {
           },
           shortcut: 'C'
         },
-        [`${self.__meta.name}:search`]: {
-          type: 'item',
-          label: 'apostrophe:commandMenuSearch',
-          action: {
-            type: 'command-menu-manager-focus-search'
-          },
-          shortcut: 'Ctrl+F Meta+F'
-        },
+        // NOTE: there is no search in the page manager
+        // [`${self.__meta.name}:search`]: {
+        //   type: 'item',
+        //   label: 'apostrophe:commandMenuSearch',
+        //   action: {
+        //     type: 'command-menu-manager-focus-search'
+        //   },
+        //   shortcut: 'Ctrl+F Meta+F'
+        // },
         [`${self.__meta.name}:select-all`]: {
           type: 'item',
           label: 'apostrophe:commandMenuSelectAll',

modules/@apostrophecms/template/index.js

@@ -432,8 +432,8 @@ module.exports = {
             const parse = config.parse
               ? config.parse
               : function (parser, nodes, lexer) {
-              // Default parser gets comma separated arguments,
-              // assumes no body
+                // Default parser gets comma separated arguments,
+                // assumes no body
 
                 // get the tag token
                 const token = parser.nextToken();
@@ -696,7 +696,7 @@ module.exports = {
           _.extend(args, data);
 
           if (req.aposError) {
-          // A 500-worthy error occurred already, i.e. in `pageBeforeSend`
+            // A 500-worthy error occurred already, i.e. in `pageBeforeSend`
             telemetry.handleError(span, req.aposError);
             span.end();
             return error(req.aposError);
@@ -739,8 +739,8 @@ module.exports = {
             span.setStatus({ code: telemetry.api.SpanStatusCode.OK });
             return content;
           } catch (e) {
-          // The page template threw an exception. Log where it
-          // occurred for easier debugging
+            // The page template threw an exception. Log where it
+            // occurred for easier debugging
             telemetry.handleError(span, e);
             return error(e);
           } finally {
@@ -1303,11 +1303,22 @@ module.exports = {
             label: options.addLabel || manager.label || `No label for ${name}`
           };
         }).filter(choice => !!choice);
+
         area.items ||= [];
-        if (area._docId) {
-          for (const item of area.items) {
+        for (const item of area.items) {
+          // Add _docId if area has one
+          if (area._docId) {
             item._docId = area._docId;
           }
+
+          // Annotate each individual widget with its options
+          // Each widget must elect into this by creating an
+          // `annotateWidgetForExternalFront() method.
+          const manager = self.apos.area.getManager?.(item.type) ||
+            self.apos.area.widgetManagers?.[item.type];
+
+          const widgetOptions = manager.annotateWidgetForExternalFront() || {};
+          item._options = widgetOptions;
         }
       }
     };

modules/@apostrophecms/widget-type/index.js

@@ -449,7 +449,12 @@ module.exports = {
           }
           return true;
         });
+      },
+
+      annotateWidgetForExternalFront() {
+        return {};
       }
+
     };
   },
   extendMethods(self) {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "apostrophe",
-  "version": "4.21.0",
+  "version": "4.22.0",
   "description": "The Apostrophe Content Management System.",
   "main": "index.js",
   "scripts": {
@@ -143,4 +143,4 @@
   "browserslist": [
     "ie >= 10"
   ]
-}
+}