@vixt/core 0.7.3 → 0.8.0

package/dist/cli/index.d.mts

@@ -0,0 +1 @@
+export { };

package/dist/cli/index.mjs

@@ -0,0 +1,29 @@
+import { defineCommand, runMain } from "citty";
+
+//#region src/cli/index.ts
+runMain(defineCommand({
+	meta: {
+		name: "vixt",
+		description: "Vixt CLI"
+	},
+	args: { command: {
+		type: "positional",
+		required: true
+	} },
+	subCommands: { prepare: defineCommand({
+		meta: {
+			name: "prepare",
+			description: "Prepare Vixt"
+		},
+		async run() {
+			const { loadConfigFromFile } = await import("vite");
+			await loadConfigFromFile({
+				command: "serve",
+				mode: "dev"
+			}, void 0, void 0, void 0, void 0, "native");
+		}
+	}) }
+}));
+
+//#endregion
+export {  };

package/dist/node/index.mjs

@@ -61,8 +61,8 @@ async function loadVixtConfig(opts) {
 		rcFile: false,
 		...opts
 	});
-	const { config, cwd: cwd$1 } = result;
-	config.rootDir ??= cwd$1;
+	const { config, cwd } = result;
+	config.rootDir ??= cwd;
 	config.buildDir ??= resolve(config.rootDir, ".vixt");
 	config.buildTypesDir ??= resolve(config.buildDir, "types");
 	config.buildLayersDir ??= resolve(config.buildDir, "layers");
@@ -91,6 +91,12 @@ function applyLayers({ config, layers = [] }) {
 			} });
 			layer.cwd = newCwd;
 		}
+		if (isSamePath(layer.cwd, resolve(rootDir))) {
+			layer.config.rootDir ??= config.rootDir;
+			layer.config.srcDir ??= config.srcDir;
+			layer.config.modulesDir ??= config.modulesDir;
+			layer.config.pluginsDir ??= config.pluginsDir;
+		}
 		layer.config.rootDir ??= layer.cwd;
 		layer.config.srcDir ??= resolve(layer.config.rootDir, "src");
 		layer.config.modulesDir ??= resolve(layer.config.srcDir, "modules");
@@ -405,14 +411,14 @@ declare module '*.vue' {
 	const codePath = path.resolve(buildTypesDir, "vue-shim.d.ts");
 	fs.outputFileSync(codePath, code);
 }
-function generateEnvDts(env$1, vixt) {
+function generateEnvDts(env, vixt) {
 	const { buildTypesDir } = vixt.options;
 	const codePath = path.resolve(buildTypesDir, "vite-env.d.ts");
 	const code = `interface ImportMeta {
   readonly env: ImportMetaEnv
 }
 interface ImportMetaEnv {
-  ${Object.entries(env$1).map(([key, value]) => `/** ${key}=${value} */\n  ${key}: ${typeof value}`).join("\n  ")}
+  ${Object.entries(env).map(([key, value]) => `/** ${key}=${value} */\n  ${key}: ${typeof value}`).join("\n  ")}
 }
 `;
 	fs.outputFileSync(codePath, code);
@@ -431,7 +437,7 @@ var typescript_default = defineVixtModule({
 			paths[ak] = [av];
 			if (stats?.isDirectory()) paths[`${ak}/*`] = [`${av}/*`];
 		}
-		const include = ["./**/*", ...vixt._layers.map((e) => e.cwd)];
+		const include = ["./**/*", ...vixt._layers.map((e) => `${e.cwd}/**/*`)];
 		return {
 			tsConfig: {
 				extends: "@vue/tsconfig/tsconfig.dom.json",
@@ -449,10 +455,10 @@ var typescript_default = defineVixtModule({
 		};
 	},
 	setup(options, vixt) {
+		generateTsConfig(options, vixt);
 		return [{
 			name: name$4,
 			configResolved(config) {
-				generateTsConfig(options, vixt);
 				generateVixtDts(options, vixt);
 				genarateShim(options, vixt);
 				generateEnvDts(config.env, vixt);
@@ -569,14 +575,14 @@ const name = "vixt:vite";
 var vite_default = defineVixtModule({
 	meta: { name },
 	setup(_, vixt) {
-		let env$1;
+		let env;
 		return {
 			name,
 			enforce: "pre",
 			config(config) {
 				const { rootDir, app } = vixt.options;
-				env$1 = loadEnv(config.mode, config.envDir, config.envPrefix);
-				const defineEnv = Object.fromEntries(Object.entries(env$1).filter(([k]) => ![
+				env = loadEnv(config.mode, config.envDir, config.envPrefix);
+				const defineEnv = Object.fromEntries(Object.entries(env).filter(([k]) => ![
 					"MODE",
 					"DEV",
 					"PROD"
@@ -589,7 +595,7 @@ var vite_default = defineVixtModule({
 			},
 			configResolved(config) {
 				Object.assign(config.env, {
-					...env$1,
+					...env,
 					...config.env
 				});
 			}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@vixt/core",
   "type": "module",
-  "version": "0.7.3",
+  "version": "0.8.0",
   "author": "SoulLyoko<https://github.com/SoulLyoko>",
   "license": "MIT",
   "homepage": "https://soullyoko.github.io/vixt/",
@@ -17,6 +17,7 @@
   ],
   "exports": {
     ".": "./dist/node/index.mjs",
+    "./cli": "./dist/cli/index.mjs",
     "./client": "./dist/client/index.js",
     "./package.json": "./package.json"
   },
@@ -28,11 +29,12 @@
   ],
   "dependencies": {
     "@types/fs-extra": "^11.0.4",
-    "@vitejs/plugin-basic-ssl": "^2.1.3",
-    "@vitejs/plugin-legacy": "^8.0.0-beta.0",
+    "@vitejs/plugin-basic-ssl": "^2.1.4",
+    "@vitejs/plugin-legacy": "^8.0.0-beta.1",
     "@vue/tsconfig": "^0.8.1",
     "c12": "^3.3.3",
     "cac": "^6.7.14",
+    "citty": "^0.2.0",
     "defu": "^6.1.4",
     "find-up": "^8.0.0",
     "fs-extra": "^11.3.3",