Merge pull request #40 from elsoul/add/frontend

add/frontend
elsoul · Aug 14, 2023 · 0486b01 · 0486b01
2 parents 42c2905 + 70feb9f
commit 0486b01
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 5 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@skeet-framework/cli",
-  "version": "1.1.2",
+  "version": "1.2.0",
   "description": "Skeet CLI",
   "main": "dist/index.js",
   "repository": "https://github.com/elsoul/skeet-cli",

diff --git a/src/cli/deploy/deploy.ts b/src/cli/deploy/deploy.ts
@@ -8,7 +8,7 @@ import { deployGraphql } from './deployGraphql'
 
 export const deploy = async () => {
   const functions = await getFunctions()
-  const functionsArray: Array<{ [key: string]: string }> = [{ name: 'webApp' }]
+  const functionsArray: Array<{ [key: string]: string }> = [{ name: 'webapp' }]
   const { app } = await importConfig()
   if (app.template.includes('GraphQL')) {
     functionsArray.push({ name: 'graphql' })
@@ -36,7 +36,7 @@ export const deploy = async () => {
       if (answers.functions) {
         answers.functions.forEach(async (service) => {
           const config = await importConfig()
-          if (service === 'webApp') {
+          if (service === 'webapp') {
             await deployWebApp()
             await deployRules(config.app.projectId)
           } else if (service === 'graphql') {

diff --git a/src/cli/yarn/yarn.ts b/src/cli/yarn/yarn.ts
@@ -1,5 +1,5 @@
 import inquirer from 'inquirer'
-import { execSyncCmd, getFunctions, FUNCTIONS_PATH } from '@/lib'
+import { execSyncCmd, getFunctions, FUNCTIONS_PATH, WEB_APP_PATH } from '@/lib'
 import { GRAPHQL_ROOT } from '@/index'
 
 export type YarnService = {
@@ -12,7 +12,11 @@ export const yarn = async (
   isDev: boolean = false
 ) => {
   const functions = await getFunctions()
-  const functionsArray: Array<{ [key: string]: string }> = [{ name: 'graphql' }]
+  const functionsArray: Array<{ [key: string]: string }> = [
+    { name: 'graphql' },
+    { name: 'webapp' },
+    { name: 'root' },
+  ]
   for await (const functionName of functions) {
     functionsArray.push({ name: functionName })
   }
@@ -76,6 +80,12 @@ const getYarnShCmd = async (
     case 'graphql':
       shCmd = ['yarn', '--cwd', `${GRAPHQL_ROOT}`, cmd]
       break
+    case 'webapp':
+      shCmd = ['yarn', '--cwd', `${WEB_APP_PATH}`, cmd]
+      break
+    case 'root':
+      shCmd = ['yarn', cmd]
+      break
     default:
       shCmd = ['yarn', '--cwd', `${FUNCTIONS_PATH}/${functionName}`, cmd]
       break