apostrophe 3.67.2 → 3.67.3

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 3.67.3 (2025-03-31)
+
+### Fixes
+
+* Hotfix: fixes a bug in which the same on-demand cache was used across multiple sites in the presence of `@apostrophecms/multisite`. In rare cases, this bug could cause the home page of site "A" to be displayed on a request for site "B," but only if requests were simultaneous. This bug did not impact single-site projects.
+
 ## 3.67.2 (2024-08-08)
 
 ### Changes

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

@@ -292,6 +292,8 @@ module.exports = {
                 const srcDir = `${dir}/${source}`;
                 if (fs.existsSync(srcDir)) {
                   if (
+                    // pnpmPaths is provided
+                    pnpmPaths &&
                     // is pnpm installation
                     self.apos.isPnpm &&
                     // is npm module and not bundled
@@ -572,11 +574,15 @@ module.exports = {
               registerCode: ''
             };
 
+            const importIndex = [];
             for (const [ registerAs, importFrom ] of Object.entries(self.iconMap)) {
-              if (importFrom.substring(0, 1) === '~') {
-                output.importCode += `import ${importFrom}Icon from '${importFrom.substring(1)}';\n`;
-              } else {
-                output.importCode += `import ${importFrom}Icon from 'vue-material-design-icons/${importFrom}.vue';\n`;
+              if (!importIndex.includes(importFrom)) {
+                if (importFrom.substring(0, 1) === '~') {
+                  output.importCode += `import ${importFrom}Icon from '${importFrom.substring(1)}';\n`;
+                } else {
+                  output.importCode += `import ${importFrom}Icon from 'vue-material-design-icons/${importFrom}.vue';\n`;
+                }
+                importIndex.push(importFrom);
               }
               output.registerCode += `Vue.component('${registerAs}', ${importFrom}Icon);\n`;
             }

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

@@ -156,6 +156,7 @@ const qs = require('qs');
 const expressBearerToken = require('express-bearer-token');
 const cors = require('cors');
 const Promise = require('bluebird');
+const expressCacheOnDemand = require('express-cache-on-demand');
 
 module.exports = {
   init(self) {
@@ -168,6 +169,7 @@ module.exports = {
       self.apos.util.error('Set it as a global option (a property of the main object passed to apostrophe).');
       self.apos.util.error('When you do so other modules will also pick up on it and make URLs absolute.');
     }
+    self.createCacheOnDemand();
   },
   tasks(self) {
     return {
@@ -771,8 +773,14 @@ module.exports = {
             }
           }
         }
-
         self.finalModuleMiddlewareAndRoutes = labeledList.map(item => (item.prepending || []).concat(item.middleware || item.routes)).flat();
+      },
+      createCacheOnDemand() {
+        const { enableCacheOnDemand = true } = self.options;
+        if (enableCacheOnDemand) {
+          // Instantiate independently for this instance of ApostropheCMS
+          self.apos.expressCacheOnDemand = expressCacheOnDemand();
+        }
       }
     };
   }

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

@@ -2,7 +2,6 @@ const _ = require('lodash');
 const path = require('path');
 const { klona } = require('klona');
 const { SemanticAttributes } = require('@opentelemetry/semantic-conventions');
-const expressCacheOnDemand = require('express-cache-on-demand')();
 
 module.exports = {
   cascades: [ 'batchOperations', 'utilityOperations' ],
@@ -88,9 +87,6 @@ module.exports = {
     };
   },
   async init(self) {
-    const { enableCacheOnDemand = true } = self.apos
-      .modules['@apostrophecms/express'].options;
-    self.enableCacheOnDemand = enableCacheOnDemand;
     self.typeChoices = self.options.types || [];
     // If "park" redeclares something with a parkedId present in "minimumPark",
     // the later one should win
@@ -130,7 +126,7 @@ module.exports = {
       // `_publishedDoc` property to each draft that also exists in a published form.
 
       getAll: [
-        ...self.enableCacheOnDemand ? [ expressCacheOnDemand ] : [],
+        ...self.apos.expressCacheOnDemand ? [ self.apos.expressCacheOnDemand ] : [],
         async (req) => {
           await self.publicApiCheckAsync(req);
           const all = self.apos.launder.boolean(req.query.all);
@@ -256,7 +252,7 @@ module.exports = {
       // `_home` or `_archive`
 
       getOne: [
-        ...self.enableCacheOnDemand ? [ expressCacheOnDemand ] : [],
+        ...self.apos.expressCacheOnDemand ? [ self.apos.expressCacheOnDemand ] : [],
         async (req, _id) => {
           _id = self.inferIdLocaleAndMode(req, _id);
           // Edit access to draft is sufficient to fetch either
@@ -724,8 +720,8 @@ database.`);
         addServeRoute() {
           self.apos.app.get('*',
             (req, res, next) => {
-              return self.enableCacheOnDemand
-                ? expressCacheOnDemand(req, res, next)
+              return self.apos.expressCacheOnDemand
+                ? self.apos.expressCacheOnDemand(req, res, next)
                 : next();
             },
             self.serve

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

@@ -1,5 +1,4 @@
 const _ = require('lodash');
-const expressCacheOnDemand = require('express-cache-on-demand')();
 
 module.exports = {
   extend: '@apostrophecms/doc-type',
@@ -225,12 +224,9 @@ module.exports = {
     self.addEditorModal();
   },
   restApiRoutes(self) {
-    const { enableCacheOnDemand = true } = self.apos
-      .modules['@apostrophecms/express'].options;
-
     return {
       getAll: [
-        ...enableCacheOnDemand ? [ expressCacheOnDemand ] : [],
+        ...self.apos.expressCacheOnDemand ? [ self.apos.expressCacheOnDemand ] : [],
         async (req) => {
           await self.publicApiCheckAsync(req);
           const query = self.getRestQuery(req);
@@ -269,7 +265,7 @@ module.exports = {
         }
       ],
       getOne: [
-        ...enableCacheOnDemand ? [ expressCacheOnDemand ] : [],
+        ...self.apos.expressCacheOnDemand ? [ self.apos.expressCacheOnDemand ] : [],
         async (req, _id) => {
           _id = self.inferIdLocaleAndMode(req, _id);
           await self.publicApiCheckAsync(req);

package/package.json

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