Skip to content

Commit 099f0b5

Browse files
committed
feat(complex-types): use defu to merge config
1 parent 4389a52 commit 099f0b5

File tree

3 files changed

+24
-15
lines changed

3 files changed

+24
-15
lines changed

packages/complex-types/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@
7070
"@nuxt/kit": "catalog:",
7171
"@vue.ts/language": "workspace:*",
7272
"@vue.ts/shared": "workspace:*",
73+
"defu": "^6.1.4",
7374
"magic-string": "catalog:",
7475
"unplugin": "catalog:"
7576
},
Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,19 @@
11
import { join } from "node:path";
22

3+
import { defu } from "defu";
4+
35
import type { Options, ResolvedOptions } from "./types";
46

5-
export const resolveOptions = (rawOptions: Options): ResolvedOptions => ({
6-
include: rawOptions.include ?? ["**/*.vue"],
7-
exclude: rawOptions.exclude ?? ["node_modules/**"],
8-
tsconfigPath: rawOptions.tsconfigPath ?? join(process.cwd(), "tsconfig.json"),
9-
defineEmits: rawOptions.defineEmits ?? true,
10-
defineProps: rawOptions.defineProps ?? true,
11-
});
7+
const defaultOptions: ResolvedOptions = {
8+
include: ["**/*.vue"],
9+
exclude: ["node_modules/**"],
10+
tsconfigPath: join(process.cwd(), "tsconfig.json"),
11+
defineEmits: true,
12+
defineProps: true,
13+
};
14+
15+
export const resolveOptions = (rawOptions: Options) =>
16+
defu(rawOptions, defaultOptions) as ResolvedOptions;
1217

1318
const quotesReg = /"/g;
1419
export const escapeQuotes = (s: string) => s.replace(quotesReg, '\\"');

pnpm-lock.yaml

Lines changed: 11 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)