create-expo-stack 2.4.0-next.e5da919 → 2.4.0

package/build/commands/create-expo-stack.js

@@ -45,15 +45,16 @@ var constants_1 = require("../constants");
 var types_1 = require("../types");
 var clearStylingPackages_1 = __importDefault(require("../utilities/clearStylingPackages"));
 var validateProjectName_1 = require("../utilities/validateProjectName");
+var navigationValidationError = "You must pass in either --react-navigation or --expo-router if you want to use the --tabs or --drawer+tabs options";
 var command = {
     name: 'create-expo-stack',
     description: 'Create a new Expo project',
     run: function (toolbox) { return __awaiter(void 0, void 0, void 0, function () {
-        var _a, exists, removeAsync, _b, first, options, _c, info, highlight, success, warning, prompt, pascalCase, printSomethingWentWrong, useDefault, skipCLI, useBlankTypescript, optionsPassedIn, cliResults, askName, name, pathSegments, error_1, generateRerunScript, packageManager, packages, authenticationPackage, navigationPackage, stylingPackage, files, formattedFiles, error_2;
+        var _a, exists, removeAsync, _b, first, options, _c, error, info, highlight, success, warning, prompt, pascalCase, printSomethingWentWrong, useDefault, skipCLI, useBlankTypescript, optionsPassedIn, cliResults, askName, name, pathSegments, err_1, generateRerunScript, packageManager, packages, authenticationPackage, navigationPackage, stylingPackage, files, formattedFiles, err_2;
         return __generator(this, function (_d) {
             switch (_d.label) {
                 case 0:
-                    _a = toolbox.filesystem, exists = _a.exists, removeAsync = _a.removeAsync, _b = toolbox.parameters, first = _b.first, options = _b.options, _c = toolbox.print, info = _c.info, highlight = _c.highlight, success = _c.success, warning = _c.warning, prompt = toolbox.prompt, pascalCase = toolbox.strings.pascalCase;
+                    _a = toolbox.filesystem, exists = _a.exists, removeAsync = _a.removeAsync, _b = toolbox.parameters, first = _b.first, options = _b.options, _c = toolbox.print, error = _c.error, info = _c.info, highlight = _c.highlight, success = _c.success, warning = _c.warning, prompt = toolbox.prompt, pascalCase = toolbox.strings.pascalCase;
                     printSomethingWentWrong = function () {
                         info("\nOops, something went wrong while creating your project \uD83D\uDE22");
                         info("\nIf this was unexpected, please open an issue: https://github.com/danstepanov/create-expo-stack#reporting-bugs--feedback");
@@ -72,14 +73,15 @@ var command = {
                 case 1:
                     _d.trys.push([1, 10, , 11]);
                     // Validation: check if the user passed in the tabs/drawer option without passing in either expo router or react navigation. If so, throw an error
-                    if ((options.tabs || options.drawer) &&
+                    if ((options.tabs || options['drawer+tabs']) &&
                         !options.reactNavigation &&
                         !options['react-navigation'] &&
                         !options.reactnavigation &&
                         !options.expoRouter &&
                         !options['expo-router'] &&
                         !options.exporouter) {
-                        throw new Error('You must pass in either --react-navigation or --expo-router if you want to use the --tabs or --drawer options');
+                        // throw an error without a stack trace
+                        throw navigationValidationError;
                     }
                     return [4 /*yield*/, (0, utilities_1.renderTitle)(toolbox)];
                 case 2:
@@ -104,7 +106,9 @@ var command = {
                     cliResults.projectName = name || constants_1.DEFAULT_APP_NAME;
                     return [3 /*break*/, 6];
                 case 5:
-                    pathSegments = first.split('/');
+                    // Destructure the results but set the projectName if the first param is passed in
+                    cliResults.projectName = first || constants_1.DEFAULT_APP_NAME;
+                    pathSegments = cliResults.projectName.split('/');
                     cliResults.projectName = pathSegments.pop(); // get last segment as the project name
                     _d.label = 6;
                 case 6:
@@ -122,9 +126,19 @@ var command = {
                     _d.label = 9;
                 case 9: return [3 /*break*/, 11];
                 case 10:
-                    error_1 = _d.sent();
+                    err_1 = _d.sent();
+                    if (err_1 === '') {
+                        // user cancelled/exited the interactive CLI
+                        return [2 /*return*/, void success("\nCancelled... \uD83D\uDC4B \n")];
+                    }
+                    if (err_1 === navigationValidationError) {
+                        // user tried passing in tabs/drawer option without passing in either expo router or react navigation
+                        return [2 /*return*/, void error("\n".concat(navigationValidationError, "\n"))];
+                    }
+                    // TODO: delete all files with projectName
+                    // await removeAsync(cliResults.projectName);
                     printSomethingWentWrong();
-                    throw error_1;
+                    throw err_1;
                 case 11:
                     _d.trys.push([11, 18, , 19]);
                     if (!options.ignite) return [3 /*break*/, 13];
@@ -171,7 +185,7 @@ var command = {
                             name: 'react-navigation',
                             type: 'navigation',
                             options: {
-                                type: options.tabs ? 'tabs' : options.drawer ? 'drawer' : 'stack'
+                                type: options.tabs ? 'tabs' : options['drawer+tabs'] ? 'drawer + tabs' : 'stack'
                             }
                         });
                     }
@@ -181,7 +195,7 @@ var command = {
                             name: 'expo-router',
                             type: 'navigation',
                             options: {
-                                type: options.tabs ? 'tabs' : options.drawer ? 'drawer' : 'stack'
+                                type: options.tabs ? 'tabs' : options['drawer+tabs'] ? 'drawer + tabs' : 'stack'
                             }
                         });
                     }
@@ -271,8 +285,8 @@ var command = {
                                 if (((_a = p.options) === null || _a === void 0 ? void 0 : _a.type) === 'tabs') {
                                     script += '--tabs ';
                                 }
-                                else if (((_b = p.options) === null || _b === void 0 ? void 0 : _b.type) === 'drawer') {
-                                    script += '--drawer ';
+                                else if (((_b = p.options) === null || _b === void 0 ? void 0 : _b.type) === 'drawer + tabs') {
+                                    script += '--drawer+tabs ';
                                 }
                             }
                         });
@@ -310,19 +324,19 @@ var command = {
                     _d.label = 17;
                 case 17: return [3 /*break*/, 19];
                 case 18:
-                    error_2 = _d.sent();
-                    if (error_2 === '') {
+                    err_2 = _d.sent();
+                    if (err_2 === '') {
                         // user cancelled/exited the interactive CLI
-                        return [2 /*return*/, void success("\nCancelled... \uD83D\uDC4B ")];
+                        return [2 /*return*/, void success("\nCancelled... \uD83D\uDC4B \n")];
                     }
                     // TODO: delete all files with projectName
                     // await removeAsync(cliResults.projectName);
                     printSomethingWentWrong();
-                    throw error_2;
+                    throw err_2;
                 case 19: return [2 /*return*/];
             }
         });
     }); }
 };
 exports.default = command;
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"create-expo-stack.js","sourceRoot":"","sources":["../../src/commands/create-expo-stack.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,IAAM,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;AAE7B,0CASsB;AACtB,0CAAgE;AAChE,kCAAyD;AACzD,2FAAqE;AACrE,wEAAuE;AAEvE,IAAM,OAAO,GAAmB;IAC9B,IAAI,EAAE,mBAAmB;IACzB,WAAW,EAAE,2BAA2B;IACxC,GAAG,EAAE,UAAO,OAAO;;;;;oBAEf,KAKE,OAAO,WAL0B,EAArB,MAAM,YAAA,EAAE,WAAW,iBAAA,EACjC,KAIE,OAAO,WAJqB,EAAhB,KAAK,WAAA,EAAE,OAAO,aAAA,EAC5B,KAGE,OAAO,MAHmC,EAAnC,IAAI,UAAA,EAAE,SAAS,eAAA,EAAE,OAAO,aAAA,EAAE,OAAO,aAAA,EAC1C,MAAM,GAEJ,OAAO,OAFH,EACK,UAAU,GACnB,OAAO,mBADY,CACX;oBAEN,uBAAuB,GAAG;wBAC9B,IAAI,CAAC,uEAA6D,CAAC,CAAC;wBACpE,IAAI,CACF,2HAA2H,CAC5H,CAAC;wBACF,IAAI,CAAC,EAAE,CAAC,CAAC;oBACX,CAAC,CAAC;oBACF,IAAI,OAAO,CAAC,IAAI,IAAI,OAAO,CAAC,CAAC,EAAE,CAAC;wBAC9B,IAAA,oBAAQ,EAAC,IAAI,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC;wBAEnC,sBAAO;oBACT,CAAC;oBAGK,UAAU,GAAG,CAAC,OAAO,CAAC,OAAO,KAAK,SAAS,IAAI,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,KAAK,SAAS,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC;oBAC1G,OAAO,GAAG,OAAO,CAAC,cAAc,CAAC;oBACjC,kBAAkB,GAAG,OAAO,CAAC,KAAK,IAAI,KAAK,CAAC;oBAE5C,eAAe,GAAG,yBAAiB,CAAC,IAAI,CAAC,UAAC,SAAS,IAAK,OAAA,OAAO,CAAC,SAAS,CAAC,KAAK,SAAS,EAAhC,CAAgC,CAAC,CAAC;oBAG5F,UAAU,GAAe,0BAAc,CAAC;;;;oBAG1C,kJAAkJ;oBAClJ,IACE,CAAC,OAAO,CAAC,IAAI,IAAI,OAAO,CAAC,MAAM,CAAC;wBAChC,CAAC,OAAO,CAAC,eAAe;wBACxB,CAAC,OAAO,CAAC,kBAAkB,CAAC;wBAC5B,CAAC,OAAO,CAAC,eAAe;wBACxB,CAAC,OAAO,CAAC,UAAU;wBACnB,CAAC,OAAO,CAAC,aAAa,CAAC;wBACvB,CAAC,OAAO,CAAC,UAAU,EACnB,CAAC;wBACD,MAAM,IAAI,KAAK,CACb,+GAA+G,CAChH,CAAC;oBACJ,CAAC;oBAED,qBAAM,IAAA,uBAAW,EAAC,OAAO,CAAC,EAAA;;oBAA1B,SAA0B,CAAC;oBAE3B,0DAA0D;oBAC1D,4EAA4E;oBAC5E,qBAAM,IAAI,OAAO,CAAC,UAAC,OAAO,IAAK,OAAA,UAAU,CAAC,OAAO,EAAE,GAAG,CAAC,EAAxB,CAAwB,CAAC,EAAA;;oBAFxD,0DAA0D;oBAC1D,4EAA4E;oBAC5E,SAAwD,CAAC;yBAErD,CAAA,CAAC,KAAK,IAAI,CAAC,OAAO,CAAC,MAAM,IAAI,CAAC,CAAC,UAAU,IAAI,eAAe,IAAI,OAAO,IAAI,kBAAkB,CAAC,CAAC,CAAA,EAA/F,wBAA+F;oBAC3F,OAAO,GAAG;wBACd,IAAI,EAAE,OAAO;wBACb,IAAI,EAAE,MAAM;wBACZ,OAAO,EAAE,kDAA2C,4BAAgB,MAAG;qBACxE,CAAC;oBACe,qBAAM,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,EAAA;;oBAAlC,IAAI,GAAK,CAAA,SAAyB,CAAA,KAA9B;oBACZ,yDAAyD;oBACzD,UAAU,CAAC,WAAW,GAAG,IAAI,IAAI,4BAAgB,CAAC;;;oBAG5C,YAAY,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;oBACtC,UAAU,CAAC,WAAW,GAAG,YAAY,CAAC,GAAG,EAAE,CAAC,CAAC,uCAAuC;;;oBAGtF,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;wBACnB,4DAA4D;wBAC5D,kEAAkE;wBAClE,UAAU,CAAC,WAAW,GAAG,UAAU,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;oBAC9D,CAAC;yBAKG,OAAO,CAAC,SAAS,EAAjB,wBAAiB;oBACnB,UAAU,CAAC,KAAK,CAAC,SAAS,GAAG,IAAI,CAAC;;wBAElC,qBAAM,IAAA,yCAAmB,EACvB,MAAM,EACN,WAAW,EACX,CAAC,CAAC,UAAU,IAAI,eAAe,IAAI,OAAO,IAAI,kBAAkB,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,EACjF,UAAU,CAAC,WAAW,CACvB,EAAA;;oBALD,SAKC,CAAC;;;;;oBAGJ,uBAAuB,EAAE,CAAC;oBAC1B,MAAM,OAAK,CAAC;;;yBAMR,OAAO,CAAC,MAAM,EAAd,yBAAc;oBAChB,qBAAM,IAAA,qBAAS,EAAC,OAAO,EAAE,UAAU,CAAC,WAAW,EAAE,UAAU,CAAC,EAAA;;oBAA5D,SAA4D,CAAC;;;oBAE7D,+GAA+G;oBAC/G,UAAU,CAAC,KAAK,CAAC,SAAS;wBACxB,OAAO,CAAC,SAAS,IAAI,CAAC,OAAO,OAAO,CAAC,OAAO,KAAK,SAAS,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,KAAK,CAAC;oBAC3F,UAAU,CAAC,KAAK,CAAC,KAAK,GAAG,OAAO,CAAC,KAAK,IAAI,CAAC,OAAO,OAAO,CAAC,GAAG,KAAK,SAAS,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,KAAK,CAAC;oBACtG,UAAU,CAAC,KAAK,CAAC,cAAc,GAAG,OAAO,CAAC,GAAG;wBAC3C,CAAC,CAAC,KAAK;wBACP,CAAC,CAAC,OAAO,CAAC,IAAI;4BACZ,CAAC,CAAC,MAAM;4BACR,CAAC,CAAC,OAAO,CAAC,GAAG;gCACX,CAAC,CAAC,KAAK;gCACP,CAAC,CAAC,OAAO,CAAC,IAAI;oCACZ,CAAC,CAAC,MAAM;oCACR,CAAC,CAAC,SAAS,CAAC;oBAEpB,0DAA0D;oBAC1D,IAAI,OAAO,OAAO,CAAC,WAAW,KAAK,QAAQ,EAAE,CAAC;wBAC5C,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;4BACxC,MAAM,IAAI,KAAK,CAAC,2DAA2D,CAAC,CAAC;wBAC/E,CAAC;oBACH,CAAC;oBAED,UAAU,CAAC,KAAK,CAAC,WAAW,GAAG,OAAO,CAAC,WAAW,KAAK,KAAK,IAAI,OAAO,CAAC,cAAc,CAAC,KAAK,KAAK,CAAC;yBAE9F,CAAC,CAAC,UAAU,IAAI,eAAe,IAAI,OAAO,IAAI,kBAAkB,CAAC,EAAjE,yBAAiE;oBAEtD,qBAAM,IAAA,kBAAM,EAAC,OAAO,EAAE,UAAU,CAAC,WAAW,CAAC,EAAA;;oBAD1D,4CAA4C;oBAC5C,UAAU,GAAG,SAA6C,CAAC;;;oBAG7D,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,cAAc,EAAE,CAAC;wBACrC,UAAU,CAAC,KAAK,CAAC,cAAc,GAAG,KAAK,CAAC;oBAC1C,CAAC;oBAED,mEAAmE;oBACnE,sBAAsB;oBACtB,IAAI,OAAO,CAAC,eAAe,IAAI,OAAO,CAAC,kBAAkB,CAAC,IAAI,OAAO,CAAC,eAAe,EAAE,CAAC;wBACtF,+BAA+B;wBAC/B,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC;4BACvB,IAAI,EAAE,kBAAkB;4BACxB,IAAI,EAAE,YAAY;4BAClB,OAAO,EAAE;gCACP,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,OAAO;6BAClE;yBACF,CAAC,CAAC;oBACL,CAAC;oBAED,IAAI,OAAO,CAAC,UAAU,IAAI,OAAO,CAAC,aAAa,CAAC,IAAI,OAAO,CAAC,UAAU,EAAE,CAAC;wBACvE,0BAA0B;wBAC1B,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC;4BACvB,IAAI,EAAE,aAAa;4BACnB,IAAI,EAAE,YAAY;4BAClB,OAAO,EAAE;gCACP,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,OAAO;6BAClE;yBACF,CAAC,CAAC;oBACL,CAAC;oBAED,mBAAmB;oBACnB,IAAI,OAAO,CAAC,UAAU,EAAE,CAAC;wBACvB,wEAAwE;wBACxE,UAAU,GAAG,IAAA,8BAAoB,EAAC,UAAU,CAAC,CAAC;wBAC9C,yBAAyB;wBACzB,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC;4BACvB,IAAI,EAAE,YAAY;4BAClB,IAAI,EAAE,SAAS;yBAChB,CAAC,CAAC;oBACL,CAAC;yBAAM,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;wBAC3B,UAAU,GAAG,IAAA,8BAAoB,EAAC,UAAU,CAAC,CAAC;wBAC9C,sBAAsB;wBACtB,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC;4BACvB,IAAI,EAAE,SAAS;4BACf,IAAI,EAAE,SAAS;yBAChB,CAAC,CAAC;oBACL,CAAC;yBAAM,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC;wBAC7B,UAAU,GAAG,IAAA,8BAAoB,EAAC,UAAU,CAAC,CAAC;wBAC9C,wBAAwB;wBACxB,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC;4BACvB,IAAI,EAAE,WAAW;4BACjB,IAAI,EAAE,SAAS;yBAChB,CAAC,CAAC;oBACL,CAAC;yBAAM,IAAI,OAAO,CAAC,UAAU,EAAE,CAAC;wBAC9B,UAAU,GAAG,IAAA,8BAAoB,EAAC,UAAU,CAAC,CAAC;wBAC9C,yBAAyB;wBACzB,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC;4BACvB,IAAI,EAAE,YAAY;4BAClB,IAAI,EAAE,SAAS;yBAChB,CAAC,CAAC;oBACL,CAAC;yBAAM,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;wBAC3B,IAAI,CAAC;4BACH,UAAU,GAAG,IAAA,8BAAoB,EAAC,UAAU,CAAC,CAAC;4BAC9C,yBAAyB;4BACzB,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC;gCACvB,IAAI,EAAE,SAAS;gCACf,IAAI,EAAE,SAAS;6BAChB,CAAC,CAAC;wBACL,CAAC;wBAAC,OAAO,KAAK,EAAE,CAAC;4BACf,OAAO,CAAC,GAAG,CAAC,EAAE,KAAK,OAAA,EAAE,CAAC,CAAC;wBACzB,CAAC;oBACH,CAAC;oBACD,+CAA+C;yBAC1C,IAAI,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,UAAC,CAAC,IAAK,OAAA,CAAC,CAAC,IAAI,KAAK,SAAS,EAApB,CAAoB,CAAC,KAAK,SAAS,EAAE,CAAC;wBAC7E,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC;4BACvB,IAAI,EAAE,YAAY;4BAClB,IAAI,EAAE,SAAS;yBAChB,CAAC,CAAC;oBACL,CAAC;oBAED,0BAA0B;oBAC1B,IAAI,OAAO,CAAC,QAAQ,EAAE,CAAC;wBACrB,uBAAuB;wBACvB,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC;4BACvB,IAAI,EAAE,UAAU;4BAChB,IAAI,EAAE,gBAAgB;yBACvB,CAAC,CAAC;oBACL,CAAC;oBAED,IAAI,OAAO,CAAC,QAAQ,EAAE,CAAC;wBACrB,uBAAuB;wBACvB,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC;4BACvB,IAAI,EAAE,UAAU;4BAChB,IAAI,EAAE,gBAAgB;yBACvB,CAAC,CAAC;oBACL,CAAC;oBAED,8CAA8C;oBAC9C,IAAI,CAAC,EAAE,CAAC,CAAC;oBACT,SAAS,CAAC,6BAA6B,CAAC,CAAC;oBACzC,IAAI,CAAC,UAAG,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,CAAC,mBAAmB,CAAC,CAAE,CAAC,CAAC;oBAE3E,IAAI,CAAC,EAAE,CAAC,CAAC;oBACT,SAAS,CAAC,gCAAgC,CAAC,CAAC;oBAGtC,mBAAmB,GAAG,UAAC,UAAsB;wBACjD,IAAI,MAAM,GAAG,gCAAyB,UAAU,CAAC,WAAW,MAAG,CAAC;wBAEhE,mBAAmB;wBACnB,UAAU,CAAC,QAAQ,CAAC,OAAO,CAAC,UAAC,CAAC;;4BAC5B,MAAM,IAAI,YAAK,CAAC,CAAC,IAAI,MAAG,CAAC;4BACzB,qEAAqE;4BACrE,IAAI,CAAC,CAAC,IAAI,KAAK,YAAY,EAAE,CAAC;gCAC5B,IAAI,CAAA,MAAA,CAAC,CAAC,OAAO,0CAAE,IAAI,MAAK,MAAM,EAAE,CAAC;oCAC/B,MAAM,IAAI,SAAS,CAAC;gCACtB,CAAC;qCAAM,IAAI,CAAA,MAAA,CAAC,CAAC,OAAO,0CAAE,IAAI,MAAK,QAAQ,EAAE,CAAC;oCACxC,MAAM,IAAI,WAAW,CAAC;gCACxB,CAAC;4BACH,CAAC;wBACH,CAAC,CAAC,CAAC;wBAEH,sDAAsD;wBACtD,IAAI,UAAU,CAAC,KAAK,CAAC,SAAS,EAAE,CAAC;4BAC/B,MAAM,IAAI,eAAe,CAAC;wBAC5B,CAAC;wBAED,mDAAmD;wBACnD,IAAI,UAAU,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC;4BAC3B,MAAM,IAAI,WAAW,CAAC;wBACxB,CAAC;wBAED,6DAA6D;wBAC7D,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC;4BAClC,MAAM,IAAI,oBAAoB,CAAC;wBACjC,CAAC;wBAED,0BAA0B;wBAC1B,IAAI,UAAU,CAAC,KAAK,CAAC,cAAc,KAAK,KAAK,EAAE,CAAC;4BAC9C,MAAM,IAAI,YAAK,UAAU,CAAC,KAAK,CAAC,cAAc,CAAE,CAAC;wBACnD,CAAC;wBAED,OAAO,MAAM,CAAC;oBAChB,CAAC,CAAC;oBAEI,cAAc,GAAG,IAAA,6BAAiB,EAAC,OAAO,EAAE,UAAU,CAAC,CAAC;oBAC9D,OAAO,CAAC,YAAK,mBAAmB,CAAC,UAAU,CAAC,CAAE,CAAC,CAAC;oBAExC,QAAQ,GAAK,UAAU,SAAf,CAAgB;oBAG1B,qBAAqB,GAAG,QAAQ,CAAC,IAAI,CAAC,UAAC,CAAC,IAAK,OAAA,CAAC,CAAC,IAAI,KAAK,gBAAgB,EAA3B,CAA2B,CAAC,IAAI,SAAS,CAAC;oBACvF,iBAAiB,GAAG,QAAQ,CAAC,IAAI,CAAC,UAAC,CAAC,IAAK,OAAA,CAAC,CAAC,IAAI,KAAK,YAAY,EAAvB,CAAuB,CAAC,IAAI,SAAS,CAAC;oBAE/E,cAAc,GAAG,QAAQ,CAAC,IAAI,CAAC,UAAC,CAAC,IAAK,OAAA,CAAC,CAAC,IAAI,KAAK,SAAS,EAApB,CAAoB,CAAC,CAAC;oBAE9D,KAAK,GAAa,EAAE,CAAC;oBAEzB,KAAK,GAAG,IAAA,iCAAqB,EAC3B,qBAAqB,EACrB,KAAK,EACL,iBAAiB,EACjB,cAAc,EACd,OAAO,EACP,UAAU,CACX,CAAC;oBAGE,cAAc,GAAU,EAAE,CAAC;oBAE/B,cAAc,GAAG,IAAA,gCAAoB,EACnC,qBAAqB,EACrB,UAAU,EACV,KAAK,EACL,cAAc,EACd,iBAAiB,EACjB,cAAc,EACd,cAAc,EACd,OAAO,CACR,CAAC;oBAEF,qBAAM,IAAA,uBAAW,EAAC,UAAU,EAAE,cAAc,EAAE,OAAO,EAAE,cAAc,CAAC,EAAA;;oBAAtE,SAAsE,CAAC;;;;;oBAGzE,IAAI,OAAK,KAAK,EAAE,EAAE,CAAC;wBACjB,4CAA4C;wBAC5C,sBAAO,KAAK,OAAO,CAAC,8BAAoB,CAAC,EAAC;oBAC5C,CAAC;oBAED,0CAA0C;oBAC1C,6CAA6C;oBAE7C,uBAAuB,EAAE,CAAC;oBAC1B,MAAM,OAAK,CAAC;;;;SAEf;CACF,CAAC;AAEF,kBAAe,OAAO,CAAC"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"create-expo-stack.js","sourceRoot":"","sources":["../../src/commands/create-expo-stack.ts"],"names":[],"mappings":"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"}

package/build/templates/base/App.tsx.ejs

@@ -1,3 +1,6 @@
+<% if (props.stylingPackage?.name === "nativewind") { %>
+import './global.css';
+<% } %>
 import React from 'react';
 
 <% if (props.stylingPackage?.name === "nativewind") {%>

package/build/templates/base/babel.config.js.ejs

@@ -2,10 +2,6 @@ module.exports = function(api) {
   api.cache(true);
   let plugins = [];
   
-  <% if (props.stylingPackage?.name === "nativewind") { %>
-    plugins.push('nativewind/babel');
-  <% } %>
-
   <% if (props.stylingPackage?.name === "tamagui") { %>
     plugins.push([
       '@tamagui/babel-plugin',
@@ -16,16 +12,19 @@ module.exports = function(api) {
     ]);
   <% } %>
 
-  <% if (props.navigationPackage?.name === 'expo-router') { %>
-    plugins.push('expo-router/babel');
-  <% } %>
-
-  <% if (props.navigationPackage?.options.type === "drawer") { %>
+  <% if (props.navigationPackage?.options.type === "drawer + tabs") { %>
     plugins.push('react-native-reanimated/plugin');
   <% } %>
 
   return {
-    presets: ['babel-preset-expo'],
-    plugins: plugins,
+    <% if (props.stylingPackage?.name === "nativewind") { %>
+      presets: [
+        ['babel-preset-expo', { jsxImportSource: 'nativewind' }],
+        'nativewind/babel',
+      ],
+    <% } else { %>
+      presets: ['babel-preset-expo'],
+    <% } %>
+    plugins,
   };
 };

package/build/templates/base/package.json.ejs

@@ -14,7 +14,7 @@
   },
   "dependencies": {
     <% if (props.stylingPackage?.name === "nativewind") { %>
-      "nativewind": "^2.0.11",
+      "nativewind": "^4.0.1",
     <% } %>
     
     <% if (props.stylingPackage?.name === "restyle") { %>
@@ -27,7 +27,7 @@
       "@tamagui/shorthands": "1.74.8",
       "@tamagui/themes": "1.74.8",
       "@tamagui/react-native-media-driver": "1.74.8",
-      "expo-font": "~11.4.0",
+      "expo-font": "~11.10.2",
     <% } %>
 
     <% if (props.stylingPackage?.name === "unistyles") { %>
@@ -36,36 +36,42 @@
 
     <% if (props.navigationPackage?.type === "navigation") { %>
       "@react-navigation/native": "^6.1.7",
-      "react-native-gesture-handler": "~2.12.0",
-      "react-native-safe-area-context": "^4.6.3",
-      "react-native-screens": "~3.22.0",
+      "react-native-gesture-handler": "~2.14.0",
+      "react-native-safe-area-context": "^4.8.2",
+      "react-native-screens": "~3.29.0",
     <% } %>
 
     <% if (props.navigationPackage?.name === "react-navigation") { %>
       "@react-navigation/stack": "^6.3.17",
-      "@expo/vector-icons": "^13.0.0",
+      "@expo/vector-icons": "^14.0.0",
     <% } %>
 
     <% if ((props.navigationPackage?.name === "react-navigation") && (props.stylingPackage?.name === "tamagui")) { %>
-      "expo-splash-screen": "~0.20.5",
+      "expo-splash-screen": "~0.26.4",
     <% } %>
 
     <% if (props.navigationPackage?.options.type === "tabs" && props.navigationPackage?.name === "react-navigation") { %>
       "@react-navigation/bottom-tabs": "^6.5.8",
     <% } %>
 
-    <% if (props.navigationPackage?.options.type === "drawer") { %>
+    <% if ((props.navigationPackage?.options.type === "drawer + tabs") && (props.navigationPackage?.name === "react-navigation")) { %>
       "@react-navigation/drawer": "^6.6.6",
-      "react-native-reanimated": "~3.3.0",
+      "@react-navigation/bottom-tabs": "^6.5.8",
+      "react-native-reanimated": "~3.6.2",
+    <% } else if (props.navigationPackage?.options.type === "drawer + tabs") { %>
+      "@react-navigation/drawer": "^6.6.6",
+      "@react-navigation/bottom-tabs": "^6.5.8",
     <% } %>
     
     <% if (props.navigationPackage?.name === "expo-router") { %>
-      "@expo/vector-icons": "^13.0.0",
-      "expo-linking": "~5.0.2",
-      "expo-router": "^2.0.0",      
-      "expo-system-ui": "~2.4.0",
-      "expo-web-browser": "~12.3.2",
+      "@expo/vector-icons": "^14.0.0",
+      "expo-linking": "~6.2.2",
+      "expo-router": "^3.4.6", 
+      "expo-constants": "~15.4.5",     
+      "expo-system-ui": "~2.9.3",
+      "expo-web-browser": "~12.8.2",
       "react-dom": "18.2.0",
+      "react-native-reanimated": "~3.6.2",
       "react-native-web": "~0.19.6",
     <% } %>
 
@@ -80,10 +86,10 @@
 	  "react-native-url-polyfill": "^2.0.0",
 	<% } %>
 
-    "expo": "~49.0.11",
-    "expo-status-bar": "~1.6.0",
+    "expo": "~50.0.4",
+    "expo-status-bar": "~1.11.1",
     "react": "18.2.0",
-    "react-native": "0.72.6"
+    "react-native": "0.73.2"
   },
   "devDependencies": {
     "@babel/core": "^7.20.0",
@@ -94,7 +100,7 @@
     "eslint-config-universe": "^12.0.0",
     "prettier": "^3.0.3",
     <% if (props.stylingPackage?.name === "nativewind") { %>
-      "tailwindcss": "3.3.2",
+      "tailwindcss": "^3.4.0",
     <% } %>
     <% if (props.stylingPackage?.name === "tamagui") { %>
       "@tamagui/babel-plugin": "1.74.8",
@@ -106,14 +112,12 @@
   },
   <% if (props.navigationPackage?.name === 'expo-router') { %>
     "resolutions": {
-      "react-refresh": "~0.14.0",
       "expo-modules-core": "~1.11.0"
     },
     "overrides": {
-      "react-refresh": "~0.14.0",
       "expo-modules-core": "~1.11.0"
     },
-  <% } else { %>
+      <% } else { %>
     "main": "node_modules/expo/AppEntry.js",
   <% } %>
   <% if (props.navigationPackage?.type === "navigation") { %>

package/build/templates/packages/expo-router/drawer/app/(drawer)/(tabs)/_layout.tsx.ejs

@@ -0,0 +1,41 @@
+import FontAwesome from '@expo/vector-icons/FontAwesome';
+import { Tabs } from 'expo-router';
+import { StyleSheet } from 'react-native';
+
+function TabBarIcon(props: {
+  name: React.ComponentProps<typeof FontAwesome>['name'];
+  color: string;
+}) {
+  return <FontAwesome size={28} style={styles.tabBarIcon} {...props} />;
+}
+
+export default function TabLayout() {
+  return (
+    <Tabs
+      screenOptions={{
+        headerShown: false,
+        tabBarActiveTintColor: 'black',
+      }}>
+      <Tabs.Screen
+        name="index"
+        options={{
+          title: 'Tab One',
+          tabBarIcon: ({ color }) => <TabBarIcon name="code" color={color} />,
+        }}
+      />
+      <Tabs.Screen
+        name="two"
+        options={{
+          title: 'Tab Two',
+          tabBarIcon: ({ color }) => <TabBarIcon name="code" color={color} />,
+        }}
+      />
+    </Tabs>
+  );
+}
+
+const styles = StyleSheet.create({
+  tabBarIcon: {
+    marginBottom: -3,
+  },
+});

package/build/templates/packages/expo-router/drawer/app/(drawer)/(tabs)/index.tsx.ejs

@@ -0,0 +1,88 @@
+<% if (props.stylingPackage?.name === 'nativewind') { %>
+    import { Text, View } from 'react-native';
+<% } else if (props.stylingPackage?.name === 'tamagui') { %>
+    import { YStack, H2, Separator, Theme } from 'tamagui';
+<% } else if (props.stylingPackage?.name === 'restyle') { %>
+    import { Box, Text } from 'theme';
+<% } else if (props.stylingPackage?.name === 'unistyles') { %>
+    import { useStyles } from 'react-native-unistyles'
+    import { Text, View } from 'react-native';
+<% } else { %>
+    import { StyleSheet, Text, View } from 'react-native';
+<% } %>
+
+import EditScreenInfo from '../../../components/edit-screen-info';
+
+export default function TabOneScreen() {
+  <% if (props.stylingPackage?.name === 'unistyles') { %>
+    const { theme } = useStyles()
+
+    return (
+			<View style={theme.components.container}>
+				<Text style={theme.components.title}>Tab One</Text>
+				<View style={theme.components.separator} />
+				<EditScreenInfo path='app/(drawer)/(tabs)/index.tsx' />
+			</View>
+    );
+  <% } else if (props.stylingPackage?.name === 'nativewind') { %>
+        return (
+			<View className={styles.container}>
+				<Text className={styles.title}>Tab One</Text>
+				<View className={styles.separator} />
+				<EditScreenInfo path='app/(drawer)/(tabs)/index.tsx' />
+			</View>
+		);
+    <% } else if (props.stylingPackage?.name === 'tamagui') { %>
+        return (
+			<Theme name='light'>
+				<YStack flex={1} alignItems='center' justifyContent='center'>
+					<H2>Tab One</H2>
+					<Separator />
+					<EditScreenInfo path='app/(drawer)/(tabs)/index.tsx' />
+				</YStack>
+			</Theme>
+		);    
+    <% } else if (props.stylingPackage?.name === 'restyle') { %>
+      return (
+        <Box flex={1} alignItems='center' justifyContent='center'>
+          <Text variant='title'>Tab One</Text>
+          <Box height={1} marginVertical='l_32' width='80%' />
+          <EditScreenInfo path='app/(drawer)/(tabs)/index.tsx' />
+        </Box>
+      );
+    <% } else { %>
+        return (
+			<View style={styles.container}>
+				<Text style={styles.title}>Tab One</Text>
+				<View style={styles.separator} />
+				<EditScreenInfo path='app/(drawer)/(tabs)/index.tsx' />
+			</View>
+		);
+    <% } %>
+}
+
+<% if (props.stylingPackage?.name === 'nativewind') { %>
+    const styles = {
+		container: `items-center flex-1 justify-center`,
+		separator: `h-[1px] my-7 w-4/5 bg-gray-200`,
+		title: `text-xl font-bold`
+	};
+<% } else if (props.stylingPackage?.name === 'stylesheet') { %>
+    const styles = StyleSheet.create({
+		container: {
+			alignItems: 'center',
+			flex: 1,
+			justifyContent: 'center',
+		},
+		separator: {
+      backgroundColor: '#d1d5db',
+			height: 1,
+			marginVertical: 30,
+			width: '80%',
+		},
+		title: {
+			fontSize: 20,
+			fontWeight: 'bold',
+		}
+	});
+<% } %>

package/build/templates/packages/expo-router/drawer/app/(drawer)/(tabs)/two.tsx.ejs

@@ -0,0 +1,88 @@
+<% if (props.stylingPackage?.name === 'nativewind') { %>
+    import { Text, View } from 'react-native';
+<% } else if (props.stylingPackage?.name === 'tamagui') { %>
+    import { YStack, H2, Separator, Theme } from 'tamagui';
+<% } else if (props.stylingPackage?.name === 'restyle') { %>
+    import { Box, Text } from 'theme';
+<% } else if (props.stylingPackage?.name === 'unistyles') { %>
+    import { useStyles } from 'react-native-unistyles'
+    import { Text, View } from 'react-native';
+<% } else { %>
+    import { StyleSheet, Text, View } from 'react-native';
+<% } %>
+
+import EditScreenInfo from '../../../components/edit-screen-info';
+
+export default function TabTwoScreen() {
+    <% if (props.stylingPackage?.name === 'unistyles') { %>
+      const { theme } = useStyles()
+
+      return (
+        <View style={theme.components.container}>
+          <Text style={theme.components.title}>Tab Two</Text>
+          <View style={theme.components.separator} />
+          <EditScreenInfo path='app/(drawer)/(tabs)/two.tsx' />
+        </View>
+      );
+    <% } else if (props.stylingPackage?.name === 'nativewind') { %>
+        return (
+			<View className={styles.container}>
+				<Text className={styles.title}>Tab Two</Text>
+				<View className={styles.separator} />
+				<EditScreenInfo path='app/(drawer)/(tabs)/two.tsx' />
+			</View>
+		);
+    <% } else if (props.stylingPackage?.name === 'tamagui') { %>
+        return (
+			<Theme name='light'>
+				<YStack flex={1} alignItems='center' justifyContent='center'>
+					<H2>Tab Two</H2>
+					<Separator />
+					<EditScreenInfo path='app/(drawer)/(tabs)/two.tsx' />
+				</YStack>
+			</Theme>
+		);    
+    <% } else if (props.stylingPackage?.name === 'restyle') { %>
+      return (
+        <Box flex={1} alignItems='center' justifyContent='center'>
+          <Text variant='title'>Tab Two</Text>
+          <Box height={1} marginVertical='l_32' width='80%' />
+          <EditScreenInfo path='app/(drawer)/(tabs)/two.tsx' />
+        </Box>
+      );
+    <% } else { %>
+        return (
+			<View style={styles.container}>
+				<Text style={styles.title}>Tab Two</Text>
+				<View style={styles.separator} />
+				<EditScreenInfo path='app/(drawer)/(tabs)/two.tsx' />
+			</View>
+		);
+    <% } %>
+}
+
+<% if (props.stylingPackage?.name === 'nativewind') { %>
+    const styles = {
+		container: `items-center flex-1 justify-center`,
+		separator: `h-[1px] my-7 w-4/5 bg-gray-200`,
+		title: `text-xl font-bold`
+	};
+<% } else if (props.stylingPackage?.name === 'stylesheet') { %>
+    const styles = StyleSheet.create({
+		container: {
+			alignItems: 'center',
+			flex: 1,
+			justifyContent: 'center',
+		},
+		separator: {
+      backgroundColor: '#d1d5db',
+			height: 1,
+			marginVertical: 30,
+			width: '80%',
+		},
+		title: {
+			fontSize: 20,
+			fontWeight: 'bold',
+		}
+	});
+<% } %>

package/build/templates/packages/expo-router/drawer/app/(drawer)/_layout.tsx.ejs

@@ -1,25 +1,49 @@
+import { FontAwesome, Ionicons, MaterialIcons } from '@expo/vector-icons';
+import { Link } from 'expo-router';
 import { Drawer } from 'expo-router/drawer';
-import { Ionicons } from '@expo/vector-icons';
+import { Pressable, StyleSheet } from 'react-native';
 
 const DrawerLayout = () => (
-	<Drawer>
-		<Drawer.Screen
-			name="index"
-			options={{
-				headerTitle: 'Home',
-				drawerLabel: 'Home',
-				drawerIcon: ({ size, color }) => <Ionicons name="home-outline" size={size} color={color} />
-			}}
-		/>
-		<Drawer.Screen
-			name="news"
-			options={{
-				headerTitle: 'Newsfeed',
-				drawerLabel: 'News',
-				drawerIcon: ({ size, color }) => <Ionicons name="newspaper-outline" size={size} color={color} />
-			}}
-		/>
-	</Drawer>
+  <Drawer>
+    <Drawer.Screen
+      name="index"
+      options={{
+        headerTitle: 'Home',
+        drawerLabel: 'Home',
+        drawerIcon: ({ size, color }) => <Ionicons name="home-outline" size={size} color={color} />,
+      }}
+    />
+    <Drawer.Screen
+      name="(tabs)"
+      options={{
+        headerTitle: 'Tabs',
+        drawerLabel: 'Tabs',
+        drawerIcon: ({ size, color }) => (
+          <MaterialIcons name="border-bottom" size={size} color={color} />
+        ),
+        headerRight: () => (
+          <Link href="/modal" asChild>
+            <Pressable>
+              {({ pressed }) => (
+                <FontAwesome
+                  name="info-circle"
+                  size={25}
+                  color="gray"
+                  style={[styles.headerRight, { opacity: pressed ? 0.5 : 1 }]}
+                />
+              )}
+            </Pressable>
+          </Link>
+        ),
+      }}
+    />
+  </Drawer>
 );
 
+const styles = StyleSheet.create({
+  headerRight: {
+    marginRight: 15,
+  },
+});
+
 export default DrawerLayout;

package/build/templates/packages/expo-router/drawer/app/(drawer)/index.tsx.ejs

@@ -11,6 +11,8 @@
   import { StyleSheet, Text, View } from "react-native";
 <% } %>
 
+import EditScreenInfo from "../../components/edit-screen-info";
+
 const Page = () => {
   <% if (props.stylingPackage?.name === "unistyles") { %>
     const { theme } = useStyles()
@@ -71,6 +73,7 @@ export default Page;
     justifyContent: "center",
   },
   separator: {
+    backgroundColor: '#d1d5db',
     height: 1,
     marginVertical: 30,
     width: "80%",