From e990db76b4cd52692c5f55d196c2c4458b0fed7a Mon Sep 17 00:00:00 2001 From: Joshua Date: Fri, 30 Jun 2023 01:37:34 -0700 Subject: [PATCH] chore(deps): Update dependencies. --- nr.config.ts | 95 ++++++------- package-lock.json | 251 ++++----------------------------- package.json | 2 +- src/lib/command.ts | 3 +- src/lib/configuration/index.ts | 7 +- src/lib/init.ts | 12 -- 6 files changed, 79 insertions(+), 291 deletions(-) diff --git a/nr.config.ts b/nr.config.ts index e0ab779..387a54f 100644 --- a/nr.config.ts +++ b/nr.config.ts @@ -2,66 +2,63 @@ import { nr } from '@darkobits/ts'; export default nr(({ script, command, isCI }) => { - script('test.smoke', { - group: 'Test', - description: 'Runs various tests on the built version of the project.', - run: [ - [ - // ----- [Smoke Tests] CJS Host Package -------------------------------- + script('test.smoke', [[ + // ----- [Smoke Tests] CJS Host Package -------------------------------- - // Using a .ts Extension; should compile with esbuild. - command.node('smoke-test', ['test.js'], { - execaOptions: { cwd: 'smoke-tests/cjs/ts-extension' } - }), + // Using a .ts Extension; should compile with esbuild. + command.node('test.js', { + name: 'smoke-test', + cwd: 'smoke-tests/cjs/ts-extension' + }), - // Using a .mts extension; should compile with esbuild. - command.node('smoke-test', ['test.js'], { - execaOptions: { cwd: 'smoke-tests/cjs/mts-extension' } - }), + // Using a .mts extension; should compile with esbuild. + command.node('test.js', { + name: 'smoke-test', + cwd: 'smoke-tests/cjs/mts-extension' + }), - // Using an .mjs extension; should load with import(). - command.node('smoke-test', ['test.js'], { - execaOptions: { cwd: 'smoke-tests/cjs/mjs-extension' } - }), + // Using an .mjs extension; should load with import(). + command.node('test.js', { + name: 'smoke-test', + cwd: 'smoke-tests/cjs/mjs-extension' + }), - // Using a .js extension; should compile with esbuild, loading issues a - // node:35129 warning. - command.node('smoke-test', ['test.js'], { - execaOptions: { cwd: 'smoke-tests/cjs/js-extension' } - }), + // Using a .js extension; should compile with esbuild, loading issues a + // node:35129 warning. + command.node('test.js', { + name: 'smoke-test', + cwd: 'smoke-tests/cjs/js-extension' + }), - // ----- [Smoke Tests] ESM Host Package -------------------------------- + // ----- [Smoke Tests] ESM Host Package -------------------------------- - // Using a .ts extension; should compile with esbuild. - command.node('smoke-test', ['test.js'], { - execaOptions: { cwd: 'smoke-tests/esm/ts-extension' } - }), + // Using a .ts extension; should compile with esbuild. + command.node('test.js', { + name: 'smoke-test', + cwd: 'smoke-tests/esm/ts-extension' + }), - // Using a .js extension; should load with import(). - command.node('smoke-test', ['test.js'], { - execaOptions: { cwd: 'smoke-tests/esm/js-extension' } - }), + // Using a .js extension; should load with import(). + command.node('test.js', { + name: 'smoke-test', + cwd: 'smoke-tests/esm/js-extension' + }), - // Using a .cjs extension; should compile with esbuild, loading issues a - // node:35129 warning. - command.node('smoke-test', ['test.js'], { - execaOptions: { cwd: 'smoke-tests/esm/cjs-extension' } - }), + // Using a .cjs extension; should compile with esbuild, loading issues a + // node:35129 warning. + command.node('test.js', { + name: 'smoke-test', + cwd: 'smoke-tests/esm/cjs-extension' + }), - // Using a .cts extension; should compile with esbuild. - command.node('smoke-test', ['test.js'], { - execaOptions: { cwd: 'smoke-tests/esm/cts-extension' } - }) - ] - ], + // Using a .cts extension; should compile with esbuild. + command.node('test.js', { cwd: 'smoke-tests/esm/cts-extension' }) + ]], { + group: 'Test', + description: 'Runs various tests on the built version of the project.', timing: true }); - if (!isCI) { - script('postPrepare', { - group: 'Lifecycle', - run: ['script:test.smoke'] - }); - } + if (!isCI) script('postBuild', ['script:test.smoke'] ); }); diff --git a/package-lock.json b/package-lock.json index d06f154..306df9f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -30,7 +30,7 @@ "yargs": "^17.7.2" }, "devDependencies": { - "@darkobits/ts": "~0.17.3", + "@darkobits/ts": "~0.17.4", "@types/fs-extra": "^11.0.1" }, "engines": { @@ -1711,30 +1711,6 @@ "node": ">=0.1.90" } }, - "node_modules/@cspotcode/source-map-support": { - "version": "0.8.1", - "resolved": "https://registry.npmjs.org/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz", - "integrity": "sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==", - "dev": true, - "peer": true, - "dependencies": { - "@jridgewell/trace-mapping": "0.3.9" - }, - "engines": { - "node": ">=12" - } - }, - "node_modules/@cspotcode/source-map-support/node_modules/@jridgewell/trace-mapping": { - "version": "0.3.9", - "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz", - "integrity": "sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==", - "dev": true, - "peer": true, - "dependencies": { - "@jridgewell/resolve-uri": "^3.0.3", - "@jridgewell/sourcemap-codec": "^1.4.10" - } - }, "node_modules/@darkobits/env": { "version": "1.3.5", "resolved": "https://registry.npmjs.org/@darkobits/env/-/env-1.3.5.tgz", @@ -1909,15 +1885,15 @@ } }, "node_modules/@darkobits/nr": { - "version": "0.14.44", - "resolved": "https://registry.npmjs.org/@darkobits/nr/-/nr-0.14.44.tgz", - "integrity": "sha512-/TOHkJlfXL605fINVC8lAIkqslb1J/YWaQs5oj0WTjBwididpz1aSqLL3giUkC6G0ZgagjZdGyCY4bi/GqKv4Q==", + "version": "0.14.46", + "resolved": "https://registry.npmjs.org/@darkobits/nr/-/nr-0.14.46.tgz", + "integrity": "sha512-ZlwYoJC8/YUyC2GNGoK3Jel05KaooyJMnG3RyJbd9Wq1kmDzPtOUkuBzhAkL6FjIsEeG2SSRrjtU4Ua3TCqOrg==", "dev": true, "peer": true, "dependencies": { "@darkobits/interop-import-default": "^1.0.0", "@darkobits/log": "^2.0.0-beta.15", - "@darkobits/saffron": "~0.32.7", + "@darkobits/saffron": "~0.32.9", "@types/is-ci": "^3.0.0", "@types/yargs-unparser": "^2.0.1", "boxen": "^7.1.0", @@ -1926,6 +1902,7 @@ "errno": "^1.0.0", "execa": "~7.1.1", "is-ci": "^3.0.1", + "is-plain-object": "^5.0.0", "kebabcase-keys": "^1.0.0", "micromatch": "^4.0.5", "npm-run-path": "~5.1.0", @@ -2007,9 +1984,9 @@ } }, "node_modules/@darkobits/saffron": { - "version": "0.32.7", - "resolved": "https://registry.npmjs.org/@darkobits/saffron/-/saffron-0.32.7.tgz", - "integrity": "sha512-D14SIPH0d9kB2YsQi9goPgl7oemxVI9Cd9uElQnlw2aw4ldQpFol2m/kTiTxhKy8vMy9T2VOA3amPewKwfhuwg==", + "version": "0.32.9", + "resolved": "https://registry.npmjs.org/@darkobits/saffron/-/saffron-0.32.9.tgz", + "integrity": "sha512-6/aXRVj6HGN4nO5OYpQ+3bNgwcN0xwdGLWPWD5ZODAad8WHmL0F5YvKjvm/NyAZeJx67/EvXeoUPgaszBtghkw==", "dev": true, "peer": true, "dependencies": { @@ -2025,15 +2002,12 @@ "camelcase-keys": "^8.0.2", "cosmiconfig": "^8.2.0", "deepmerge": "^4.3.1", - "esbuild": "^0.18.9", + "esbuild": "^0.18.10", "fs-extra": "^11.1.1", "node-version": "^3.0.0", "read-pkg-up": "^9.1.0", "resolve-pkg": "^2.0.0", - "ts-import": "^5.0.0-beta.0", - "ts-node": "^10.9.1", "tsconfck": "^2.1.1", - "tsconfig-paths": "^4.2.0", "yargs": "^17.7.2" }, "engines": { @@ -2049,15 +2023,15 @@ } }, "node_modules/@darkobits/ts": { - "version": "0.17.3", - "resolved": "https://registry.npmjs.org/@darkobits/ts/-/ts-0.17.3.tgz", - "integrity": "sha512-rNRPH9al+GPsHhuRjNOcWKLih/2HguIPVKEzTnN86WgBna5Tum9GnhEcCMInf6OG5cyNqJtBkB4Rjx6TgmeKVg==", + "version": "0.17.4", + "resolved": "https://registry.npmjs.org/@darkobits/ts/-/ts-0.17.4.tgz", + "integrity": "sha512-2nO6mhmg638S94Nj/V7bWBuDfrzzWtUzfdQ7k4hH/6WI53DJMD7Paqh1PFZa0tGE8ojZZZIsRktUQIH0WrSLoQ==", "dev": true, "dependencies": { "@darkobits/interop-import-default": "^1.0.0", "@darkobits/log": "^2.0.0-beta.16", "@rollup/plugin-auto-install": "^3.0.4", - "@rollup/plugin-typescript": "^11.1.1", + "@rollup/plugin-typescript": "^11.1.2", "@semantic-release/changelog": "^6.0.3", "@semantic-release/git": "^10.0.1", "conventional-changelog-conventionalcommits": "^6.1.0", @@ -2081,15 +2055,15 @@ "npm": ">=8" }, "peerDependencies": { - "@darkobits/eslint-plugin": "~0.4.9", - "@darkobits/nr": "~0.14.44", + "@darkobits/eslint-plugin": "~0.4.10", + "@darkobits/nr": "~0.14.46", "@types/node": "^20.3.2", "@vitest/coverage-v8": "^0.32.2", "@vitest/ui": "~0.32.2", "eslint": "^8.43.0", "npm-check-updates": "^16.10.13", - "semantic-release": "^21.0.5", - "typescript": "~5.1.5", + "semantic-release": "^21.0.6", + "typescript": "~5.1.6", "vite": "^4.3.9", "vitest": "~0.32.2" } @@ -4018,34 +3992,6 @@ "node": ">= 10" } }, - "node_modules/@tsconfig/node10": { - "version": "1.0.9", - "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.9.tgz", - "integrity": "sha512-jNsYVVxU8v5g43Erja32laIDHXeoNvFEpX33OK4d6hljo3jDhCBDhx5dhCCTMWUojscpAagGiRkBKxpdl9fxqA==", - "dev": true, - "peer": true - }, - "node_modules/@tsconfig/node12": { - "version": "1.0.11", - "resolved": "https://registry.npmjs.org/@tsconfig/node12/-/node12-1.0.11.tgz", - "integrity": "sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag==", - "dev": true, - "peer": true - }, - "node_modules/@tsconfig/node14": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/@tsconfig/node14/-/node14-1.0.3.tgz", - "integrity": "sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow==", - "dev": true, - "peer": true - }, - "node_modules/@tsconfig/node16": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.4.tgz", - "integrity": "sha512-vxhUy4J8lyeyinH7Azl1pdd43GJhZH/tP2weN8TntQblOY+A0XbT8DJk1/oCPuOOyg/Ja757rG0CgHcWC8OfMA==", - "dev": true, - "peer": true - }, "node_modules/@tufjs/canonical-json": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/@tufjs/canonical-json/-/canonical-json-1.0.0.tgz", @@ -4904,13 +4850,6 @@ "node": "^12.13.0 || ^14.15.0 || >=16.0.0" } }, - "node_modules/arg": { - "version": "4.1.3", - "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz", - "integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==", - "dev": true, - "peer": true - }, "node_modules/argparse": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", @@ -6001,16 +5940,6 @@ "node": ">= 6" } }, - "node_modules/comment-parser": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/comment-parser/-/comment-parser-1.3.1.tgz", - "integrity": "sha512-B52sN2VNghyq5ofvUsqZjmk6YkihBX5vMSChmSK9v4ShjKf3Vk5Xcmgpw4o+iIgtrnM/u5FiMpz9VKb8lpBveA==", - "dev": true, - "peer": true, - "engines": { - "node": ">= 12.0.0" - } - }, "node_modules/commondir": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz", @@ -6775,13 +6704,6 @@ "url": "https://github.com/sponsors/d-fischer" } }, - "node_modules/create-require": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz", - "integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==", - "dev": true, - "peer": true - }, "node_modules/cross-spawn": { "version": "7.0.3", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", @@ -7138,16 +7060,6 @@ "node": ">=8" } }, - "node_modules/diff": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz", - "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==", - "dev": true, - "peer": true, - "engines": { - "node": ">=0.3.1" - } - }, "node_modules/diff-sequences": { "version": "29.4.3", "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-29.4.3.tgz", @@ -11115,13 +11027,6 @@ "semver": "bin/semver" } }, - "node_modules/make-error": { - "version": "1.3.6", - "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz", - "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==", - "dev": true, - "peer": true - }, "node_modules/make-fetch-happen": { "version": "11.1.1", "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-11.1.1.tgz", @@ -16243,13 +16148,6 @@ "node": ">= 0.8.0" } }, - "node_modules/options-defaults": { - "version": "2.0.40", - "resolved": "https://registry.npmjs.org/options-defaults/-/options-defaults-2.0.40.tgz", - "integrity": "sha512-a0oW0AMaP/Uqk1gU7s3unE83wzs/MACy3wsCnNREn4wqp4KCcxRdulRjf0d2FeIxENbGJ4EBGtHTQ6J30XB6Cw==", - "dev": true, - "peer": true - }, "node_modules/over-9000": { "version": "9000.1.4", "resolved": "https://registry.npmjs.org/over-9000/-/over-9000-9000.1.4.tgz", @@ -18224,9 +18122,9 @@ "peer": true }, "node_modules/semantic-release": { - "version": "21.0.5", - "resolved": "https://registry.npmjs.org/semantic-release/-/semantic-release-21.0.5.tgz", - "integrity": "sha512-mCc7Hx9Ro/1Clk9tLLgwQIQuiEzx+1OX12EazvNysnx1VG4eaNJE9b9IyWtTxyFxaFYi7nM5VB5ZDVzheHTDPA==", + "version": "21.0.6", + "resolved": "https://registry.npmjs.org/semantic-release/-/semantic-release-21.0.6.tgz", + "integrity": "sha512-NDyosObAwUNzPpdf+mpL49Xy+5iYHjdWM34LBNdbdYv9vBLbw+eCCDihxcqPh+f9m4ZzlBrYCkHUaZv2vPGW9A==", "dev": true, "peer": true, "dependencies": { @@ -19665,75 +19563,6 @@ "typescript": ">=4.1.0" } }, - "node_modules/ts-import": { - "version": "5.0.0-beta.0", - "resolved": "https://registry.npmjs.org/ts-import/-/ts-import-5.0.0-beta.0.tgz", - "integrity": "sha512-YOe/xCmwDWughfeaAaGJ4UWzlCKNnt9e+oda3St6mUMkRJCTBhBso+7XApIijw7Mr9SS6NLOdav8i5EJrx7UVQ==", - "dev": true, - "peer": true, - "dependencies": { - "comment-parser": "1.3.1", - "options-defaults": "2.0.40", - "tslib": "2.5.0" - }, - "engines": { - "node": ">=18" - }, - "peerDependencies": { - "typescript": "5" - } - }, - "node_modules/ts-import/node_modules/tslib": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.0.tgz", - "integrity": "sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg==", - "dev": true, - "peer": true - }, - "node_modules/ts-node": { - "version": "10.9.1", - "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.9.1.tgz", - "integrity": "sha512-NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw==", - "dev": true, - "peer": true, - "dependencies": { - "@cspotcode/source-map-support": "^0.8.0", - "@tsconfig/node10": "^1.0.7", - "@tsconfig/node12": "^1.0.7", - "@tsconfig/node14": "^1.0.0", - "@tsconfig/node16": "^1.0.2", - "acorn": "^8.4.1", - "acorn-walk": "^8.1.1", - "arg": "^4.1.0", - "create-require": "^1.1.0", - "diff": "^4.0.1", - "make-error": "^1.1.1", - "v8-compile-cache-lib": "^3.0.1", - "yn": "3.1.1" - }, - "bin": { - "ts-node": "dist/bin.js", - "ts-node-cwd": "dist/bin-cwd.js", - "ts-node-esm": "dist/bin-esm.js", - "ts-node-script": "dist/bin-script.js", - "ts-node-transpile-only": "dist/bin-transpile.js", - "ts-script": "dist/bin-script-deprecated.js" - }, - "peerDependencies": { - "@swc/core": ">=1.2.50", - "@swc/wasm": ">=1.2.50", - "@types/node": "*", - "typescript": ">=2.7" - }, - "peerDependenciesMeta": { - "@swc/core": { - "optional": true - }, - "@swc/wasm": { - "optional": true - } - } - }, "node_modules/tsc-alias": { "version": "1.8.6", "resolved": "https://registry.npmjs.org/tsc-alias/-/tsc-alias-1.8.6.tgz", @@ -19779,21 +19608,6 @@ } } }, - "node_modules/tsconfig-paths": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-4.2.0.tgz", - "integrity": "sha512-NoZ4roiN7LnbKn9QqE1amc9DJfzvZXxF4xDavcOWt1BPkdx+m+0gJuPM+S0vCe7zTJMYUP0R8pO2XMr+Y8oLIg==", - "dev": true, - "peer": true, - "dependencies": { - "json5": "^2.2.2", - "minimist": "^1.2.6", - "strip-bom": "^3.0.0" - }, - "engines": { - "node": ">=6" - } - }, "node_modules/tslib": { "version": "2.6.0", "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.0.tgz", @@ -19902,9 +19716,9 @@ } }, "node_modules/typescript": { - "version": "5.1.5", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.1.5.tgz", - "integrity": "sha512-FOH+WN/DQjUvN6WgW+c4Ml3yi0PH+a/8q+kNIfRehv1wLhWONedw85iu+vQ39Wp49IzTJEsZ2lyLXpBF7mkF1g==", + "version": "5.1.6", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.1.6.tgz", + "integrity": "sha512-zaWCozRZ6DLEWAWFrVDz1H6FVXzUSfTy5FUMWsQlU8Ym5JP9eO4xkTIROFCQvhQf61z6O/G6ugw3SgAnvvm+HA==", "peer": true, "bin": { "tsc": "bin/tsc", @@ -20183,13 +19997,6 @@ "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==", "dev": true }, - "node_modules/v8-compile-cache-lib": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz", - "integrity": "sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==", - "dev": true, - "peer": true - }, "node_modules/v8-to-istanbul": { "version": "9.1.0", "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.1.0.tgz", @@ -21332,16 +21139,6 @@ "node": ">=12" } }, - "node_modules/yn": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz", - "integrity": "sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==", - "dev": true, - "peer": true, - "engines": { - "node": ">=6" - } - }, "node_modules/yocto-queue": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", diff --git a/package.json b/package.json index d8927f0..4f00e59 100644 --- a/package.json +++ b/package.json @@ -45,7 +45,7 @@ "yargs": "^17.7.2" }, "devDependencies": { - "@darkobits/ts": "~0.17.3", + "@darkobits/ts": "~0.17.4", "@types/fs-extra": "^11.0.1" } } diff --git a/src/lib/command.ts b/src/lib/command.ts index 27560a0..187616e 100644 --- a/src/lib/command.ts +++ b/src/lib/command.ts @@ -23,7 +23,6 @@ type ParsedPackageName = T extends string function parsePackageName(packageName: T) { if (typeof packageName !== 'string') { - console.log('PACKAGE NAME IS NOT A STRING'); return { scope: undefined, name: undefined } as ParsedPackageName; } @@ -117,6 +116,8 @@ export default function buildCommand< // If the user provided an explicit file name, use it. Otherwise, use the // non-scope portion of the name from the host application's package.json. + // TODO: This approach does not allow the dependent CLI to take a --config + // flag to specify a custom configuration file to use. const fileName = saffronCommand.config?.fileName ?? parsePackageName(hostPkg.json?.name).name; if (!fileName) throw new Error('Unable to infer configuration file name. Either set a "name" property in package.json or set "config.fileName" in a command builder.'); diff --git a/src/lib/configuration/index.ts b/src/lib/configuration/index.ts index 64e40e1..5446fff 100644 --- a/src/lib/configuration/index.ts +++ b/src/lib/configuration/index.ts @@ -15,7 +15,12 @@ import ConfigurationLoader from 'lib/configuration/loader'; * filesystem calls here. */ export default async function loadConfiguration(options: SaffronCosmiconfigOptions) { - const { fileName, key, searchFrom, ...cosmicOptions } = validators.cosmiconfigOptions(options); + const { + fileName, + key, + searchFrom, + ...cosmicOptions + } = validators.cosmiconfigOptions(options); const mergedOptions = merge({ loaders: { diff --git a/src/lib/init.ts b/src/lib/init.ts index d8b6c87..5a16c7a 100644 --- a/src/lib/init.ts +++ b/src/lib/init.ts @@ -43,15 +43,3 @@ export default function init(cb?: SaffronInitCallback) { process.exit(1); }); } - -// cli.init(() => (err, argv, output) => { -// if (err) { -// console.error(MakinUrText.fromString(err.message ?? err)); -// return; -// } - -// if (output) { -// console.error(MakinUrText.fromString(output)); -// return; -// } -// });