@plone/volto 16.15.0 → 16.16.0

package/.changelog.draft

@@ -1,24 +1,6 @@
-## 16.15.0 (2023-03-08)
+## 16.16.0 (2023-03-09)
 
 ### Feature
 
-- Improvements to the dev API proxy:
-  - Prefer RAZZLE_INTERNAL_API_PATH over RAZZLE_API_PATH as the target of the proxy.
-    The target of the API proxy is now always logged on startup, even in production mode.
-  - Support proxying to a backend served over https. For this configuration it
-    might be necessary to set RAZZLE_DEV_PROXY_INSECURE=1 if the backend
-    certificate can't be verified.
-
-  [davisagli] [#4434](https://github.com/plone/volto/issues/4434)
-
-### Bugfix
-
-- fix: newsitem and event views wrapper classNames @nzambello [#4443](https://github.com/plone/volto/issues/4443)
-- Fix weird GHA failure on config option not supported @sneridagh [#4466](https://github.com/plone/volto/issues/4466)
-- Fix history view dropdown for first entry, showing 'Revert to this version option' always @sneridagh [#4471](https://github.com/plone/volto/issues/4471)
-- Fix order of row of long table in edit and view mode @iFlameing [#4473](https://github.com/plone/volto/issues/4473)
-
-### Documentation
-
-- Complete teaser docs, add new section in `Blocks`: `Core Blocks developers notes` @sneridagh [#4461](https://github.com/plone/volto/issues/4461)
+- - Add directive to cache stable resources in browser or intermediate server for 365 days by default directly in the SSR Express server, static resource that could change after a new deployment for 1 minute. @mamico [#2216](https://github.com/plone/volto/issues/2216)
 

package/CHANGELOG.md

@@ -8,6 +8,13 @@
 
 <!-- towncrier release notes start -->
 
+## 16.16.0 (2023-03-09)
+
+### Feature
+
+- - Add directive to cache stable resources in browser or intermediate server for 365 days by default directly in the SSR Express server, static resource that could change after a new deployment for 1 minute. @mamico [#2216](https://github.com/plone/volto/issues/2216)
+
+
 ## 16.15.0 (2023-03-08)
 
 ### Feature
@@ -1087,8 +1094,6 @@ See https://6.dev-docs.plone.org/volto/upgrade-guide/index.html for more informa
 
 ## 16.0.0-alpha.34 (2022-09-17)
 
-### Breaking
-
 ### Feature
 
 - Added new components `Aliases` for aliases control in Volto. Alias management in both controlpanel and object view. @andreiggr @avoinea

package/package.json

@@ -9,7 +9,7 @@
     }
   ],
   "license": "MIT",
-  "version": "16.15.0",
+  "version": "16.16.0",
   "repository": {
     "type": "git",
     "url": "git@github.com:plone/volto.git"

package/packages/volto-slate/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plone/volto-slate",
-  "version": "16.15.0",
+  "version": "16.16.0",
   "description": "Slate.js integration with Volto",
   "main": "src/index.js",
   "author": "European Environment Agency: IDM2 A-Team",

package/src/config/server.js

@@ -2,6 +2,7 @@ import imagesMiddleware from '@plone/volto/express-middleware/images';
 import filesMiddleware from '@plone/volto/express-middleware/files';
 import robotstxtMiddleware from '@plone/volto/express-middleware/robotstxt';
 import sitemapMiddleware from '@plone/volto/express-middleware/sitemap';
+import staticsMiddleware from '@plone/volto/express-middleware/static';
 import devProxyMiddleware from '@plone/volto/express-middleware/devproxy';
 
 const settings = {
@@ -11,10 +12,28 @@ const settings = {
     imagesMiddleware(),
     robotstxtMiddleware(),
     sitemapMiddleware(),
+    staticsMiddleware(),
   ],
   criticalCssPath: 'public/critical.css',
   readCriticalCss: null, // so it will be defaultReadCriticalCss
   extractScripts: { errorPages: false },
+  staticFiles: [
+    {
+      id: 'root_static',
+      match: /^\/static\/.*/,
+      headers: {
+        // stable resources never change. 31536000 seconds == 365 days
+        'Cache-Control': 'public, max-age=31536000',
+      },
+    },
+    {
+      id: 'all',
+      match: /.*/,
+      headers: {
+        'Cache-Control': 'public, max-age=60',
+      },
+    },
+  ],
 };
 
 export default settings;

package/src/express-middleware/static.js

@@ -0,0 +1,32 @@
+import express from 'express';
+import path from 'path';
+import config from '@plone/volto/registry';
+
+const staticMiddleware = express.static(
+  process.env.BUILD_DIR
+    ? path.join(process.env.BUILD_DIR, 'public')
+    : process.env.RAZZLE_PUBLIC_DIR,
+  {
+    setHeaders: function (res, path) {
+      const pathLib = require('path');
+      const base = pathLib.resolve(process.env.RAZZLE_PUBLIC_DIR);
+      const relpath = path.substr(base.length);
+      config.settings.serverConfig.staticFiles.some((elem) => {
+        if (relpath.match(elem.match)) {
+          for (const name in elem.headers) {
+            res.setHeader(name, elem.headers[name] || 'undefined');
+          }
+          return true;
+        }
+        return false;
+      });
+    },
+  },
+);
+
+export default function () {
+  const middleware = express.Router();
+  middleware.all('*', staticMiddleware);
+  middleware.id = 'staticResourcesProcessor';
+  return middleware;
+}

package/src/server.jsx

@@ -59,13 +59,6 @@ const supported = new locale.Locales(keys(languages), 'en');
 
 const server = express()
   .disable('x-powered-by')
-  .use(
-    express.static(
-      process.env.BUILD_DIR
-        ? path.join(process.env.BUILD_DIR, 'public')
-        : process.env.RAZZLE_PUBLIC_DIR,
-    ),
-  )
   .head('/*', function (req, res) {
     // Support for HEAD requests. Required by start-test utility in CI.
     res.send('');