diff --git a/mochify/lib/load-config.js b/mochify/lib/load-config.js index 1b39890a..3da8e3ac 100644 --- a/mochify/lib/load-config.js +++ b/mochify/lib/load-config.js @@ -1,12 +1,12 @@ 'use strict'; const deepmerge = require('deepmerge'); -const { cosmiconfig } = require('cosmiconfig'); +const { lilconfig } = require('lilconfig'); exports.loadConfig = loadConfig; async function loadConfig(options) { - const explorer = cosmiconfig('mochify'); + const explorer = lilconfig('mochify'); const default_config_promise = explorer.search(); diff --git a/mochify/lib/load-config.test.js b/mochify/lib/load-config.test.js index 21e34580..34400a22 100644 --- a/mochify/lib/load-config.test.js +++ b/mochify/lib/load-config.test.js @@ -4,32 +4,32 @@ const proxyquire = require('proxyquire'); const { assert, refute, sinon } = require('@sinonjs/referee-sinon'); describe('mochify/lib/load-config', () => { - let cosmiconfig_api; - let cosmiconfig; + let lilconfig_api; + let lilconfig; beforeEach(() => { - cosmiconfig_api = { + lilconfig_api = { search: sinon.fake.resolves(null), load: sinon.fake.resolves(null) }; - cosmiconfig = sinon.fake.returns(cosmiconfig_api); + lilconfig = sinon.fake.returns(lilconfig_api); }); function requireLoadConfig() { const { loadConfig } = proxyquire('./load-config', { - cosmiconfig: { - cosmiconfig + lilconfig: { + lilconfig } }); return loadConfig; } function setDefaultConfig(config) { - sinon.replace(cosmiconfig_api, 'search', sinon.fake.resolves({ config })); + sinon.replace(lilconfig_api, 'search', sinon.fake.resolves({ config })); } function setSpecifiedConfig(config) { - sinon.replace(cosmiconfig_api, 'load', sinon.fake.resolves({ config })); + sinon.replace(lilconfig_api, 'load', sinon.fake.resolves({ config })); } it('searches for default config only', async () => { @@ -38,9 +38,9 @@ describe('mochify/lib/load-config', () => { const promise = loadConfig({}); await assert.resolves(promise); - assert.calledOnceWithExactly(cosmiconfig, 'mochify'); - assert.calledOnceWithExactly(cosmiconfig_api.search); - refute.called(cosmiconfig_api.load); + assert.calledOnceWithExactly(lilconfig, 'mochify'); + assert.calledOnceWithExactly(lilconfig_api.search); + refute.called(lilconfig_api.load); }); it('returns given options', async () => { @@ -112,8 +112,8 @@ describe('mochify/lib/load-config', () => { config: 'some.config.js', reporter: 'dot' }); - assert.calledOnceWithExactly(cosmiconfig_api.search); - assert.calledOnceWithExactly(cosmiconfig_api.load, 'some.config.js'); + assert.calledOnceWithExactly(lilconfig_api.search); + assert.calledOnceWithExactly(lilconfig_api.load, 'some.config.js'); }); it('options override specified config', async () => { diff --git a/mochify/package.json b/mochify/package.json index d642be3e..6b4220e5 100644 --- a/mochify/package.json +++ b/mochify/package.json @@ -28,10 +28,10 @@ }, "dependencies": { "convert-source-map": "^1.1.3", - "cosmiconfig": "^7.0.0", "deepmerge": "^4.2.2", "execa": "^5.1.1", "glob": "^7.1.7", + "lilconfig": "^3.0.0", "mime": "^2.5.2", "mocha": "^10.2.0", "source-map": "^0.5.7", diff --git a/package-lock.json b/package-lock.json index 2ed1014c..bbc99186 100644 --- a/package-lock.json +++ b/package-lock.json @@ -113,10 +113,10 @@ "license": "MIT", "dependencies": { "convert-source-map": "^1.1.3", - "cosmiconfig": "^7.0.0", "deepmerge": "^4.2.2", "execa": "^5.1.1", "glob": "^7.1.7", + "lilconfig": "^3.0.0", "mime": "^2.5.2", "mocha": "^10.2.0", "source-map": "^0.5.7", @@ -646,11 +646,6 @@ "resolved": "https://registry.npmjs.org/@types/node/-/node-20.1.2.tgz", "integrity": "sha512-CTO/wa8x+rZU626cL2BlbCDzydgnFNgc19h4YvizpTO88MFQxab8wqisxaofQJ/9bLGugRdWIuX/TbIs6VVF6g==" }, - "node_modules/@types/parse-json": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz", - "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==" - }, "node_modules/@types/which": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/@types/which/-/which-2.0.2.tgz", @@ -1420,21 +1415,6 @@ "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz", "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==" }, - "node_modules/cosmiconfig": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.1.0.tgz", - "integrity": "sha512-AdmX6xUzdNASswsFtmwSt7Vj8po9IuqXm0UXz7QKPuEUmPB4XyjGfaAr2PSuELMwkRMVH1EpIkX5bTZGRB3eCA==", - "dependencies": { - "@types/parse-json": "^4.0.0", - "import-fresh": "^3.2.1", - "parse-json": "^5.0.0", - "path-type": "^4.0.0", - "yaml": "^1.10.0" - }, - "engines": { - "node": ">=10" - } - }, "node_modules/cross-fetch": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-4.0.0.tgz", @@ -3371,7 +3351,6 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-3.0.0.tgz", "integrity": "sha512-K2U4W2Ff5ibV7j7ydLr+zLAkIg5JJ4lPn1Ltsdt+Tz/IjQ8buJ55pZAxoP34lqIiwtF9iAvtLv3JGv7CAyAg+g==", - "dev": true, "engines": { "node": ">=14" } @@ -5768,14 +5747,6 @@ "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", "dev": true }, - "node_modules/yaml": { - "version": "1.10.2", - "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz", - "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==", - "engines": { - "node": ">= 6" - } - }, "node_modules/yargs": { "version": "16.2.0", "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",