domma-cms 0.69.3 → 0.69.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "domma-cms",
-  "version": "0.69.3",
+  "version": "0.69.4",
   "description": "File-based CMS powered by Domma and Fastify. Run npx domma-cms my-site to create a new project.",
   "type": "module",
   "main": "server/server.js",

package/scripts/run-tests.mjs

@@ -77,7 +77,9 @@ try {
 const given = process.argv.slice(2);
 const files = given.filter(a => !a.startsWith('-'));
 const args = ['--test', '--test-concurrency=1', ...given, ...(files.length ? [] : ['tests/**/*.test.js'])];
-const child = spawn(process.execPath, args, {cwd: copy, stdio: 'inherit', env: process.env});
+// DOMMA_REPO_ROOT: where the real checkout is, for the few tests that compare
+// against a sibling repo (../dcms-marketplace) the temp copy has no neighbour for.
+const child = spawn(process.execPath, args, {cwd: copy, stdio: 'inherit', env: {...process.env, DOMMA_REPO_ROOT: ROOT}});
 
 // Ctrl+C, or a kill: stop the suite, then still delete the copy.
 for (const sig of ['SIGINT', 'SIGTERM', 'SIGHUP']) {

package/server/services/siteGitignore.js

@@ -41,12 +41,15 @@ export const ENGINE_TOP_LEVEL = new Set([
 const SITE_ROOTS = ['content', 'config', 'plugins'];
 
 /**
- * Plugins that were promoted into core (0.67.0) or retired. A site that has not
- * yet booted a release that removes them still has the folder; it is engine,
- * not the site's.
+ * Every slug dcms-marketplace reserves (its reserved.json): plugins promoted
+ * into core (0.67.0), retired, or withdrawn. None is shipped by any upstream
+ * any more, so without this list a leftover folder - `shopping-cart` on
+ * cms.dommajs.org, withdrawn scaffolder output - reads as the site's own code
+ * and gets committed. A reserved name is never the site's: its folder is engine.
  */
 export const RETIRED_PLUGINS = [
-    'analytics', 'contacts', 'notes', 'todo', 'demo-viewer', 'theme-switcher', 'site-search'
+    'analytics', 'contacts', 'notes', 'todo', 'demo-viewer', 'theme-switcher', 'site-search',
+    'seo-pro', 'shopping-cart', 'form-builder'
 ];
 
 /**
@@ -78,7 +81,7 @@ export const ENGINE_SCHEMAS = [
  */
 export const PRIVATE_DATA = [
     'notifications', 'api-tokens', 'notes-notes', 'todo-items',
-    'contacts-contacts', 'contacts-groups', 'roles', 'user-profiles',
+    'contacts', 'contacts-contacts', 'contacts-groups', 'roles', 'user-profiles',
     'user-messages', 'user-message-threads', 'analytics-events', 'enquiries',
     'blog-comments', 'invoices', 'invoice-receivers', 'invoice-issuers',
     'surveys-contacts', 'surveys-invites'