Upgrade chai to v6 and chai-as-promised to v8

Ndpnt · Ndpnt · commit 025250bc924a · 2025-09-17T16:40:47.000+02:00
Chai v6 no longer provides default export, requires named imports
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -59,8 +59,8 @@
     "ajv-formats": "^3.0.1",
     "archiver": "^5.3.0",
     "async": "^3.2.2",
-    "chai": "^4.3.4",
-    "chai-as-promised": "^7.1.1",
+    "chai": "^6.0.1",
+    "chai-as-promised": "^8.0.2",
     "chai-exclude": "^2.1.0",
     "commander": "^9.4.1",
     "config": "^4.1.1",
diff --git a/scripts/dataset/export/index.test.js b/scripts/dataset/export/index.test.js
@@ -2,7 +2,7 @@ import fs from 'fs/promises';
 import path from 'path';
 import { fileURLToPath } from 'url';
 
-import chai from 'chai';
+import { expect, use } from 'chai';
 import config from 'config';
 import dircompare from 'dir-compare';
 import mime from 'mime';
@@ -15,8 +15,6 @@ import generateArchive from './index.js';
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 
-const { expect } = chai;
-
 const FIRST_SERVICE_PROVIDER_ID = 'ServiceA';
 const SECOND_SERVICE_PROVIDER_ID = 'ServiceB';
 
@@ -113,7 +111,7 @@ describe('Export', () => {
   });
 });
 
