chore: wip

chrisbbreuer · chrisbbreuer · commit 04e397ee64a2 · 2023-05-17T20:52:29.000-07:00
diff --git a/.stacks/core/actions/package.json b/.stacks/core/actions/package.json
@@ -259,9 +259,21 @@
     "vue-component-meta": "^1.6.5"
   },
   "dependencies": {
+    "@stacksjs/cli": "workspace:*",
+    "@stacksjs/config": "workspace:*",
+    "@stacksjs/database": "workspace:*",
+    "@stacksjs/error-handling": "workspace:*",
+    "@stacksjs/logging": "workspace:*",
+    "@stacksjs/pages": "workspace:*",
+    "@stacksjs/path": "workspace:*",
+    "@stacksjs/security": "workspace:*",
+    "@stacksjs/storage": "workspace:*",
     "@stacksjs/strings": "workspace:*",
+    "@stacksjs/utils": "workspace:*",
     "fast-glob": "^3.2.12",
-    "fs-extra": "^11.1.1"
+    "fs-extra": "^11.1.1",
+    "markdown-it": "^13.0.1",
+    "vue-component-meta": "^1.6.5"
   },
   "devDependencies": {
     "@stacksjs/development": "workspace:*",
diff --git a/.stacks/core/actions/src/clean.ts b/.stacks/core/actions/src/clean.ts
@@ -1,15 +1,12 @@
-import { log, runCommand } from '@stacksjs/cli'
+import { log } from '@stacksjs/cli'
 import { projectPath } from '@stacksjs/path'
-import { ExitCode, NpmScript } from '@stacksjs/types'
+import { del } from '@stacksjs/utils'
 
-log.info('Running clean command...')
+log.info('Running clean command...', projectPath())
 
-const result = await runCommand(NpmScript.Clean, { cwd: projectPath() })
-
-if (result.isOk()) {
-  log.success('Cleaned up')
-  process.exit(ExitCode.Success)
-}
-
-log.error(result.error)
-process.exit(ExitCode.FatalError)
+await del([
+  projectPath('pnpm-lock.yaml'),
+  projectPath('node_modules/'),
+  projectPath('.stacks/**/dist'),
+  projectPath('.stacks/**/node_modules')
+])
diff --git a/.stacks/core/actions/src/helpers/package-json.ts b/.stacks/core/actions/src/helpers/package-json.ts
@@ -1,8 +1,7 @@
 import { log } from '@stacksjs/logging'
 import { writeTextFile } from '@stacksjs/storage'
 import { packageJsonPath } from '@stacksjs/path'
-import { library } from '@stacksjs/config'
-import { packageManager } from '../../package.json' assert { type: 'json' }
+import { library, packageManager } from '@stacksjs/config'
 
 export async function generatePackageJson(type: 'vue-components' | 'web-components' | 'functions') {
   let name, description, directory, keywords, config, prettyName
diff --git a/.stacks/core/actions/src/helpers/utils.ts b/.stacks/core/actions/src/helpers/utils.ts
@@ -38,9 +38,6 @@ export async function runAction(action: string, options?: ActionOptions): Promis
   const opts = parseOptions(options)
   const cmd = `npx tsx ${actionsPath(`${action}.ts ${opts}`)}`
 
-  // eslint-disable-next-line no-console
-  console.log('cmd', cmd)
-
   if (options?.verbose)
     log.debug('running command:', italic(cmd))
 
diff --git a/.stacks/core/buddy/README.md b/.stacks/core/buddy/README.md
@@ -72,7 +72,7 @@ _Create your personal or professional Vercel-like cloud, based on MIT-licensed O
 - ⛅️ **Serverless** _on-demand, auto-scaling, zero maintenance_
 - 🚏 **CDN** _zero-config low-latency CDN, including request life-cycle hooks & optimized request compressions (Brotli & gzip)_
 - 🔀 **Domain** _version-controlled & zero-config domain management (e.g. DNS)_
-- 📧 **Email** _secure & simplistic easy-peasy@custom-domains.com mail_
+- 📧 **Email** _secure & simplistic <easy-peasy@custom-domains.com> mail_
 - 🔐 **Firewall** _native web application firewall support_
 - 🚜 **Maintenance** _handles your cloud infrastructure via the Stacks & Serverless framework_
 - 🤖 **Infrastructure as Code** _create & maintain your cloud infrastructure with ease_
diff --git a/.stacks/core/buddy/src/commands/clean.ts b/.stacks/core/buddy/src/commands/clean.ts
@@ -14,14 +14,14 @@ async function clean(buddy: CLI) {
     .option('--verbose', descriptions.verbose, { default: false })
     .action(async (options: CleanOptions) => {
       const perf = await intro('buddy clean')
-      const result = await runAction(Action.Fresh, { ...options, verbose: true })
+      const result = await runAction(Action.Clean, { ...options, verbose: true })
 
       if (result.isErr()) {
         outro('While running the clean command, there was an issue', { startTime: perf, useSeconds: true, isError: true }, result.error as Error)
         process.exit(ExitCode.FatalError)
       }
 
-      outro('Cleaned project.', { startTime: perf, useSeconds: true })
+      outro('Cleaned up', { startTime: perf, useSeconds: true })
       process.exit(ExitCode.Success)
     })
 }
diff --git a/.stacks/core/buddy/src/commands/fresh.ts b/.stacks/core/buddy/src/commands/fresh.ts
@@ -17,7 +17,7 @@ async function fresh(buddy: CLI) {
       const result = await runAction(Action.Fresh, { ...options, verbose: true })
 
       if (result.isErr()) {
-        outro('While running the fresh command, there was an issue', { startTime: perf, useSeconds: true, isError: true }, result.error as Error)
+        outro('While running the `fresh` command, there was an issue', { startTime: perf, useSeconds: true, isError: true }, result.error as Error)
         process.exit(ExitCode.FatalError)
       }
 
diff --git a/.stacks/core/buddy/src/commands/release.ts b/.stacks/core/buddy/src/commands/release.ts
@@ -16,16 +16,8 @@ async function release(buddy: CLI) {
       const startTime = await intro('buddy release')
       const result = await runAction(Action.Release, { ...options, shell: true })
 
-      console.log('result', result)
-
-      // check if any element of the array is an error
-      if (Array.isArray(result) && result.some(r => r.isErr())) {
-        log.error('Failed to trigger the CI/CD release workflow.', result)
-        process.exit()
-      }
-
       if (result.isErr()) {
-        log.error('Failed to trigger the CI/CD release workflow.', result.error)
+        log.error('Failed to complete ', result.error)
         process.exit()
       }
 
diff --git a/.stacks/core/buddy/src/commands/version.ts b/.stacks/core/buddy/src/commands/version.ts
@@ -3,9 +3,17 @@ import { bold, dim, green, intro } from '@stacksjs/cli'
 import { filesystem } from '@stacksjs/storage'
 import { log } from '@stacksjs/logging'
 import { frameworkPath } from '@stacksjs/path'
-import type { PackageJson } from 'type/node'
 
 async function version(buddy: CLI) {
+  // maybe use type-fest?
+type PackageJson = {
+  engines: {
+    node: string
+    pnpm: string
+  }
+  version: string
+}
+
   const { fs } = filesystem
 
   const descriptions = {
diff --git a/.stacks/core/cli/src/run.ts b/.stacks/core/cli/src/run.ts
@@ -2,7 +2,7 @@ import { execSync as childExec } from 'node:child_process'
 import type { CliOptions, CommandResult, CommandReturnValue, ResultAsync, SpinnerOptions as Spinner } from '@stacksjs/types'
 import { ExitCode } from '@stacksjs/types'
 import { projectPath } from '@stacksjs/path'
-import { ResultAsync as AsyncResult, err } from '@stacksjs/error-handling'
+import { ResultAsync as AsyncResult } from '@stacksjs/error-handling'
 import { determineDebugLevel } from '@stacksjs/utils'
 import { log } from './console'
 import { spawn } from './command'
@@ -46,7 +46,6 @@ export function execSync(command: string) {
  * @returns The result of the command.
  */
 export async function runCommand(command: string, options?: CliOptions): Promise<ResultAsync<CommandReturnValue, Error>> {
-  console.log('runCommand', command, options)
   return await exec(command, options)
 }
 
@@ -69,8 +68,6 @@ export async function runCommands(commands: string[], options?: CliOptions): Pro
 
   const spinner = determineSpinner(options)
 
-  console.log('spinner', spinner)
-
   for (const command of commands) {
     const result = await runCommand(command, options)
 
@@ -79,8 +76,7 @@ export async function runCommands(commands: string[], options?: CliOptions): Pro
     }
     else if (result.isErr()) {
       if (spinner) {
-        // spinner.fail('Failed to run command.')
-        err(result.error)
+        log.error(new Error('Failed to run command'))
         process.exit(ExitCode.FatalError)
       }
 
diff --git a/.stacks/core/config/src/stacks.ts b/.stacks/core/config/src/stacks.ts
@@ -1,7 +1,14 @@
 import { loadConfig } from 'c12'
+import { readPackageJson } from '@stacksjs/storage'
+import { frameworkPath } from '@stacksjs/path'
 import type { ResolvedStacksOptions, StacksOptions } from '@stacksjs/types'
 import { app, cache, cdn, cli, database, debug, dns, docs, email, events, git, hashing, library, notification, payment, searchEngine, services, storage, ui } from './defaults'
 
+export const packageManager = async () => {
+  const { packageManager } = await readPackageJson(frameworkPath('package.json'))
+  return packageManager
+}
+
 export const stacksConfigDefaults = {
   app,
   cache,
diff --git a/.stacks/core/storage/src/index.ts b/.stacks/core/storage/src/index.ts
@@ -1,7 +1,7 @@
 import { fileURLToPath } from 'node:url'
 import fs from 'fs-extra'
 import { detectIndent, detectNewline } from '@stacksjs/utils'
-import type { JsonFile, TextFile } from '@stacksjs/types'
+import type { JsonFile, TextFile, PackageJson } from '@stacksjs/types'
 import { componentsPath, dirname, functionsPath, join, projectPath } from '@stacksjs/path'
 import { contains } from '@stacksjs/arrays'
 
@@ -21,6 +21,16 @@ export async function readJsonFile(name: string, cwd?: string): Promise<JsonFile
   return { ...file, data, indent, newline }
 }
 
+/**
+ * Reads a package.json file and returns the parsed data.
+ */
+export async function readPackageJson(name: string, cwd?: string) {
+  const file = await readJsonFile(name, cwd)
+  const data = file.data as PackageJson
+
+  return data
+}
+
 /**
  * Writes the given data to the specified JSON file.
  */
diff --git a/.stacks/core/types/src/cli.ts b/.stacks/core/types/src/cli.ts
@@ -201,7 +201,7 @@ export const enum NpmScript {
   BuildFunctions = 'build:functions',
   BuildDocs = 'build:docs',
   BuildStacks = 'build:stacks',
-  Clean = 'rimraf ./pnpm-lock.yaml ./node_modules/ ./.stacks/**/node_modules ./.stacks/**/dist',
+  Clean = 'rimraf pnpm-lock.yaml node_modules/ .stacks/**/node_modules .stacks/**/dist',
   Dev = 'dev',
   DevComponents = 'vite --config ./core/build/src/vue-components.ts',
   DevDocs = 'npx vitepress dev ./docs/src',
diff --git a/.stacks/core/types/src/fs.ts b/.stacks/core/types/src/fs.ts
@@ -15,3 +15,11 @@ export interface JsonFile {
   indent: string
   newline: string | undefined
 }
+
+/**
+ * Describes a package.json file.
+ */
+export interface PackageJson {
+  packageManager: string
+  // wip
+}
diff --git a/.stacks/core/utils/src/config.ts b/.stacks/core/utils/src/config.ts
@@ -1,9 +1,6 @@
 import type { AppOptions, CacheOptions, CdnOptions, CronJobOptions, DatabaseOptions, DebugOptions, DnsOptions, EmailOptions, Events, GitOptions, HashingOptions, LibraryOptions, Model, NotificationOptions, PagesOption, PaymentOptions, SearchEngineOptions, ServicesOptions, StorageOptions, UiOptions, UserCliOptions } from '@stacksjs/types'
 
-export function env(key: any, fallback?: any) {
-  // eslint-disable-next-line no-console
-  console.log('fallback', fallback)
-
+export function env(key: any, _fallback?: any) {
   // if (key && import.meta?.env)
   //   return import.meta.env[key]
 
diff --git a/.stacks/core/utils/src/delete.ts b/.stacks/core/utils/src/delete.ts
@@ -0,0 +1,3 @@
+import { rimraf } from 'rimraf'
+
+export { rimraf, rimraf as del }
diff --git a/.stacks/core/utils/src/index.ts b/.stacks/core/utils/src/index.ts
@@ -1,6 +1,7 @@
 export { assert, toString, noop, loop, getTypeName } from './base'
 export * from './config'
 export * from './debounce'
+export * from './delete'
 export * from './equal'
 export * from './function'
 export * from './guards'
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ async function fresh(buddy: CLI) {`
`17`	`17`	`const result = await runAction(Action.Fresh, { ...options, verbose: true })`
`18`	`18`
`19`	`19`	`if (result.isErr()) {`
`20`		`- outro('While running the fresh command, there was an issue', { startTime: perf, useSeconds: true, isError: true }, result.error as Error)`
	`20`	+ outro('While running the `fresh` command, there was an issue', { startTime: perf, useSeconds: true, isError: true }, result.error as Error)
`21`	`21`	`process.exit(ExitCode.FatalError)`
`22`	`22`	`}`
`23`	`23`