stacks 0.58.28 → 0.58.30

package/core/utils/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@stacksjs/utils",
   "type": "module",
-  "version": "0.58.28",
+  "version": "0.58.30",
   "description": "The Stacks helper functions.",
   "author": "Chris Breuer",
   "license": "MIT",

package/core/validation/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@stacksjs/validation",
   "type": "module",
-  "version": "0.58.28",
+  "version": "0.58.30",
   "description": "The Stacks Validation ways.",
   "author": "Chris Breuer",
   "license": "MIT",

package/core/vite/README.md

@@ -21,7 +21,7 @@ bun install -d @stacksjs/vite-plugin
 Now, you can use it in your project:
 
 ```js
-import vitePlugin from '@stacksjs/vite-plugin'
+import vite from '@stacksjs/vite'
 
 // wip
 ```

package/core/vite/build.ts

@@ -1,7 +1,7 @@
 import { runCommand } from '@stacksjs/cli'
 import { handleError } from '@stacksjs/error-handling'
 
-const result = await runCommand('bun build ./src/index.ts --outdir dist --format esm --external markdown-it-shikiji --external unplugin-vue-macros/vite --external vite-plugin-webfont-dl --external unplugin-vue-markdown/vite --external unplugin-auto-import/vite --external @intlify/unplugin-vue-i18n/vite --external defu --external @stacksjs/types --external @stacksjs/path --external vite --external unplugin-vue-components/vite --external unocss/vite --external @stacksjs/config --external @stacksjs/cli --external vitepress --external vite-plugin-inspect --external vite-plugin-vue-layouts --external unplugin-vue-router --external unplugin-vue-router/vite --external vite-plugin-pwa --external @vitejs/plugin-vue --external @stacksjs/alias --external vite-ssg-sitemap --external @stacksjs/server --external @stacksjs/env --external @unhead/vue --external markdown-it-link-attributes --external vite-plugin-vue-devtools --external vite-plugin-pages --target bun', {
+const result = await runCommand('bun build ./src/index.ts --outdir dist --format esm --external markdown-it-shikiji --external unplugin-vue-macros/vite --external vite-plugin-webfont-dl --external unplugin-vue-markdown/vite --external unplugin-auto-import/vite --external @intlify/unplugin-vue-i18n/vite --external defu --external @stacksjs/types --external @stacksjs/path --external unplugin-vue-components/vite --external unocss/vite --external @stacksjs/config --external @stacksjs/cli --external vitepress --external vite --external vite-plugin-inspect --external vite-plugin-vue-layouts --external unplugin-vue-router --external unplugin-vue-router/vite --external vite-plugin-pwa --external @vitejs/plugin-vue --external @stacksjs/alias --external vite-ssg-sitemap --external @stacksjs/server --external @stacksjs/env --external @unhead/vue --external markdown-it-link-attributes --external vite-plugin-vue-devtools --external vite-plugin-pages --target bun', {
   cwd: import.meta.dir,
 })
 

package/core/vite/dist/index.js

@@ -10,9 +10,6 @@ var __export = (target, all) => {
     });
 };
 
