@vuetify/cli 1.0.2 → 1.1.0

package/dist/index.mjs

@@ -8,7 +8,7 @@ import P, { cwd, stdin, stdout } from "node:process";
 import * as k$4 from "node:readline";
 import c from "node:readline";
 import { ReadStream } from "node:tty";
-import fs, { appendFileSync, cpSync, createWriteStream, existsSync, lstatSync, mkdirSync, mkdtempSync, promises, readFileSync, readdirSync, realpathSync, renameSync, rmSync, statSync, unlinkSync, writeFileSync } from "node:fs";
+import fs, { appendFileSync, cpSync, createWriteStream, existsSync, lstatSync, mkdirSync, mkdtempSync, promises, readFileSync, readdirSync, realpathSync, renameSync, rmSync, statSync, writeFileSync } from "node:fs";
 import path, { delimiter, dirname, isAbsolute, join, normalize, resolve } from "node:path";
 import fs$1, { constants, mkdir, readFile, rm, writeFile } from "node:fs/promises";
 import { URL as URL$1, fileURLToPath, pathToFileURL } from "node:url";
@@ -9918,14 +9918,8 @@ var en_default = {
 		"css_framework": {
 			"select": "Which CSS framework?",
 			"unocss": { "hint": "Instant on-demand atomic CSS engine" },
-			"unocss_wind4": {
-				"label": "UnoCSS with Wind4 preset",
-				"hint": "soon"
-			},
-			"unocss_vuetify": {
-				"label": "UnoCSS with Vuetify preset",
-				"hint": "soon"
-			},
+			"unocss_wind4": { "label": "UnoCSS with Wind4 preset" },
+			"unocss_vuetify": { "label": "UnoCSS with Vuetify preset" },
 			"tailwindcss": {
 				"label": "Tailwind CSS",
 				"hint": "A utility-first CSS framework"
@@ -9959,10 +9953,6 @@ var en_default = {
 				"hint": "with eslint-config-vuetify"
 			},
 			"i18n": { "label": "I18n" },
-			"vuetify_nuxt_module": {
-				"label": "Vuetify Nuxt Module",
-				"hint": "Use vuetify-nuxt-module instead of local plugin"
-			},
 			"mcp": {
 				"label": "MCP",
 				"hint": "with @vuetify/mcp and @intellectronica/ruler"
@@ -10218,10 +10208,6 @@ var ru_default = {
 				"hint": "с eslint-config-vuetify"
 			},
 			"i18n": { "label": "I18n" },
-			"vuetify_nuxt_module": {
-				"label": "Vuetify Nuxt Module",
-				"hint": "Использовать vuetify-nuxt-module вместо локального плагина"
-			},
 			"mcp": {
 				"label": "MCP",
 				"hint": "с @vuetify/mcp и @intellectronica/ruler"
@@ -10312,6 +10298,7 @@ const i18n$2 = new import_require.I18n({
 	ru: ru_default
 }, {
 	defaultLocale: "en",
+	enableFallback: true,
 	locale: normalizeLocale$1(getCurrentLocale())
 });
 
@@ -126331,14 +126318,25 @@ async function prompt(args, cwd = process.cwd()) {
 			if (type === "vuetify" && platform === "nuxt") return qt({
 				message: i18n$1.t("prompts.css_framework.select"),
 				initialValue: "none",
-				options: [{
-					label: "Tailwind CSS",
-					value: "tailwindcss",
-					hint: i18n$1.t("prompts.css_framework.tailwindcss.hint")
-				}, {
-					label: i18n$1.t("prompts.css_framework.none"),
-					value: "none"
-				}]
+				options: [
+					{
+						label: i18n$1.t("prompts.css_framework.none"),
+						value: "none"
+					},
+					{
+						label: "Tailwind CSS",
+						value: "tailwindcss",
+						hint: i18n$1.t("prompts.css_framework.tailwindcss.hint")
+					},
+					{
+						label: i18n$1.t("prompts.css_framework.unocss_wind4.label"),
+						value: "unocss-wind4"
+					},
+					{
+						label: i18n$1.t("prompts.css_framework.unocss_vuetify.label"),
+						value: "unocss-vuetify"
+					}
+				]
 			});
 			return qt({
 				message: i18n$1.t("prompts.css_framework.select"),
@@ -126370,15 +126368,11 @@ async function prompt(args, cwd = process.cwd()) {
 					},
 					{
 						label: i18n$1.t("prompts.css_framework.unocss_wind4.label"),
-						disabled: true,
-						value: "unocss-wind4",
-						hint: i18n$1.t("prompts.css_framework.unocss_wind4.hint")
+						value: "unocss-wind4"
 					},
 					{
 						label: i18n$1.t("prompts.css_framework.unocss_vuetify.label"),
-						disabled: true,
-						value: "unocss-vuetify",
-						hint: i18n$1.t("prompts.css_framework.unocss_vuetify.hint")
+						value: "unocss-vuetify"
 					}
 				]
 			});
@@ -126394,7 +126388,7 @@ async function prompt(args, cwd = process.cwd()) {
 			if (args.features) return Promise.resolve(args.features);
 			if (!args.interactive) return Promise.resolve([]);
 			const platform = results.platform || args.platform;
-			const type = results.type || args.type;
+			results.type || args.type;
 			return platform === "vue" ? Lt({
 				message: i18n$1.t("prompts.features.select", { hint: dim("↑/↓ to navigate, space to select, a to toggle all, enter to confirm") }),
 				options: [
@@ -126432,11 +126426,6 @@ async function prompt(args, cwd = process.cwd()) {
 						value: "eslint",
 						hint: i18n$1.t("prompts.features.eslint.hint")
 					},
-					...type === "vuetify0" ? [] : [{
-						label: i18n$1.t("prompts.features.vuetify_nuxt_module.label"),
-						value: "vuetify-nuxt-module",
-						hint: i18n$1.t("prompts.features.vuetify_nuxt_module.hint")
-					}],
 					{
 						label: i18n$1.t("prompts.features.mcp.label"),
 						value: "mcp",
@@ -126451,11 +126440,7 @@ async function prompt(args, cwd = process.cwd()) {
 						value: "i18n"
 					}
 				],
-				initialValues: [
-					"eslint",
-					...type === "vuetify0" ? [] : ["vuetify-nuxt-module"],
-					"mcp"
-				],
+				initialValues: ["eslint", "mcp"],
 				required: false
 			});
 		},
@@ -126488,9 +126473,7 @@ async function prompt(args, cwd = process.cwd()) {
 		clientHints: ({ results }) => {
 			if (args.clientHints !== void 0) return Promise.resolve(args.clientHints);
 			if (!args.interactive) return Promise.resolve(false);
-			const platform = results.platform || args.platform;
-			const features = results.features || args.features || [];
-			if (platform === "nuxt" && features.includes("vuetify-nuxt-module")) return Mt({
+			if ((results.platform || args.platform) === "nuxt") return Mt({
 				message: i18n$1.t("prompts.client_hints.enable"),
 				initialValue: false
 			});
@@ -147825,10 +147808,10 @@ var dependencies = {
 	"unocss": "^66.5.12",
 	"@unocss/transformer-directives": "^66.6.0",
 	"@unocss/nuxt": "^66.5.12",
-	"unocss-preset-vuetify": "^0.1.1",
+	"unocss-preset-vuetify": "^0.2.1",
 	"tailwindcss": "^4.1.18",
+	"@tailwindcss/postcss": "^4.1.18",
 	"@tailwindcss/vite": "^4.1.18",
-	"@nuxtjs/tailwindcss": "^7.0.0-beta.1",
 	"pathe": "^2.0.3",
 	"@vuetify/loader-shared": "^2.1.1",
 	"@intellectronica/ruler": "^0.3.18",
@@ -148037,6 +148020,37 @@ const mcp = {
 	}
 };
 
+//#endregion
+//#region ../shared/src/features/client-hints.ts
+const nuxtClientHints = {
+	name: "client-hints",
+	apply: async ({ cwd, isNuxt }) => {
+		if (!isNuxt) return;
+		const configPath = join$1(cwd, "nuxt.config.ts");
+		const mod = await loadFile(configPath);
+		const options = getDefaultExportOptions(mod);
+		if (options) {
+			options.vuetify ??= {};
+			options.vuetify.moduleOptions ??= {};
+			options.vuetify.moduleOptions.ssrClientHints = {
+				reloadOnFirstRequest: false,
+				viewportSize: true,
+				prefersColorScheme: true,
+				prefersReducedMotion: true,
+				prefersColorSchemeOptions: { useBrowserThemeOnly: false }
+			};
+			options.vuetify.vuetifyOptions ??= {};
+			options.vuetify.vuetifyOptions.theme ??= {};
+			options.vuetify.vuetifyOptions.theme.defaultTheme = "dark";
+			options.vuetify.vuetifyOptions.theme.themes = {
+				light: {},
+				dark: {}
+			};
+		}
+		await writeFile(configPath, mod.generate().code);
+	}
+};
+
 //#endregion
 //#region ../shared/src/features/pinia.ts
 const pinia = {
@@ -148090,7 +148104,7 @@ export const useAppStore = defineStore('app', {
 
 //#endregion
 //#region ../shared/package.json
-var version$1 = "1.0.2";
+var version$1 = "1.1.0";
 
 //#endregion
 //#region ../shared/src/utils/getTemplateSource.ts
@@ -148237,11 +148251,7 @@ const tailwindcss = {
 		if (isNuxt) {
 			pkg.devDependencies = pkg.devDependencies || {};
 			pkg.devDependencies["tailwindcss"] = dependencies.tailwindcss;
-			pkg.devDependencies["@nuxtjs/tailwindcss"] = dependencies["@nuxtjs/tailwindcss"];
-			const configPath = join$1(cwd, "nuxt.config.ts");
-			const mod = await loadFile(configPath);
-			addNuxtModule(mod, "@nuxtjs/tailwindcss");
-			await writeFile(configPath, mod.generate().code);
+			pkg.devDependencies["@tailwindcss/postcss"] = dependencies["@tailwindcss/postcss"];
 		} else {
 			pkg.devDependencies = pkg.devDependencies || {};
 			pkg.devDependencies["tailwindcss"] = dependencies.tailwindcss;
@@ -148276,7 +148286,7 @@ async function applyUnocssBase({ cwd, pkg, isTypescript, isNuxt }, options = {})
 	if (pkg.devDependencies) {
 		delete pkg.devDependencies["tailwindcss"];
 		delete pkg.devDependencies["@tailwindcss/vite"];
-		delete pkg.devDependencies["@nuxtjs/tailwindcss"];
+		delete pkg.devDependencies["@tailwindcss/postcss"];
 	}
 	if (isNuxt) {
 		pkg.devDependencies["@unocss/nuxt"] = dependencies["@unocss/nuxt"];
@@ -148320,68 +148330,6 @@ const unocssVuetify = {
 	}
 };
 
-//#endregion
-//#region ../shared/src/features/vuetify-nuxt-manual.ts
-const vuetifyNuxtManual = {
-	name: "vuetify-nuxt-manual",
-	apply: async ({ cwd, pkg, isNuxt }) => {
-		if (!isNuxt) return;
-		const configPath = join$1(cwd, "nuxt.config.ts");
-		pkg.devDependencies = pkg.devDependencies || {};
-		pkg.devDependencies["vite-plugin-vuetify"] = dependencies["vite-plugin-vuetify"];
-		pkg.devDependencies["@vuetify/loader-shared"] = dependencies["@vuetify/loader-shared"];
-		pkg.devDependencies["pathe"] = dependencies.pathe;
-		const mod = await loadFile(configPath);
-		mod.imports.$prepend({
-			from: "vite-plugin-vuetify",
-			imported: "transformAssetUrls"
-		});
-		const options = getDefaultExportOptions(mod);
-		if (options) {
-			options.build ||= {};
-			options.build.transpile ||= [];
-			if (!options.build.transpile.includes("vuetify")) options.build.transpile.push("vuetify");
-			options.vite ||= {};
-			options.vite.vue ||= {};
-			options.vite.vue.template ||= {};
-			options.vite.vue.template.transformAssetUrls = builders.raw("transformAssetUrls");
-		}
-		await writeFile(configPath, mod.generate().code);
-	}
-};
-
-//#endregion
-//#region ../shared/src/features/vuetify-nuxt-module.ts
-const vuetifyNuxtModule = {
-	name: "vuetify-nuxt-module",
-	apply: async ({ cwd, pkg, clientHints, isNuxt }) => {
-		if (!isNuxt) return;
-		pkg.dependencies = pkg.dependencies || {};
-		pkg.dependencies["vuetify-nuxt-module"] = dependencies["vuetify-nuxt-module"];
-		const configPath = join$1(cwd, "nuxt.config.ts");
-		const mod = await loadFile(configPath);
-		const manualModulePath = join$1(cwd, "modules/vuetify.ts");
-		if (existsSync(manualModulePath)) unlinkSync(manualModulePath);
-		const options = getDefaultExportOptions(mod);
-		if (options) {
-			options.modules ||= [];
-			options.modules.push("vuetify-nuxt-module");
-			options.vuetify = {
-				moduleOptions: {},
-				vuetifyOptions: {}
-			};
-			if (clientHints) options.vuetify.moduleOptions.ssrClientHints = {
-				reloadOnFirstRequest: false,
-				viewportSize: true,
-				prefersColorScheme: true,
-				prefersReducedMotion: true,
-				prefersColorSchemeOptions: { useBrowserThemeOnly: false }
-			};
-		}
-		await writeFile(configPath, mod.generate().code);
-	}
-};
-
 //#endregion
 //#region ../shared/src/features/index.ts
 const features = {
@@ -148391,15 +148339,14 @@ const features = {
 	i18n,
 	eslint,
 	mcp,
-	"vuetify-nuxt-module": vuetifyNuxtModule,
-	"vuetify-nuxt-manual": vuetifyNuxtManual,
+	"client-hints": nuxtClientHints,
 	unocss,
 	"unocss-wind4": unocssWind4,
 	"unocss-vuetify": unocssVuetify,
 	tailwindcss,
 	"css-none": cssNone
 };
-async function applyFeatures(cwd, featureNames, pkg, isTypescript, isNuxt, clientHints, type) {
+async function applyFeatures(cwd, featureNames, pkg, isTypescript, isNuxt, type) {
 	for (const name of featureNames) {
 		const feature = features[name];
 		if (feature) await feature.apply({
@@ -148407,7 +148354,6 @@ async function applyFeatures(cwd, featureNames, pkg, isTypescript, isNuxt, clien
 			pkg,
 			isTypescript,
 			isNuxt,
-			clientHints,
 			type
 		});
 	}
@@ -149393,10 +149339,10 @@ async function installDependencies(root = process.cwd(), manager = packageManage
 //#endregion
 //#region ../shared/src/functions/scaffold.ts
 function resolveTemplateName(templates, platform, type, features) {
-	if (platform !== "vue" || type !== "vuetify") return templates[platform][type];
-	if (features.includes("unocss-wind4")) return "vue/unocss-wind4";
-	if (features.includes("unocss-vuetify")) return "vue/unocss-vuetify";
-	if (features.includes("tailwindcss")) return "vue/tailwind";
+	if (type !== "vuetify") return templates[platform][type];
+	if (features.includes("unocss-wind4")) return `${platform}/unocss-wind4`;
+	if (features.includes("unocss-vuetify")) return `${platform}/unocss-vuetify`;
+	if (features.includes("tailwindcss")) return `${platform}/tailwind`;
 	return templates[platform][type];
 }
 async function resolveSharedAssetsPath() {
@@ -149434,7 +149380,7 @@ async function applySharedAssets(projectRoot, platform, type) {
 	try {
 		if (needsFavicon) copySharedAsset(join$1(assets.path, "favicon.ico"), join$1(projectRoot, "public", "favicon.ico"));
 		if (needsLogo) {
-			const logoRoot = platform === "nuxt" ? join$1(projectRoot, "assets") : join$1(projectRoot, "src", "assets");
+			const logoRoot = platform === "nuxt" ? join$1(projectRoot, "app", "assets") : join$1(projectRoot, "src", "assets");
 			copySharedAsset(join$1(assets.path, "logo.png"), join$1(logoRoot, "logo.png"));
 			copySharedAsset(join$1(assets.path, "logo.svg"), join$1(logoRoot, "logo.svg"));
 		}
@@ -149444,7 +149390,7 @@ async function applySharedAssets(projectRoot, platform, type) {
 	}
 }
 async function scaffold(options, callbacks = {}) {
-	const { cwd, name, platform, features, typescript, type, packageManager, install, force, clientHints, debug: debugFlag } = options;
+	const { cwd, name, platform, features, typescript, type, packageManager, install, force, debug: debugFlag } = options;
 	const debug = (...msg) => debugFlag && console.log("DEBUG:", ...msg);
 	const projectRoot = join$1(cwd, name);
 	debug("projectRoot=", projectRoot);
@@ -149493,13 +149439,7 @@ async function scaffold(options, callbacks = {}) {
 	let pkg;
 	pkg = await readPackageJSON$1(join$1(projectRoot, "package.json"));
 	callbacks.onConfigStart?.();
-	if (features && features.length > 0) await applyFeatures(projectRoot, features, pkg, !!typescript, platform === "nuxt", clientHints, type);
-	if (platform === "nuxt" && type !== "vuetify0" && (!features || !features.includes("vuetify-nuxt-module"))) await vuetifyNuxtManual.apply({
-		cwd: projectRoot,
-		pkg,
-		isTypescript: !!typescript,
-		isNuxt: true
-	});
+	if (features && features.length > 0) await applyFeatures(projectRoot, features, pkg, !!typescript, platform === "nuxt", type);
 	callbacks.onConfigEnd?.();
 	const pkgPath = join$1(projectRoot, "package.json");
 	if (existsSync(pkgPath)) {
@@ -149613,12 +149553,11 @@ async function createVuetify(options, commandOptions) {
 			name: context.name,
 			platform: context.platform,
 			type: context.type,
-			features: context.features,
+			features: [...context.features, ...context.clientHints ? ["client-hints"] : []],
 			typescript: !!context.typescript,
 			packageManager: context.packageManager,
 			install: context.install,
 			force: context.force,
-			clientHints: context.clientHints,
 			debug: args.debug
 		}, {
 			onDownloadStart: (templateName) => {
@@ -151050,7 +150989,7 @@ const JsonReporter = { report: async (data, options) => {
 
 //#endregion
 //#region package.json
-var version = "1.0.2";
+var version = "1.1.0";
 
 //#endregion
 //#region src/commands/analyze.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vuetify/cli",
-  "version": "1.0.2",
+  "version": "1.1.0",
   "description": "Vuetify CLI",
   "type": "module",
   "files": [
@@ -35,7 +35,7 @@
     "open": "^11.0.0",
     "pathe": "^2.0.3",
     "tsdown": "^0.20.3",
-    "@vuetify/cli-shared": "1.0.2"
+    "@vuetify/cli-shared": "1.1.0"
   },
   "dependencies": {
     "@typescript-eslint/parser": "^8.54.0"