From 6f0dddbbcb06a8f2634cf20709e8b96d151a2c4c Mon Sep 17 00:00:00 2001 From: Karan Janthe Date: Sat, 7 Oct 2023 14:56:57 +0530 Subject: [PATCH 1/3] fix: updated error msg for jsconfig in cli --- packages/cli/src/utils/get-config.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/cli/src/utils/get-config.ts b/packages/cli/src/utils/get-config.ts index b6376d70294..14fa6e1221e 100644 --- a/packages/cli/src/utils/get-config.ts +++ b/packages/cli/src/utils/get-config.ts @@ -65,7 +65,7 @@ export async function resolveConfigPaths(cwd: string, config: RawConfig) { if (tsConfig.resultType === "failed") { throw new Error( - `Failed to load tsconfig.json. ${tsConfig.message ?? ""}`.trim() + `Failed to load ${config.tsx ? "tsconfig" : "jsconfig"}.json. ${tsConfig.message ?? ""}`.trim() ) } From 29321b726daae48ed5809c18fe113161308a5c85 Mon Sep 17 00:00:00 2001 From: shadcn Date: Sat, 21 Oct 2023 16:20:39 +0400 Subject: [PATCH 2/3] chore: add changeset --- .changeset/smart-pants-smile.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/smart-pants-smile.md diff --git a/.changeset/smart-pants-smile.md b/.changeset/smart-pants-smile.md new file mode 100644 index 00000000000..b353ce7110e --- /dev/null +++ b/.changeset/smart-pants-smile.md @@ -0,0 +1,5 @@ +--- +"shadcn-ui": patch +--- + +use jsconfig for non-ts projects From d48e4bdfebf113041c35b1d58f21473ecb9f9206 Mon Sep 17 00:00:00 2001 From: shadcn Date: Sat, 21 Oct 2023 16:26:10 +0400 Subject: [PATCH 3/3] style(cli): format --- packages/cli/src/utils/get-config.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/cli/src/utils/get-config.ts b/packages/cli/src/utils/get-config.ts index 14fa6e1221e..4ea29431c2b 100644 --- a/packages/cli/src/utils/get-config.ts +++ b/packages/cli/src/utils/get-config.ts @@ -65,7 +65,9 @@ export async function resolveConfigPaths(cwd: string, config: RawConfig) { if (tsConfig.resultType === "failed") { throw new Error( - `Failed to load ${config.tsx ? "tsconfig" : "jsconfig"}.json. ${tsConfig.message ?? ""}`.trim() + `Failed to load ${config.tsx ? "tsconfig" : "jsconfig"}.json. ${ + tsConfig.message ?? "" + }`.trim() ) }