Other files formatted

solidjs-community · May 23, 2024 · a3663d3 · a3663d3
1 parent 289214b
commit a3663d3
Show file tree

Hide file tree

Showing 2 changed files with 231 additions and 29 deletions.
diff --git a/biome.json b/biome.json
@@ -1,28 +1 @@
-{
-	"$schema": "https://biomejs.dev/schemas/1.7.3/schema.json",
-	"formatter": {
-		"enabled": true,
-		"formatWithErrors": false,
-		"indentStyle": "tab",
-		"indentWidth": 2,
-		"lineEnding": "cr",
-		"lineWidth": 120,
-		"attributePosition": "auto",
-		"ignore": ["**/*.rs", "**/*.yaml"]
-	},
-	"organizeImports": { "enabled": true },
-	"linter": { "enabled": true, "rules": { "recommended": true } },
-	"javascript": {
-		"formatter": {
-			"jsxQuoteStyle": "double",
-			"quoteProperties": "asNeeded",
-			"trailingComma": "all",
-			"semicolons": "always",
-			"arrowParentheses": "always",
-			"bracketSpacing": true,
-			"bracketSameLine": false,
-			"quoteStyle": "double",
-			"attributePosition": "auto"
-		}
-	}
-}
+{	"$schema": "https://biomejs.dev/schemas/1.7.3/schema.json",	"formatter": {		"enabled": true,		"formatWithErrors": false,		"indentStyle": "tab",		"indentWidth": 2,		"lineEnding": "cr",		"lineWidth": 120,		"attributePosition": "auto",		"ignore": ["**/*.rs", "**/*.yaml"]	},	"organizeImports": { "enabled": true },	"linter": { "enabled": true, "rules": { "recommended": true } },	"javascript": {		"formatter": {			"jsxQuoteStyle": "double",			"quoteProperties": "asNeeded",			"trailingComma": "all",			"semicolons": "always",			"arrowParentheses": "always",			"bracketSpacing": true,			"bracketSameLine": false,			"quoteStyle": "double",			"attributePosition": "auto"		}	}}

