stacks 0.53.1 → 0.56.3

package/core/buddy/src/commands/generate.ts

@@ -29,22 +29,24 @@ async function generate(buddy: CLI) {
     .option('--verbose', descriptions.verbose, { default: false })
     .action(async (options: GeneratorOptions) => {
       if (hasNoOptions(options)) {
-        const answers = await prompt(descriptions.select, {
-          type: 'multiselect',
-          required: true,
-          options: [
-            { label: '1.) TypeScript Types', value: 'types' },
-            { label: '2.) Library Entry Points', value: 'entries' },
-            { label: '3.) Web Types', value: 'web-types' },
-            { label: '4.) VS Code Custom Data', value: 'custom-data' },
-            { label: '5.) IDE Helpers', value: 'ide-helpers' },
-            { label: '6.) Vue 2 & 3 Compatibility', value: 'vue-compatibility' },
-            { label: '7.) Component Meta', value: 'component-meta' },
-          ],
-        })
+        let answers = await prompt.require()
+          .multiselect(descriptions.select, {
+            options: [
+              { label: '1.) TypeScript Types', value: 'types' },
+              { label: '2.) Library Entry Points', value: 'entries' },
+              { label: '3.) Web Types', value: 'web-types' },
+              { label: '4.) VS Code Custom Data', value: 'custom-data' },
+              { label: '5.) IDE Helpers', value: 'ide-helpers' },
+              { label: '6.) Vue 2 & 3 Compatibility', value: 'vue-compatibility' },
+              { label: '7.) Component Meta', value: 'component-meta' },
+            ],
+          })
+
+        if (isString(answers))
+          answers = [answers]
 
         // creates an object out of array and sets answers to true
-        options = answers.reduce((a: any, v: any) => ({ ...a, [v]: true }), {})
+        options = (answers as Array<any>).reduce((a: any, v: any) => ({ ...a, [v]: true }), {})
       }
 
       await startGenerationProcess(options)

package/core/buddy/src/commands/key.ts

@@ -1,5 +1,5 @@
 import type { CLI, KeyOptions } from '@stacksjs/types'
-import { intro, outro } from '@stacksjs/cli'
+import { intro, log, outro } from '@stacksjs/cli'
 import { Action } from '@stacksjs/types'
 import { runAction } from '@stacksjs/actions'
 

package/core/buddy/src/commands/lint.ts

@@ -15,15 +15,15 @@ async function lint(buddy: CLI) {
     .option('-f, --fix', descriptions.lintFix, { default: false })
     .option('--verbose', descriptions.verbose, { default: false })
     .action(async (options: LintOptions) => {
-      const perf = await intro('buddy lint')
+      const startTime = await intro('buddy lint')
       const result = await runAction(Action.Lint, { ...options, showSpinner: true, spinnerText: 'Linting...' })
-
+      // console.log('res', result)
       if (result.isErr()) {
-        outro('While running `buddy lint`, there was an issue', { startTime: perf, useSeconds: true, isError: true }, result.error as Error)
+        outro('While running `buddy lint`, there was an issue', { startTime, useSeconds: true, isError: true }, result.error as Error)
         process.exit()
       }
 
-      outro('Linted your project', { startTime: perf, useSeconds: true })
+      outro('Linted your project', { startTime, useSeconds: true })
     })
 
   buddy

package/core/buddy/src/commands/make.ts

@@ -53,21 +53,26 @@ async function make(buddy: CLI) {
       }
 
       if (hasNoOptions(options)) {
-        const answers = await prompt(descriptions.select, {
-          type: 'multiselect',
-          required: true,
-          options: [
-            { label: 'Page', value: 'page' },
-            { label: 'Function', value: 'function' },
-            { label: 'Component', value: 'component' },
-            { label: 'Notification', value: 'notification' },
-            { label: 'Language', value: 'language' },
-            { label: 'Database', value: 'database' },
-            { label: 'Migration', value: 'migration' },
-            { label: 'Factory', value: 'factory' },
-            { label: 'Stack', value: 'stack' },
-          ],
-        })
+        let answers = await prompt.require()
+          .multiselect(descriptions.select, {
+            options: [
+              { label: 'Page', value: 'page' },
+              { label: 'Function', value: 'function' },
+              { label: 'Component', value: 'component' },
+              { label: 'Notification', value: 'notification' },
+              { label: 'Language', value: 'language' },
+              { label: 'Database', value: 'database' },
+              { label: 'Migration', value: 'migration' },
+              { label: 'Factory', value: 'factory' },
+              { label: 'Stack', value: 'stack' },
+            ],
+          })
+
+        if (answers !== null)
+          process.exit(ExitCode.InvalidArgument)
+
+        if (isString(answers))
+          answers = [answers]
 
         // creates an object out of array and sets answers to true
         options = answers.reduce((a: any, v: any) => ({ ...a, [v]: true }), {})

package/core/buddy/src/commands/setting.ts

@@ -10,12 +10,12 @@ async function setting(buddy: CLI) {
     .command('page:setting', descriptions.command)
     .option('--verbose', descriptions.verbose, { default: false })
     .action(async () => {
-      console.log('Generating setting pages...')
+      console.log('Generating setting views...')
       // const startTime = await intro('buddy page:setting')
       // const result = await runAction(Action.GenerateSettings)
       //
       // if (result.isErr()) {
-      //   log.error('Something went wrong when generating', result.error as Error)
+      //   log.error('Something went wrong when generating')
       //   process.exit()
       // }
       //

package/core/buddy/src/commands/upgrade.ts

@@ -31,28 +31,24 @@ async function upgrade(buddy: CLI) {
       const perf = await intro('buddy upgrade')
 
       if (hasNoOptions(options)) {
-        const answers = await prompt(descriptions.select, {
-          type: 'multiselect',
-          required: true,
-          options: [
-            { value: 'dependencies', label: 'Dependencies' },
-            { value: 'framework', label: 'Framework' },
-            { value: 'node', label: 'Node.js' },
-            { value: 'package-manager', label: 'Package Manager' },
-          ],
-        })
-
-        if (answers.includes('dependencies'))
-          options.dependencies = true
-
-        if (answers.includes('framework'))
-          options.framework = true
-
-        if (answers.includes('node'))
-          options.node = true
-
-        if (answers.includes('package-manager'))
-          options.packageManager = true
+        let answers = await prompt.require()
+          .multiselect(descriptions.select, {
+            options: [
+              { value: 'dependencies', label: 'Dependencies' },
+              { value: 'framework', label: 'Framework' },
+              { value: 'node', label: 'Node.js' },
+              { value: 'package-manager', label: 'Package Manager' },
+            ],
+          })
+
+        if (answers !== null)
+          process.exit(ExitCode.InvalidArgument)
+
+        if (isString(answers))
+          answers = [answers]
+
+        // creates an object out of array and sets answers to true
+        options = answers.reduce((a: any, v: any) => ({ ...a, [v]: true }), {})
       }
 
       const result = await runAction(Action.Upgrade, { ...options, shell: true })

package/core/buddy/src/commands/version.ts

@@ -1,7 +1,7 @@
 import type { CLI } from '@stacksjs/types'
 import { bold, dim, green, intro } from '@stacksjs/cli'
 import { log } from '@stacksjs/logging'
-import { storage } from '@stacksjs/storage'
+import * as storage from '@stacksjs/storage'
 
 async function version(buddy: CLI) {
   const descriptions = {

package/core/build/build.config.ts

@@ -1,15 +1,30 @@
-import { defineBuildConfig } from 'unbuild'
+import { alias, defineBuildConfig } from '@stacksjs/development'
 
 export default defineBuildConfig({
+  alias,
+
   entries: [
-    {
-      builder: 'mkdist',
-      input: './src/',
-      outDir: './dist/',
-      format: 'esm',
-    },
+    './src/index',
+  ],
+
+  externals: [
+    '@stacksjs/alias',
+    '@stacksjs/config',
+    '@stacksjs/path',
+    '@stacksjs/server',
+    '@stacksjs/types',
+    '@stacksjs/utils',
+    '@stacksjs/development',
+    'unocss',
+    'defu',
+    'vite-plugin-mkcert',
+    'picocolors',
   ],
 
+  rollup: {
+    inlineDependencies: true,
+  },
+
   clean: true,
   declaration: true,
 })

package/core/build/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@stacksjs/build",
   "type": "module",
-  "version": "0.53.1",
-  "packageManager": "pnpm@8.5.1",
+  "version": "0.56.3",
+  "packageManager": "pnpm@8.6.5",
   "description": "The Stacks framework build tools and configurations.",
   "author": "Chris Breuer",
   "license": "MIT",
@@ -44,7 +44,7 @@
   "scripts": {
     "build": "unbuild",
     "dev": "unbuild --stub",
-    "prepublishOnly": "pnpm run build",
+    "prepublishOnly": "unbuild",
     "typecheck": "tsc --noEmit"
   },
   "peerDependencies": {
@@ -58,12 +58,12 @@
     "markdown-it-link-attributes": "^4.0.1",
     "markdown-it-shiki": "^0.9.0",
     "unbuild": "^1.2.1",
-    "unplugin-auto-import": "^0.16.2",
-    "unplugin-vue-components": "^0.24.1",
-    "vite": "^4.3.8",
-    "vite-plugin-inspect": "^0.7.28",
-    "vite-plugin-pages": "^0.30.1",
-    "vite-plugin-pwa": "^0.15.0",
+    "unplugin-auto-import": "^0.16.4",
+    "unplugin-vue-components": "^0.25.1",
+    "vite": "^4.3.9",
+    "vite-plugin-inspect": "^0.7.29",
+    "vite-plugin-pages": "^0.31.0",
+    "vite-plugin-pwa": "^0.16.4",
     "vite-plugin-vue-layouts": "^0.8.0",
     "vite-plugin-vue-markdown": "^0.23.5",
     "vite-ssg": "^0.22.2",
@@ -71,6 +71,7 @@
     "vue-docgen-web-types": "^0.1.8"
   },
   "devDependencies": {
-    "@stacksjs/development": "workspace:*"
+    "@stacksjs/development": "workspace:*",
+    "vite-plugin-mkcert": "^1.15.0"
   }
 }

package/core/build/src/desktop.ts

@@ -24,7 +24,7 @@ export default defineConfig({
     port: 3333,
     strictPort: true,
   },
-  envPrefix: ['VITE_', 'TAURI_'],
+  envPrefix: [''],
   plugins: [
 
     Vue({
@@ -49,7 +49,7 @@ export default defineConfig({
       ],
       dts: '../../../auto-imports.d.ts',
       dirs: [
-        '../../../../functions',
+        projectPath('functions'),
         '../../../../app/stores',
       ],
       vueTemplate: true,

package/core/build/src/example-vue.ts

@@ -3,7 +3,8 @@ import type { ViteConfig } from '@stacksjs/types'
 import { examplesPath } from '@stacksjs/path'
 import { server } from '@stacksjs/server'
 import { alias } from '@stacksjs/alias'
-import { uiEngine } from '.'
+
+// import { uiEngine } from '.'
 
 export const vueComponentsExampleConfig: ViteConfig = {
   root: examplesPath('vue-components'),
@@ -14,9 +15,9 @@ export const vueComponentsExampleConfig: ViteConfig = {
 
   server,
 
-  plugins: [
-    uiEngine(),
-  ],
+  // plugins: [
+  //   uiEngine(),
+  // ],
 }
 
 export default defineConfig(() => {

package/core/build/src/example-wc.ts

@@ -3,7 +3,8 @@ import type { ViteConfig } from '@stacksjs/types'
 import { examplesPath } from '@stacksjs/path'
 import { server } from '@stacksjs/server'
 import { alias } from '@stacksjs/alias'
-import { uiEngine } from '.'
+
+// import { uiEngine } from '.'
 
 export const webComponentsExampleConfig: ViteConfig = {
   root: examplesPath('web-components'),
@@ -14,9 +15,9 @@ export const webComponentsExampleConfig: ViteConfig = {
 
   server,
 
-  plugins: [
-    uiEngine(true),
-  ],
+  // plugins: [
+  //   uiEngine(true),
+  // ],
 }
 
 export default defineConfig(() => {

package/core/build/src/functions.ts

@@ -1,23 +1,24 @@
 import type { BuildOptions as ViteBuildOptions } from 'vite'
 import { defineConfig } from 'vite'
 import type { ViteConfig } from '@stacksjs/types'
-import { buildEntriesPath, frameworkPath, functionsPath, projectPath } from '@stacksjs/path'
+import { frameworkPath, functionsPath, libraryEntryPath, projectPath } from '@stacksjs/path'
 import { library } from '@stacksjs/config'
 import { alias } from '@stacksjs/alias'
-import { autoImports } from '.'
+
+// import { autoImports } from '.'
 
 export const functionsConfig: ViteConfig = {
   root: functionsPath(),
   envDir: projectPath(),
-  envPrefix: 'APP_',
+  envPrefix: '',
 
   resolve: {
     alias,
   },
 
-  plugins: [
-    autoImports(),
-  ],
+  // plugins: [
+  //   autoImports(),
+  // ],
 
   build: functionsBuildOptions(),
 }
@@ -28,9 +29,9 @@ export function functionsBuildOptions(): ViteBuildOptions {
     emptyOutDir: true,
     sourcemap: library.functions?.shouldGenerateSourcemap,
     lib: {
-      entry: buildEntriesPath('functions.ts'),
+      entry: libraryEntryPath('functions'),
       name: library.functions?.name,
-      formats: library.functions?.shouldBuildIife ? ['cjs', 'es', 'iife'] : ['cjs', 'es'],
+      formats: ['cjs', 'es'],
       fileName: (format: string) => {
         if (format === 'es')
           return 'index.mjs'
@@ -38,9 +39,6 @@ export function functionsBuildOptions(): ViteBuildOptions {
         if (format === 'cjs')
           return 'index.cjs'
 
-        if (format === 'iife')
-          return 'index.iife.js'
-
         return 'index.?.js'
       },
     },

package/core/build/src/index.ts

@@ -1,7 +1,7 @@
-export * from './example-vue'
-export * from './example-wc'
-export * from './functions'
-export * from './pages'
-export * from './vue-components'
-export * from './web-components'
-export * from './stacks'
+export * as vueComponentExample from './example-vue'
+export * as webComponentExample from './example-wc'
+export * as functions from './functions'
+export * as views from './views'
+export * as vueComponents from './vue-components'
+export * as webComponents from './web-components'
+export * as stacks from './stacks'

package/core/build/src/stacks.ts

@@ -6,23 +6,22 @@ import Inspect from 'vite-plugin-inspect'
 import Pages from 'vite-plugin-pages'
 import Layouts from 'vite-plugin-vue-layouts'
 import type { PluginOption } from 'vite'
-import Markdown from 'vite-plugin-vue-markdown'
-import LinkAttributes from 'markdown-it-link-attributes'
-import Shiki from 'markdown-it-shiki'
 import { VitePWA } from 'vite-plugin-pwa'
 import { defu } from 'defu'
-import type { AutoImportsOptions, ComponentOptions, InspectOptions, LayoutOptions, MarkdownOptions, PagesOption } from '@stacksjs/types'
+import type { AutoImportsOptions, ComponentOptions, InspectOptions, LayoutOptions, PagesOption } from '@stacksjs/types'
 import { path as p, resolve } from '@stacksjs/path'
 
-function inspect(options?: InspectOptions) {
+export { resolve }
+
+export function inspect(options?: InspectOptions) {
   return Inspect(options)
 }
 
-function layouts(options?: LayoutOptions) {
+export function layouts(options?: LayoutOptions) {
   return Layouts(options)
 }
 
-function components(options?: ComponentOptions): PluginOption {
+export function components(options?: ComponentOptions): PluginOption {
   const defaultOptions = {
     // also allow auto-loading markdown components
     extensions: ['vue', 'md'],
@@ -40,7 +39,7 @@ function components(options?: ComponentOptions): PluginOption {
 }
 
 // https://github.com/hannoeru/vite-plugin-pages
-function pages(options?: PagesOption) {
+export function pages(options?: PagesOption) {
   const defaultOptions = {
     extensions: ['vue', 'md'],
     dirs: [
@@ -53,39 +52,17 @@ function pages(options?: PagesOption) {
   return Pages(newOptions)
 }
 
-function markdown(options?: MarkdownOptions) {
-  const defaultOptions = {
-    wrapperClasses: 'prose prose-sm m-auto text-left',
-    headEnabled: true,
-    markdownItSetup(md: any) {
-    // https://prismjs.com/
-      md.use(Shiki, {
-        theme: 'nord',
-      })
-      md.use(LinkAttributes, {
-        matcher: (link: string) => /^https?:\/\//.test(link),
-        attrs: {
-          target: '_blank',
-          rel: 'noopener',
-        },
-      })
-    },
-  }
-
-  const newOptions = defu(options, defaultOptions)
-
-  return Markdown(newOptions)
-}
-
-function autoImports(options?: AutoImportsOptions) {
+export function autoImports(options?: AutoImportsOptions) {
   const defaultOptions: AutoImportsOptions = {
     imports: [
       'vue', 'vue-router', 'vue/macros', 'vitest',
       { '@stacksjs/ui': ['CssEngine', 'UiEngine', 'Store', 'presetForms', 'transformerCompileClass'] },
+      { '@stacksjs/logging': ['dd', 'dump'] }, // we also export `log` in st stacks/cli
+      // { '@stacksjs/validation': ['validate', 'validateAll', 'validateSync', 'validateAllSync'] },
     ],
     dirs: [
-      p.projectPath('functions'),
-      p.projectPath('components'),
+      p.resourcesPath('functions'),
+      p.resourcesPath('components'),
       p.projectPath('config'),
 
       // auto imported utilities start here
@@ -94,26 +71,33 @@ function autoImports(options?: AutoImportsOptions) {
       p.authPath('src'),
       p.cachePath('src'),
       p.chatPath('src'),
+      p.cliPath('src'),
+      p.cloudPath('src'),
       p.databasePath('src'),
+      p.datetimePath('src'),
       p.desktopPath('src'),
       p.errorHandlingPath('src'),
+      p.eventsPath('src'),
+      p.fakerPath('src'),
       p.healthPath('src'),
       p.lintPath('src'),
-      p.loggingPath('src'),
       p.notificationsPath('src'),
       p.objectsPath('src'),
+      p.ormPath('src'),
       p.pathPath('src'),
       p.paymentsPath('src'),
       p.pushPath('src'),
       p.queuePath('src'),
+      p.queryBuilderPath('src'),
       p.realtimePath('src'),
       p.routerPath('src'),
       p.searchEnginePath('src'),
       p.securityPath('src'),
+      p.signalsPath('src'),
       p.smsPath('src'),
+      p.slugPath('src'),
       p.storagePath('src'),
       p.stringsPath('src'),
-      p.tablesPath('src'),
       p.testingPath('src'),
       p.utilsPath('src'),
       p.validationPath('src'),
@@ -131,14 +115,14 @@ function autoImports(options?: AutoImportsOptions) {
   return AutoImport(newOptions)
 }
 
-function cssEngine(isWebComponent = false) {
+export function cssEngine(isWebComponent = false) {
   return Unocss({
     configFile: p.uiPath('src/unocss.ts'),
     mode: isWebComponent ? 'shadow-dom' : 'vue-scoped',
   })
 }
 
-function pwa() {
+export function pwa() {
   return VitePWA({
     registerType: 'autoUpdate',
     includeAssets: ['favicon.svg', 'safari-pinned-tab.svg'],
@@ -168,7 +152,7 @@ function pwa() {
   })
 }
 
-// function i18n(options?: i18nOptions) {
+// export function i18n(options?: i18nOptions) {
 //   const defaultOptions: i18nOptions = {
 //     runtimeOnly: true,
 //     compositionOnly: true,
@@ -180,7 +164,7 @@ function pwa() {
 //   return VueI18n(newOptions)
 // }
 
-function uiEngine(isWebComponent = false) {
+export function uiEngine(isWebComponent = false) {
   if (isWebComponent) {
     return Vue({
       include: [/\.vue$/, /\.md$/],
@@ -197,15 +181,14 @@ function uiEngine(isWebComponent = false) {
   })
 }
 
-function componentPreset(isWebComponent = false) {
-  return <PluginOption>[
-    inspect,
+export function componentPreset(isWebComponent = false) {
+  return [
+    // inspect,
     uiEngine(isWebComponent),
     cssEngine(isWebComponent),
-    autoImports,
-    components,
-    markdown,
-  ]
+    // autoImports,
+    // components,
+  ] satisfies PluginOption
 }
 
 // const pagesPreset = (isWebComponent = false) => <PluginOption>[
@@ -215,5 +198,3 @@ function componentPreset(isWebComponent = false) {
 // const functionsPreset = () => <PluginOption>[
 //   //
 // ]
-
-export { resolve, componentPreset, uiEngine, autoImports, cssEngine, components, inspect, markdown, pages, pwa, layouts }

package/core/build/src/{pages.ts → views.ts}

@@ -1,15 +1,15 @@
 import { defineConfig } from 'vite'
-
-// import generateSitemap from 'vite-ssg-sitemap'
 import type { ViteConfig } from '@stacksjs/types'
 import { functionsPath, projectPath } from '@stacksjs/path'
 import { alias } from '@stacksjs/alias'
-import { autoImports, components, cssEngine, inspect, layouts, markdown, pages, pwa, uiEngine } from '.'
+
+// import { autoImports, components, cssEngine, inspect, layouts, pages, pwa, uiEngine } from '.'
+// import generateSitemap from 'vite-ssg-sitemap'
 
 export const pagesConfig: ViteConfig = {
   root: functionsPath(),
   envDir: projectPath(),
-  envPrefix: 'APP_',
+  envPrefix: 'FRONTEND_',
 
   resolve: {
     alias,
@@ -17,16 +17,15 @@ export const pagesConfig: ViteConfig = {
 
   plugins: [
     // preview(),
-    uiEngine(),
-    pages(),
-    cssEngine(),
-    components(),
-    layouts(),
-    // i18n(),
-    markdown(),
-    autoImports(),
-    pwa(),
-    inspect(),
+    // uiEngine(),
+    // pages(),
+    // cssEngine(),
+    // components(),
+    // layouts(),
+    // // i18n(),
+    // autoImports(),
+    // pwa(),
+    // inspect(),
   ],
 
   // https://github.com/antfu/vite-ssg