apostrophe 4.28.1 → 4.29.0

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

@@ -174,7 +174,10 @@ module.exports = {
     origin: null,
     preview: true,
     // Set to false to opt out of the automatic styling wrapping of widget output
-    stylesWrapper: true
+    stylesWrapper: true,
+    // If set to true, the widget editor will hide tabs when there is only one,
+    // even if groups are defined. Defaults to false for backwards compatibility.
+    hideSingleTab: false
   },
   init(self) {
     self.isExplicitOrigin = self.options.origin !== null;
@@ -306,14 +309,20 @@ module.exports = {
           label: 'apostrophe:styles',
           fields: groupFields
         };
-        // Create a default group if none exist
+        // Create a default group if none exist.
+        // Ignore utility group if it's the only one, since it's now the way
+        // to hide fields (see layout column widget).
+        const visibleFields = Object.keys(self.fields)
+          .filter(
+            fieldName => !self.fieldsGroups.utility?.fields?.includes(fieldName)
+          );
         if (
-          !Object.keys(self.fieldsGroups).length &&
-          Object.keys(self.fields).length
+          !Object.keys(self.fieldsGroups).filter(g => g !== 'utility').length &&
+          visibleFields.length
         ) {
           self.fieldsGroups.basics = {
             label: 'apostrophe:basics',
-            fields: Object.keys(self.fields)
+            fields: visibleFields
           };
         }
         self.fieldsGroups.styles = stylesGroup;
@@ -530,6 +539,12 @@ module.exports = {
         // then feeding it our widgets as if they were docs.
 
         if (!(widgets.length && widgets[0]._virtual)) {
+          // For non-virtual widgets whose loading was deferred,
+          // relationships were just populated above but the page-level
+          // `attachments` query builder already ran before widget
+          // loading occurred. Re-annotate so that attachment `_urls`
+          // reflect crop/focal-point data from relationship `_fields`.
+          self.apos.attachment.all(widgets, { annotate: true });
           return;
         }
 
@@ -772,7 +787,8 @@ module.exports = {
           preview: self.options.preview,
           isExplicitOrigin: self.isExplicitOrigin,
           widgetOperations: self.getWidgetOperations(req),
-          widgetBreadcrumbOperations: self.getWidgetBreadcrumbOperations(req)
+          widgetBreadcrumbOperations: self.getWidgetBreadcrumbOperations(req),
+          hideSingleTab: self.options.hideSingleTab
         });
         return result;
       }

package/modules/@apostrophecms/widget-type/ui/apos/components/AposWidgetEditor.vue

@@ -56,7 +56,7 @@
         :items="breadcrumbs"
       />
       <AposWidgetModalTabs
-        v-if="tabs.length && tabs[0].name !== 'ungrouped'"
+        v-if="shouldShowTabs"
         :key="tabKey"
         :current="currentTab"
         :tabs="tabs"
@@ -120,8 +120,7 @@ import AposModalTabsMixin from 'Modules/@apostrophecms/modal/mixins/AposModalTab
 import { detectDocChange } from 'Modules/@apostrophecms/schema/lib/detectChange';
 import newInstance from 'apostrophe/modules/@apostrophecms/schema/lib/newInstance.js';
 import { debounceAsync } from 'Modules/@apostrophecms/ui/utils';
-import { renderScopedStyles } from 'Modules/@apostrophecms/styles/universal/render.mjs';
-import checkIfConditions from 'apostrophe/lib/universal/check-if-conditions.mjs';
+import { renderScopedStyles } from 'Modules/@apostrophecms/styles/render-factory.js';
 import breakpointPreviewTransformer from 'postcss-viewport-to-container-toggle/standalone.js';
 import { useModalStore } from 'Modules/@apostrophecms/ui/stores/modal';
 
