Merge branch 'main' into tauri-integration

packages/commands/src/handlers/add.ts

@@ -4,8 +4,8 @@ import { Integrations, Supported, integrations, setRootFile } from "../lib/integ
 import * as p from "@clack/prompts";
 import color from "picocolors";
 import { primitives, loadPrimitives } from "@solid-cli/utils/primitives";
-import { t } from "@solid-cli/utils";
-import { fileExists, getRootFile, getAppConfig, validateFilePath } from "../lib/utils/helpers";
+import { isSolidStart, t } from "@solid-cli/utils";
+import { fileExists, getRootFile, getConfigFile, validateFilePath } from "../lib/utils/helpers";
 import { writeFile, readFile } from "@solid-cli/utils/fs";
 import { transformPlugins, type PluginOptions } from "@solid-cli/utils/transform";
 import {
@@ -43,8 +43,9 @@ const handleAutocompleteAdd = async () => {
 				{ label: t.NO, value: false },
 				{ label: t.YES_FORCE, value: [true, "force"] },
 			],
-			message: `${t.CONFIRM_INSTALL(a.length)} \n${color.red(S_BAR)} \n${color.red(S_BAR)}  ${" " + color.yellow(a.map((opt) => opt.label).join(" ")) + " "
-				} \n${color.red(S_BAR)} `,
+			message: `${t.CONFIRM_INSTALL(a.length)} \n${color.red(S_BAR)} \n${color.red(S_BAR)}  ${
+				" " + color.yellow(a.map((opt) => opt.label).join(" ")) + " "
+			} \n${color.red(S_BAR)} `,
 		}),
 	);
 
@@ -109,6 +110,10 @@ export const handleAdd = async (packages?: string[], forceTransform: boolean = f
 		})
 		.filter((p) => p) as Configs;
 
+	const configType = (await isSolidStart()) ? "app" : "vite";
+
+	const configFile = await getConfigFile(configType);
+
 	for (let i = 0; i < configs.length; i++) {
 		const config = configs[i];
 		config.installs.forEach((p) => queueUpdate({ type: "package", name: p, dev: false }));
@@ -122,20 +127,19 @@ export const handleAdd = async (packages?: string[], forceTransform: boolean = f
 	if (!configs.length) return;
 	const pluginOptions = configs.map((c) => c.pluginOptions).filter(Boolean) as PluginOptions[];
 	if (pluginOptions.length) {
-		const appConfig = await getAppConfig();
 		await spinnerify({
-		startText: "Processing config",
-		finishText: "Config processed",
-		fn: async () => {
-			const code = await transformPlugins(
-				configs.map((c) => c.pluginOptions).filter(Boolean) as PluginOptions[],
-				{ name: appConfig, contents: (await readFile(appConfig)).toString() },
-				forceTransform,
-				undefined,
-			);
-			await writeFile(appConfig, code);
-		},
-	});
+			startText: "Processing config",
+			finishText: "Config processed",
+			fn: async () => {
+				const code = await transformPlugins(
+					configs.map((c) => c.pluginOptions).filter(Boolean) as PluginOptions[],
+					{ type: configType, name: configFile, contents: (await readFile(configFile)).toString() },
+					forceTransform,
+					undefined,
+				);
+				await writeFile(configFile, code);
+			},
+		});
 	}
 
 	p.log.info("Preparing post install steps for integrations");

packages/commands/src/handlers/start/adapter.ts