-chai.use(chai => {
+use(chai => {
   const { Assertion } = chai;
 
   Assertion.addMethod('sameContentAs', function (expectedContentPath) {
diff --git a/src/archivist/extract/index.test.js b/src/archivist/extract/index.test.js
@@ -2,7 +2,7 @@ import fsApi from 'fs';
 import path from 'path';
 import { fileURLToPath } from 'url';
 
-import chai from 'chai';
+import { expect } from 'chai';
 import mime from 'mime';
 
 import SourceDocument from '../services/sourceDocument.js';
@@ -13,7 +13,6 @@ import extract from './index.js';
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 const fs = fsApi.promises;
-const { expect } = chai;
 
 const virtualLocation = 'https://example.com/main';
 const rawHTML = `
diff --git a/src/archivist/fetcher/fullDomFetcher.test.js b/src/archivist/fetcher/fullDomFetcher.test.js
@@ -1,14 +1,13 @@
 import http from 'http';
 
-import chai from 'chai';
+import { expect, use } from 'chai';
 import chaiAsPromised from 'chai-as-promised';
 
 import fetch, { launchHeadlessBrowser, stopHeadlessBrowser } from './fullDomFetcher.js';
 
-const { expect } = chai;
 const SERVER_PORT = 8977;
 
-chai.use(chaiAsPromised);
+use(chaiAsPromised);
 
 const dynamicHTML = '<!DOCTYPE html><html><head><title>Dynamic Page</title><script>setTimeout(() => { document.body.innerHTML += "<div class=\'dynamic\'>Loaded</div>"; }, 100);</script></head><body></body></html>';
 const delayedContentHTML = '<!DOCTYPE html><html><head><title>Delayed Content</title><script>setTimeout(() => { document.querySelector(".content").textContent = "Final content"; }, 100);</script></head><body><div class="content"></div></body></html>';
diff --git a/src/archivist/fetcher/index.test.js b/src/archivist/fetcher/index.test.js
@@ -3,18 +3,17 @@ import http from 'http';
 import path from 'path';
 import { fileURLToPath } from 'url';
 
-import chai from 'chai';
+import { expect, use } from 'chai';
 import chaiAsPromised from 'chai-as-promised';
 import iconv from 'iconv-lite';
 
 import fetch, { launchHeadlessBrowser, stopHeadlessBrowser, FetchDocumentError, FETCHER_TYPES } from './index.js';
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 
-const { expect } = chai;
 const SERVER_PORT = 8976;
 
-chai.use(chaiAsPromised);
+use(chaiAsPromised);
 
 const termsHTML = '<!DOCTYPE html><html><head><meta charset="UTF-8"><title>First provider TOS</title></head><body><h1>Terms of service</h1><p>Dapibus quis diam sagittis</p></body></html>';
 const termsWithOtherCharsetHTML = '<!DOCTYPE html><html><head><meta http-equiv="Content-Type" content="text/html; charset=windows-1251"><title>TOS на първия доставчик</title></head><body><h1>Условия за ползване</h1><p>Dapibus quis diam sagittis</p></body></html>';
diff --git a/src/archivist/index.test.js b/src/archivist/index.test.js
@@ -2,7 +2,7 @@ import fsApi from 'fs';
 import path from 'path';
 import { fileURLToPath } from 'url';
 
-import chai from 'chai';
+import { expect, use } from 'chai';
 import config from 'config';
 import nock from 'nock';
 import sinon from 'sinon';
@@ -16,8 +16,7 @@ import Archivist, { EVENTS } from './index.js';
 
 const fs = fsApi.promises;
 
-chai.use(sinonChai);
-const { expect } = chai;
+use(sinonChai);
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 
diff --git a/src/archivist/recorder/index.test.js b/src/archivist/recorder/index.test.js
@@ -1,13 +1,11 @@
-import chai from 'chai';
+import { expect } from 'chai';
 import config from 'config';
 
 import Snapshot from './snapshot.js';
 import Version from './version.js';
 
 import Recorder from './index.js';
 
-const { expect } = chai;
-
 const MIME_TYPE = 'text/html';
 const FETCH_DATE = new Date('2000-01-01T12:00:00.000Z');
 const FETCH_DATE_LATER = new Date('2000-01-02T12:00:00.000Z');
diff --git a/src/archivist/recorder/repositories/git/index.test.js b/src/archivist/recorder/repositories/git/index.test.js
@@ -2,7 +2,7 @@ import fs from 'fs';
 import path from 'path';
 import { fileURLToPath } from 'url';
 
-import chai from 'chai';
+import { expect } from 'chai';
 import config from 'config';
 import mime from 'mime';
 
@@ -14,8 +14,6 @@ import Git from './git.js';
 
 import GitRepository from './index.js';
 
-const { expect } = chai;
-
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 
 const RECORDER_PATH = path.resolve(__dirname, '../../../../..', config.get('@opentermsarchive/engine.recorder.versions.storage.git.path'));
diff --git a/src/archivist/recorder/repositories/mongo/index.test.js b/src/archivist/recorder/repositories/mongo/index.test.js
@@ -2,7 +2,7 @@ import fs from 'fs';
 import path from 'path';
 import { fileURLToPath } from 'url';
 
-import chai from 'chai';
+import { expect } from 'chai';
 import config from 'config';
 import mime from 'mime';
 import { MongoClient } from 'mongodb';
@@ -12,7 +12,6 @@ import Version from '../../version.js';
 
 import MongoRepository from './index.js';
 
-const { expect } = chai;
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 
 const { connectionURI } = config.get('@opentermsarchive/engine.recorder.snapshots.storage.mongo');
diff --git a/src/archivist/recorder/snapshot.test.js b/src/archivist/recorder/snapshot.test.js
@@ -1,9 +1,7 @@
-import chai from 'chai';
+import { expect } from 'chai';
 
 import Snapshot from './snapshot.js';
 
-const { expect } = chai;
-
 describe('Snapshot', () => {
   let subject;
 
diff --git a/src/archivist/recorder/version.test.js b/src/archivist/recorder/version.test.js
@@ -1,9 +1,7 @@
-import chai from 'chai';
+import { expect } from 'chai';
 
 import Version from './version.js';
 
-const { expect } = chai;
-
 describe('Version', () => {
   let subject;
 
diff --git a/src/archivist/services/index.test.js b/src/archivist/services/index.test.js
@@ -1,7 +1,7 @@
 import fs from 'fs/promises';
 import path from 'path';
 
-import chai from 'chai';
+import { expect, use } from 'chai';
 import sinon from 'sinon';
 import sinonChai from 'sinon-chai';
 
@@ -14,8 +14,7 @@ import Terms from './terms.js';
 
 import { getDeclaredServicesIds, loadServiceDeclaration, loadServiceFilters, getServiceFilters, createSourceDocuments, createServiceFromDeclaration, load, loadWithHistory } from './index.js';
 
-chai.use(sinonChai);
-const { expect } = chai;
+use(sinonChai);
 
 describe('Services', () => {
   describe('#getDeclaredServicesIds', () => {
diff --git a/src/archivist/services/service.test.js b/src/archivist/services/service.test.js
@@ -1,10 +1,8 @@
-import chai from 'chai';
+import { expect } from 'chai';
 
 import Service from './service.js';
 import Terms from './terms.js';
 
-const { expect } = chai;
-
 describe('Service', () => {
   let subject;
   const TERMS_OF_SERVICE_TYPE = 'Terms of Service';
diff --git a/src/archivist/services/sourceDocument.test.js b/src/archivist/services/sourceDocument.test.js
@@ -1,9 +1,7 @@
-import chai from 'chai';
+import { expect } from 'chai';
 
 import SourceDocument from './sourceDocument.js';
 
-const { expect } = chai;
-
 describe('SourceDocument', () => {
   const URL = 'https://www.service.example/terms';
 
diff --git a/src/archivist/services/terms.test.js b/src/archivist/services/terms.test.js
@@ -1,10 +1,8 @@
-import chai from 'chai';
+import { expect } from 'chai';
 
 import SourceDocument from './sourceDocument.js';
 import Terms from './terms.js';
 
-const { expect } = chai;
-
 describe('Terms', () => {
   const service = { name: 'Service' };
   const termsType = 'Terms of Service';
diff --git a/src/collection-api/routes/versions.test.js b/src/collection-api/routes/versions.test.js
diff --git a/src/reporter/labels.test.js b/src/reporter/labels.test.js
