sitespeed.io 37.4.0 → 37.4.2

package/CHANGELOG.md

@@ -1,9 +1,17 @@
 
 # CHANGELOG - sitespeed.io  (we use [semantic versioning](https://semver.org))
+## 37.4.2 - 2025-04-19
+### Fixed
+* s3: If you add Expires to your object using the API, it was broken since the upgrade to v3. This fix change so we allways use a Date when setting Expires [#4503](https://github.com/sitespeedio/sitespeed.io/pull/4503).
+* Make sure that HAR files included in the HTML excludes closing script tags in the body of an response [#4500](https://github.com/sitespeedio/sitespeed.io/pull/4500).
+
+## 37.4.1 - 2025-04-10
+### Fixed
+* If testing one page fails, make sure that we still can genereate the HTML [#4495](https://github.com/sitespeedio/sitespeed.io/pull/4495).
 
 ## 37.4.0 - 2025-04-09
 ### Added
-* Updated Doker container with Firefox 137, Chrome 135 and Edge 135 [#4494](https://github.com/sitespeedio/sitespeed.io/pull/4494).
+* Updated Docker container with Firefox 137, Chrome 135 and Edge 135 [#4494](https://github.com/sitespeedio/sitespeed.io/pull/4494).
 
 ## 37.3.2 - 2025-03-21
 ### Fixed

package/lib/plugins/html/renderer.js

@@ -30,6 +30,7 @@ export function renderTemplate(templateName, locals) {
     return getTemplate(templateName)(locals);
   } catch (error) {
     log.error('Could not generate %s, %s', templateName, error.message);
+    return `Could not generate ${templateName} error: ${error.message}`;
   }
 }
 export function addTemplate(templateName, templateString) {

package/lib/plugins/html/templates/url/waterfall/includeHARinHTML.pug

@@ -3,7 +3,7 @@
 //- specific run (the median run) in summaryPageHAR.
 //- Inline script tags breaks the output
 - dahar = h.get(pageInfo.data, 'browsertime.run.har', summaryPageHAR)
-- dahar = JSON.stringify(dahar.log).split('</script>').join('&lt;/script&gt;')
+- dahar = JSON.stringify(dahar.log).split('</script>').join('&lt;/script&gt;').split('<script>').join('&lt;script&gt;')
 
 script(src= assetsPath + 'js/perf-cascade.min.js')
 script(type='text/javascript').

package/lib/plugins/s3/index.js

@@ -12,19 +12,35 @@ import { runWithConcurrencyLimit } from './limit.js';
 
 const log = getLogger('sitespeedio.plugin.s3');
 
+const normalizeExpires = maybeSeconds => {
+  if (typeof maybeSeconds === 'number' && Number.isFinite(maybeSeconds)) {
+    const seconds = Number.parseInt(maybeSeconds, 10);
+    const expires = new Date(Date.now() + seconds * 1000);
+    log.info('Setting s3.expires to ' + expires);
+    return expires;
+  }
+  return maybeSeconds;
+};
+
 async function uploadFile(file, s3Client, s3Options, prefix, baseDir) {
   const stream = await fsPromises.readFile(file);
   const contentType = getContentType(file);
   const subPath = path.relative(baseDir, file);
-  const parameters = {
+  const baseParams = {
     Bucket: s3Options.bucketname,
     Key: path.join(s3Options.path || prefix, subPath),
     Body: stream,
     ContentType: contentType,
-    ACL: s3Options.acl,
-    ...s3Options.params
+    ACL: s3Options.acl
   };
 
+  const userParams = { ...s3Options.params };
+  if ('Expires' in userParams) {
+    userParams.Expires = normalizeExpires(userParams.Expires);
+  }
+
+  const parameters = { ...baseParams, ...userParams };
+
   try {
     await s3Client.send(new PutObjectCommand(parameters));
     log.debug(`Uploaded ${file} to S3 bucket ${s3Options.bucketname}`);

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "sitespeed.io",
-  "version": "37.4.0",
+  "version": "37.4.2",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "sitespeed.io",
-      "version": "37.4.0",
+      "version": "37.4.2",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {

package/package.json

@@ -5,7 +5,7 @@
     "sitespeed.io": "./bin/sitespeed.js",
     "sitespeed.io-wpr": "./bin/browsertimeWebPageReplay.js"
   },
-  "version": "37.4.0",
+  "version": "37.4.2",
   "description": "sitespeed.io is an open-source tool for comprehensive web performance analysis, enabling you to test, monitor, and optimize your website’s speed using real browsers in various environments.",
   "keywords": [
     "performance",