-// src/index.ts
-import {defineConfig, loadEnv as viteLoadEnv} from "vite";
-
 // src/example-vue.ts
 var exports_example_vue = {};
 __export(exports_example_vue, {
@@ -30,6 +27,7 @@ __export(exports_example_vue, {
 import {examplesPath} from "@stacksjs/path";
 import {server as server2} from "@stacksjs/server";
 import {alias as alias2} from "@stacksjs/alias";
+import {defineConfig} from "vite";
 var vueComponentsExampleConfig = {
   root: examplesPath("vue-components"),
   resolve: {
@@ -59,6 +57,7 @@ __export(exports_example_wc, {
 import {examplesPath as examplesPath2} from "@stacksjs/path";
 import {server as server4} from "@stacksjs/server";
 import {alias as alias4} from "@stacksjs/alias";
+import {defineConfig as defineConfig2} from "vite";
 var webComponentsExampleConfig = {
   root: examplesPath2("web-components"),
   resolve: {
@@ -68,7 +67,7 @@ var webComponentsExampleConfig = {
     type: "example"
   })
 };
-var example_wc_default = defineConfig(() => {
+var example_wc_default = defineConfig2(() => {
   return webComponentsExampleConfig;
 });
 // src/functions.ts
@@ -92,6 +91,7 @@ __export(exports_functions, {
 });
 import {frameworkPath, functionsPath, libraryEntryPath, projectPath} from "@stacksjs/path";
 import {alias as alias6} from "@stacksjs/alias";
+import {defineConfig as defineConfig3} from "vite";
 function functionsBuildOptions() {
   return {
     outDir: frameworkPath("functions/dist"),
@@ -120,7 +120,7 @@ var functionsConfig = {
   },
   build: functionsBuildOptions()
 };
-var functions_default = defineConfig(({ command }) => {
+var functions_default = defineConfig3(({ command }) => {
   if (command === "serve")
     return functionsConfig;
   return functionsConfig;
@@ -135,95 +135,13 @@ __export(exports_views, {
   }
 });
 import {path as p7} from "@stacksjs/path";
-import {defineConfig as defineConfig2} from "vite";
-import Vue2 from "@vitejs/plugin-vue";
+import {defineConfig as defineConfig4} from "vite";
+import Vue from "@vitejs/plugin-vue";
 import generateSitemap from "vite-ssg-sitemap";
 import {server as server6} from "@stacksjs/server";
 import {alias as alias8} from "@stacksjs/alias";
 import VueMacros from "unplugin-vue-macros/vite";
 
-// src/stacks.ts
-var exports_stacks = {};
-__export(exports_stacks, {
-  uiEngine: () => {
-    {
-      return uiEngine;
-    }
-  },
-  router: () => {
-    {
-      return router;
-    }
-  },
-  pwa: () => {
-    {
-      return pwa;
-    }
-  },
-  pages: () => {
-    {
-      return pages;
-    }
-  },
-  markdown: () => {
-    {
-      return markdown;
-    }
-  },
-  layouts: () => {
-    {
-      return layouts;
-    }
-  },
-  inspect: () => {
-    {
-      return inspect;
-    }
-  },
-  i18n: () => {
-    {
-      return i18n;
-    }
-  },
-  devtools: () => {
-    {
-      return default2;
-    }
-  },
-  cssEngine: () => {
-    {
-      return cssEngine;
-    }
-  },
-  components: () => {
-    {
-      return components;
-    }
-  },
-  autoImports: () => {
-    {
-      return autoImports;
-    }
-  }
-});
-
-// src/plugin/ui-engine.ts
-import Vue from "@vitejs/plugin-vue";
-function uiEngine(isWebComponent = false) {
-  if (isWebComponent) {
-    return Vue({
-      include: /\.(stx|vue|md)($|\?)/,
-      template: {
-        compilerOptions: {
-          isCustomElement: () => true
-        }
-      }
-    });
-  }
-  return Vue({
-    include: /\.(stx|vue|md)($|\?)/
-  });
-}
 // src/plugin/auto-imports.ts
 import {path as p} from "@stacksjs/path";
 import {unheadVueComposablesImports as VueHeadImports} from "@unhead/vue";
@@ -231,7 +149,7 @@ import AutoImport from "unplugin-auto-import/vite";
 import {VueRouterAutoImports} from "unplugin-vue-router";
 function autoImports(options) {
   return AutoImport({
-    include: /\.(stx|vue|js|ts|mdx?|elm|html)($|\?)/,
+    include: /\.(stx|js|ts|mdx?|elm|html)($|\?)/,
     imports: [
       "pinia",
       "vue",
@@ -253,17 +171,29 @@ function autoImports(options) {
     ...options
   });
 }
-// src/plugin/inspect.ts
-import Inspect from "vite-plugin-inspect";
-function inspect(options) {
-  return Inspect(options);
+
+// src/plugin/components.ts
+import Components from "unplugin-vue-components/vite";
+import {path as p2} from "@stacksjs/path";
+function components(options) {
+  return Components({
+    extensions: ["stx", "vue", "md"],
+    include: /\.(stx|vue|md)($|\?)/,
+    dirs: [
+      p2.componentsPath(),
+      p2.uiPath("src/components/")
+    ],
+    dts: p2.frameworkPath("types/components.d.ts"),
+    ...options
+  });
 }
+
 // src/plugin/css-engine.ts
 import UnoCSS from "unocss/vite";
-import {path as p2} from "@stacksjs/path";
+import {path as p3} from "@stacksjs/path";
 function cssEngine(isWebComponent = false) {
   return UnoCSS({
-    configFile: p2.uiPath("src/uno.config.ts"),
+    configFile: p3.uiPath("src/uno.config.ts"),
     mode: isWebComponent ? "shadow-dom" : "vue-scoped",
     content: {
       pipeline: {
@@ -272,91 +202,41 @@ function cssEngine(isWebComponent = false) {
     }
   });
 }
-// src/plugin/components.ts
-import Components from "unplugin-vue-components/vite";
-import {path as p3} from "@stacksjs/path";
-function components(options) {
-  return Components({
-    extensions: ["stx", "vue", "md"],
-    include: /\.(stx|vue|md)($|\?)/,
-    dirs: [
-      p3.componentsPath(),
-      p3.uiPath("src/components/")
-    ],
-    dts: p3.frameworkPath("types/components.d.ts"),
-    ...options
-  });
-}
-// src/plugin/pages.ts
-import {defu} from "defu";
-import VueRouter from "unplugin-vue-router/vite";
-function pages(options) {
-  const defaultOptions = {
-    extensions: [".stx", ".vue", ".md"],
-    getRouteName: (routeNode) => getFileBasedRouteName(routeNode)
-  };
-  const newOptions = defu(options, defaultOptions);
-  return VueRouter(newOptions);
-}
-var getFileBasedRouteName = function(node) {
-  if (!node.parent)
-    return "";
-  const segment = node.value.rawSegment === "index" ? "" : node.value.rawSegment;
-  const path7 = getFileBasedRouteName(node.parent) + (segment ? `/${segment}` : "");
-  const cleanedPath = path7.replace(/^\//, "").replace(/\//g, ".").replace(/\[|\]/g, "");
-  return cleanedPath;
-};
-// src/plugin/pwa.ts
-import {path as path8} from "@stacksjs/path";
-import {VitePWA} from "vite-plugin-pwa";
-function pwa() {
-  return VitePWA({
-    srcDir: path8.publicPath(),
-    registerType: "autoUpdate",
-    includeAssets: ["favicon.svg", "safari-pinned-tab.svg"],
-    manifest: {
-      name: "Stacks",
-      short_name: "Stacks",
-      theme_color: "#ffffff",
-      icons: [
-        {
-          src: "/pwa-192x192.png",
-          sizes: "192x192",
-          type: "image/png"
-        },
-        {
-          src: "/pwa-512x512.png",
-          sizes: "512x512",
-          type: "image/png"
-        },
-        {
-          src: "/pwa-512x512.png",
-          sizes: "512x512",
-          type: "image/png",
-          purpose: "any maskable"
-        }
-      ]
-    }
+
+// src/plugin/devtools.ts
+import {default as default2} from "vite-plugin-vue-devtools";
+
+// src/plugin/i18n.ts
+import VueI18n from "@intlify/unplugin-vue-i18n/vite";
+import {path as p4} from "@stacksjs/path";
+function i18n() {
+  return VueI18n({
+    runtimeOnly: true,
+    compositionOnly: true,
+    fullInstall: true,
+    include: [
+      p4.resolve(__dirname, "../../../../../../../lang/**")
+    ]
   });
 }
+var __dirname = "/home/runner/work/stacks/stacks/storage/framework/core/vite/src/plugin";
+
 // src/plugin/layouts.ts
-import {path as p4} from "@stacksjs/path";
+import {path as p5} from "@stacksjs/path";
 import Layouts from "vite-plugin-vue-layouts";
-function layouts(options, isMain = true) {
-  if (!isMain)
-    return Layouts(options);
-  return Layouts({
+function layouts(options) {
+  const opts = {
     extensions: ["stx", "vue"],
-    layoutsDirs: p4.layoutsPath(),
-    defaultLayout: p4.layoutsPath("default.stx"),
+    layoutsDirs: p5.layoutsPath(),
     exclude: [
-      p4.layoutsPath("mails")
+      p5.layoutsPath("dashboard"),
+      p5.layoutsPath("mails")
     ],
     ...options
-  });
+  };
+  return Layouts(opts);
 }
-// src/plugin/devtools.ts
-import {default as default2} from "vite-plugin-vue-devtools";
+
 // src/plugin/markdown.ts
 import Markdown from "unplugin-vue-markdown/vite";
 import LinkAttributes from "markdown-it-link-attributes";
@@ -383,36 +263,59 @@ function markdown() {
     }
   });
 }
-// src/plugin/i18n.ts
-import VueI18n from "@intlify/unplugin-vue-i18n/vite";
-import {path as p5} from "@stacksjs/path";
-function i18n() {
-  return VueI18n({
-    runtimeOnly: true,
-    compositionOnly: true,
-    fullInstall: true,
-    include: [
-      p5.resolve(__dirname, "../../../../../../../lang/**")
-    ]
+
+// src/plugin/pwa.ts
+import {path as path10} from "@stacksjs/path";
+import {VitePWA} from "vite-plugin-pwa";
+function pwa() {
+  return VitePWA({
+    srcDir: path10.publicPath(),
+    registerType: "autoUpdate",
+    includeAssets: ["favicon.svg", "safari-pinned-tab.svg"],
+    manifest: {
+      name: "Stacks",
+      short_name: "Stacks",
+      theme_color: "#ffffff",
+      icons: [
+        {
+          src: "/pwa-192x192.png",
+          sizes: "192x192",
+          type: "image/png"
+        },
+        {
+          src: "/pwa-512x512.png",
+          sizes: "512x512",
+          type: "image/png"
+        },
+        {
+          src: "/pwa-512x512.png",
+          sizes: "512x512",
+          type: "image/png",
+          purpose: "any maskable"
+        }
+      ]
+    }
   });
 }
-var __dirname = "/home/runner/work/stacks/stacks/storage/framework/core/vite/src/plugin";
+
 // src/plugin/router.ts
 import {config as config2} from "@stacksjs/config";
-import VueRouter2 from "unplugin-vue-router/vite";
+import VueRouter from "unplugin-vue-router/vite";
 import {path as p6} from "@stacksjs/path";
-function router() {
-  return VueRouter2({
+function router(options) {
+  return VueRouter({
     extensions: [".stx", ".md"],
     dts: p6.frameworkPath("types/router.d.ts"),
     routesFolder: [
       p6.resourcesPath("views")
     ],
-    logs: config2.app.debug || false
+    logs: config2.app.debug || false,
+    ...options
   });
 }
+
 // src/views.ts
-var views_default = defineConfig2({
+var views_default = defineConfig4({
   build: {
     rollupOptions: {
       external: ["path", "fs", "net", "tls", "stream", "node:process", "constants", "node:dns/promises", "node:util"]
@@ -438,13 +341,16 @@ var views_default = defineConfig2({
   plugins: [
     VueMacros({
       plugins: {
-        vue: Vue2({
+        vue: Vue({
           include: /\.(stx|vue|md)($|\?)/
         })
       }
     }),
     router(),
-    layouts(),
+    layouts({
+      extensions: ["stx", "vue"],
+      layoutsDirs: p7.layoutsPath("", { relative: true })
+    }),
     autoImports(),
     components(),
     cssEngine(),
@@ -485,7 +391,115 @@ import {alias as alias10} from "@stacksjs/alias";
 import {server as server8} from "@stacksjs/server";
 import {config as c} from "@stacksjs/config";
 import {path as p8} from "@stacksjs/path";
-import {defineConfig as defineConfig3} from "vite";
+import {defineConfig as defineConfig5} from "vite";
+
+// src/plugins.ts
+var exports_plugins = {};
+__export(exports_plugins, {
+  uiEngine: () => {
+    {
+      return uiEngine;
+    }
+  },
+  router: () => {
+    {
+      return router;
+    }
+  },
+  pwa: () => {
+    {
+      return pwa;
+    }
+  },
+  pages: () => {
+    {
+      return pages;
+    }
+  },
+  markdown: () => {
+    {
+      return markdown;
+    }
+  },
+  layouts: () => {
+    {
+      return layouts;
+    }
+  },
+  inspect: () => {
+    {
+      return inspect;
+    }
+  },
+  i18n: () => {
+    {
+      return i18n;
+    }
+  },
+  devtools: () => {
+    {
+      return default2;
+    }
+  },
+  cssEngine: () => {
+    {
+      return cssEngine;
+    }
+  },
+  components: () => {
+    {
+      return components;
+    }
+  },
+  autoImports: () => {
+    {
+      return autoImports;
+    }
+  }
+});
+
+// src/plugin/ui-engine.ts
+import Vue2 from "@vitejs/plugin-vue";
+function uiEngine(isWebComponent = false) {
+  if (isWebComponent) {
+    return Vue2({
+      include: /\.(stx|vue|md)($|\?)/,
+      template: {
+        compilerOptions: {
+          isCustomElement: () => true
+        }
+      }
+    });
+  }
+  return Vue2({
+    include: /\.(stx|vue|md)($|\?)/
+  });
+}
+// src/plugin/inspect.ts
+import Inspect from "vite-plugin-inspect";
+function inspect(options) {
+  return Inspect(options);
+}
+// src/plugin/pages.ts
+import {defu} from "defu";
+import VueRouter2 from "unplugin-vue-router/vite";
+function pages(options) {
+  const defaultOptions = {
+    extensions: [".stx", ".vue", ".md"],
+    getRouteName: (routeNode) => getFileBasedRouteName(routeNode)
+  };
+  const newOptions = defu(options, defaultOptions);
+  return VueRouter2(newOptions);
+}
+var getFileBasedRouteName = function(node) {
+  if (!node.parent)
+    return "";
+  const segment = node.value.rawSegment === "index" ? "" : node.value.rawSegment;
+  const path13 = getFileBasedRouteName(node.parent) + (segment ? `/${segment}` : "");
+  const cleanedPath = path13.replace(/^\//, "").replace(/\//g, ".").replace(/\[|\]/g, "");
+  return cleanedPath;
+};
+// src/components.ts
 function vueComponentsBuildOptions() {
   return {
     outDir: p8.libsPath("components/vue/dist"),
@@ -539,7 +553,7 @@ var config4 = {
   ],
   build: vueComponentsBuildOptions()
 };
-var components_default = defineConfig3(({ command }) => {
+var components_default = defineConfig5(({ command }) => {
   if (command === "serve")
     return config4;
   return config4;
@@ -566,6 +580,7 @@ __export(exports_web_components, {
 import {path as p9} from "@stacksjs/path";
 import {server as server10} from "@stacksjs/server";
 import {alias as alias12} from "@stacksjs/alias";
+import {defineConfig as defineConfig6} from "vite";
 function webComponentsBuildOptions() {
   return {
     outDir: p9.frameworkPath("components/web/dist"),
@@ -600,7 +615,7 @@ var webComponentsConfig = {
   plugins: [],
   build: webComponentsBuildOptions()
 };
-var web_components_default = defineConfig(({ command }) => {
+var web_components_default = defineConfig6(({ command }) => {
   if (command === "serve")
     return webComponentsConfig;
   return webComponentsConfig;
@@ -608,7 +623,7 @@ var web_components_default = defineConfig(({ command }) => {
 // src/plugin/docs.ts
 import {kolorist as c2} from "@stacksjs/cli";
 // package.json
-var version = "0.58.28";
+var version = "0.58.30";
 
 // src/plugin/docs.ts
 var docsEngine = {
@@ -619,11 +634,6 @@ var docsEngine = {
     };
   }
 };
-
-// src/index.ts
-var loadEnv = function(...args) {
-  return viteLoadEnv(...args);
-};
 export {
   exports_web_components as webComponents,
   exports_example_wc as webComponentExample,
@@ -631,19 +641,17 @@ export {
   exports_example_vue as vueComponentExample,
   exports_views as views,
   uiEngine,
-  exports_stacks as stacks,
+  exports_plugins as stacks,
   router,
   pwa,
   pages,
   markdown,
-  loadEnv,
   layouts,
   inspect,
   i18n,
   exports_functions as functions,
   docsEngine,
   default2 as devtools,
-  defineConfig,
   cssEngine,
   components,
   autoImports

package/core/vite/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@stacksjs/vite",
   "type": "module",
-  "version": "0.58.28",
+  "version": "0.58.30",
   "description": "The Stacks Vite plugin.",
   "author": "Chris Breuer",
   "license": "MIT",
@@ -103,13 +103,13 @@
     "@vitejs/plugin-vue": "^5.0.3",
     "markdown-it-link-attributes": "^4.0.1",
     "markdown-it-shiki": "^0.9.0",
-    "unplugin-auto-import": "^0.17.3",
+    "unplugin-auto-import": "^0.17.5",
     "unplugin-vue-components": "^0.26.0",
-    "vite": "^5.0.11",
+    "vite": "^5.0.12",
     "vite-plugin-full-reload": "^1.1.0",
-    "vite-plugin-inspect": "^0.8.1",
+    "vite-plugin-inspect": "^0.8.3",
     "vite-plugin-pages": "^0.32.0",
-    "vite-plugin-pwa": "^0.17.4",
+    "vite-plugin-pwa": "^0.17.5",
     "vite-plugin-vue-markdown": "^0.23.8",
     "vite-ssg": "^0.23.6",
     "vite-ssg-sitemap": "^0.6.1"

package/core/vite/src/components.ts

@@ -4,7 +4,7 @@ import { config as c } from '@stacksjs/config'
 import { path as p } from '@stacksjs/path'
 import { defineConfig } from 'vite'
 import type { ViteConfig } from '@stacksjs/types'
-import { autoImports, components, cssEngine, devtools, inspect, uiEngine } from './stacks'
+import { autoImports, components, cssEngine, devtools, inspect, uiEngine } from './plugins'
 import type { ViteBuildOptions } from '.'
 
 const config = {