apostrophe 3.29.0 → 3.30.0

package/CHANGELOG.md

@@ -1,5 +1,25 @@
 # Changelog
 
+## 3.30.0 (2022-10-12)
+
+### Adds
+
+* New `APOS_LOG_ALL_ROUTES` environment variable. If set, Apostrophe logs information about all middleware functions and routes that are executed on behalf of a particular URL.
+* Adds the `addFileGroups` option to the `attachment` module. Additionally it exposes a new method, `addFileGroup(group)`. These allow easier addition of new file groups or extension of the existing groups.
+
+### Fixes
+
+* Vue 3 may now be used in a separate webpack build at project level without causing problems for the admin UI Vue 2 build.
+* Fixes `cache` module `clear-cache` CLI task message
+* Fixes help message for `express` module `list-routes` CLI task
+
+## 3.29.1 (2022-10-03)
+
+### Fixes
+
+* Hotfix to restore Node 14 support. Of course Node 16 is also supported.
+
+
 ## 3.29.0 (2022-10-03)
 
 ### Adds

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

@@ -24,6 +24,8 @@ module.exports = ({
 
   const config = {
     entry: importFile,
+    // Ensure that the correct version of vue-loader is found
+    context: __dirname,
     mode: process.env.NODE_ENV || 'development',
     optimization: {
       minimize: process.env.NODE_ENV === 'production'

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

@@ -87,6 +87,12 @@ module.exports = {
       }
     ];
 
+    if (self.options.addFileGroups) {
+      self.options.addFileGroups.forEach(newGroup => {
+        self.addFileGroup(newGroup);
+      });
+    };
+
     // Do NOT add keys here unless they have the value `true`
     self.croppable = {
       gif: true,
@@ -1183,6 +1189,23 @@ module.exports = {
           });
         });
       },
+
+      addFileGroup(newGroup) {
+        if (self.fileGroups.some(existingGroup => existingGroup.name === newGroup.name)) {
+          const existingGroup = self.fileGroups.find(existingGroup => existingGroup.name === newGroup.name);
+          if (newGroup.extensions) {
+            existingGroup.extensions = [ ...existingGroup.extensions, ...newGroup.extensions ];
+          };
+          if (newGroup.extensionMaps) {
+            existingGroup.extensionMaps = {
+              ...existingGroup.extensionMaps,
+              ...newGroup.extensionMaps
+            };
+          }
+        } else {
+          self.fileGroups.push(newGroup);
+        }
+      },
       ...require('./lib/legacy-migrations')(self)
     };
   },

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

