@vixt/vue 0.1.28 → 0.1.30

package/dist/index.mjs

@@ -12,9 +12,8 @@ import VueDevTools from 'vite-plugin-vue-devtools';
 import Layouts from 'vite-plugin-vue-layouts';
 
 function getAppComponentPath(vixt) {
-  const { srcDirName } = vixt.options;
   for (const layer of vixt._layers) {
-    const appComponentPath = path.resolve(layer.cwd, srcDirName, "App.vue");
+    const appComponentPath = path.resolve(layer.config.srcDir, "App.vue");
     if (fs.existsSync(appComponentPath))
       return appComponentPath;
   }
@@ -26,12 +25,12 @@ function genarateAppComponent(vixt) {
 }
 
 function generateAppConfig(vixt) {
-  const { buildImportsDir, srcDirName } = vixt.options;
+  const { buildImportsDir } = vixt.options;
   let appConfigsImportTemplate = "";
   let appConfigsMergeTemplate = "";
   let i = 0;
   for (const layer of vixt._layers) {
-    const appConfigPath = path.resolve(layer.cwd, srcDirName, "app.config.ts");
+    const appConfigPath = path.resolve(layer.config.srcDir, "app.config.ts");
     if (fs.existsSync(appConfigPath)) {
       const appConfigName = `__app_config_${i}`;
       appConfigsImportTemplate += `import ${appConfigName} from '${appConfigPath}'
@@ -66,11 +65,11 @@ function resolveHeadTag(tag, attrs) {
   return attrs?.children ? `<${tag} ${attrsStr}>${attrs.children}</${tag}>` : `<${tag} ${attrsStr} />`;
 }
 function generateIndexHtml(options, vixt) {
-  const { buildDir, buildDirName, rootDir, srcDirName } = vixt.options;
+  const { buildDir, rootDir, srcDir } = vixt.options;
   const indexHtmlPath = path.resolve(rootDir, "index.html");
   if (!fs.existsSync(indexHtmlPath))
     fs.outputFileSync(indexHtmlPath, `<!-- Generated by Vixt -->
-<!-- This file transform from '${buildDirName}/index.html' -->
+<!-- This file transform from '${path.basename(buildDir)}/index.html' -->
 `);
   const { head = {}, rootTag, rootId } = options;
   const headTemplate = Object.entries(head).filter(([k]) => k !== "noscript").map(([tag, attrs]) => attrs.map((e) => resolveHeadTag(tag, e))).flat().join("\n");
@@ -94,7 +93,7 @@ ${headTemplate}
     <${rootTag} id="${rootId}">
 ${loadingTemplate}
     </${rootTag}>
-    <script type="module" src="/${srcDirName}/main.ts"><\/script>
+    <script type="module" src="${srcDir.replace(rootDir, "")}/main.ts"><\/script>
 ${noscriptTemplate}
   </body>
 </html>
@@ -104,12 +103,11 @@ ${noscriptTemplate}
 }
 
 function generatePlugins(vixt) {
-  const { srcDirName } = vixt.options;
   let pluginsImportTemplate = "";
   let pluginsMergeTemplate = "";
   let i = 0;
   for (const layer of [...vixt._layers].reverse()) {
-    const pluginsDir = path.resolve(layer.cwd, srcDirName, "plugins");
+    const pluginsDir = path.resolve(layer.config.srcDir, "plugins");
     const files = fs.existsSync(pluginsDir) ? fs.readdirSync(pluginsDir) : [];
     for (const f of files) {
       const p = path.resolve(pluginsDir, f);
@@ -133,11 +131,11 @@ function usePlugins(options) {
 }
 
 function generateMainTs(options, vixt) {
-  const { buildDir, buildDirName, srcDir } = vixt.options;
+  const { buildDir, srcDir } = vixt.options;
   const mainTsPath = path.resolve(srcDir, "main.ts");
   if (!fs.existsSync(mainTsPath))
     fs.outputFileSync(mainTsPath, `// Generated by Vixt
-// This file transform from '${buildDirName}/main.ts'
+// This file transform from '${path.basename(buildDir)}/main.ts'
 `);
   const appComponentTemplate = genarateAppComponent(vixt);
   const cssTemplate = generateCss(options);
@@ -224,7 +222,7 @@ const appVue = defineVixtModule({
 
 const presetVue = defineVixtModule({
   async setup(_, vixt) {
-    const { components, composables = [], constants = [], utils = [], stores = [], pages, layouts } = resolveLayersDirs(vixt._layers, vixt.options);
+    const { components, composables = [], constants = [], utils = [], stores = [], pages, layouts } = resolveLayersDirs(vixt._layers);
     const { buildTypesDir, buildImportsDir } = vixt.options;
     const defaultOptions = {
       vue: {},

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@vixt/vue",
   "type": "module",
-  "version": "0.1.28",
+  "version": "0.1.30",
   "author": "SoulLyoko<https://github.com/SoulLyoko>",
   "license": "MIT",
   "homepage": "https://github.com/SoulLyoko/vixt#readme",
@@ -20,18 +20,18 @@
   "dependencies": {
     "@vitejs/plugin-vue": "^5.2.0",
     "@vitejs/plugin-vue-jsx": "^4.1.0",
-    "@vueuse/core": "^11.3.0",
-    "pinia": "^2.2.6",
-    "pinia-plugin-persistedstate": "^4.1.3",
-    "unocss": "^0.64.1",
-    "unplugin-auto-import": "^0.18.5",
-    "unplugin-vue-components": "^0.27.4",
-    "unplugin-vue-router": "^0.10.8",
-    "vite-plugin-vue-devtools": "^7.6.4",
+    "@vueuse/core": "^12.4.0",
+    "pinia": "^2.3.0",
+    "pinia-plugin-persistedstate": "^4.2.0",
+    "unocss": "^0.65.4",
+    "unplugin-auto-import": "^0.19.0",
+    "unplugin-vue-components": "^0.28.0",
+    "unplugin-vue-router": "^0.10.9",
+    "vite-plugin-vue-devtools": "^7.7.0",
     "vite-plugin-vue-layouts": "^0.11.0",
     "vue": "^3.5.13",
-    "vue-router": "^4.4.5",
-    "@vixt/core": "0.1.28"
+    "vue-router": "^4.5.0",
+    "@vixt/core": "0.1.30"
   },
   "scripts": {
     "build": "unbuild"