apostrophe 3.6.0 → 3.7.0

package/CHANGELOG.md

@@ -1,5 +1,32 @@
 # Changelog
 
+## 3.7.0 - 2021-10-28
+
+### Adds
+
+* Schema select field choices can now be populated by a server side function, like an API call. Set the `choices` property to a method name of the calling module. That function should take a single argument of `req`, and return an array of objects with `label` and `value` properties. The function can be async and will be awaited.
+
+* Apostrophe now has built-in support for the Node.js cluster module. If the `APOS_CLUSTER_PROCESSES` environment variable is set to a number, that number of child processes are forked, sharing the same listening port. If the variable is set to `0`, one process is forked for each CPU core, with a minimum of `2` to provide availability during restarts. If the variable is set to a negative number, that number is added to the number of CPU cores, e.g. `-1` is a good way to reserve one core for MongoDB if it is running on the same server. This is for production use only (`NODE_ENV=production`). If a child process fails it is restarted automatically.
+
+### Fixes
+
+* Prevents double-escaping interpolated localization strings in the UI.
+* Rich text editor style labels are now run through a localization method to get the translated strings from their l10n keys.
+* Fixes README Node version requirement (Node 12+).
+* The text alignment buttons now work immediately in a new rich text widget. Previously they worked only after manually setting a style or refreshing the page. Thanks to Michelin for their support of this fix.
+* Users can now activate the built-in date and time editing popups of modern browsers when using the `date` and `time` schema field types.
+* Developers can now `require` their project `app.js` file in the Node.js REPL for debugging and inspection. Thanks to [Matthew Francis Brunetti](https://github.com/zenflow).
+* If a static text phrase is unavailable in both the current locale and the default locale, Apostrophe will always fall back to the `en` locale as a last resort, which ensures the admin UI works if it has not been translated.
+* Developers can now `require` their project `app.js` in the Node.js REPL for debugging and inspection
+* Ensure array field items have valid _id prop before storing. Thanks to Thanks to [Matthew Francis Brunetti](https://github.com/zenflow).
+
+### Changes
+
+* In 3.x, `relationship` fields have an optional `builders` property, which replaces `filters` from 2.x, and within that an optional `project` property, which replaces `projection` from 2.x (to match MongoDB's `cursor.project`). Prior to this release leaving the old syntax in place could lead to severe performance problems due to a lack of projections. Starting with this release the 2.x syntax results in an error at startup to help the developer correct their code.
+* The `className` option from the widget options in a rich text area field is now also applied to the rich text editor itself, for a consistently WYSIWYG appearance when editing and when viewing. Thanks to [Max Mulatz](https://github.com/klappradla) for this contribution.
+* Adds deprecation notes to doc module `afterLoad` events, which are deprecated.
+* Removes unused `afterLogin` method in the login module.
+
 ## 3.6.0 - 2021-10-13
 
 ### Adds
@@ -8,7 +35,8 @@
 * Adds 'no-search' modifier to relationship fields as a UI simplification option.
 * Fields can now have their own `modifiers` array. This is combined with the schema modifiers, allowing for finer grained control of field rendering.
 * Adds a Slovak localization file. Activate the `sk` locale to use this. Many thanks to [Michael Huna](https://github.com/Miselrkba) for the contribution.
-* Adds a Spanish localization file. Activate the `es` locale to use this. Many thanks to [egonzalezg9](https://github.com/egonzalezg9) for the contribution.
+* Adds a Spanish localization file. Activate the `es` locale to use this. Many thanks to [Eugenio Gonzalez](https://github.com/egonzalezg9) for the contribution.
+* Adds a Brazilian Portuguese localization file. Activate the `pt-BR` locale to use this. Many thanks to [Pietro Rutzen](https://github.com/pietro-rutzen) for the contribution.
 
 ### Fixes
 

package/README.md

@@ -43,7 +43,7 @@ We recommend installing the following with [Homebrew](https://brew.sh/) on macOS
 
 | Software | Minimum Version | Notes
 | ------------- | ------------- | -----
-| Node.js | 10.x | Or better
+| Node.js | 12.x | Or better
 | npm  | 6.x  | Or better
 | MongoDB  | 3.6  | Or better
 | Imagemagick  | Any | Faster image uploads, GIF support (optional)

package/index.js

@@ -2,11 +2,43 @@ const path = require('path');
 const _ = require('lodash');
 const argv = require('boring')({ end: true });
 const fs = require('fs');
+const { stripIndent } = require('common-tags');
+const cluster = require('cluster');
+const { cpus } = require('os');
+const process = require('process');
 const npmResolve = require('resolve');
+
 let defaults = require('./defaults.js');
-const { stripIndent } = require('common-tags');
 
-// **Awaiting the Apostrophe function is optional**
+// ## Top-level options
+//
+// `cluster`
+//
+// If set to `true`, Apostrophe will spawn as many processes as
+// there are CPU cores on the server, or a minimum of 2, and balance
+// incoming connections among them. This ensures availability while one
+// process is restarting due to a crash and also increases scalability if
+// the server has multiple CPU cores.
+//
+// If set to an object with a `processes` property, that many
+// processes are started. If `processes` is 0 or a negative number,
+// it is added to the number of CPU cores reported by the server.
+// Notably, `-1` can be a good way to reserve one CPU core for MongoDB
+// in a single-server deployment.
+//
+// However when in cluster mode no fewer than 2 processes will be
+// started as there is no availability benefit without at least 2.
+//
+// If a child process exits with a failure status code it will be
+// restarted. However, if it exits in less than 20 seconds after
+// startup there will be a 20 second delay to avoid flooding logs
+// and pinning the CPU.
+//
+// Alternatively the `APOS_CLUSTER_PROCESSES` environment variable
+// can be set to a number, which will effectively set the cluster
+// option to `cluster: { processes: n }`.
+//
+// ## Awaiting the Apostrophe function
 //
 // The apos function is async, but in typical cases you do not
 // need to await it. If you simply call it, Apostrophe will
@@ -21,8 +53,63 @@ const { stripIndent } = require('common-tags');
 // To avoid exiting on errors, pass the `exit: false` option.
 // This can option also can be used to allow awaiting a command line
 // task, as they also normally exit on completion.
+//
+// If `options.cluster` is truthy, the function quickly resolves to
+// `null` in the primary process. In the child process it resolves as
+// documented above.
 
 module.exports = async function(options) {
+  const guardTime = 20000;
+  if (process.env.APOS_CLUSTER_PROCESSES) {
+    options.cluster = {
+      processes: parseInt(process.env.APOS_CLUSTER_PROCESSES)
+    };
+  }
+  if (options.cluster && (process.env.NODE_ENV !== 'production')) {
+    console.log('NODE_ENV is not set to production, disabling cluster mode');
+    options.cluster = false;
+  }
+  if (options.cluster && !argv._.length) {
+    // For bc with node 14 and below we need to check both
+    if (cluster.isPrimary || cluster.isMaster) {
+      let processes = options.cluster.processes || cpus().length;
+      if (processes <= 0) {
+        processes = cpus().length + processes;
+      }
+      let capped = '';
+      if (processes > cpus().length) {
+        processes = cpus().length;
+        capped = ' (capped to number of CPU cores)';
+      }
+      if (processes < 2) {
+        processes = 2;
+        if (capped) {
+          capped = ' (less than 2 cores, capped to minimum of 2)';
+        } else {
+          capped = ' (using minimum of 2)';
+        }
+      }
+      console.log(`Starting ${processes} cluster child processes${capped}`);
+      for (let i = 0; i < processes; i++) {
+        clusterFork();
+      }
+      cluster.on('exit', (worker, code, signal) => {
+        if (code !== 0) {
+          if ((Date.now() - worker.bornAt) < guardTime) {
+            console.error(`Worker process ${worker.process.pid} failed in ${seconds(Date.now() - worker.bornAt)}, waiting ${seconds(guardTime)} before restart`);
+            setTimeout(() => {
+              respawn(worker);
+            }, guardTime);
+          } else {
+            respawn(worker);
+          }
+        }
+      });
+      return null;
+    } else {
+      console.log(`Cluster worker ${process.pid} started`);
+    }
+  }
 
   // The core is not a true moog object but it must look enough like one
   // to participate as an async event emitter
@@ -174,7 +261,7 @@ module.exports = async function(options) {
   function getRoot() {
     let _module = module;
     let m = _module;
-    while (m.parent) {
+    while (m.parent && m.parent.filename) {
       // The test file is the root as far as we are concerned,
       // not mocha itself
       if (m.parent.filename.match(/\/node_modules\/mocha\//)) {
@@ -518,3 +605,17 @@ module.exports.bundle = {
   modules: abstractClasses.concat(_.keys(defaults.modules)),
   directory: 'modules'
 };
+
+function seconds(msec) {
+  return (Math.round(msec / 100) / 10) + ' seconds';
+}
+
+function clusterFork() {
+  const worker = cluster.fork();
+  worker.bornAt = Date.now();
+}
+
+function respawn(worker) {
+  console.error(`Respawning worker process ${worker.process.pid}`);
+  clusterFork();
+}

package/modules/@apostrophecms/doc/index.js

@@ -439,6 +439,7 @@ module.exports = {
         await self.insertBody(req, doc, options);
         await m.emit('afterInsert', req, doc, options);
         await m.emit('afterSave', req, doc, options);
+        // TODO: Remove `afterLoad` in next major version. Deprecated.
         await m.emit('afterLoad', req, [ doc ]);
         return doc;
       },
@@ -474,6 +475,7 @@ module.exports = {
         await self.updateBody(req, doc, options);
         await m.emit('afterUpdate', req, doc, options);
         await m.emit('afterSave', req, doc, options);
+        // TODO: Remove `afterLoad` in next major version. Deprecated.
         await m.emit('afterLoad', req, [ doc ]);
         return doc;
       },

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

@@ -389,7 +389,7 @@ module.exports = {
         self.schema = self.apos.schema.compose({
           addFields: self.apos.schema.fieldsToArray(`Module ${self.__meta.name}`, self.fields),
           arrangeFields: self.apos.schema.groupsToArray(self.fieldsGroups)
-        });
+        }, self);
         if (self.options.slugPrefix) {
           if (self.options.slugPrefix === 'deduplicate-') {
             const req = self.apos.task.getReq();

package/modules/@apostrophecms/i18n/index.js

@@ -51,9 +51,14 @@ module.exports = {
         throw self.apos.error('invalid', `Locale prefixes must not contain more than one forward slash ("/").\nUse hyphens as separators. Check locale "${key}".`);
       }
     }
+    const fallbackLng = [ self.defaultLocale ];
+    // In case the default locale also has inadequate admin UI phrases
+    if (fallbackLng[0] !== 'en') {
+      fallbackLng.push('en');
+    }
     // Make sure we have our own instance to avoid conflicts with other apos objects
     self.i18next = i18next.createInstance({
-      fallbackLng: self.defaultLocale,
+      fallbackLng,
       // Required to prevent the debugger from complaining
       languages: Object.keys(self.locales),
       // Added later, but required here
@@ -459,6 +464,10 @@ module.exports = {
         if (req.locale !== self.defaultLocale) {
           i18n[self.defaultLocale] = self.getBrowserBundles(self.defaultLocale);
         }
+        // In case the default locale also has inadequate admin UI phrases
+        if (!i18n.en) {
+          i18n.en = self.getBrowserBundles('en');
+        }
         const result = {
           i18n,
           locale: req.locale,

package/modules/@apostrophecms/login/index.js

@@ -365,21 +365,6 @@ module.exports = {
         return 1000 * 60 * 60 * (self.options.passwordResetHours || 48);
       },
 
-      // Invoked by passport after an authentication strategy succeeds
-      // and the user has been logged in. Invokes `loginAfterLogin` on
-      // any modules that have one and redirects to `req.redirect` or,
-      // if it is not set, to `/`.
-
-      async afterLogin(req, res) {
-        try {
-          await self.emit('after', req);
-        } catch (e) {
-          self.apos.util.error(e);
-          return res.redirect('/');
-        }
-        return res.redirect(req.redirect || '/');
-      },
-
       getBrowserData(req) {
         return {
           action: self.action,

package/modules/@apostrophecms/migration/index.js

@@ -260,7 +260,7 @@ module.exports = {
           // Intentionally emitted regardless of whether the site is new or not.
           //
           // This is the right time to park pages, for instance, because the
-          // database is guaranteed to be in a sane state, whether because the
+          // database is guaranteed to be in a stable state, whether because the
           // site is new or because migrations ran successfully.
           await self.emit('after');
         } finally {

package/modules/@apostrophecms/piece-type/ui/apos/components/AposDocsManagerDisplay.vue

@@ -26,7 +26,7 @@
         <th class="apos-table__header" key="contextMenu">
           <component
             :is="getEl({})"
-            class="apos-table__header-label is-hidden"
+            class="apos-table__header-label apos-is-hidden"
           >
             {{ $t('apostrophe:moreOperations') }}
           </component>

package/modules/@apostrophecms/rich-text-widget/ui/apos/components/AposRichTextWidgetEditor.vue

@@ -26,7 +26,7 @@
       </AposContextMenuDialog>
     </bubble-menu>
     <div class="apos-rich-text-editor__editor" :class="editorModifiers">
-      <editor-content :editor="editor" :class="moduleOptions.className" />
+      <editor-content :editor="editor" :class="editorOptions.className" />
     </div>
     <div class="apos-rich-text-editor__editor_after" :class="editorModifiers">
       {{ $t('apostrophe:emptyRichTextWidget') }}
@@ -102,11 +102,27 @@ export default {
 
       activeOptions.styles = this.enhanceStyles(activeOptions.styles || this.defaultOptions.styles);
 
+      activeOptions.className = (activeOptions.className !== undefined)
+        ? activeOptions.className : this.moduleOptions.className;
+
       return activeOptions;
     },
-
+    autofocus() {
+      // Only true for a new rich text widget
+      return !this.stripPlaceholderBrs(this.value.content).length;
+    },
     initialContent() {
-      return this.stripPlaceholderBrs(this.value.content);
+      const content = this.stripPlaceholderBrs(this.value.content);
+      if (!content.length) {
+        // If we don't supply a valid instance of the first style, then
+        // the text align control will not work until the user manually
+        // applies a style or refreshes the page
+        const defaultStyle = this.editorOptions.styles.find(style => style.def);
+        const _class = defaultStyle.class ? ` class="${defaultStyle.class}"` : '';
+        return `<${defaultStyle.tag}${_class}></${defaultStyle.tag}>`;
+      } else {
+        return content;
+      }
     },
     toolbar() {
       return this.editorOptions.toolbar;
@@ -135,7 +151,7 @@ export default {
     aposTiptapExtensions() {
       return (apos.tiptapExtensions || [])
         .map(extension => extension({
-          styles: this.editorOptions.styles,
+          styles: this.editorOptions.styles.map(this.localizeStyle),
           types: this.tiptapTypes
         }));
     }
@@ -152,7 +168,7 @@ export default {
   mounted() {
     this.editor = new Editor({
       content: this.initialContent,
-      autofocus: !this.initialContent,
+      autofocus: this.autofocus,
       onUpdate: this.editorUpdate,
       extensions: [
         StarterKit,
@@ -265,6 +281,14 @@ export default {
         }
       }
       return styles;
+    },
+    localizeStyle(style) {
+      style.label = this.$t(style.label);
+
+      return {
+        ...style,
+        label: this.$t(style.label)
+      };
     }
   }
 };

package/modules/@apostrophecms/schema/index.js

@@ -18,6 +18,7 @@ const _ = require('lodash');
 const dayjs = require('dayjs');
 const tinycolor = require('tinycolor2');
 const { klona } = require('klona');
+const { stripIndent } = require('common-tags');
 
 module.exports = {
   options: {
@@ -323,7 +324,13 @@ module.exports = {
     self.addFieldType({
       name: 'select',
       async convert(req, field, data, destination) {
-        destination[field.name] = self.apos.launder.select(data[field.name], field.choices, field.def);
+        let choices;
+        if ((typeof field.choices) === 'string') {
+          choices = await self.apos.modules[field.moduleName][field.choices](req);
+        } else {
+          choices = field.choices;
+        }
+        destination[field.name] = self.apos.launder.select(data[field.name], choices, field.def);
       },
       index: function (value, field, texts) {
         const silent = field.silent === undefined ? true : field.silent;
@@ -354,7 +361,9 @@ module.exports = {
                 return self.apos.launder.select(v, field.choices, null);
               });
             } else {
-              value = self.apos.launder.select(value, field.choices, null);
+              value = (typeof field.choices) === 'string'
+                ? self.apos.launder.string(value)
+                : self.apos.launder.select(value, field.choices, null);
               if (value === null) {
                 return null;
               }
@@ -362,9 +371,16 @@ module.exports = {
             }
           },
           choices: async function () {
+            let allChoices;
             const values = await query.toDistinct(field.name);
+            if ((typeof field.choices) === 'string') {
+              const req = self.apos.task.getReq();
+              allChoices = await self.apos.modules[field.moduleName][field.choices](req);
+            } else {
+              allChoices = field.choices;
+            }
             const choices = _.map(values, function (value) {
-              const choice = _.find(field.choices, { value: value });
+              const choice = _.find(allChoices, { value: value });
               return {
                 value: value,
                 label: choice && (choice.label || value)
@@ -980,6 +996,12 @@ module.exports = {
         if (field.schema && !Array.isArray(field.schema)) {
           fail('schema property should be an array if present at this stage');
         }
+        if (field.filters) {
+          fail('"filters" property should be changed to "builders" for 3.x');
+        }
+        if (field.builders && field.builders.projection) {
+          fail('"projection" sub-property should be changed to "project" for 3.x');
+        }
         function lintType(type) {
           type = self.apos.doc.normalizeType(type);
           if (!_.find(self.apos.doc.managers, { name: type })) {
@@ -1102,7 +1124,7 @@ module.exports = {
       // alterFields option should be avoided if your needs can be met
       // via another option.
 
-      compose(options) {
+      compose(options, module) {
         let schema = [];
 
         // Useful for finding good unit test cases
@@ -1292,9 +1314,29 @@ module.exports = {
         // like workflow to patch schema fields of various modules
         // without inadvertently impacting other apos instances
         // when running with @apostrophecms/multisite
-        return _.map(schema, function (field) {
+        schema = _.map(schema, function (field) {
           return _.clone(field);
         });
+
+        _.each(schema, function(field) {
+          // For use in resolving options like "choices" when they
+          // contain a method name. For bc don't mess with possible
+          // existing usages in custom schema field types predating
+          // this feature
+          self.setModuleName(field, module);
+        });
+        return schema;
+      },
+
+      // Recursively set moduleName property of the field and any subfields,
+      // as might be found in array or object fields. `module` is an actual module
+      setModuleName(field, module) {
+        field.moduleName = field.moduleName || (module && module.__meta.name);
+        if ((field.type === 'array') || (field.type === 'object')) {
+          _.each(field.schema || [], function(subfield) {
+            self.setModuleName(subfield, module);
+          });
+        }
       },
 
       // refine is like compose, but it starts with an existing schema array
@@ -1930,6 +1972,7 @@ module.exports = {
             } else if (field.type === 'array') {
               if (doc[field.name]) {
                 doc[field.name].forEach(item => {
+                  item._id = item._id || self.apos.util.generateId();
                   item.metaType = 'arrayItem';
                   item.scopedArrayName = field.scopedArrayName;
                   forSchema(field.schema, item);
@@ -2216,7 +2259,12 @@ module.exports = {
           self.apos.util.error(format(s));
         }
         function format(s) {
-          return '\n' + options.type + ' ' + options.subtype + ', field name ' + field.name + ':\n\n' + s + '\n';
+          return stripIndent`
+            ${options.type} ${options.subtype}, ${field.type} field "${field.name}":
+
+            ${s}
+
+          `;
         }
       },
 
@@ -2529,6 +2577,32 @@ module.exports = {
 
     };
   },
+  apiRoutes(self) {
+    return {
+      get: {
+        async choices(req) {
+          const id = self.apos.launder.string(req.query.fieldId);
+          const field = self.getFieldById(id);
+          let choices = [];
+          if (
+            !field ||
+            field.type !== 'select' ||
+            !(field.choices && typeof field.choices === 'string')
+          ) {
+            throw self.apos.error('invalid');
+          }
+          choices = await self.apos.modules[field.moduleName][field.choices](req);
+          if (Array.isArray(choices)) {
+            return {
+              choices
+            };
+          } else {
+            throw self.apos.error('invalid', `The method ${field.choices} from the module ${field.moduleName} did not return an array`);
+          }
+        }
+      }
+    };
+  },
   extendMethods(self) {
     return {
       getBrowserData(_super, req) {
@@ -2543,7 +2617,7 @@ module.exports = {
           }
           fields[name] = component;
         }
-
+        browserOptions.action = self.action;
         browserOptions.components = { fields: fields };
         return browserOptions;
       }

package/modules/@apostrophecms/schema/ui/apos/components/AposInputSelect.vue

@@ -49,9 +49,27 @@ export default {
       choices: []
     };
   },
-  mounted() {
+  async mounted() {
+    let choices;
+    if (typeof this.field.choices === 'string') {
+      const action = this.options.action;
+      const response = await apos.http.get(
+        `${action}/choices`,
+        {
+          qs: {
+            fieldId: this.field._id
+          },
+          busy: true
+        }
+      );
+      if (response.choices) {
+        choices = response.choices;
+      }
+    } else {
+      choices = this.field.choices;
+    }
     // Add an null option if there isn't one already
-    if (!this.field.required && !this.field.choices.find(choice => {
+    if (!this.field.required && !choices.find(choice => {
       return choice.value === null;
     })) {
       this.choices.push({
@@ -59,12 +77,12 @@ export default {
         value: null
       });
     }
-    this.choices = this.choices.concat(this.field.choices);
+    this.choices = this.choices.concat(choices);
     this.$nextTick(() => {
       // this has to happen on nextTick to avoid emitting before schemaReady is
       // set in AposSchema
-      if (this.field.required && (this.next == null) && (this.field.choices[0] != null)) {
-        this.next = this.field.choices[0].value;
+      if (this.field.required && (this.next == null) && (this.choices[0] != null)) {
+        this.next = this.choices[0].value;
       }
     });
   },
@@ -74,7 +92,7 @@ export default {
         return 'required';
       }
 
-      if (value && !this.field.choices.find(choice => choice.value === value)) {
+      if (value && !this.choices.find(choice => choice.value === value)) {
         return 'invalid';
       }
 

package/modules/@apostrophecms/schema/ui/apos/components/AposInputSlug.vue

@@ -73,10 +73,6 @@ export default {
     icon () {
       if (this.error) {
         return 'circle-medium-icon';
-      } else if (this.field.type === 'date') {
-        return 'calendar-icon';
-      } else if (this.field.type === 'time') {
-        return 'clock-icon';
       } else if (this.field.icon) {
         return this.field.icon;
       } else {

package/modules/@apostrophecms/schema/ui/apos/components/AposInputString.vue

@@ -71,10 +71,6 @@ export default {
     icon () {
       if (this.error) {
         return 'circle-medium-icon';
-      } else if (this.field.type === 'date') {
-        return 'calendar-icon';
-      } else if (this.field.type === 'time') {
-        return 'clock-icon';
       } else if (this.field.icon) {
         return this.field.icon;
       } else {
@@ -207,9 +203,6 @@ export default {
     // height of date/time input is slightly larger than others due to the browser spinner ui
     height: 46px;
     padding-right: 40px;
-    &::-webkit-calendar-picker-indicator {
-      background: none;
-    }
   }
   .apos-input--date {
     &::-webkit-clear-button {

package/modules/@apostrophecms/ui/ui/apos/components/AposCellContextMenu.vue

@@ -64,7 +64,7 @@ export default {
   .apos-table__cell-field--context-menu__content {
     @include apos-transition();
     display: inline-block;
-    opacity: 0;
+    opacity: 0.3;
     &.apos-is-visible {
       opacity: 1;
     }

package/modules/@apostrophecms/ui/ui/apos/lib/i18next.js

@@ -10,11 +10,20 @@ export default {
   install(Vue, options) {
     const i18n = options.i18n;
 
+    const fallbackLng = [ i18n.defaultLocale ];
+    // In case the default locale also has inadequate admin UI phrases
+    if (fallbackLng[0] !== 'en') {
+      fallbackLng.push('en');
+    }
+
     i18next.init({
       lng: i18n.locale,
-      fallbackLng: i18n.defaultLocale,
+      fallbackLng,
       resources: {},
-      debug: i18n.debug
+      debug: i18n.debug,
+      interpolation: {
+        escapeValue: false
+      }
     });
 
     for (const [ ns, phrases ] of Object.entries(i18n.i18n[i18n.locale])) {
@@ -25,6 +34,11 @@ export default {
         i18next.addResourceBundle(i18n.defaultLocale, ns, phrases, true, true);
       }
     }
+    if ((i18n.locale !== 'en') && (i18n.defaultLocale !== 'en')) {
+      for (const [ ns, phrases ] of Object.entries(i18n.i18n.en)) {
+        i18next.addResourceBundle('en', ns, phrases, true, true);
+      }
+    }
 
     // Like standard i18next $t, but also with support
     // for just one object argument with at least a `key`

package/modules/@apostrophecms/ui/ui/apos/scss/global/_tables.scss

@@ -5,7 +5,7 @@
 
 .apos-table__header {
   margin-bottom: $spacing-base;
-  padding: 12.5px 4.5px;
+  padding: 12.5px 15px;
   border-bottom: 1px solid var(--a-base-8);
   color: var(--a-base-3);
   text-align: left;
@@ -52,12 +52,13 @@ span.apos-table__header-label:hover {
   @include apos-transition(all, 0.05s);
 }
 .apos-table__cell {
-  padding: 5px;
+  padding: 5px 15px;
   border-bottom: 1px solid var(--a-base-10);
 }
 
 .apos-table__cell--context-menu  {
-  width: 40px;
+  padding-right: 0;
+  padding-left: 0;
 }
 
 .apos-table__cell-field--context-menu  {

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

@@ -156,7 +156,7 @@ module.exports = {
         self.schema = self.apos.schema.compose({
           addFields: self.apos.schema.fieldsToArray(`Module ${self.__meta.name}`, self.fields),
           arrangeFields: self.apos.schema.groupsToArray(self.fieldsGroups)
-        });
+        }, self);
         const forbiddenFields = [
           '_id',
           'type'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apostrophe",
-  "version": "3.6.0",
+  "version": "3.7.0",
   "description": "The Apostrophe Content Management System.",
   "main": "index.js",
   "scripts": {

package/.scratch.md

@@ -1,2 +0,0 @@
-- `/deep/ .apos-button` to `:deep(.apos-button)`
-- Remove v-popover, v-tooltip, VueClickOutsideElement