@@ -97,7 +97,7 @@ module.exports = {
   tasks(self) {
     return {
       'clear-cache': {
-        help: 'Usage: node app @apostrophecms/cache:clear namespace1 namespace2...\n\nClears all values stored in a given namespace or namespaces. If you are using apos.cache in your own code you will\nknow the namespace name. Standard caches include "@apostrophecms/oembed". Normally it is not necessary to clear them.',
+        usage: 'usage: node app @apostrophecms/cache:clear-cache namespace1 namespace2...\n\nClears all values stored in a given namespace or namespaces. If you are using apos.cache in your own code you will\nknow the namespace name. Standard caches include "@apostrophecms/oembed". Normally it is not necessary to clear them.',
         task: async (argv) => {
           const namespaces = argv._.slice(1);
           if (!namespaces.length) {

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

@@ -171,7 +171,7 @@ module.exports = {
   tasks(self) {
     return {
       'list-routes': {
-        help: 'List all Express routes registered via routes(), apiRoutes(), etc. (not directly via apos.app)',
+        usage: 'Usage: node app @apostrophecms/express:list-routes \n\n List all Express routes registered via routes(), apiRoutes(), etc. (not directly via apos.app)',
         async task(argv) {
           for (const info of self.finalModuleMiddlewareAndRoutes) {
             if (info.route) {
@@ -214,14 +214,23 @@ module.exports = {
           await self.findModuleMiddlewareAndRoutes();
           for (const item of self.finalModuleMiddlewareAndRoutes) {
             if (item.method) {
+              if (process.env.APOS_LOG_ALL_ROUTES) {
+                item.route._aposItem = item;
+              }
               self.apos.app[item.method](item.url, item.route);
             } else if (item.middleware) {
+              if (process.env.APOS_LOG_ALL_ROUTES) {
+                item.middleware._aposItem = item;
+              }
               if (item.url) {
                 self.apos.app.use(item.url, item.middleware);
               } else {
                 self.apos.app.use(item.middleware);
               }
             } else if ((typeof item) === 'function') {
+              if (process.env.APOS_LOG_ALL_ROUTES) {
+                item._aposItem = item;
+              }
               // Simple middleware
               self.apos.app.use(item);
             } else {
@@ -378,6 +387,42 @@ module.exports = {
             strictNullHandling: true
           });
         });
+        if (process.env.APOS_LOG_ALL_ROUTES) {
+          self.logAllRoutes();
+        }
+      },
+
+      logAllRoutes() {
+        const superUse = self.apos.app.use.bind(self.apos.app);
+        const methods = [ 'get', 'post', 'put', 'delete', 'patch', 'options', 'head', 'all' ];
+        self.apos.app.use = function (path, middleware) {
+          if (typeof path === 'function') {
+            middleware = path;
+            path = '';
+          }
+          superUse(path, (req, ...args) => {
+            const moduleName = middleware._aposItem && middleware._aposItem.moduleName;
+            const name = moduleName && middleware._aposItem.name;
+            self.apos.util.log(`${req.url} invokes middleware ${path ? `for path ${path} ` : ''}${moduleName && `found at ${moduleName}:${name}`}`);
+            return middleware(req, ...args);
+          });
+        };
+        for (const method of methods) {
+          const superMethod = self.apos.app[method].bind(self.apos.app);
+          self.apos.app[method] = (path, ...args) => {
+            if ((method === 'get') && (!args.length)) {
+              // Handle app.get in its configuration getter form
+              return superMethod(path);
+            }
+            const middleware = args.slice(0, args.length - 1);
+            const fn = args[args.length - 1];
+            superMethod(path, ...middleware, (req, ...args) => {
+              const moduleName = (fn === self.apos.page.serve) ? '@apostrophecms/page' : (fn._aposItem && fn._aposItem.moduleName);
+              self.apos.util.log(`${req.url} invokes ${method.toUpperCase()} route for path ${path} ${moduleName ? `in the module ${moduleName}` : ''}`);
+              return fn(req, ...args);
+            });
+          };
+        }
       },
 
       // Patch Express so that all calls to `res.redirect` honor
@@ -650,6 +695,11 @@ module.exports = {
         const moduleNames = Array.from(new Set([ self.__meta.name, ...Object.keys(self.apos.modules) ]));
         for (const name of moduleNames) {
           const middleware = self.apos.modules[name].middleware || {};
+          if (process.env.APOS_LOG_ALL_ROUTES) {
+            for (const [ name, item ] of Object.entries(middleware)) {
+              item.name = name;
+            }
+          }
           labeledList.push({
             name: `middleware:${name}`,
             middleware: Object.values(middleware).filter(middleware => !middleware.before)
@@ -657,6 +707,11 @@ module.exports = {
         }
         for (const name of Object.keys(self.apos.modules)) {
           const _routes = self.apos.modules[name]._routes;
+          if (process.env.APOS_LOG_ALL_ROUTES) {
+            for (const [ name, item ] of Object.entries(_routes)) {
+              item.name = name;
+            }
+          }
           labeledList.push({
             name: `routes:${name}`,
             routes: _routes.filter(route => !route.before)
@@ -682,8 +737,12 @@ module.exports = {
               before.prepending = before.prepending || [];
               before.prepending.push(item);
             }
+            if (process.env.APOS_LOG_ALL_ROUTES) {
+              item.moduleName = name;
+            }
           }
         }
+
         self.finalModuleMiddlewareAndRoutes = labeledList.map(item => (item.prepending || []).concat(item.middleware || item.routes)).flat();
       }
     };

package/modules/@apostrophecms/schema/lib/addFieldTypes.js

@@ -51,9 +51,9 @@ module.exports = (self) => {
       return _.isEqual(one[field.name], two[field.name]);
     },
     validate: function (field, options, warn, fail) {
-      let widgets = field.options?.widgets || {};
+      let widgets = (field.options && field.options.widgets) || {};
 
-      if (field.options?.groups) {
+      if (field.options && field.options.groups) {
         for (const group of Object.keys(field.options.groups)) {
           widgets = {
             ...widgets,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apostrophe",
-  "version": "3.29.0",
+  "version": "3.30.0",
   "description": "The Apostrophe Content Management System.",
   "main": "index.js",
   "scripts": {
@@ -109,7 +109,7 @@
     "vue": "^2.6.14",
     "vue-advanced-cropper": "^1.10.1",
     "vue-click-outside-element": "^1.0.15",
-    "vue-loader": "~15.9.8",
+    "vue-loader": "^15.10.0",
     "vue-material-design-icons": "~4.12.1",
     "vue-style-loader": "^4.1.2",
     "vue-template-compiler": "^2.6.14",

package/test/attachments.js

@@ -80,6 +80,75 @@ describe('Attachment', function() {
       assert(good);
     });
 
+    it('should allow upload if extension has been added to the current fileGroups', async function() {
+      let apos;
+      let good = true;
+      try {
+        apos = await t.create({
+          root: module,
+          modules: {
+            '@apostrophecms/attachment': {
+              options: {
+                addFileGroups: [
+                  {
+                    name: 'images',
+                    extensions: [
+                      'mp4'
+                    ]
+                  }
+                ]
+              }
+            }
+          }
+        });
+        const filename = 'tiny.mp4';
+        await apos.attachment.insert(apos.task.getReq(), {
+          name: filename,
+          path: uploadSource + filename
+        });
+      } catch (e) {
+        good = false;
+      } finally {
+        assert(good);
+        t.destroy(apos);
+      }
+    });
+
+    it('should allow upload if extension has been added in a new fileGroup', async function() {
+      let apos;
+      let good = true;
+      try {
+        apos = await t.create({
+          root: module,
+          modules: {
+            '@apostrophecms/attachment': {
+              options: {
+                addFileGroups: [
+                  {
+                    name: 'testGroup',
+                    extensions: [
+                      'mp4'
+                    ],
+                    extensionMaps: {}
+                  }
+                ]
+              }
+            }
+          }
+        });
+        const filename = 'tiny.mp4';
+        await apos.attachment.insert(apos.task.getReq(), {
+          name: filename,
+          path: uploadSource + filename
+        });
+      } catch (e) {
+        good = false;
+      } finally {
+        assert(good);
+        t.destroy(apos);
+      }
+    });
+
     it('should crop an image file when requested', async function() {
       let result = await insert('crop_image.png');
       const crop = {