Merge branch 'development' into pv-amend

Author: neilblair

.platform.app.yaml

@@ -165,17 +165,24 @@ web:
     '/sites/default/files':
       # Allow access to all files in the public files directory.
       allow: true
-      expires: 1d
+      expires: 5m
       passthru: '/index.php'
       root: 'web/sites/default/files'
 
       # Do not execute PHP scripts.
       scripts: false
 
       rules:
-        # Provide a longer TTL (2 weeks) for aggregated CSS and JS files.
+        # Allow a longer Fastly TTL for publication files
+        '^/sites/default/files/':
+          headers:
+            Surrogate-Control: max-age=31536000
+        # Provide a longer TTL for aggregated CSS and JS files.
         '^/sites/default/files/(css|js)':
-          expires: 2w
+          expires: 1y
+        # Provide a longer TTL for Drupal image files.
+        '^/sites/default/files/styles/[^\.]+\.(jpe?g|png|gif|svgz?)$':
+          expires: 4w
 crons:
   # Log shipping cron.
   logging:

composer.json

@@ -150,7 +150,7 @@
         "drupal/views_data_export": "^1.0",
         "drupal/webform": "^6.2",
         "drupal/whatlinkshere": "^2.1",
-        "drupal/xls_serialization": "^1.4",
+        "drupal/xls_serialization": "^2.0",
         "drush/drush": "^12.5",
         "geocoder-php/google-maps-provider": "^4.6",
         "harvesthq/chosen": "^1.8",
@@ -196,7 +196,8 @@
             "oomphinc/composer-installers-extender": true,
             "phpstan/extension-installer": true,
             "zaporylie/composer-drupal-optimizations": true,
-            "php-http/discovery": true
+            "php-http/discovery": true,
+            "tbachert/spi": true
         }
     },
     "extra": {