stacks 0.52.10 → 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
@@ -38,7 +38,7 @@ async function lint(buddy: CLI) {
         process.exit()
       }
 
-      log.success('Fixed lint errors.')
+      log.success('Fixed lint errors')
     })
 }
 

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/onboarding.ts

@@ -1,9 +1,6 @@
 import type { CLI } from '@stacksjs/types'
-import { intro, outro } from '@stacksjs/cli'
-import { Action } from '@stacksjs/types'
-import { runAction } from '@stacksjs/actions'
 
-async function onboarding(buddy: CLI) {
+export async function onboarding(buddy: CLI) {
   const descriptions = {
     command: 'Generate Onboarding Pages',
     verbose: 'Enable verbose output',
@@ -13,16 +10,13 @@ async function onboarding(buddy: CLI) {
     .command('page:onboarding', descriptions.command)
     .option('--verbose', descriptions.verbose, { default: false })
     .action(async () => {
-      const startTime = await intro('buddy page:onboarding')
-      const result = await runAction(Action.GenerateOnboarding)
-
-      if (result.isErr()) {
-        log.error('Something went wrong when generating', result.error as Error)
-        process.exit()
-      }
-
-      outro('Pages generated successfully', { startTime })
+      console.log('onboarding')
+      // const startTime = await intro('buddy page:onboarding')
+      // const result = await runAction(Action.GenerateOnboarding)
+      //
+      // if (result.isErr())
+      //   process.exit()
+      //
+      // outro('Pages generated successfully', { startTime })
     })
 }
-
-export { onboarding }

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

@@ -1,7 +1,4 @@
 import type { CLI } from '@stacksjs/types'
-import { intro, outro } from '@stacksjs/cli'
-import { Action } from '@stacksjs/types'
-import { runAction } from '@stacksjs/actions'
 
 async function setting(buddy: CLI) {
   const descriptions = {
@@ -13,15 +10,16 @@ async function setting(buddy: CLI) {
     .command('page:setting', descriptions.command)
     .option('--verbose', descriptions.verbose, { default: false })
     .action(async () => {
-      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)
-        process.exit()
-      }
-
-      outro('Pages generated successfully', { startTime })
+      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')
+      //   process.exit()
+      // }
+      //
+      // outro('Pages generated successfully', { startTime })
     })
 }
 

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,21 +1,9 @@
 import type { CLI } from '@stacksjs/types'
 import { bold, dim, green, intro } from '@stacksjs/cli'
-import { filesystem } from '@stacksjs/storage'
 import { log } from '@stacksjs/logging'
-import { frameworkPath } from '@stacksjs/path'
+import * as storage from '@stacksjs/storage'
 
 async function version(buddy: CLI) {
-  // maybe use type-fest?
-  interface PackageJson {
-    engines: {
-      node: string
-      pnpm: string
-    }
-    version: string
-  }
-
-  const { fs } = filesystem
-
   const descriptions = {
     version: 'Retrieving Stacks build version',
   }
@@ -25,15 +13,15 @@ async function version(buddy: CLI) {
     .action(async () => {
       await intro('buddy version')
 
-      const depVersions = JSON.parse(fs.readFileSync('./package.json', 'utf8')) as PackageJson
-      const nodeVersion = depVersions.engines.node.replace('>=v', '')
-      const pnpmVersion = depVersions.engines.pnpm.replace('>=', '')
-      const stacksVersion = JSON.parse(fs.readFileSync(frameworkPath('/package.json'), 'utf8')) as PackageJson
+      const pkg = await storage.readPackageJson('./package.json')
+      const nodeVersion = pkg.engines.node.replace('>=v', '')
+      const pnpmVersion = pkg.engines.pnpm.replace('>=', '')
+      const stacksVersion = pkg.version
 
-      log.info(green(bold('Stacks: ')) + dim(` ${stacksVersion.version}`))
+      log.info(green(bold('Stacks: ')) + dim(` ${stacksVersion}`))
       log.info(green(bold('node: ')) + dim(`   ${nodeVersion}`))
       log.info(green(bold('pnpm: ')) + dim(`   ${pnpmVersion}`))
-    // redis (or other cache/s), mysql (or other database/s),
+      // redis (or other cache/s), mysql (or other database/s),
     })
 }
 

package/core/buddy/src/index.ts

@@ -1,22 +1 @@
 export * from './commands'
-export * from '@stacksjs/alias'
-// export * from '@stacksjs/ai'
-export * from '@stacksjs/arrays'
-export * from '@stacksjs/build'
-export * from '@stacksjs/cli'
-export * from '@stacksjs/cloud'
-export * from '@stacksjs/collections'
-export * from '@stacksjs/config'
-export * from '@stacksjs/faker'
-// export * from '@stacksjs/events'
-// export * from '@stacksjs/desktop'
-// export * from '@stacksjs/notifications'
-export * from '@stacksjs/storage'
-export * from '@stacksjs/router'
-export * from '@stacksjs/server'
-export * from '@stacksjs/strings'
-export * from '@stacksjs/types'
-export * from '@stacksjs/objects'
-export * from '@stacksjs/path'
-export * from '@stacksjs/ui'
-// export * from '@stacksjs/utils'

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.52.10",
-  "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.0",
-    "unplugin-vue-components": "^0.24.1",
-    "vite": "^4.3.8",
-    "vite-plugin-inspect": "^0.7.26",
-    "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(),
 }
@@ -26,11 +27,11 @@ export function functionsBuildOptions(): ViteBuildOptions {
   return {
     outDir: frameworkPath('functions/dist'),
     emptyOutDir: true,
-    sourcemap: library.functions.shouldGenerateSourcemap,
+    sourcemap: library.functions?.shouldGenerateSourcemap,
     lib: {
-      entry: buildEntriesPath('functions.ts'),
-      name: library.functions.name,
-      formats: library.functions.shouldBuildIife ? ['cjs', 'es', 'iife'] : ['cjs', 'es'],
+      entry: libraryEntryPath('functions'),
+      name: library.functions?.name,
+      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'