Skip to content

Commit 040beae

Browse files
committed
test: Roughly convert test/config-files.spec.js to typescript
1 parent 0e57e4b commit 040beae

File tree

7 files changed

+706
-214
lines changed

7 files changed

+706
-214
lines changed

defaults.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import spec from "conventional-changelog-config-spec/versions/2.1.0/schema.json";
2-
import { PrettyPrint } from "type-helpers";
2+
import { PrettyPrint } from "./type-helpers";
33

44
const defaults = {
55
infile: "CHANGELOG.md",

lib/opts/index.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,5 +113,9 @@ export const getMergedConfig = async (
113113
});
114114

115115
const configFromFile = await getConfigFromFile();
116-
return { ...(legacyConf ?? {}), ...(modernConf ?? {}), ...(configFromFile ?? {}) };
116+
return {
117+
...(legacyConf ?? {}),
118+
...(modernConf ?? {}),
119+
...(configFromFile ?? {}),
120+
};
117121
};

0 commit comments

Comments
 (0)