@@ -227,6 +226,12 @@ export default {
     moduleOptions() {
       return window.apos.modules[apos.area.widgetManagers[this.type]];
     },
+    shouldShowTabs() {
+      if (this.moduleOptions.hideSingleTab) {
+        return this.tabs.length > 1;
+      }
+      return this.tabs.length && this.tabs[0].name !== 'ungrouped';
+    },
     typeLabel() {
       return this.moduleOptions.label;
     },
@@ -553,7 +558,6 @@ export default {
       if (recomputeOnlyStyles) {
         const styles = renderScopedStyles(this.schema, value.data, {
           rootSelector: '__placeholder_root_selector__',
-          checkIfConditionsFn: checkIfConditions,
           subset: this.moduleOptions.stylesFields
         });
         this.applyPreviewStyles(styles);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apostrophe",
-  "version": "4.28.1",
+  "version": "4.29.0",
   "description": "The Apostrophe Content Management System.",
   "main": "index.js",
   "repository": {
@@ -50,7 +50,7 @@
     "autoprefixer": "^10.4.1",
     "bluebird": "^3.7.2",
     "body-parser": "^1.18.2",
-    "cheerio": "^1.0.0-rc.10",
+    "cheerio": "^1.1.0",
     "chokidar": "^3.5.2",
     "common-tags": "^1.8.0",
     "concat-with-sourcemaps": "^1.1.0",
@@ -61,9 +61,9 @@
     "cssnano": "^7.1.1",
     "csv-parse": "^5.6.0",
     "dayjs": "^1.9.8",
-    "dompurify": "^3.2.5",
+    "dompurify": "^3.3.2",
     "encodeurl": "^2.0.0",
-    "express": "^4.16.4",
+    "express": "^4.22.0",
     "express-bearer-token": "^3.0.0",
     "express-session": "^1.18.2",
     "fs-extra": "^7.0.1",
@@ -77,15 +77,14 @@
     "jsdom": "^24.1.0",
     "klona": "^2.0.4",
     "launder": "^1.4.0",
-    "lodash": "^4.17.21",
+    "lodash": "^4.18.1",
     "mini-css-extract-plugin": "^1.6.0",
-    "minimatch": "^3.0.4",
+    "minimatch": "^3.1.4",
     "mkdirp": "^0.5.5",
-    "multer": "^2.0.2",
+    "multer": "^2.1.1",
     "node-fetch": "^2.6.1",
-    "nodemailer": "^7.0.10",
+    "nodemailer": "^8.0.5",
     "nunjucks": "^3.2.1",
-    "oembetter": "^1.1.3",
     "parseurl": "^1.3.3",
     "passport": "^0.6.0",
     "passport-local": "^1.0.0",
@@ -101,7 +100,7 @@
     "regexp-quote": "0.0.0",
     "resolve": "^1.19.0",
     "resolve-from": "^5.0.0",
-    "sass": "^1.80.3",
+    "sass": "^1.85.0",
     "sass-loader": "^16.0.0",
     "server-destroy": "^1.0.1",
     "sluggo": "^1.0.0",
@@ -110,30 +109,31 @@
     "tiny-emitter": "^2.1.0",
     "tough-cookie": "^4.0.0",
     "underscore.string": "^3.3.4",
-    "uploadfs": "^1.26.1",
     "void-elements": "^3.1.0",
     "vue": "^3.5.20",
     "vue-advanced-cropper": "^2.8.8",
     "vue-loader": "^17.1.0",
     "vue-style-loader": "^4.1.3",
-    "webpack": "^5.72.0",
+    "webpack": "^5.106.1",
     "webpack-merge": "^5.7.3",
     "xregexp": "^2.0.0",
     "@apostrophecms/emulate-mongo-3-driver": "^1.0.6",
     "express-cache-on-demand": "^1.0.4",
     "broadband": "^1.1.0",
-    "sanitize-html": "^2.17.2",
+    "boring": "^1.1.1",
+    "oembetter": "^1.1.4",
     "postcss-viewport-to-container-toggle": "^2.3.0",
-    "boring": "^1.1.1"
+    "uploadfs": "^1.26.1",
+    "sanitize-html": "^2.17.3"
   },
   "devDependencies": {
     "eslint": "^9.39.1",
     "form-data": "^4.0.4",
-    "mocha": "^11.7.1",
+    "mocha": "^11.7.5",
     "nyc": "^17.1.0",
     "stylelint": "^16.5.0",
-    "eslint-config-apostrophe": "^6.0.2",
-    "stylelint-config-apostrophe": "^4.4.0"
+    "stylelint-config-apostrophe": "^4.4.0",
+    "eslint-config-apostrophe": "^6.0.2"
   },
   "browserslist": [
     "ie >= 10"

package/test/add-missing-schema-fields-project/node_modules/.package-lock.json

@@ -5,7 +5,7 @@
   "requires": true,
   "packages": {
     "../..": {
-      "version": "4.28.0",
+      "version": "4.27.0",
       "license": "MIT",
       "dependencies": {
         "@apostrophecms/emulate-mongo-3-driver": "workspace:^",
@@ -100,7 +100,7 @@
         "tiny-emitter": "^2.1.0",
         "tough-cookie": "^4.0.0",
         "underscore.string": "^3.3.4",
-        "uploadfs": "workspace:^",
+        "uploadfs": "^1.25.1",
         "void-elements": "^3.1.0",
         "vue": "^3.5.20",
         "vue-advanced-cropper": "^2.8.8",