@@ -34,7 +34,7 @@ export const handleAdapter = async (name?: string, forceTransform = false) => {
 	const sym = Symbol(name).toString();
 	let code = await transformPlugins(
 		[],
-		{ name: "app.config.ts", contents: (await readFile("app.config.ts")).toString() },
+		{ type: "app", name: "app.config.ts", contents: (await readFile("app.config.ts")).toString() },
 		forceTransform,
 	);
 	code = `import ${name} from "solid-start-${name}";\n` + code;

packages/commands/src/handlers/start/mode.ts

@@ -30,7 +30,7 @@ export const handleMode = async (mode?: SupportedModes) => {
 	if (mode != "ssg") {
 		const newConfig = await transformPlugins(
 			[],
-			{ name: "app.config.ts", contents: (await readFile("app.config.ts")).toString() },
+			{ type: "app", name: "app.config.ts", contents: (await readFile("app.config.ts")).toString() },
 			true,
 			true,
 		);

packages/commands/src/lib/utils/helpers.ts

@@ -102,39 +102,39 @@ export async function findFiles(
   return filePaths;
 }
 
-export const getAppConfig = async () => {
-  let configFile = "app.config.ts";
-
-  const existsHere = fileExists(configFile);
-
-  if (!existsHere) {
-    const root = await getProjectRoot();
-    const existsInRoot = validateFilePath(root, "app.config");
-    if (existsInRoot) {
-      const correctConfig = await cancelable(
-        p.confirm({
-          message: `Could not find app config in current directory, but found app config in \`${root}\`. Is this the correct vite config?`,
-        }),
-      );
-      if (correctConfig) return existsInRoot;
-    }
-
-    p.log.error(color.red(`Can't find app.config file`));
-    await cancelable(
-      p.text({
-        message: "Type path to app config: ",
-        validate(value) {
-          const path = validateFilePath(value, "app.config");
-          if (!path) return `App config not found. Please try again`;
-          else {
-            configFile = path;
-          }
-        },
-      }),
-    );
-  }
-
-  return configFile;
+export const getConfigFile = async (file: "app" | "vite" = "app") => {
+	let configFile = `${file}.config.ts`;
+
+	const existsHere = fileExists(configFile);
+
+	if (!existsHere) {
+		const root = await getProjectRoot();
+		const existsInRoot = validateFilePath(root, `${file}.config`);
+		if (existsInRoot) {
+			const correctConfig = await cancelable(
+				p.confirm({
+					message: `Could not find ${file} config in current directory, but found ${file} config in \`${root}\`. Is this the correct ${file} config?`,
+				}),
+			);
+			if (correctConfig) return existsInRoot;
+		}
+
+		p.log.error(color.red(`Can't find ${file}.config file`));
+		await cancelable(
+			p.text({
+				message: `Type path to ${file} config: `,
+				validate(value) {
+					const path = validateFilePath(value, `${file}.config`);
+					if (!path) return `${file} config not found. Please try again`;
+					else {
+						configFile = path;
+					}
+				},
+			}),
+		);
+	}
+
+	return configFile;
 };
 
 export async function manipulateJsonFile(name: string, manipulate: (obj: Record<string, any>) => Record<string, any>) {

packages/commands/tests/assets/sample_app_config.txt

@@ -0,0 +1,7 @@
+import { defineConfig } from "@solidjs/start/config";
+// Simulates an app config
+export default defineConfig({
+  vite: {
+    plugins: [solid()]
+  }
+});

packages/swc-plugin-solid-cli/tests/fixture/basic_tests/basic_config/output.js → packages/commands/tests/assets/sample_unocss_vite_result.txt

@@ -1,5 +1,9 @@
 import UnoCss from "unocss/vite";
 import { defineConfig } from "vite";
+// Simulates an app config
 export default defineConfig({
-	plugins: [solid(), UnoCss({})],
+  plugins: [
+      solid(),
+      UnoCss({})
+  ]
 });

packages/commands/tests/assets/sample_vite_config.txt

@@ -1,7 +1,5 @@
-import { defineConfig } from "@solidjs/start/config";
+import { defineConfig } from "vite";
 // Simulates an app config
 export default defineConfig({
-  vite: {
-    plugins: [solid()]
-  }
+  plugins: [solid()]
 });

packages/commands/tests/config_manipulation.test.ts

@@ -9,14 +9,21 @@ const readFile = async (path: string): Promise<string> => {
 		readFile1(path, (_, data) => res(data.toString())),
 	);
 };
+
 const removeWhitespace = (str: string) => str.replace(/\s/g, "");
+
 vi.mock("fs/promises", () => {
 	return {
 		readFile: async (name: string) => {
 			if (name === "app.config.ts") {
+				const sampleConfig: string = await readFile("./packages/commands/tests/assets/sample_app_config.txt");
+				return sampleConfig;
+			}
+			if (name === "vite.config.ts") {
 				const sampleConfig: string = await readFile("./packages/commands/tests/assets/sample_vite_config.txt");
 				return sampleConfig;
 			}
+
 			return "{}";
 		},
 		writeFile: async (_, contents: string) => {
@@ -46,22 +53,41 @@ vi.mock("@solid-cli/utils/updates", async () => {
 
 vi.mock("../src/lib/utils/helpers.ts", async () => {
 	return {
-		getAppConfig: async (): Promise<string> => new Promise((r) => r("app.config.ts")),
-		fileExists: (path: string) => path.includes("app_config") || path.includes("app.tsx") || path.includes("index.tsx"),
+		getConfigFile: async (file: string): Promise<string> => new Promise((r) => r(`${file}.config.ts`)),
+		fileExists: (path: string) =>
+			path.includes("vite_config") ||
+			path.includes("app_config") ||
+			path.includes("app.tsx") ||
+			path.includes("index.tsx"),
 		getRootFile: async (): Promise<string> => new Promise((r) => r("./src/app.tsx")),
 	};
 });
+
+let testingSolidStart = false;
+
+vi.mock("@solid-cli/utils", async () => {
+	return {
+		isSolidStart: async () => new Promise((r) => r(testingSolidStart)),
+	};
+});
+
 describe("Update config", () => {
-	it(
-		"Adds a plugin properly to the config",
-		async () => {
-			await handleAdd(["unocss"]);
+	it("Adds a plugin properly to the app config", { timeout: 50000 }, async () => {
+		testingSolidStart = true;
+		await handleAdd(["unocss"]);
 
-			const expected = await readFile("./packages/commands/tests/assets/sample_unocss_result.txt");
-			// @ts-ignore
-			const newConfig = UPDATESQUEUE.find((u) => u.name === "app.config.ts")?.contents;
-			expect(removeWhitespace(expected)).toBe(removeWhitespace(newConfig));
-		},
-		{ timeout: 50000 },
-	);
+		const expected = await readFile("./packages/commands/tests/assets/sample_unocss_app_result.txt");
+		// @ts-ignore
+		const newConfig = UPDATESQUEUE.find((u) => u.name === "app.config.ts")?.contents;
+		expect(removeWhitespace(newConfig)).toBe(removeWhitespace(expected));
+	});
+	it("Adds a plugin properly to the vite config", { timeout: 50000 }, async () => {
+		testingSolidStart = false;
+		await handleAdd(["unocss"]);
+
+		const expected = await readFile("./packages/commands/tests/assets/sample_unocss_vite_result.txt");
+		// @ts-ignore
+		const newConfig = UPDATESQUEUE.find((u) => u.name === "vite.config.ts")?.contents;
+		expect(removeWhitespace(newConfig)).toBe(removeWhitespace(expected));
+	});
 });