@mochi-css/tsuki 3.0.0 → 4.0.0

package/README.md

@@ -15,7 +15,7 @@ To get more info, run it with `-h` or `--help` option.
 ## What `tsuki` sets up
 
 During initialization, `tsuki` installs the required packages and creates a `mochi.config.ts` file in your project root.
-This file is the single place to configure all Mochi-CSS options (`roots`, `extractors`, `plugins`, etc.) - all integrations load it automatically.
+This file is the single place to configure all Mochi-CSS options (`roots`, `plugins`, `splitCss`, etc.) - all integrations load it automatically.
 
 ## Presets
 

package/dist/index.js

@@ -138,7 +138,7 @@ var ModuleRunner = class {
 //#endregion
 //#region src/version.ts
 function mochiPackage(name) {
-	return `${name}@^${parseInt("3.0.0".split(".")[0] ?? "0", 10)}.0.0`;
+	return `${name}@^${parseInt("4.0.0".split(".")[0] ?? "0", 10)}.0.0`;
 }
 
 //#endregion
@@ -442,59 +442,16 @@ function findMochiConfig() {
 	return mochiConfigNames.find((name) => fsExtra.existsSync(name));
 }
 const defaultMochiConfigBase = dedent`
-    import { defineConfig } from "@mochi-css/config"
+    import { defineConfig } from "@mochi-css/vanilla/config"
 
     export default defineConfig({})
 `;
 function defaultMochiConfigWithOptions(tmpDir, styledId) {
+	const importPath = styledId ? "@mochi-css/vanilla-react/config" : "@mochi-css/vanilla/config";
 	const lines = [];
 	if (tmpDir !== void 0) lines.push(`    tmpDir: ${JSON.stringify(tmpDir)},`);
-	if (styledId) lines.push(`    plugins: [styledIdPlugin()],`);
 	if (!styledId && lines.length === 0) return defaultMochiConfigBase;
-	return `${styledId ? dedent`
-              import { defineConfig } from "@mochi-css/config"
-              import { styledIdPlugin } from "@mochi-css/builder"
-          ` : `import { defineConfig } from "@mochi-css/config"`}\n\nexport default defineConfig({\n${lines.join("\n")}\n})\n`;
-}
-function addStyledIdPluginToObj(obj, configPath) {
-	getPluginsElements(obj, configPath).push({
-		type: "CallExpression",
-		callee: {
-			type: "Identifier",
-			name: "styledIdPlugin"
-		},
-		arguments: []
-	});
-}
-function addStyledIdToAst(mod, configPath) {
-	const exportDefault = mod.$ast.body.find((s) => s.type === "ExportDefaultDeclaration");
-	if (!exportDefault) throw new Error(`No default export found in ${configPath}`);
-	const decl = exportDefault.declaration;
-	if (decl["type"] === "ObjectExpression") {
-		addStyledIdPluginToObj(decl, configPath);
-		return;
-	}
-	if (decl["type"] === "CallExpression") {
-		const firstArg = decl["arguments"][0];
-		if (firstArg?.["type"] === "ObjectExpression") {
-			addStyledIdPluginToObj(firstArg, configPath);
-			return;
-		}
-	}
-	throw new Error(`Failed to add styledIdPlugin to ${configPath}`);
-}
-async function addStyledIdToExistingConfig(configPath) {
-	const content = await fs.readFile(configPath, "utf-8");
-	if (content.includes("styledIdPlugin")) return;
-	const mod = parseModule(content);
-	mod.imports.$prepend({
-		from: "@mochi-css/builder",
-		imported: "styledIdPlugin",
-		local: "styledIdPlugin"
-	});
-	addStyledIdToAst(mod, configPath);
-	const { code } = generateCode(mod);
-	await fs.writeFile(configPath, code);
+	return `import { defineConfig } from "${importPath}"\n\nexport default defineConfig({\n${lines.join("\n")}\n})\n`;
 }
 function getConfigObject(mod) {
 	const exportDefault = mod.$ast.body.find((s) => s.type === "ExportDefaultDeclaration");
@@ -527,6 +484,12 @@ async function addTmpDirToExistingConfig(configPath, tmpDir) {
 	const { code } = generateCode(mod);
 	await fs.writeFile(configPath, code);
 }
+async function patchToVanillaReact(configPath) {
+	const content = await fs.readFile(configPath, "utf-8");
+	if (content.includes("@mochi-css/vanilla-react")) return;
+	const patched = content.replace(/"@mochi-css\/vanilla\/config"/g, "\"@mochi-css/vanilla-react/config\"");
+	await fs.writeFile(configPath, patched);
+}
 function createMochiConfigModule(options = {}) {
 	const { styledId = false, tmpDir } = options;
 	return {
@@ -545,19 +508,26 @@ function createMochiConfigModule(options = {}) {
 					p.log.warn(`Could not automatically add tmpDir to ${existing} — add it manually`);
 				}
 				if (styledId) try {
-					await addStyledIdToExistingConfig(existing);
-					p.log.success("Added styledIdPlugin to mochi.config.ts");
+					await patchToVanillaReact(existing);
+					p.log.success("Switched mochi.config to @mochi-css/vanilla-react/config");
 				} catch {
-					p.log.warn(`Could not automatically add styledIdPlugin to ${existing} — add it manually`);
+					p.log.warn(`Could not patch ${existing} — change the import to @mochi-css/vanilla-react/config manually`);
 				}
 			}
-			ctx.requirePackage(mochiPackage("@mochi-css/config"));
+			ctx.requirePackage(mochiPackage("@mochi-css/vanilla"));
+			if (styledId) ctx.requirePackage(mochiPackage("@mochi-css/vanilla-react"));
 		}
 	};
 }
 
 //#endregion
 //#region src/modules/uiFramework.ts
