fix tests

huntabyte · Oct 14, 2024 · c2c475a · c2c475a
1 parent 798ff78
commit c2c475a
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 7 deletions.
diff --git a/packages/cli/src/commands/add.ts b/packages/cli/src/commands/add.ts
@@ -253,7 +253,7 @@ async function runAdd(cwd: string, config: Config, options: AddOptions) {
 				title: `${highlight(pm)}: Installing dependencies`,
 				enabled: dependencies.size > 0,
 				async task() {
-					await execa(pm, [add.command, ...add.args], {
+					await execa(add.command, [...add.args], {
 						cwd,
 					});
 					return `Dependencies installed with ${highlight(pm)}`;

diff --git a/packages/cli/src/commands/init.ts b/packages/cli/src/commands/init.ts
@@ -372,7 +372,7 @@ export async function runInit(cwd: string, config: Config, options: InitOptions)
 				title: `${highlight(pm)}: Installing dependencies`,
 				enabled: options.deps,
 				async task() {
-					await execa(pm, [add.command, ...add.args], {
+					await execa(add.command, [...add.args], {
 						cwd,
 					});
 					return `Dependencies installed with ${highlight(pm)}`;

diff --git a/packages/cli/src/commands/update.ts b/packages/cli/src/commands/update.ts
@@ -234,7 +234,7 @@ async function runUpdate(cwd: string, config: Config, options: UpdateOptions) {
 				title: `${highlight(pm)}: Installing dependencies`,
 				enabled: dependencies.size > 0,
 				async task() {
-					await execa(pm, [add.command, ...add.args], {
+					await execa(add.command, [...add.args], {
 						cwd,
 					});
 					return `Dependencies installed with ${highlight(pm)}`;

diff --git a/packages/cli/src/utils/get-config.ts b/packages/cli/src/utils/get-config.ts
@@ -78,8 +78,8 @@ export async function resolveConfigPaths(cwd: string, config: RawConfig) {
 		);
 	}
 
-	const utilsPath = resolveImport(config.aliases.utils, pathAliases);
-	const componentsPath = resolveImport(config.aliases.components, pathAliases);
+	let utilsPath = resolveImport(config.aliases.utils, pathAliases);
+	let componentsPath = resolveImport(config.aliases.components, pathAliases);
 	const aliasError = (type: string, alias: string) =>
 		new ConfigError(
 			`Invalid import alias found: (${highlight(`"${type}": "${alias}"`)}) in ${highlight("components.json")}.
@@ -90,6 +90,9 @@ export async function resolveConfigPaths(cwd: string, config: RawConfig) {
 	if (utilsPath === undefined) throw aliasError("utils", config.aliases.utils);
 	if (componentsPath === undefined) throw aliasError("components", config.aliases.components);
 
+	utilsPath = path.normalize(utilsPath);
+	componentsPath = path.normalize(componentsPath);
+
 	return v.parse(configSchema, {
 		...config,
 		resolvedPaths: {

diff --git a/packages/cli/test/commands/init.spec.ts b/packages/cli/test/commands/init.spec.ts
@@ -41,7 +41,7 @@ it("init (config-full)", async () => {
 	expect(mockMkdir).toHaveBeenNthCalledWith(1, expect.stringContaining("src"), expect.anything());
 	expect(mockMkdir).toHaveBeenNthCalledWith(
 		2,
-		expect.stringContaining("src/lib/components"),
+		expect.stringContaining("src\\lib\\components"),
 		expect.anything()
 	);
 

diff --git a/packages/cli/test/utils/get-config.spec.ts b/packages/cli/test/utils/get-config.spec.ts
@@ -151,7 +151,9 @@ describe("getConfig", () => {
 	});
 
 	it("handles cases where the project uses jsconfig.json", async () => {
-		expect(await getConf("config-jsconfig")).toEqual({
+		const config = await getConf("config-jsconfig");
+
+		expect(config).toEqual({
 			style: "new-york",
 			tailwind: {
 				config: "tailwind.config.js",