Merge branch 'main' into costs-audit

.eslintrc.cjs

@@ -29,7 +29,7 @@ module.exports = {
     {
       files: ['*.test.js'],
       rules: {
-        'no-unused-expressions': 'off',
+        '@typescript-eslint/no-unused-expressions': 'off',
       },
     },
   ],

CHANGELOG.md

@@ -1,3 +1,17 @@
+## [1.25.7](https://github.com/adobe/spacecat-audit-worker/compare/v1.25.6...v1.25.7) (2024-08-20)
+
+
+### Bug Fixes
+
+* **deps:** update dependency @adobe/spacecat-shared-data-access to v1.41.6 ([#368](https://github.com/adobe/spacecat-audit-worker/issues/368)) ([5ef8523](https://github.com/adobe/spacecat-audit-worker/commit/5ef8523020e93c8fc74649d1a860851549f3beb8))
+
+## [1.25.6](https://github.com/adobe/spacecat-audit-worker/compare/v1.25.5...v1.25.6) (2024-08-19)
+
+
+### Bug Fixes
+
+* **deps:** update adobe fixes ([#366](https://github.com/adobe/spacecat-audit-worker/issues/366)) ([d803793](https://github.com/adobe/spacecat-audit-worker/commit/d803793d8fa1a1891536727d7dc4853bb9a4f743))
+
 ## [1.25.5](https://github.com/adobe/spacecat-audit-worker/compare/v1.25.4...v1.25.5) (2024-08-17)
 
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adobe/spacecat-audit-worker",
-  "version": "1.25.5",
+  "version": "1.25.7",
   "description": "SpaceCat Audit Worker",
   "main": "src/index.js",
   "type": "module",
@@ -57,13 +57,13 @@
     "@adobe/helix-universal": "5.0.5",
     "@adobe/helix-universal-logger": "3.0.18",
     "@adobe/spacecat-shared-ahrefs-client": "1.5.0",
-    "@adobe/spacecat-shared-data-access": "1.41.4",
-    "@adobe/spacecat-shared-http-utils": "1.6.5",
+    "@adobe/spacecat-shared-data-access": "1.41.6",
+    "@adobe/spacecat-shared-http-utils": "1.6.7",
     "@adobe/spacecat-shared-rum-api-client": "2.7.3",
     "@adobe/spacecat-shared-rum-api-client-v1": "npm:@adobe/[email protected]",
     "@aws-sdk/client-lambda": "3.632.0",
     "@aws-sdk/credential-provider-node": "3.632.0",
-    "@adobe/spacecat-shared-utils": "1.19.3",
+    "@adobe/spacecat-shared-utils": "1.19.4",
     "@aws-sdk/client-secrets-manager": "3.632.0",
     "@aws-sdk/client-sqs": "3.632.0",
     "diff": "5.2.0",
@@ -81,15 +81,15 @@
     "@semantic-release/exec": "6.0.3",
     "@semantic-release/git": "10.0.1",
     "@semantic-release/npm": "12.0.1",
-    "@typescript-eslint/eslint-plugin": "7.18.0",
-    "@typescript-eslint/parser": "7.18.0",
+    "@typescript-eslint/eslint-plugin": "8.2.0",
+    "@typescript-eslint/parser": "8.2.0",
     "c8": "10.1.2",
-    "chai": "4.5.0",
+    "chai": "5.1.1",
     "chai-as-promised": "8.0.0",
     "dotenv": "16.4.5",
     "eslint": "8.57.0",
     "husky": "9.1.4",
-    "junit-report-builder": "3.2.1",
+    "junit-report-builder": "5.0.0",
     "lint-staged": "15.2.9",
     "mocha": "10.7.3",
     "mocha-multi-reporters": "1.5.1",
@@ -98,7 +98,7 @@
     "nodemon": "3.1.4",
     "semantic-release": "24.1.0",
     "sinon": "18.0.0",
-    "sinon-chai": "3.7.0",
+    "sinon-chai": "4.0.0",
     "typescript": "5.5.4",
     "yaml": "2.5.0"
   },

renovate.json5

@@ -10,12 +10,6 @@
       ],
       "allowedVersions": ">=23.0"
     },
-    {
-      "matchPackageNames": [
-        "chai"
-      ],
-      "allowedVersions": "<5.0.0"
-    },
     {
       "matchPackageNames": [
         "eslint"

src/canonical/handler.js

@@ -216,7 +216,7 @@ export async function validateCanonicalTag(url, log) {
               });
               log.info(`Canonical URL ${canonicalUrl} does not reference itself`);
             }
-          } catch (error) {
+          } catch {
             checks.push({
               check: CANONICAL_CHECKS.CANONICAL_URL_INVALID.check,
               success: false,
@@ -273,7 +273,7 @@ export function validateCanonicalFormat(canonicalUrl, baseUrl, log) {
 
   try {
     base = new URL(baseUrl);
-  } catch (error) {
+  } catch {
     log.error(`Invalid URL: ${baseUrl}`);
     checks.push({
       check: CANONICAL_CHECKS.URL_UNDEFINED.check,
@@ -326,7 +326,7 @@ export function validateCanonicalFormat(canonicalUrl, baseUrl, log) {
 
     try {
       url = new URL(canonicalUrl);
-    } catch (error) {
+    } catch {
       log.error(`Invalid URL: ${canonicalUrl}`);
       checks.push({
         check: CANONICAL_CHECKS.URL_UNDEFINED.check,

src/experimentation/handler.js

@@ -35,7 +35,7 @@ export function hasNonWWWSubdomain(baseUrl) {
   try {
     const uri = new URI(baseUrl);
     return hasText(uri.domain()) && hasText(uri.subdomain()) && uri.subdomain() !== 'www';
-  } catch (e) {
+  } catch {
     throw new Error(`Cannot parse baseURL: ${baseUrl}`);
   }
 }

src/support/utils.js

@@ -43,7 +43,7 @@ export function hasNonWWWSubdomain(baseUrl) {
   try {
     const uri = new URI(baseUrl);
     return hasText(uri.domain()) && hasText(uri.subdomain()) && uri.subdomain() !== 'www';
-  } catch (e) {
+  } catch {
     throw new Error(`Cannot parse baseURL: ${baseUrl}`);
   }
 }
@@ -75,7 +75,7 @@ export function extractDomainAndProtocol(inputUrl) {
       protocol: parsedUrl.protocol.slice(0, -1),
       domain: parsedUrl.hostname,
     };
-  } catch (error) {
+  } catch {
     return null;
   }
 }

test/audits/apex.test.js

@@ -11,7 +11,7 @@
  */
 
 /* eslint-env mocha */
-import chai from 'chai';
+import { expect, use } from 'chai';
 import sinon from 'sinon';
 import sinonChai from 'sinon-chai';
 import chaiAsPromised from 'chai-as-promised';
@@ -20,9 +20,8 @@ import { apexAuditRunner } from '../../src/apex/handler.js';
 import { MockContextBuilder } from '../shared.js';
 import { hasNonWWWSubdomain, toggleWWW } from '../../src/support/utils.js';
 
-chai.use(sinonChai);
-chai.use(chaiAsPromised);
-const { expect } = chai;
+use(sinonChai);
+use(chaiAsPromised);
 
 const message = {
   type: 'apex',

test/audits/backlinks.test.js

@@ -17,16 +17,15 @@ import { createSiteTopPage } from '@adobe/spacecat-shared-data-access/src/models
 import { createConfiguration } from '@adobe/spacecat-shared-data-access/src/models/configuration.js';
 import { createOrganization } from '@adobe/spacecat-shared-data-access/src/models/organization.js';
 
-import chai from 'chai';
+import { expect, use } from 'chai';
 import chaiAsPromised from 'chai-as-promised';
 import sinon from 'sinon';
 import sinonChai from 'sinon-chai';
 import nock from 'nock';
 import auditBrokenBacklinks from '../../src/backlinks/handler.js';
 
-chai.use(sinonChai);
-chai.use(chaiAsPromised);
-const { expect } = chai;
+use(sinonChai);
+use(chaiAsPromised);
 
 describe('Backlinks Tests', function () {
   this.timeout(10000);

test/audits/canonical.test.js

@@ -12,7 +12,7 @@
 
 /* eslint-env mocha */
 
-import chai from 'chai';
+import { expect, use } from 'chai';
 import chaiAsPromised from 'chai-as-promised';
 import sinon from 'sinon';
 import sinonChai from 'sinon-chai';
@@ -22,9 +22,8 @@ import {
   validateCanonicalRecursively, canonicalAuditRunner, CANONICAL_CHECKS,
 } from '../../src/canonical/handler.js';
 
-chai.use(sinonChai);
-chai.use(chaiAsPromised);
-const { expect } = chai;
+use(sinonChai);
+use(chaiAsPromised);
 
 describe('Canonical URL Tests', () => {
   let log;

test/audits/conversion.test.js

@@ -11,15 +11,14 @@
  */
 
 /* eslint-env mocha */
-import chai from 'chai';
+import { expect, use } from 'chai';
 import sinon from 'sinon';
 import sinonChai from 'sinon-chai';
 import nock from 'nock';
 import { conversionAuditRunner } from '../../src/conversion/handler.js';
 import { rumDashboardData, rumSourcesData, expectedConversionData } from '../fixtures/conversion-data.js';
 
-chai.use(sinonChai);
-const { expect } = chai;
+use(sinonChai);
 
 const DOMAIN_REQUEST_DEFAULT_PARAMS = {
   interval: 7,

test/audits/cwv.test.js

@@ -12,7 +12,7 @@
 
 /* eslint-env mocha */
 
-import chai from 'chai';
+import { expect, use } from 'chai';
 import sinon from 'sinon';
 import sinonChai from 'sinon-chai';
 import { Request } from '@adobe/fetch';
@@ -22,8 +22,7 @@ import { main } from '../../src/index.js';
 import { getRUMUrl } from '../../src/support/utils.js';
 import { expectedAuditResult, rumData } from '../fixtures/rum-data.js';
 
-chai.use(sinonChai);
-const { expect } = chai;
+use(sinonChai);
 
 const sandbox = sinon.createSandbox();
 const DOMAIN_REQUEST_DEFAULT_PARAMS = {

test/audits/experimentation.test.js

@@ -11,7 +11,7 @@
  */
 
 /* eslint-env mocha */
-import chai from 'chai';
+import { expect, use } from 'chai';
 import sinon from 'sinon';
 import sinonChai from 'sinon-chai';
 import nock from 'nock';
@@ -24,8 +24,7 @@ import {
   rumDataEmpty,
 } from '../fixtures/experimentation-data.js';
 
-chai.use(sinonChai);
-const { expect } = chai;
+use(sinonChai);
 
 const DOMAIN_REQUEST_DEFAULT_PARAMS = {
   interval: 7,

test/audits/lhs.test.js

@@ -12,7 +12,7 @@
 
 /* eslint-env mocha */
 
-import chai from 'chai';
+import { expect, use } from 'chai';
 import chaiAsPromised from 'chai-as-promised';
 import sinon from 'sinon';
 import sinonChai from 'sinon-chai';
@@ -27,9 +27,8 @@ import createLHSAuditRunner, {
 } from '../../src/lhs/lib.js';
 import { MockContextBuilder } from '../shared.js';
 
-const { expect } = chai;
-chai.use(sinonChai);
-chai.use(chaiAsPromised);
+use(sinonChai);
+use(chaiAsPromised);
 
 const message = {
   type: 'lhs-mobile',

test/audits/notfound.test.js

@@ -12,16 +12,15 @@
 
 /* eslint-env mocha */
 
-import chai from 'chai';
+import { expect, use } from 'chai';
 import sinon from 'sinon';
 import sinonChai from 'sinon-chai';
 import nock from 'nock';
 import { audit404Runner } from '../../src/notfound/handler.js';
 import { notFoundData } from '../fixtures/notfounddata.js';
 import { MockContextBuilder } from '../shared.js';
 
-chai.use(sinonChai);
-const { expect } = chai;
+use(sinonChai);
 
 describe('404 Tests', () => {
   const url = 'https://abc.com';

test/audits/sitemap.test.js

@@ -11,7 +11,7 @@
  */
 /* eslint-env mocha */
 
-import chai from 'chai';
+import { expect, use } from 'chai';
 import sinon from 'sinon';
 import sinonChai from 'sinon-chai';
 import nock from 'nock';
@@ -26,9 +26,8 @@ import {
 import { extractDomainAndProtocol } from '../../src/support/utils.js';
 import { MockContextBuilder } from '../shared.js';
 
-chai.use(sinonChai);
-chai.use(chaiAsPromised);
-const { expect } = chai;
+use(sinonChai);
+use(chaiAsPromised);
 const sandbox = sinon.createSandbox();
 
 describe('Sitemap Audit', () => {

test/common/audit.test.js

@@ -11,7 +11,7 @@
  */
 
 /* eslint-env mocha */
-import chai from 'chai';
+import { expect, use } from 'chai';
 import sinon from 'sinon';
 import sinonChai from 'sinon-chai';
 import chaiAsPromised from 'chai-as-promised';
@@ -30,9 +30,8 @@ import { AuditBuilder } from '../../src/common/audit-builder.js';
 import { MockContextBuilder } from '../shared.js';
 import { getUrlWithoutPath } from '../../src/support/utils.js';
 
-chai.use(sinonChai);
-chai.use(chaiAsPromised);
-const { expect } = chai;
+use(sinonChai);
+use(chaiAsPromised);
 
 const baseURL = 'https://space.cat';
 const message = {

test/index.test.js

@@ -12,14 +12,13 @@
 
 /* eslint-env mocha */
 
-import chai from 'chai';
+import { expect, use } from 'chai';
 import sinon from 'sinon';
 import sinonChai from 'sinon-chai';
 import { Request } from '@adobe/fetch';
 import { main } from '../src/index.js';
 
-chai.use(sinonChai);
-const { expect } = chai;
+use(sinonChai);
 
 const sandbox = sinon.createSandbox();
 

test/support/psi-client.test.js

@@ -12,16 +12,14 @@
 
 /* eslint-env mocha */
 
-import chai from 'chai';
+import { expect, use } from 'chai';
 import chaiAsPromised from 'chai-as-promised';
 import nock from 'nock';
 import sinon from 'sinon';
 
 import PSIClient from '../../src/support/psi-client.js';
 
-chai.use(chaiAsPromised);
-
-const { expect } = chai;
+use(chaiAsPromised);
 
 describe('PSIClient', () => {
   let client;
@@ -104,7 +102,7 @@ describe('PSIClient', () => {
       try {
         await client.performPSICheck('testsite.com', 'mobile');
         expect.fail('Should have thrown an error');
-      } catch (e) {
+      } catch {
         expect(logMock.error.called).to.be.true;
       }
     });