From 39a449f62bad406b348ef2940926c9dc34e1fef5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 30 May 2024 12:35:29 +0000 Subject: [PATCH 1/2] chore(deps-dev): bump chai from 4.3.10 to 5.1.1 Bumps [chai](https://github.com/chaijs/chai) from 4.3.10 to 5.1.1. - [Release notes](https://github.com/chaijs/chai/releases) - [Changelog](https://github.com/chaijs/chai/blob/main/History.md) - [Commits](https://github.com/chaijs/chai/compare/v4.3.10...v5.1.1) --- updated-dependencies: - dependency-name: chai dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- package-lock.json | 138 +++++++++++++++++++++------------------------- 1 file changed, 62 insertions(+), 76 deletions(-) diff --git a/package-lock.json b/package-lock.json index 2f322d4..4727891 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6835,21 +6835,19 @@ ] }, "node_modules/chai": { - "version": "4.3.10", - "resolved": "https://registry.npmjs.org/chai/-/chai-4.3.10.tgz", - "integrity": "sha512-0UXG04VuVbruMUYbJ6JctvH0YnC/4q3/AkT18q4NaITo91CUm0liMS9VqzT9vZhVQ/1eqPanMWjBM+Juhfb/9g==", + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/chai/-/chai-5.1.1.tgz", + "integrity": "sha512-pT1ZgP8rPNqUgieVaEY+ryQr6Q4HXNg8Ei9UnLUrjN4IA7dvQC5JB+/kxVcPNDHyBcc/26CXPkbNzq3qwrOEKA==", "dev": true, "dependencies": { - "assertion-error": "^1.1.0", - "check-error": "^1.0.3", - "deep-eql": "^4.1.3", - "get-func-name": "^2.0.2", - "loupe": "^2.3.6", - "pathval": "^1.1.1", - "type-detect": "^4.0.8" + "assertion-error": "^2.0.1", + "check-error": "^2.1.1", + "deep-eql": "^5.0.1", + "loupe": "^3.1.0", + "pathval": "^2.0.0" }, "engines": { - "node": ">=4" + "node": ">=12" } }, "node_modules/chai-files": { @@ -6861,6 +6859,15 @@ "assertion-error": "^1.0.1" } }, + "node_modules/chai/node_modules/assertion-error": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-2.0.1.tgz", + "integrity": "sha512-Izi8RQcffqCeNVgFigKli1ssklIbpHnCYc6AknXGYoB6grJqyeby7jv12JUQgmTAnIDnbck1uxksT4dzN3PWBA==", + "dev": true, + "engines": { + "node": ">=12" + } + }, "node_modules/chainsaw": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/chainsaw/-/chainsaw-0.1.0.tgz", @@ -6909,15 +6916,12 @@ } }, "node_modules/check-error": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.3.tgz", - "integrity": "sha512-iKEoDYaRmd1mxM90a2OEfWhjsjPpYPuQ+lMYsoxB126+t8fw7ySEO48nmDg5COTjxDI65/Y2OWpeEHk3ZOe8zg==", + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/check-error/-/check-error-2.1.1.tgz", + "integrity": "sha512-OAlb+T7V4Op9OwdkjmguYRqncdlx5JiofwOAUkmTF+jNdHwzTaTs4sRAGpzLF3oOz5xAyDGrPgeIDFQmDOTiJw==", "dev": true, - "dependencies": { - "get-func-name": "^2.0.2" - }, "engines": { - "node": "*" + "node": ">= 16" } }, "node_modules/chokidar": { @@ -7207,13 +7211,10 @@ } }, "node_modules/deep-eql": { - "version": "4.1.3", - "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-4.1.3.tgz", - "integrity": "sha512-WaEtAOpRA1MQ0eohqZjpGD8zdI0Ovsm8mmFhaDN8dvDZzyoUMcYDnf5Y6iu7HTXxf8JDS23qWa4a+hKCDyOPzw==", + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-5.0.1.tgz", + "integrity": "sha512-nwQCf6ne2gez3o1MxWifqkciwt0zhl0LO1/UwVu4uMBuPmflWM4oQ70XMqHqnBJA+nhzncaqL9HVL6KkHJ28lw==", "dev": true, - "dependencies": { - "type-detect": "^4.0.0" - }, "engines": { "node": ">=6" } @@ -8619,9 +8620,9 @@ } }, "node_modules/loupe": { - "version": "2.3.7", - "resolved": "https://registry.npmjs.org/loupe/-/loupe-2.3.7.tgz", - "integrity": "sha512-zSMINGVYkdpYSOBmLi0D1Uo7JU9nVdQKrHxC8eYlV+9YKK9WePqAlL7lSlorG/U2Fw1w0hTBmaa/jrQ3UbPHtA==", + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/loupe/-/loupe-3.1.1.tgz", + "integrity": "sha512-edNu/8D5MKVfGVFRhFf8aAxiTM6Wumfz5XsaatSxlD3w4R1d/WEKUTydCdPGbl9K7QG/Ca3GnDV2sIKIpXRQcw==", "dev": true, "dependencies": { "get-func-name": "^2.0.1" @@ -9444,12 +9445,12 @@ } }, "node_modules/pathval": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/pathval/-/pathval-1.1.1.tgz", - "integrity": "sha512-Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/pathval/-/pathval-2.0.0.tgz", + "integrity": "sha512-vE7JKRyES09KiunauX7nd2Q9/L7lhok4smP9RZTDeD4MVs72Dp2qNFVz39Nz5a0FVEW0BJR6C0DYrq6unoziZA==", "dev": true, "engines": { - "node": "*" + "node": ">= 14.16" } }, "node_modules/pend": { @@ -10533,15 +10534,6 @@ "node": "*" } }, - "node_modules/type-detect": { - "version": "4.0.8", - "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz", - "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==", - "dev": true, - "engines": { - "node": ">=4" - } - }, "node_modules/type-fest": { "version": "0.8.1", "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz", @@ -16630,18 +16622,24 @@ "dev": true }, "chai": { - "version": "4.3.10", - "resolved": "https://registry.npmjs.org/chai/-/chai-4.3.10.tgz", - "integrity": "sha512-0UXG04VuVbruMUYbJ6JctvH0YnC/4q3/AkT18q4NaITo91CUm0liMS9VqzT9vZhVQ/1eqPanMWjBM+Juhfb/9g==", + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/chai/-/chai-5.1.1.tgz", + "integrity": "sha512-pT1ZgP8rPNqUgieVaEY+ryQr6Q4HXNg8Ei9UnLUrjN4IA7dvQC5JB+/kxVcPNDHyBcc/26CXPkbNzq3qwrOEKA==", "dev": true, "requires": { - "assertion-error": "^1.1.0", - "check-error": "^1.0.3", - "deep-eql": "^4.1.3", - "get-func-name": "^2.0.2", - "loupe": "^2.3.6", - "pathval": "^1.1.1", - "type-detect": "^4.0.8" + "assertion-error": "^2.0.1", + "check-error": "^2.1.1", + "deep-eql": "^5.0.1", + "loupe": "^3.1.0", + "pathval": "^2.0.0" + }, + "dependencies": { + "assertion-error": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-2.0.1.tgz", + "integrity": "sha512-Izi8RQcffqCeNVgFigKli1ssklIbpHnCYc6AknXGYoB6grJqyeby7jv12JUQgmTAnIDnbck1uxksT4dzN3PWBA==", + "dev": true + } } }, "chai-files": { @@ -16688,13 +16686,10 @@ "integrity": "sha1-wKHS86cJLgN3S/qD8UwPxXkKhmc=" }, "check-error": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.3.tgz", - "integrity": "sha512-iKEoDYaRmd1mxM90a2OEfWhjsjPpYPuQ+lMYsoxB126+t8fw7ySEO48nmDg5COTjxDI65/Y2OWpeEHk3ZOe8zg==", - "dev": true, - "requires": { - "get-func-name": "^2.0.2" - } + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/check-error/-/check-error-2.1.1.tgz", + "integrity": "sha512-OAlb+T7V4Op9OwdkjmguYRqncdlx5JiofwOAUkmTF+jNdHwzTaTs4sRAGpzLF3oOz5xAyDGrPgeIDFQmDOTiJw==", + "dev": true }, "chokidar": { "version": "3.5.3", @@ -16920,13 +16915,10 @@ } }, "deep-eql": { - "version": "4.1.3", - "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-4.1.3.tgz", - "integrity": "sha512-WaEtAOpRA1MQ0eohqZjpGD8zdI0Ovsm8mmFhaDN8dvDZzyoUMcYDnf5Y6iu7HTXxf8JDS23qWa4a+hKCDyOPzw==", - "dev": true, - "requires": { - "type-detect": "^4.0.0" - } + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-5.0.1.tgz", + "integrity": "sha512-nwQCf6ne2gez3o1MxWifqkciwt0zhl0LO1/UwVu4uMBuPmflWM4oQ70XMqHqnBJA+nhzncaqL9HVL6KkHJ28lw==", + "dev": true }, "default-require-extensions": { "version": "3.0.0", @@ -17984,9 +17976,9 @@ } }, "loupe": { - "version": "2.3.7", - "resolved": "https://registry.npmjs.org/loupe/-/loupe-2.3.7.tgz", - "integrity": "sha512-zSMINGVYkdpYSOBmLi0D1Uo7JU9nVdQKrHxC8eYlV+9YKK9WePqAlL7lSlorG/U2Fw1w0hTBmaa/jrQ3UbPHtA==", + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/loupe/-/loupe-3.1.1.tgz", + "integrity": "sha512-edNu/8D5MKVfGVFRhFf8aAxiTM6Wumfz5XsaatSxlD3w4R1d/WEKUTydCdPGbl9K7QG/Ca3GnDV2sIKIpXRQcw==", "dev": true, "requires": { "get-func-name": "^2.0.1" @@ -18603,9 +18595,9 @@ } }, "pathval": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/pathval/-/pathval-1.1.1.tgz", - "integrity": "sha512-Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/pathval/-/pathval-2.0.0.tgz", + "integrity": "sha512-vE7JKRyES09KiunauX7nd2Q9/L7lhok4smP9RZTDeD4MVs72Dp2qNFVz39Nz5a0FVEW0BJR6C0DYrq6unoziZA==", "dev": true }, "pend": { @@ -19450,12 +19442,6 @@ "resolved": "https://registry.npmjs.org/traverse/-/traverse-0.3.9.tgz", "integrity": "sha1-cXuPIgzAu3tE5AUUwisui7xw2Lk=" }, - "type-detect": { - "version": "4.0.8", - "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz", - "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==", - "dev": true - }, "type-fest": { "version": "0.8.1", "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz", From e1c4dc9175ca50d64b6f1bb165307e11756d38b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Eichhorn?= Date: Thu, 5 Sep 2024 11:32:20 +0200 Subject: [PATCH 2/2] Migrate tests to Esm --- test/{end2end.spec.js => end2end.spec.mjs} | 27 +++++++++---------- .../{extension.spec.js => extension.spec.mjs} | 19 +++++-------- ...tadata.spec.js => maven-metadata.spec.mjs} | 13 +++++---- ...ttings.spec.js => maven-settings.spec.mjs} | 15 +++++------ ...ctor.spec.js => version-selector.spec.mjs} | 15 +++++------ 5 files changed, 40 insertions(+), 49 deletions(-) rename test/{end2end.spec.js => end2end.spec.mjs} (87%) rename test/{extension.spec.js => extension.spec.mjs} (88%) rename test/{maven-metadata.spec.js => maven-metadata.spec.mjs} (78%) rename test/{maven-settings.spec.js => maven-settings.spec.mjs} (91%) rename test/{version-selector.spec.js => version-selector.spec.mjs} (95%) diff --git a/test/end2end.spec.js b/test/end2end.spec.mjs similarity index 87% rename from test/end2end.spec.js rename to test/end2end.spec.mjs index 64df7bf..8afe332 100644 --- a/test/end2end.spec.js +++ b/test/end2end.spec.mjs @@ -1,19 +1,18 @@ -const chai = require('chai'); -const expect = chai.expect -global.td = require('testdouble') -const tdChai = require('testdouble-chai'); -chai.use(tdChai(td)); -const chaiFiles = require('chai-files'); -chai.use(chaiFiles); +import { expect, use } from 'chai'; +import * as td from 'testdouble'; +import tdChai from 'testdouble-chai'; +use(tdChai(td)); +import chaiFiles from 'chai-files'; +use(chaiFiles); const file = chaiFiles.file; -const finalhandler = require('finalhandler') -const http = require('http') -const serveStatic = require('serve-static') +import finalhandler from 'finalhandler'; +import http from 'http' +import serveStatic from 'serve-static'; -const {mkdtemp} = require('fs/promises'); -const {join} = require('path'); -const {tmpdir} = require('os'); -const { spawn } = require('child_process') +import { mkdtemp } from 'fs/promises'; +import { join } from 'path'; +import { tmpdir } from 'os'; +import { spawn } from 'child_process' describe('Maven Content Extension', function () { diff --git a/test/extension.spec.js b/test/extension.spec.mjs similarity index 88% rename from test/extension.spec.js rename to test/extension.spec.mjs index feee178..5a054e8 100644 --- a/test/extension.spec.js +++ b/test/extension.spec.mjs @@ -1,23 +1,18 @@ -const chai = require('chai'); -const expect = chai.expect -global.td = require('testdouble') -const tdChai = require('testdouble-chai'); -chai.use(tdChai(td)); +import { expect, use } from 'chai'; +import * as td from 'testdouble'; +import tdChai from 'testdouble-chai'; +use(tdChai(td)); let MavenContentSourceExtension, mavenTypes, MavenClient, MavenContentSource, ContentSourceFactory; describe('antora maven content extension', function () { - beforeEach(function () { + beforeEach(async function () { mavenTypes = td.replace('../lib/maven-types') MavenClient = td.replace('../lib/maven-client') MavenContentSource = td.replace('../lib/maven-content-source', td.constructor(['toString', 'addAsSourceToPlaybook'])) - MavenContentSource.prototype.toString = () => { - return "testdouble"; - } ContentSourceFactory = td.replace('../lib/content-source-factory') - - MavenContentSourceExtension = require('../lib/extension') + MavenContentSourceExtension = (await import('../lib/extension.js')).default }) afterEach(function () { @@ -89,7 +84,7 @@ describe('antora maven content extension', function () { await extension.onPlaybookBuilt({playbook}) - expect(ContentSourceFactory.prototype.produceContentSourcesIntoPlaybook).to.have.been.called; + expect(extension.contentSourceFactory.produceContentSourcesIntoPlaybook).to.have.been.called; const updatedVars = expectVarUpdate(); expect(updatedVars).to.deep.equal({playbook}); }) diff --git a/test/maven-metadata.spec.js b/test/maven-metadata.spec.mjs similarity index 78% rename from test/maven-metadata.spec.js rename to test/maven-metadata.spec.mjs index c73447f..cf8fbf3 100644 --- a/test/maven-metadata.spec.js +++ b/test/maven-metadata.spec.mjs @@ -1,11 +1,10 @@ -const chai = require('chai'); -const expect = chai.expect -global.td = require('testdouble') -const tdChai = require('testdouble-chai'); -chai.use(tdChai(td)); -const fs = require("fs") +import { expect, use } from 'chai'; +import * as td from 'testdouble'; +import tdChai from 'testdouble-chai'; +use(tdChai(td)); +import fs from "fs"; -const {MavenMetaDataFile} = require("../lib/maven-files"); +import { MavenMetaDataFile } from "../lib/maven-files.js"; describe('maven metadata handling', function () { diff --git a/test/maven-settings.spec.js b/test/maven-settings.spec.mjs similarity index 91% rename from test/maven-settings.spec.js rename to test/maven-settings.spec.mjs index e58fed6..8462d46 100644 --- a/test/maven-settings.spec.js +++ b/test/maven-settings.spec.mjs @@ -1,12 +1,11 @@ -const chai = require('chai'); -const expect = chai.expect -global.td = require('testdouble') -const tdChai = require('testdouble-chai'); -chai.use(tdChai(td)); -const fs = require("fs") +import { expect, use } from 'chai'; +import * as td from 'testdouble'; +import tdChai from 'testdouble-chai'; +use(tdChai(td)); +import fs from "fs"; -const {MavenSettingsFile} = require("../lib/maven-files"); -const {MavenRepository} = require("../lib/maven-types"); +import { MavenSettingsFile } from "../lib/maven-files.js"; +import { MavenRepository } from "../lib/maven-types.js"; const USER_PASS_BASIC_AUTH_HEADERS = { Authorization: 'Basic ' + Buffer.from('user:pass', 'utf-8').toString('base64') diff --git a/test/version-selector.spec.js b/test/version-selector.spec.mjs similarity index 95% rename from test/version-selector.spec.js rename to test/version-selector.spec.mjs index a858e72..14369d0 100644 --- a/test/version-selector.spec.js +++ b/test/version-selector.spec.mjs @@ -1,11 +1,10 @@ -const chai = require('chai'); -const expect = chai.expect -global.td = require('testdouble') -const tdChai = require('testdouble-chai'); -chai.use(tdChai(td)); - -const selectVersion = require('../lib/version-selector') -const versioning = require('../lib/versioning') +import { expect, use } from 'chai'; +import * as td from 'testdouble'; +import tdChai from 'testdouble-chai'; +use(tdChai(td)); + +import selectVersion from '../lib/version-selector.js' +import * as versioning from '../lib/versioning.js' function createVersionRepoList(scheme, ...versions) { // version selector expects descending order