apostrophe 3.48.0 → 3.49.0

package/CHANGELOG.md

@@ -1,5 +1,46 @@
 # Changelog
 
+## 3.49.0 (2023-06-08)
+
+### Changes
+* Updates area UX to not display Add Content controls when a widget is focused.
+* Updates area UX to unfocus widget on esc key.
+* Updates widget UI to use dashed outlines instead of borders to indicate bounds.
+* Updates UI for Insert Menu.
+* Updates Insert Menu UX to allow mid-node insertion.
+* Rich Text Widget's Insert components are now expected to emit `done` and `cancel` for proper RT cleanup. `close` still supported for BC, acts as `done`.
+* Migrated the business logic of the login-related Vue components to external mixins, so that the templates and styles can be overridden by
+copying the component `.vue` file to project level without copying all of the business logic. If you have already copied the components to style them,
+we encourage you to consider replacing your `script` tag with the new version, which just imports the mixin, so that fixes we make there will be
+available in your project.
+
+### Adds
+* Adds keyboard accessibility to Insert menu.
+* Adds regex pattern feature for string fields.
+* Adds `pnpm` support. Introduces new optional Apostrophe root configuration `pnpm` to force opt-in/out when auto detection fails. See the [documentation](https://v3.docs.apostrophecms.org/guide/using-pnpm.html) for more details.
+* Adds a warning if database queries involving relationships
+are made before the last `apostrophe:modulesRegistered` handler has fired.
+If you need to call Apostrophe's `find()` methods at startup,
+it is best to wait for the `@apostrophecms/doc:beforeReplicate` event.
+* Allow `@` when a piece is a template and `/@` for page templates (doc-template-library module).
+* Adds a `prefix` option to the http frontend util module.  
+If explicitly set to `false`, prevents the prefix from being automatically added to the URL,  
+when making calls with already-prefixed URLs for instance.
+* Adds the `redirectToFirstLocale` option to the `i18n` module to prevent users from reaching a version of their site that would not match any locale when requesting the site without a locale prefix in the URL.
+* If just one instance of a piece type should always exist (per locale if localized), the
+`singletonAuto` option may now be set to `true` or to an object with a `slug` option in
+order to guarantee it. This implicitly sets `singleton: true` as well. This is now used
+internally by `@apostrophecms/global` as well as the optional `@apostrophecms-pro/palette` module.
+
+### Fixes
+* Fix 404 error when viewing/editing a doc which draft has a different version of the slug than the published one.
+* Fixed a bug where multiple home pages can potentially be inserted into the database if the
+default locale is renamed. Introduced the `async apos.doc.bestAposDocId(criteria)` method to
+help identify the right `aposDocId` when inserting a document that might exist in
+other locales.
+* Fixed a bug where singletons like the global doc might not be inserted at all if they
+exist under the former name of the default locale and there are no other locales.
+
 ## 3.48.0 (2023-05-26)
 
 ### Adds
@@ -105,10 +146,10 @@ shouldn't close the link dialog etc.
 
 ### Fixes
 
-* Fix various issues on conditional fields that were occurring when adding new widgets with default values or selecting a falsy value in a field that has a conditional field relying on it.  
+* Fix various issues on conditional fields that were occurring when adding new widgets with default values or selecting a falsy value in a field that has a conditional field relying on it.
 Populate new or existing doc instances with default values and add an empty `null` choice to select fields that do not have a default value (required or not) and to the ones configured with dynamic choices.
 * Rich text widgets save more reliably when many actions are taken quickly just before save.
-* Fix an issue in the `oembed` field where the value was kept in memory after cancelling the widget editor, which resulted in saving the value if the widget was nested and the parent widget was saved.  
+* Fix an issue in the `oembed` field where the value was kept in memory after cancelling the widget editor, which resulted in saving the value if the widget was nested and the parent widget was saved.
 Also improve the `oembed` field UX by setting the input as `readonly` rather than `disabled` when fetching the video metadata, in order to avoid losing its focus when typing.
 
 ## 3.44.0 (2023-04-13)

package/index.js

@@ -55,6 +55,13 @@ let defaults = require('./defaults.js');
 // If set, Apostrophe will invoke it (await) before invoking process.exit.
 // `beforeExit` may be an async function, will be awaited, and takes no arguments.
 //
+// `pnpm`
+// A boolean to force on or off the pnpm related build routines. If not set,
+// an automated check will be performed to determine if pnpm is in use. We offer
+// an option, because automated check is not 100% reliable. Monorepo tools are
+// often hiding package management specifics (lock files, node_module structure, etc.)
+// in a centralized store.
+//
 // ## Awaiting the Apostrophe function
 //
 // The apos function is async, but in typical cases you do not
@@ -222,6 +229,11 @@ async function apostrophe(options, telemetry, rootSpan) {
     self.root = options.root || getRoot();
     self.rootDir = options.rootDir || path.dirname(self.root.filename);
     self.npmRootDir = options.npmRootDir || self.rootDir;
+    self.selfDir = __dirname;
+    // Signals to various (build related) places that we are running a pnpm installation.
+    // The relevant option, if set, has a higher precedence over the automated check.
+    self.isPnpm = options.pnpm ??
+      fs.existsSync(path.join(self.npmRootDir, 'pnpm-lock.yaml'));
 
     testModule();
 
@@ -290,7 +302,13 @@ async function apostrophe(options, telemetry, rootSpan) {
     self.apos.schema.registerAllSchemas();
     await self.apos.lock.withLock('@apostrophecms/migration:migrate', async () => {
       await self.apos.migration.migrate(); // emits before and after events, inside the lock
-      await self.apos.global.insertIfMissing();
+      // Inserts the global doc in the default locale if it does not exist; same for other
+      // singleton piece types registered by other modules
+      for (const module of Object.values(self.modules)) {
+        if (self.instanceOf(module, '@apostrophecms/piece-type') && module.options.singletonAuto) {
+          await module.insertIfMissing();
+        }
+      }
       await self.apos.page.implementParkAllInDefaultLocale();
       await self.apos.doc.replicate(); // emits beforeReplicate and afterReplicate events
       // Replicate will have created the parked pages across locales if needed, but we may
@@ -632,7 +650,7 @@ async function apostrophe(options, telemetry, rootSpan) {
             `
           );
         } else {
-          warn('orphan-modules', `You have a ${self.localModules}/${name} folder, but that module is not activated in app.js and it is not a base class of any other active module. Right now that code doesn't do anything.`);
+          warn('orphan-modules', `You have a ${self.localModules}/${name} folder, but that module is not activated in app.js\nand it is not a base class of any other active module. Right now that code doesn't do anything.`);
         }
       }
       function warn(name, message) {

package/lib/locales.js

@@ -32,7 +32,7 @@ module.exports = {
     ) {
       throw new Error(stripIndent`
         If some of your locales have hostnames, then they all must have
-        hostnames, or your top-level baseUrl option must be set.
+        hostnames, and your top-level baseUrl option must be set.
 
         In development, you can set baseUrl to http://localhost:3000
         for testing purposes. In production it should always be set

package/lib/moog-require.js

@@ -95,6 +95,7 @@ module.exports = function(options) {
       npmDefinition = importFresh(npmPath);
       npmDefinition.__meta = {
         npm: true,
+        bundled: _.has(self.bundled, type),
         dirname: path.dirname(npmPath),
         filename: npmPath,
         name: type
@@ -165,6 +166,8 @@ module.exports = function(options) {
       // multiple references to my-foo which is ambiguous
       result.__meta.name = self.originalToMy(originalType);
     }
+    // Mark "my" modules as such
+    result.__meta.my = self.isMy(result.__meta.name);
     return result;
   };
 

package/modules/@apostrophecms/admin-bar/ui/apos/components/TheAposContextBar.vue

@@ -533,14 +533,24 @@ export default {
           aposEdit: '1'
         } : {})
       };
-      const url = apos.http.addQueryToUrl(window.location.href, qs);
+
+      const { action } = window.apos.modules[this.context.type];
+      const doc = await apos.http.get(`${action}/${this.context.aposDocId}`, {
+        qs: {
+          aposMode: this.draftMode,
+          project: { _url: 1 }
+        }
+      });
+
+      const url = apos.http.addQueryToUrl(doc._url, qs);
       const content = await apos.http.get(url, {
         qs,
         headers: {
           'Cache-Control': 'no-cache'
         },
         draft: true,
-        busy: true
+        busy: true,
+        prefix: false
       });
 
       refreshable.innerHTML = content;

package/modules/@apostrophecms/area/ui/apos/components/AposAreaEditor.vue

@@ -249,6 +249,8 @@ export default {
     },
     updateWidgetFocused(widgetId) {
       this.focusedWidget = widgetId;
+      // Attached to window so that modals can see the area is active
+      window.apos.focusedWidget = widgetId;
     },
     async up(i) {
       if (this.docId === window.apos.adminBar.contextId) {

package/modules/@apostrophecms/area/ui/apos/components/AposAreaWidget.vue

@@ -530,33 +530,16 @@ export default {
   .apos-area-widget-inner {
     position: relative;
     min-height: 50px;
-    &:before, &:after {
-      content: '';
-      position: absolute;
-      left: 0;
-      width: 100%;
-      height: 1px;
-      border-top: 1px dashed var(--a-primary);
-      opacity: 0;
-      transition: opacity 0.2s ease;
-      pointer-events: none;
-    }
-
-    &:before {
-      top: 0;
-    }
-    &:after {
-      bottom: 0;
-    }
+    border-radius: var(--a-border-radius);
+    outline: 1px solid transparent;
+    transition: outline 0.2s ease;
     &.apos-is-highlighted {
-      &:before, &:after {
-        opacity: 0.4;
-      }
+      outline: 1px dashed var(--a-primary-transparent-50);
     }
     &.apos-is-focused {
-      &:before, &:after {
-        opacity: 1;
-        border-top: 1px solid var(--a-primary);
+      outline: 1px dashed var(--a-primary);
+      &::v-deep .apos-rich-text-editor__editor.apos-is-visually-empty {
+        box-shadow: none;
       }
     }
 

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

@@ -260,11 +260,12 @@ module.exports = {
             });
           }
 
-          async function moduleOverrides(modulesDir, source) {
+          async function moduleOverrides(modulesDir, source, pnpmPaths) {
             await fs.remove(modulesDir);
             await fs.mkdirp(modulesDir);
             let names = {};
             const directories = {};
+            const pnpmOnly = {};
             // Most other modules are not actually instantiated yet, but
             // we can access their metadata, which is sufficient
             for (const name of modulesToInstantiate) {
@@ -273,6 +274,9 @@ module.exports = {
               for (const entry of metadata.__meta.chain) {
                 const effectiveName = entry.name.replace(/^my-/, '');
                 names[effectiveName] = true;
+                if (entry.npm && !entry.bundled && !entry.my) {
+                  pnpmOnly[entry.dirname] = true;
+                }
                 ancestorDirectories.push(entry.dirname);
                 directories[effectiveName] = directories[effectiveName] || [];
                 for (const dir of ancestorDirectories) {
@@ -288,6 +292,21 @@ module.exports = {
               for (const dir of directories[name]) {
                 const srcDir = `${dir}/${source}`;
                 if (fs.existsSync(srcDir)) {
+                  if (
+                    // is pnpm installation
+                    self.apos.isPnpm &&
+                    // is npm module and not bundled
+                    pnpmOnly[dir] &&
+                    // isn't apos core module
+                    !dir.startsWith(path.join(self.apos.npmRootDir, 'node_modules/apostrophe/'))
+                  ) {
+                    // Ignore further attempts to register this path (performance)
+                    pnpmOnly[dir] = false;
+                    // resolve symlinked pnpm path
+                    const resolved = fs.realpathSync(dir);
+                    // go up to the pnpm node_modules directory
+                    pnpmPaths.add(resolved.split(name)[0]);
+                  }
                   await fs.copy(srcDir, moduleDir);
                 }
               }
@@ -302,7 +321,9 @@ module.exports = {
             }));
             const modulesDir = `${buildDir}/${name}/modules`;
             const source = options.source || name;
-            await moduleOverrides(modulesDir, `ui/${source}`);
+            // Gather pnpm modules that are used in the build to be added as resolve paths
+            const pnpmModules = new Set();
+            await moduleOverrides(modulesDir, `ui/${source}`, pnpmModules);
 
             let iconImports, componentImports, tiptapExtensionImports, appImports, indexJsImports, indexSassImports;
             if (options.apos) {
@@ -382,6 +403,7 @@ module.exports = {
                 outputPath: bundleDir,
                 outputFilename,
                 bundles: webpackExtraBundles,
+                pnpmModulesResolvePaths: pnpmModules,
                 // Added on the fly by the
                 // @apostrophecms/asset-es5 module,
                 // if it is present
@@ -774,10 +796,13 @@ module.exports = {
           async function findPackageLock() {
             const packageLockPath = path.join(self.apos.npmRootDir, 'package-lock.json');
             const yarnPath = path.join(self.apos.npmRootDir, 'yarn.lock');
+            const pnpmPath = path.join(self.apos.npmRootDir, 'pnpm-lock.yaml');
             if (await fs.pathExists(packageLockPath)) {
               return packageLockPath;
             } else if (await fs.pathExists(yarnPath)) {
               return yarnPath;
+            } else if (await fs.pathExists(pnpmPath)) {
+              return pnpmPath;
             } else {
               return false;
             }

package/modules/@apostrophecms/asset/lib/webpack/apos/webpack.config.js

@@ -11,7 +11,12 @@ if (process.env.APOS_BUNDLE_ANALYZER) {
 }
 
 module.exports = ({
-  importFile, modulesDir, outputPath, outputFilename
+  importFile,
+  modulesDir,
+  outputPath,
+  outputFilename,
+  // it's a Set, not an array
+  pnpmModulesResolvePaths
 }, apos) => {
   const tasks = [ scss, vue, js ].map(task =>
     task(
@@ -23,6 +28,7 @@ module.exports = ({
     )
   );
 
+  const pnpmModulePath = apos.isPnpm ? [ path.join(apos.selfDir, '../') ] : [];
   const config = {
     entry: importFile,
     // Ensure that the correct version of vue-loader is found
@@ -47,7 +53,16 @@ module.exports = ({
     // at a later date if needed
     resolveLoader: {
       extensions: [ '*', '.js', '.vue', '.json' ],
-      modules: [ 'node_modules/apostrophe/node_modules', 'node_modules' ]
+      modules: [
+        // 1. Allow webpack to find loaders from core dependencies (pnpm), empty if not pnpm
+        ...pnpmModulePath,
+        // 2. Allow webpack to find loaders from dependencies of any project level packages (pnpm),
+        // empty if not pnpm
+        ...[ ...pnpmModulesResolvePaths ],
+        // 3. npm related paths
+        'node_modules/apostrophe/node_modules',
+        'node_modules'
+      ]
     },
     resolve: {
       extensions: [ '*', '.js', '.vue', '.json' ],
@@ -58,6 +73,12 @@ module.exports = ({
       },
       modules: [
         'node_modules',
+        // 1. Allow webpack to find imports from core dependencies (pnpm), empty if not pnpm
+        ...pnpmModulePath,
+        // 2. Allow webpack to find imports from dependencies of any project level packages (pnpm),
+        // empty if not pnpm
+        ...[ ...pnpmModulesResolvePaths ],
+        // 3. npm related paths
         `${apos.npmRootDir}/node_modules/apostrophe/node_modules`,
         `${apos.npmRootDir}/node_modules`
       ],

package/modules/@apostrophecms/asset/lib/webpack/src/webpack.config.js

@@ -10,7 +10,15 @@ if (process.env.APOS_BUNDLE_ANALYZER) {
 }
 
 module.exports = ({
-  importFile, modulesDir, outputPath, outputFilename, bundles = {}, es5, es5TaskFn
+  importFile,
+  modulesDir,
+  outputPath,
+  outputFilename,
+  // it's a Set, not an array
+  pnpmModulesResolvePaths,
+  bundles = {},
+  es5,
+  es5TaskFn
 }, apos) => {
   const mainBundleName = outputFilename.replace('.js', '');
   const taskFns = [ scssTask, ...(es5 ? [ es5TaskFn ] : []) ];
@@ -27,6 +35,7 @@ module.exports = ({
   );
 
   const moduleName = es5 ? 'nomodule' : 'module';
+  const pnpmModulePath = apos.isPnpm ? [ path.join(apos.selfDir, '../') ] : [];
   const config = {
     entry: {
       [mainBundleName]: importFile,
@@ -57,7 +66,16 @@ module.exports = ({
       extensions: [ '*', '.js' ],
       // Make sure css-loader and postcss-loader can always be found, even
       // if npm didn't hoist them
-      modules: [ 'node_modules', 'node_modules/apostrophe/node_modules' ]
+      modules: [
+        'node_modules',
+        // 1. Allow webpack to find loaders from dependencies of any project level packages (pnpm),
+        // empty if not pnpm
+        ...[ ...pnpmModulesResolvePaths ],
+        // 2. Allow webpack to find loaders from core dependencies (pnpm), empty if not pnpm
+        ...pnpmModulePath,
+        // 3. npm related paths
+        'node_modules/apostrophe/node_modules'
+      ]
     },
     resolve: {
       extensions: [ '*', '.js' ],
@@ -67,6 +85,12 @@ module.exports = ({
       },
       modules: [
         'node_modules',
+        // 1. Allow webpack to find imports from dependencies of any project level packages (pnpm),
+        // empty if not pnpm
+        ...[ ...pnpmModulesResolvePaths ],
+        // 2. Allow webpack to find imports from core dependencies (pnpm), empty if not pnpm
+        ...pnpmModulePath,
+        // 3. npm related paths
         `${apos.npmRootDir}/node_modules`,
         // Make sure core-js and regenerator-runtime can always be found, even
         // if npm didn't hoist them

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

@@ -1,6 +1,7 @@
 const _ = require('lodash');
 const cuid = require('cuid');
 const { SemanticAttributes } = require('@opentelemetry/semantic-conventions');
+const { klona } = require('klona');
 
 // This module is responsible for managing all of the documents (apostrophe "docs")
 // in the `aposDocs` mongodb collection.
@@ -296,6 +297,148 @@ module.exports = {
   },
   methods(self) {
     return {
+      // `pairs` is an array of arrays, each containing an old _id
+      // and a new _id that should replace it.
+      //
+      // `aposDocId` is implicitly updated, `path` is updated if a page,
+      // and all references found in relationships are updated via reverse
+      // relationship id lookups, after which attachment references are updated.
+      // This is a slow operation, which is why this method should be called only
+      // by migrations and tasks that remedy an unexpected situation. _id is
+      // meant to be an immutable property, this method is a workaround
+      // for situations like a renamed locale or a replication bug fix.
+      //
+      // If `keep` is set to `'old'` the old document's content wins
+      // in the event of a conflict. If `keep` is set to `'new'` the
+      // new document's content wins in the event of a conflict.
+      // If `keep` is not set, a `conflict` error is thrown in the
+      // event of a conflict.
+
+      async changeDocIds(pairs, { keep } = {}) {
+        let renamed = 0;
+        let kept = 0;
+        // Get page paths up front so we can avoid multiple queries when working on path changes
+        const pages = await self.apos.doc.db.find({
+          path: { $exists: 1 },
+          slug: /^\//
+        }).project({
+          path: 1,
+          aposLastTargetId: 1
+        }).toArray();
+        for (const pair of pairs) {
+          const [ from, to ] = pair;
+          const existing = await self.apos.doc.db.findOne({ _id: from });
+          if (!existing) {
+            throw self.apos.error('notfound');
+          }
+          const replacement = klona(existing);
+          await self.apos.doc.db.removeOne({ _id: from });
+          const oldAposDocId = existing.aposDocId;
+          replacement._id = to;
+          const parts = to.split(':');
+          replacement.aposDocId = parts[0];
+          // Watch out for nonlocalized types, don't set aposLocale for them
+          if (parts.length > 1) {
+            replacement.aposLocale = parts.slice(1).join(':');
+          }
+          const isPage = self.apos.page.isPage(existing);
+          if (isPage) {
+            replacement.path = existing.path.replace(existing.aposDocId, replacement.aposDocId);
+          }
+          try {
+            await self.apos.doc.db.insertOne(replacement);
+            renamed++;
+          } catch (e) {
+            // First reinsert old doc to prevent content loss on new doc insert failure
+            await self.apos.doc.db.insertOne(existing);
+            if (!self.apos.doc.isUniqueError(e)) {
+              // We cannot fix this error
+              throw e;
+            }
+            const existingReplacement = await self.apos.doc.db.findOne({ _id: replacement._id });
+            if (!existingReplacement) {
+              // We don't know the cause of this error
+              throw e;
+            }
+            if (keep === 'new') {
+              // New content already exists in new locale, delete old locale
+              // and keep new
+              await self.apos.doc.db.removeOne({ _id: existing._id });
+              kept++;
+            } else if (keep === 'old') {
+              // We want to keep the old content, but with the new
+              // identifiers. Once again we need to remove the old doc first
+              // to cut down on conflicts
+              try {
+                await self.apos.doc.db.deleteOne({ _id: existing._id });
+                await self.apos.doc.db.deleteOne({ _id: replacement._id });
+                await self.apos.doc.db.insertOne(replacement);
+                renamed++;
+              } catch (e) {
+                // Reinsert old doc to prevent content loss on new doc insert failure
+                await self.apos.doc.db.insertOne(existing);
+                throw e;
+              }
+              kept++;
+            } else {
+              throw self.apos.error('conflict');
+            }
+          }
+          if (isPage) {
+            for (const page of pages) {
+              if (page.aposLastTargetId === from) {
+                await self.apos.doc.db.updateOne({
+                  _id: page._id
+                }, {
+                  $set: {
+                    aposLastTargetId: to
+                  }
+                });
+              }
+              if (page.path.includes(oldAposDocId)) {
+                await self.apos.doc.db.updateOne({
+                  _id: page._id
+                }, {
+                  $set: {
+                    path: page.path.replace(oldAposDocId, replacement.aposDocId)
+                  }
+                });
+              }
+            }
+          }
+          if (existing.relatedReverseIds?.length) {
+            const relatedDocs = await self.apos.doc.db.find({
+              aposDocId: { $in: existing.relatedReverseIds }
+            }).toArray();
+            for (const doc of relatedDocs) {
+              replaceId(doc, oldAposDocId, replacement.aposDocId);
+              await self.apos.doc.db.replaceOne({
+                _id: doc._id
+              }, doc);
+            }
+          }
+        }
+        await self.apos.attachment.recomputeAllDocReferences();
+        return {
+          renamed,
+          kept
+        };
+        function replaceId(obj, oldId, newId) {
+          if (obj == null) {
+            return;
+          }
+          if ((typeof obj) !== 'object') {
+            return;
+          }
+          for (const key of Object.keys(obj)) {
+            if (obj[key] === oldId) {
+              obj[key] = newId;
+            } else {
+              replaceId(obj[key], oldId, newId);
+            }
+          }
+        }
+      },
       async enableCollection() {
         self.db = await self.apos.db.collection('aposDocs');
       },
@@ -1142,6 +1285,7 @@ module.exports = {
             type: module.name
           });
         }
+        self.replicateReached = true;
         // Include the criteria array in the event so that more entries can be pushed to it
         await self.emit('beforeReplicate', criteria);
         // We can skip the core work of this method if there is only one locale,
@@ -1303,6 +1447,11 @@ module.exports = {
         });
       },
 
+      async bestAposDocId(criteria) {
+        const existing = await self.apos.doc.db.findOne(criteria, { projection: { aposDocId: 1 } });
+        return existing?.aposDocId || self.apos.util.generateId();
+      },
+
       ...require('./lib/legacy-migrations')(self)
     };
   }

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

@@ -193,6 +193,12 @@ module.exports = {
     if (!self.options.name) {
       self.options.name = self.__meta.name;
     }
+    if (self.options.singletonAuto) {
+      self.options.singleton = true;
+    }
+    if (self.options.replicate === undefined) {
+      self.options.replicate = self.options.localized && self.options.singletonAuto;
+    }
     self.name = self.options.name;
     // Each doc-type has an array of fields which will be updated
     // if the document is moved to the archive. In most cases 'slug'
@@ -1473,7 +1479,9 @@ module.exports = {
         browserOptions.schema = self.allowedSchema(req);
         browserOptions.localized = self.isLocalized();
         browserOptions.autopublish = self.options.autopublish;
-        browserOptions.previewDraft = self.isLocalized() && !browserOptions.autopublish && self.options.previewDraft;
+        browserOptions.previewDraft = self.isLocalized() &&
+          !browserOptions.autopublish &&
+          self.options.previewDraft;
 
         return browserOptions;
       }

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

@@ -42,7 +42,9 @@ module.exports = {
     // Intentionally the same
     pluralLabel: 'apostrophe:globalDocLabel',
     searchable: false,
-    singleton: true,
+    singletonAuto: {
+      slug: 'global'
+    },
     showPermissions: true,
     replicate: true
   },
@@ -77,23 +79,10 @@ module.exports = {
   },
   methods(self) {
     return {
-      async insertIfMissing() {
-        // Insert at startup
-        const req = self.apos.task.getReq();
-        const existing = await self.apos.doc.db.findOne({ slug: self.slug });
-        if (!existing) {
-          const _new = self.newInstance();
-          Object.assign(_new, {
-            slug: self.slug,
-            type: self.name
-          });
-          await self.insert(req, _new);
-        }
-      },
       // Fetch and return the `global` doc object. You probably don't need to call this,
       // because middleware has already populated `req.data.global` for you.
       async findGlobal(req) {
-        return self.find(req, { slug: self.slug }).permission(false).toObject();
+        return self.find(req, { type: self.name }).permission(false).toObject();
       },
       // Fetch the global doc and add it to `req.data` as `req.data.global`, if it
       // is not already present. If it is already present, skip the

package/modules/@apostrophecms/i18n/i18n/en.json

@@ -376,13 +376,13 @@
   "richTextH4": "Heading 4 (H4)",
   "richTextHighlight": "Mark",
   "richTextHorizontalRule": "Horizontal Rule",
-  "richTextInsertMenuHeading": "Insert...",
+  "richTextInsertMenuHeading": "Insert element...",
   "richTextItalic": "Italic",
   "richTextLink": "Link",
   "richTextOrderedList": "Ordered List",
   "richTextParagraph": "Paragraph (P)",
   "richTextPlaceholder": "Start Typing Here...",
-  "richTextPlaceholderWithInsertMenu": "Start Typing Here or Press /...",
+  "richTextPlaceholderWithInsertMenu": "Start typing or press '/' for commands...",
   "richTextRedo": "Redo",
   "richTextStrikethrough": "Strike",
   "richTextStyleConfigWarning": "Misconfigured rich text style: label: {{ label }}, {{ tag }}",
@@ -399,6 +399,7 @@
   "saveDraftDescription": "Save as a draft to publish later.",
   "saveType": "Save {{ type }}",
   "savingDocument": "Saving document...",
+  "search": "Search",
   "searchDocType": "Search {{ type }}",
   "searchLabel": "Search Page",
   "searchLocales": "Search Locales",