@vixt/core 0.6.3 → 0.6.5

package/dist/node/index.mjs

@@ -12,6 +12,7 @@ import Legacy from "@vitejs/plugin-legacy";
 import Analyzer from "vite-bundle-analyzer";
 import Ssl from "@vitejs/plugin-basic-ssl";
 import Checker from "vite-plugin-checker";
+import { builders, parseExpression, parseModule } from "magicast";
 
 //#region src/node/env.ts
 function loadCLIOptions() {
@@ -464,33 +465,35 @@ const resolvedVirtualModuleId$2 = `\0${virtualModuleId$2}`;
 var virtual_app_config_default = defineVixtModule({
 	meta: { name: name$3 },
 	setup(_, vixt) {
-		let appConfigsImportTemplate = "";
-		let appConfigsMergeTemplate = "";
-		let i = 0;
-		for (const layer of vixt._layers) {
-			const appConfigPath = path.resolve(layer.config.srcDir, "app.config.ts");
-			if (fs.existsSync(appConfigPath)) {
-				const appConfigName = `__app_config_${i}`;
-				appConfigsImportTemplate += `import ${appConfigName} from '${appConfigPath}'\n`;
-				appConfigsMergeTemplate += `${appConfigName}, `;
-				i++;
-			}
-		}
 		return {
 			name: name$3,
 			resolveId(id) {
 				if (id === virtualModuleId$2) return resolvedVirtualModuleId$2;
 			},
 			load(id) {
-				if (id === resolvedVirtualModuleId$2) {
-					const { baseURL = "/", rootId = "app" } = vixt.options.app ?? {};
-					return `
-import { defu } from 'defu'
-${appConfigsImportTemplate}
-const appConfig = defu(${appConfigsMergeTemplate}{ baseURL: '${baseURL}', rootId: '${rootId}' })
-export default appConfig
-`;
+				if (id !== resolvedVirtualModuleId$2) return;
+				const { baseURL = "/", rootId = "app" } = vixt.options.app ?? {};
+				const code = parseModule("import { defu } from \"defu\"");
+				const defuCall = builders.functionCall("defu");
+				let i = 0;
+				for (const layer of vixt._layers) {
+					const appConfigPath = path.resolve(layer.config.srcDir, "app.config.ts");
+					if (fs.existsSync(appConfigPath)) {
+						const appConfigName = `__app_config_${i++}`;
+						code.imports.$append({
+							local: appConfigName,
+							imported: "default",
+							from: appConfigPath
+						});
+						defuCall.$args.push(parseExpression(appConfigName));
+					}
 				}
+				defuCall.$args.push({
+					baseURL,
+					rootId
+				});
+				code.exports.default = defuCall;
+				return code.generate();
 			}
 		};
 	}
@@ -504,14 +507,13 @@ const resolvedVirtualModuleId$1 = `\0${virtualModuleId$1}`;
 var virtual_css_default = defineVixtModule({
 	meta: { name: name$2 },
 	setup(_, vixt) {
-		const cssTemplate = vixt.options.app?.css?.map((css) => `import '${css}'`).join("\n") ?? "";
 		return {
 			name: name$2,
 			resolveId(id) {
 				if (id === virtualModuleId$1) return resolvedVirtualModuleId$1;
 			},
 			load(id) {
-				if (id === resolvedVirtualModuleId$1) return cssTemplate;
+				if (id === resolvedVirtualModuleId$1) return vixt.options.app?.css?.map((css) => `import '${css}'`).join("\n") ?? "";
 			}
 		};
 	}
@@ -525,37 +527,33 @@ const resolvedVirtualModuleId = `\0${virtualModuleId}`;
 var virtual_plugins_default = defineVixtModule({
 	meta: { name: name$1 },
 	setup(_, vixt) {
-		const { plugins: pluginsDirs = [] } = resolveLayersDirs(vixt._layers);
-		let pluginsImportTemplate = "";
-		let pluginsMergeTemplate = "";
-		let i = 0;
-		for (const plugin of vixt.options.plugins ?? []) {
-			const pluginName = `__plugin_${i}`;
-			pluginsImportTemplate += `import ${pluginName} from '${plugin}'\n`;
-			pluginsMergeTemplate += `${pluginName}, `;
-			i++;
-		}
-		for (const pluginsDir of pluginsDirs.reverse()) {
-			const files = fs.existsSync(pluginsDir) ? fs.readdirSync(pluginsDir) : [];
-			for (const f of files.filter((f$1) => /[jt]sx?$/.test(f$1))) {
-				const p = path.resolve(pluginsDir, f);
-				const pluginName = `__plugin_${i}`;
-				pluginsImportTemplate += `import ${pluginName} from '${p}'\n`;
-				pluginsMergeTemplate += `${pluginName}, `;
-				i++;
-			}
-		}
 		return {
 			name: name$1,
 			resolveId(id) {
 				if (id === virtualModuleId) return resolvedVirtualModuleId;
 			},
 			load(id) {
-				if (id === resolvedVirtualModuleId) return `
-${pluginsImportTemplate}
-const plugins = [${pluginsMergeTemplate}]
-export default plugins
-`;
+				if (id !== resolvedVirtualModuleId) return;
+				const { plugins: pluginsDirs = [] } = resolveLayersDirs(vixt._layers);
+				const code = parseModule("");
+				const pluginsArray = parseExpression("[]");
+				let i = 0;
+				function addPlugin(from) {
+					const pluginName = `__plugin_${i++}`;
+					code.imports.$append({
+						local: pluginName,
+						imported: "default",
+						from
+					});
+					pluginsArray.push(parseExpression(pluginName));
+				}
+				for (const pluginPath of vixt.options.plugins ?? []) addPlugin(pluginPath);
+				for (const pluginsDir of pluginsDirs.reverse()) {
+					const files = fs.existsSync(pluginsDir) ? fs.readdirSync(pluginsDir) : [];
+					for (const file of files.filter((f) => /[jt]sx?$/.test(f))) addPlugin(path.resolve(pluginsDir, file));
+				}
+				code.exports.default = pluginsArray;
+				return code.generate();
 			}
 		};
 	}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@vixt/core",
   "type": "module",
-  "version": "0.6.3",
+  "version": "0.6.5",
   "author": "SoulLyoko<https://github.com/SoulLyoko>",
   "license": "MIT",
   "homepage": "https://soullyoko.github.io/vixt/",
@@ -37,6 +37,7 @@
     "find-up": "^8.0.0",
     "fs-extra": "^11.3.3",
     "jiti": "^2.6.1",
+    "magicast": "^0.5.1",
     "mlly": "^1.8.0",
     "pathe": "^2.0.3",
     "pkg-types": "^2.3.0",