fix: resolve failing handlebars check

MentorMate · Mar 29, 2024 · 9b450f6 · 9b450f6
1 parent 87ba885
commit 9b450f6
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 15 deletions.
diff --git a/baseProject/App.tsx b/baseProject/App.tsx
@@ -12,10 +12,7 @@ import { BottomTabNavigator } from './src/common/navigation/bottomTab/BottomTabN
 {{else}}
 import { HomeContainer } from './src/features/home/container/HomeContainer'
 {{/if}}
-{{#if hasGluestackUICore}}
-import { GluestackUIProvider } from '@gluestack-ui/themed';
-{{/if}}
-{{#if hasGluestackUI}}
+{{#if hasAnyGluestackUIOption}}
   import { GluestackUIProvider } from '@gluestack-ui/themed';
   {{#if hasGluestackUIDefaultTheme}}
   import {config } from '@gluestack-ui/config';
@@ -50,7 +47,7 @@ const App = () => {
             <HomeContainer />
             {{/if}}
           </SafeAreaView>
-        {{#if hasGluestackUI}}</GluestackUIProvider>{{else if hasGluestackUICore}}</GluestackUIProvider>{{/if}}
+        {{#if hasAnyGluestackUIOption}}</GluestackUIProvider>{{/if}}
       </NavigationContainer>
     {{#if hasReduxToolkit}}</Provider>{{/if}}
   );

diff --git a/baseProject/config/storybook/preview.tsx b/baseProject/config/storybook/preview.tsx
@@ -1,11 +1,7 @@
 /* eslint-disable react/react-in-jsx-scope */
 import React from 'react';
 import type { Preview } from '@storybook/react';
-{{#if hasGluestackUICore}}
-import { GluestackUIProvider } from '@gluestack-ui/themed';
-import { StyleSheet, View } from 'react-native';
-{{/if}}
-{{#if hasGluestackUI}}
+{{#if hasAnyGluestackUIOption}}
 import { GluestackUIProvider } from '@gluestack-ui/themed';
 import { StyleSheet, View } from 'react-native';
   {{#if hasGluestackUIDefaultTheme}}
@@ -29,7 +25,7 @@ export const decorators = [
     <View style={styles.container}>
       {{#if hasGluestackUI}}<GluestackUIProvider config={config}>{{else if hasGluestackUICore}}<GluestackUIProvider>{{/if}}
         <Story />
-      {{#if hasGluestackUI}}</GluestackUIProvider>{{else if hasGluestackUICore}}</GluestackUIProvider>{{/if}}
+      {{#if hasAnyGluestackUIOption}}</GluestackUIProvider>{{/if}}
     </View>
   ),
 ];

diff --git a/baseProject/jest.config.js b/baseProject/jest.config.js
@@ -8,7 +8,7 @@ module.exports = {
     '.+\\.(css|styl|less|sass|scss|png|jpg|ttf|woff|woff2)$': 'babel-jest',
     '\\.(png|jpg|jpeg|gif|svg)$': '<rootDir>/config/jest/transformAssets.js',
   },
-  {{#if (or hasGluestackUI hasGluestackUICore)}}
+  {{#if hasAnyGluestackUIOption}}
     transformIgnorePatterns: [
       '<rootDir>/node_modules/(?!((jest-)?react-native|@react-native(-community)?)|@expo?/.*|@gluestack-ui|@gluestack-ui/.*|@legendapp/motion)',
     ],

diff --git a/src/tools/options.ts b/src/tools/options.ts
@@ -71,15 +71,18 @@ export const SelectionToTemplateParamsMap: Partial<Record<
   Partial<TemplateParams>
 >> = {
   [StyleLibraryChoice.GluestackUICore]: {
-    hasGluestackUICore: true
+    hasGluestackUICore: true,
+    hasAnyGluestackUIOption: true
   },
   [StyleLibraryChoice.GluestackUIDefault]: {
     hasGluestackUI: true,
-    hasGluestackUIDefaultTheme: true
+    hasGluestackUIDefaultTheme: true,
+    hasAnyGluestackUIOption: true
   },
   [StyleLibraryChoice.GluestackUIEjected]: {
     hasGluestackUI: true,
-    hasGluestackUIEjected: true
+    hasGluestackUIEjected: true,
+    hasAnyGluestackUIOption: true
   },
   [StyleLibraryChoice.StyledComponents]: {
     hasStyledComponents: true
@@ -156,6 +159,7 @@ export const DefaultTemplateParams: TemplateParams = {
   hasGluestackUICore: false,
   hasGluestackUIDefaultTheme: false,
   hasGluestackUIEjected: false,
+  hasAnyGluestackUIOption: false,
   hasStyledComponents: false,
   hasStorybook: false,
   hasStorybookExample: false,

diff --git a/src/types/BaseProjectTemplateParams.ts b/src/types/BaseProjectTemplateParams.ts
@@ -3,6 +3,7 @@ export interface TemplateParams {
   hasGluestackUICore: boolean;
   hasGluestackUIDefaultTheme: boolean;
   hasGluestackUIEjected: boolean;
+  hasAnyGluestackUIOption: boolean;
   hasStorybook: boolean;
   hasStorybookExample: boolean;
   hasReduxToolkit: boolean;