+async function patchConfigForReact(configPath) {
+	const content = await fs.readFile(configPath, "utf-8");
+	if (content.includes("@mochi-css/vanilla-react")) return;
+	const patched = content.replace(/"@mochi-css\/vanilla\/config"/g, "\"@mochi-css/vanilla-react/config\"");
+	await fs.writeFile(configPath, patched);
+}
 function createUiFrameworkModule(options = {}) {
 	return {
 		id: "ui-framework",
@@ -565,14 +535,19 @@ function createUiFrameworkModule(options = {}) {
 		async run(ctx) {
 			const { framework: cliOption } = ctx.moduleOptions;
 			let useReact = options.auto === true || cliOption === "react";
-			if (useReact) {
-				ctx.requirePackage(mochiPackage("@mochi-css/react"), false);
-				return;
+			if (!useReact) {
+				if (ctx.nonInteractive) return;
+				const confirmed = await p.confirm({ message: "Do you use React?" });
+				if (p.isCancel(confirmed) || !confirmed) return;
+				useReact = true;
+			}
+			ctx.requirePackage(mochiPackage("@mochi-css/vanilla-react"), false);
+			const configPath = findMochiConfig();
+			if (configPath) try {
+				await patchConfigForReact(configPath);
+			} catch {
+				p.log.warn(`Could not patch ${configPath} — change the import to @mochi-css/vanilla-react/config manually`);
 			}
-			if (ctx.nonInteractive) return;
-			const confirmed = await p.confirm({ message: "Do you use React?" });
-			if (p.isCancel(confirmed) || !confirmed) return;
-			useReact = true;
 		}
 	};
 }
@@ -583,10 +558,7 @@ const vitePreset = {
 	id: "vite",
 	name: "Vite",
 	setup(runner) {
-		runner.register(createMochiConfigModule({
-			styledId: true,
-			tmpDir: ".mochi"
-		}));
+		runner.register(createMochiConfigModule({ tmpDir: ".mochi" }));
 		runner.register(createPostcssModule());
 		runner.register(viteModule);
 		runner.register(createUiFrameworkModule());
@@ -688,7 +660,7 @@ const presets = {
 
 //#endregion
 //#region src/index.ts
-program.name("tsuki").description("Add mochi-css to your project").version("3.0.0").addOption(new Option("-p, --preset <preset>", "Preset to use").choices([
+program.name("tsuki").description("Add mochi-css to your project").version("4.0.0").addOption(new Option("-p, --preset <preset>", "Preset to use").choices([
 	"vite",
 	"nextjs",
 	"lib"

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@mochi-css/tsuki",
     "repository": "git@github.com:Niikelion/mochi-css.git",
-    "version": "3.0.0",
+    "version": "4.0.0",
     "license": "MIT",
     "type": "module",
     "bin": "./dist/index.js",
@@ -15,7 +15,7 @@
         "manual": "jiti scripts/manual.ts",
         "lint": "eslint src",
         "lint:fix": "eslint src --fix",
-        "format": "prettier --write"
+        "format": "prettier --write ."
     },
     "devDependencies": {
         "@mochi-css/shared-config": "^2.0.0",