fix: some issues

Author: dannyhw

cli/src/commands/create-expo-stack.ts

@@ -301,7 +301,7 @@ const command: GluegunCommand = {
           // Add zustand package
           cliResults.packages.push({
             name: 'zustand',
-            type: 'state_management'
+            type: 'state-management'
           });
         }
 
@@ -363,6 +363,13 @@ const command: GluegunCommand = {
                 script += '--drawer+tabs ';
               }
             }
+
+            const stateManagementPackage = cliResults.packages.find((p) => p.type === 'state-management');
+
+            if (stateManagementPackage) {
+              // currently only redux is supported
+              script += `--${stateManagementPackage.name} `;
+            }
           } else {
             // Add the packages
             cliResults.packages.forEach((p) => {
@@ -408,6 +415,7 @@ const command: GluegunCommand = {
         warning(`  ${generateRerunScript(cliResults)}`);
 
         const { packages } = cliResults;
+
         // Define props to be passed into the templates
         const authenticationPackage = packages.find((p) => p.type === 'authentication') || undefined;
         const navigationPackage = packages.find((p) => p.type === 'navigation') || undefined;
@@ -417,7 +425,7 @@ const command: GluegunCommand = {
         const analyticsPackage = packages.find((p) => p.type === 'analytics');
 
         //add the state management package if it is selected
-        const stateManagementPackage = packages.find((p) => p.type === 'state_management') || undefined;
+        const stateManagementPackage = packages.find((p) => p.type === 'state-management') || undefined;
 
         let files: string[] = [];
 

cli/src/types.ts

@@ -26,8 +26,8 @@ export const availablePackages = [
   'restyle',
   'unistyles',
   'i18next',
-  'zustand'
-  'vexo-analytics',
+  'zustand',
+  'vexo-analytics'
 ] as const;
 
 export type AuthenticationSelect = 'supabase' | 'firebase' | undefined;
@@ -62,7 +62,7 @@ export type SelectedComponents =
 
 export type AvailablePackages = {
   name: (typeof availablePackages)[number];
-  type: 'navigation' | 'styling' | 'authentication' | 'internationalization' | 'state_management' | 'analytics';
+  type: 'navigation' | 'styling' | 'authentication' | 'internationalization' | 'state-management' | 'analytics';
   options?: { selectedComponents?: SelectedComponents[]; type?: NavigationTypes };
 };
 

cli/src/utilities/configureProjectFiles.ts

@@ -327,10 +327,6 @@ export function configureProjectFiles(
       files = [...files, ...firebaseFiles];
     }
 
-    // add state management files if needed
-    if (stateManagementPackage?.name === 'zustand') {
-      const zustandFiles = ['packages/zustand/StateManagement/zustandStore.ts.ejs'];
-      files = [...files, ...zustandFiles];
     // add vexo analytics files if needed
     if (analyticsPackage?.name == 'vexo-analytics') {
       const vexoFiles = ['packages/vexo-analytics/.env.ejs'];
@@ -354,6 +350,12 @@ export function configureProjectFiles(
     }
   }
 
+  // add state management files if needed
+  if (stateManagementPackage?.name === 'zustand') {
+    const zustandFiles = ['packages/zustand/StateManagement/zustandStore.ts.ejs'];
+    files = [...files, ...zustandFiles];
+  }
+
   // Add npmrc file if user is using pnpm
   if (packageManager === 'pnpm') {
     files.push('base/.npmrc.ejs');

cli/src/utilities/runCLI.ts

@@ -364,6 +364,32 @@ export async function runCLI(toolbox: Toolbox, projectName: string): Promise<Cli
     success(`No problem, skipping eas for now.`);
   }
 
+  const stateManagementSelect = await select({
+    message: 'What would you like to use for state management?',
+    options: [
+      { value: undefined, label: 'None' },
+      { value: 'zustand', label: 'Zustand' }
+      // { value: 'mobx', label: 'MobX' },
+      // { value: 'redux', label: 'Redux' },
+    ]
+  });
+
+  if (isCancel(stateManagementSelect)) {
+    cancel('Cancelled... 👋');
+    return process.exit(0);
+  }
+
+  if (stateManagementSelect) {
+    cliResults.packages.push({
+      name: stateManagementSelect as StateManagementSelect,
+      type: 'state-management'
+    });
+
+    success(`You'll be using ${stateManagementSelect} for state management.`);
+  } else {
+    success(`No problem, skipping state management for now.`);
+  }
+
   // Offer user ability to save configuration
   const shouldSaveConfig = await confirm({
     message: 'Would you like to save this configuration for future use?',
@@ -385,37 +411,6 @@ export async function runCLI(toolbox: Toolbox, projectName: string): Promise<Cli
       cancel('Cancelled... 👋');
       return process.exit(0);
     }
-    if (authenticationSelect) {
-      cliResults.packages.push({ name: authenticationSelect as AuthenticationSelect, type: 'authentication' });
-    } else {
-      success(`No problem, skipping authentication for now.`);
-    }
-
-    const stateManagementSelect = await select({
-      message: 'What would you like to use for state management?',
-      options: [
-        { value: undefined, label: 'None' },
-        { value: 'zustand', label: 'Zustand' }
-        // { value: 'mobx', label: 'MobX' },
-      ]
-    });
-
-    if (isCancel(stateManagementSelect)) {
-      cancel('Cancelled... 👋');
-      return process.exit(0);
-    }
-
-    if (stateManagementSelect) {
-      cliResults.packages.push({ name: stateManagementSelect as StateManagementSelect, type: 'state_management' });
-      success(`You'll be using ${stateManagementSelect} for state management.`);
-    } else {
-      success(`No problem, skipping state management for now.`);
-    }
-
-    const internationalizationSelect = await confirm({
-      message: `What would you like to support internationalization?`,
-      initialValue: false
-    });
 
     await saveConfig({ name, cliResults });
   }

docs/src/content/docs/en/installation.md

@@ -67,6 +67,7 @@ bun create expo-stack myapp --expo-router --nativewind --bun
 | `--drawer`           | Use a Drawer navigator (pass with either Expo Router or React Navigation flag) |
 | `--firebase`         | Use Firebase for authentication, initial configuration only                    |
 | `--supabase`         | Use Supabase for authentication, initial configuration only                    |
+| `--vexo-analytics`   | Use Vexo Analytics for analytics, initial configuration only                   |
 | `--nativewind`       | Use Nativewind for styling                                                     |
 | `--unistyles`        | Use Unistyles for styling                                                      |
 | `--tamagui`          | Use Tamagui for styling                                                        |