Skip to content

Commit

Permalink
test: Roughly convert test/config-files.spec.js to typescript
Browse files Browse the repository at this point in the history
  • Loading branch information
TimothyJones committed Apr 7, 2023
1 parent 0e57e4b commit 040beae
Show file tree
Hide file tree
Showing 7 changed files with 706 additions and 214 deletions.
2 changes: 1 addition & 1 deletion defaults.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import spec from "conventional-changelog-config-spec/versions/2.1.0/schema.json";
import { PrettyPrint } from "type-helpers";
import { PrettyPrint } from "./type-helpers";

const defaults = {
infile: "CHANGELOG.md",
Expand Down
6 changes: 5 additions & 1 deletion lib/opts/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -113,5 +113,9 @@ export const getMergedConfig = async (
});

const configFromFile = await getConfigFromFile();
return { ...(legacyConf ?? {}), ...(modernConf ?? {}), ...(configFromFile ?? {}) };
return {
...(legacyConf ?? {}),
...(modernConf ?? {}),
...(configFromFile ?? {}),
};
};
Loading

0 comments on commit 040beae

Please sign in to comment.