diff --git a/packages/commands/src/lib/integrations.ts b/packages/commands/src/lib/integrations.ts
@@ -1 +1,230 @@
-import { insertAfter, insertAtBeginning } from "@solid-cli/utils/fs";import { writeFile } from "fs/promises";import { fileExists, manipulateJsonFile, validateFilePath } from "./utils/helpers";import { $ } from "execa";import { getRunnerCommand, detectPackageManager } from "@solid-cli/utils/package-manager";import { createSignal } from "@solid-cli/reactivity";import * as p from "@clack/prompts";import color from "picocolors";import { cancelable } from "@solid-cli/ui";import { flushQueue } from "@solid-cli/utils/updates";import { PluginOptions } from "@solid-cli/utils/transform";// All the integrations/packages that we supportexport type Supported = keyof typeof integrations;export type IntegrationsValue = {	pluginOptions?: PluginOptions;	installs: string[];	installsDev?: string[];	additionalConfig?: () => Promise<void>;	postInstall?: () => Promise<void>;};export type Integrations = Record<Supported, IntegrationsValue>;export const [rootFile, setRootFile] = createSignal<string | undefined>(undefined);export const integrations: Record<string, IntegrationsValue> = {	tailwind: {		installs: ["tailwindcss", "postcss", "autoprefixer"],		postInstall: async () => {			const pM = detectPackageManager();			await $`${getRunnerCommand(pM)} tailwindcss init -p`;			let tailwindConfig = "tailwind.config.js";			if (!fileExists(tailwindConfig)) {				p.log.error(color.red(`Can't find tailwind config file`));				await cancelable(					p.text({						message: `Type path to tailwind config: `,						validate(value) {							if (!value.length) return `Path can not be empty`;							const path = validateFilePath(value, "tailwind.config");							if (!path) return `Tailwind config at \`${value}\` not found. Please try again`;							else {								tailwindConfig = path;							}						},					}),				);			}			let indexCss = "./src/index.css";			if (!fileExists(indexCss)) {				p.log.error(color.red(`Can't find index.css`));				await cancelable(					p.text({						message: `Type path to index.css: `,						validate(value) {							if (!value.length) return `Path can not be empty`;							const path = validateFilePath(value, "index.css");							if (!path) return `index.css at \`${value}\` not found. Please try again`;							else {								indexCss = path;							}						},					}),				);			}			p.log.info("Updating tailwind config");			await insertAfter(tailwindConfig, "content: [", '"./index.html", "./src/**/*.{js,ts,jsx,tsx}"');			await insertAtBeginning(indexCss, "@tailwind base;\n@tailwind components;\n@tailwind utilities;\n");			// Instantly flush queue			await flushQueue();		},	},	unocss: {		pluginOptions: {			importName: "UnoCss",			importSource: "unocss/vite",			isDefault: true,			options: {},		},		installs: [""],		installsDev: ["unocss"],		additionalConfig: async () => {			const path = rootFile();			if (!path) return;			await insertAtBeginning(path, `import "virtual:uno.css";\n`);		},	},	vitepwa: {		pluginOptions: {			importName: "VitePWA",			importSource: "vite-plugin-pwa",			isDefault: false,			options: {},		},		installs: ["vite-plugin-pwa"],	},	"solid-devtools": {		pluginOptions: {			importName: "devtools",			importSource: "solid-devtools/vite",			isDefault: true,			options: {},		},		installs: ["solid-devtools"],		additionalConfig: async () => {			const path = rootFile();			if (!path) return;			await insertAtBeginning(path, `import "solid-devtools";\n`);		},	},	vitest: {		installs: [],		installsDev: [			"vitest",			"jsdom",			"@solidjs/testing-library",			"@testing-library/user-event",			"@testing-library/jest-dom",		],		additionalConfig: async () => {			try {				p.log.info("Adding test script to package.json");				let hasStart = false;				manipulateJsonFile("package.json", (packageJson) => {					if (!packageJson.scripts) {						packageJson.scripts = {};					}					if (!/\bvitest\b/.test(packageJson.scripts.test || "")) {						packageJson.scripts.test = "vitest";					}					hasStart = packageJson.dependencies["@solidjs/start"];					return packageJson;				});				const hasTs = fileExists("tsconfig.json");				if (hasTs) {					p.log.info("Adding testing types to tsconfig.json");					manipulateJsonFile("tsconfig.json", (tsConfig) => {						if (!tsConfig.compilerOptions) {							tsConfig.compilerOptions = {};						}						tsConfig.compilerOptions.types = [							...new Set([...(tsConfig.compilerOptions.types || []), "vite/client", "@testing-library/jest-dom"]),						];						return tsConfig;					});				}				if (					hasStart &&					["ts", "mjs", "cjs", "js"].every(						(suffix) => !fileExists(`vite.config.${suffix}`) && !fileExists(`vitest.config.${suffix}`),					)				) {					const suffix = hasTs ? "ts" : "mjs";					p.log.info(`Adding vitest.config.${suffix}`);					await writeFile(						`vitest.config.${suffix}`,						`import solid from "vite-plugin-solid";import { defineConfig } from "vitest/config";export default defineConfig({  plugins: [solid()],  resolve: {    conditions: ["development", "browser"],  },});`,						"utf-8",					);				}			} catch (err) {				console.error(err);			}		},	},	"tauri-v1.x": {		installs: ["@tauri-apps/cli"],		postInstall: async () => {			try {				let name = "";				manipulateJsonFile("package.json", (packageJson) => {					if (!packageJson.scripts) {						packageJson.scripts = {};					}					packageJson.scripts.tauri = "tauri";					name = packageJson.name;					return packageJson;				});				await flushQueue();				const pM = detectPackageManager();				await $`${getRunnerCommand(pM)} tauri init --ci -A ${name} -W ${name} -D ../dist -P http://localhost:3000`;				p.note(`Make sure you have installed all prerequisites: https://tauri.app/v1/guides/getting-started/prerequisites    Start tauri development with ${color.bold(pM.name)} ${color.bold(pM.runScriptCommand("tauri dev"))}`);			} catch (err) {				console.error(err);			}		},	},	"tauri-v2.x": {		installs: ["@tauri-apps/cli@next"],		postInstall: async () => {			try {				let name = "";				manipulateJsonFile("package.json", (packageJson) => {					if (!packageJson.scripts) {						packageJson.scripts = {};					}					packageJson.scripts.tauri = "tauri";					name = packageJson.name;					return packageJson;				});				await flushQueue();				const pM = detectPackageManager();				await $`${getRunnerCommand(pM)} tauri init --ci -A ${name} -W ${name} -D ../dist -P http://localhost:3000`;				p.note(`Make sure you have installed all prerequisites: https://v2.tauri.app/start/prerequisites/    Start tauri development with ${color.bold(pM.name)} ${color.bold(pM.runScriptCommand("tauri dev"))}`);			} catch (err) {				console.error(err);			}		},	},};
+import { insertAfter, insertAtBeginning } from "@solid-cli/utils/fs";
+import { writeFile } from "fs/promises";
+import { fileExists, manipulateJsonFile, validateFilePath } from "./utils/helpers";
+import { $ } from "execa";
+import { getRunnerCommand, detectPackageManager } from "@solid-cli/utils/package-manager";
+import { createSignal } from "@solid-cli/reactivity";
+import * as p from "@clack/prompts";
+import color from "picocolors";
+import { cancelable } from "@solid-cli/ui";
+import { flushQueue } from "@solid-cli/utils/updates";
+import { PluginOptions } from "@solid-cli/utils/transform";
+
+// All the integrations/packages that we support
+export type Supported = keyof typeof integrations;
+
+export type IntegrationsValue = {
+	pluginOptions?: PluginOptions;
+	installs: string[];
+	installsDev?: string[];
+	additionalConfig?: () => Promise<void>;
+	postInstall?: () => Promise<void>;
+};
+
+export type Integrations = Record<Supported, IntegrationsValue>;
+
+export const [rootFile, setRootFile] = createSignal<string | undefined>(undefined);
+
+export const integrations: Record<string, IntegrationsValue> = {
+	tailwind: {
+		installs: ["tailwindcss", "postcss", "autoprefixer"],
+		postInstall: async () => {
+			const pM = detectPackageManager();
+			await $`${getRunnerCommand(pM)} tailwindcss init -p`;
+			let tailwindConfig = "tailwind.config.js";
+			if (!fileExists(tailwindConfig)) {
+				p.log.error(color.red(`Can't find tailwind config file`));
+				await cancelable(
+					p.text({
+						message: `Type path to tailwind config: `,
+						validate(value) {
+							if (!value.length) return `Path can not be empty`;
+							const path = validateFilePath(value, "tailwind.config");
+							if (!path) return `Tailwind config at \`${value}\` not found. Please try again`;
+							else {
+								tailwindConfig = path;
+							}
+						},
+					}),
+				);
+			}
+
+			let indexCss = "./src/index.css";
+			if (!fileExists(indexCss)) {
+				p.log.error(color.red(`Can't find index.css`));
+				await cancelable(
+					p.text({
+						message: `Type path to index.css: `,
+						validate(value) {
+							if (!value.length) return `Path can not be empty`;
+							const path = validateFilePath(value, "index.css");
+							if (!path) return `index.css at \`${value}\` not found. Please try again`;
+							else {
+								indexCss = path;
+							}
+						},
+					}),
+				);
+			}
+			p.log.info("Updating tailwind config");
+			await insertAfter(tailwindConfig, "content: [", '"./index.html", "./src/**/*.{js,ts,jsx,tsx}"');
+			await insertAtBeginning(indexCss, "@tailwind base;\n@tailwind components;\n@tailwind utilities;\n");
+			// Instantly flush queue
+			await flushQueue();
+		},
+	},
+	unocss: {
+		pluginOptions: {
+			importName: "UnoCss",
+			importSource: "unocss/vite",
+			isDefault: true,
+			options: {},
+		},
+		installs: [""],
+		installsDev: ["unocss"],
+		additionalConfig: async () => {
+			const path = rootFile();
+			if (!path) return;
+			await insertAtBeginning(path, `import "virtual:uno.css";\n`);
+		},
+	},
+	vitepwa: {
+		pluginOptions: {
+			importName: "VitePWA",
+			importSource: "vite-plugin-pwa",
+			isDefault: false,
+			options: {},
+		},
+		installs: ["vite-plugin-pwa"],
+	},
+	"solid-devtools": {
+		pluginOptions: {
+			importName: "devtools",
+			importSource: "solid-devtools/vite",
+			isDefault: true,
+			options: {},
+		},
+		installs: ["solid-devtools"],
+		additionalConfig: async () => {
+			const path = rootFile();
+			if (!path) return;
+			await insertAtBeginning(path, `import "solid-devtools";\n`);
+		},
+	},
+	vitest: {
+		installs: [],
+		installsDev: [
+			"vitest",
+			"jsdom",
+			"@solidjs/testing-library",
+			"@testing-library/user-event",
+			"@testing-library/jest-dom",
+		],
+		additionalConfig: async () => {
+			try {
+				p.log.info("Adding test script to package.json");
+				let hasStart = false;
+				manipulateJsonFile("package.json", (packageJson) => {
+					if (!packageJson.scripts) {
+						packageJson.scripts = {};
+					}
+					if (!/\bvitest\b/.test(packageJson.scripts.test || "")) {
+						packageJson.scripts.test = "vitest";
+					}
+					hasStart = packageJson.dependencies["@solidjs/start"];
+					return packageJson;
+				});
+				const hasTs = fileExists("tsconfig.json");
+				if (hasTs) {
+					p.log.info("Adding testing types to tsconfig.json");
+					manipulateJsonFile("tsconfig.json", (tsConfig) => {
+						if (!tsConfig.compilerOptions) {
+							tsConfig.compilerOptions = {};
+						}
+						tsConfig.compilerOptions.types = [
+							...new Set([...(tsConfig.compilerOptions.types || []), "vite/client", "@testing-library/jest-dom"]),
+						];
+						return tsConfig;
+					});
+				}
+				if (
+					hasStart &&
+					["ts", "mjs", "cjs", "js"].every(
+						(suffix) => !fileExists(`vite.config.${suffix}`) && !fileExists(`vitest.config.${suffix}`),
+					)
+				) {
+					const suffix = hasTs ? "ts" : "mjs";
+					p.log.info(`Adding vitest.config.${suffix}`);
+					await writeFile(
+						`vitest.config.${suffix}`,
+						`import solid from "vite-plugin-solid";
+import { defineConfig } from "vitest/config";
+
+export default defineConfig({
+  plugins: [solid()],
+  resolve: {
+    conditions: ["development", "browser"],
+  },
+});
+`,
+						"utf-8",
+					);
+				}
+			} catch (err) {
+				console.error(err);
+			}
+		},
+	},
+	"tauri-v1.x": {
+		installs: ["@tauri-apps/cli"],
+		postInstall: async () => {
+			try {
+				let name = "";
+				manipulateJsonFile("package.json", (packageJson) => {
+					if (!packageJson.scripts) {
+						packageJson.scripts = {};
+					}
+					packageJson.scripts.tauri = "tauri";
+					name = packageJson.name;
+					return packageJson;
+				});
+				await flushQueue();
+				const pM = detectPackageManager();
+				await $`${getRunnerCommand(pM)} tauri init --ci -A ${name} -W ${name} -D ../dist -P http://localhost:3000`;
+				p.note(
+					`Make sure you have installed all prerequisites: https://tauri.app/v1/guides/getting-started/prerequisites
+
+    Start tauri development with ${color.bold(pM.name)} ${color.bold(pM.runScriptCommand("tauri dev"))}`,
+				);
+			} catch (err) {
+				console.error(err);
+			}
+		},
+	},
+	"tauri-v2.x": {
+		installs: ["@tauri-apps/cli@next"],
+		postInstall: async () => {
+			try {
+				let name = "";
+				manipulateJsonFile("package.json", (packageJson) => {
+					if (!packageJson.scripts) {
+						packageJson.scripts = {};
+					}
+					packageJson.scripts.tauri = "tauri";
+					name = packageJson.name;
+					return packageJson;
+				});
+				await flushQueue();
+				const pM = detectPackageManager();
+				await $`${getRunnerCommand(pM)} tauri init --ci -A ${name} -W ${name} -D ../dist -P http://localhost:3000`;
+				p.note(
+					`Make sure you have installed all prerequisites: https://v2.tauri.app/start/prerequisites/
+
+    Start tauri development with ${color.bold(pM.name)} ${color.bold(pM.runScriptCommand("tauri dev"))}`,
+				);
+			} catch (err) {
+				console.error(err);
+			}
+		},
+	},
+};