create-expo-stack 2.5.0-next.24b962d → 2.5.0-next.4353605

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

@@ -46,6 +46,8 @@ 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 projectNameValidationError = "A project with the name";
+var bunInstallationError = 'User cancelled to install recommended version of Bun.';
 var command = {
     name: 'create-expo-stack',
     description: 'Create a new Expo project',
@@ -69,9 +71,10 @@ var command = {
                     useBlankTypescript = options.blank || false;
                     optionsPassedIn = types_1.availablePackages.some(function (condition) { return options[condition] !== undefined; });
                     cliResults = constants_1.defaultOptions;
+                    cliResults.flags.packageManager = (0, utilities_1.getPackageManager)(toolbox, cliResults);
                     _d.label = 1;
                 case 1:
-                    _d.trys.push([1, 10, , 11]);
+                    _d.trys.push([1, 7, , 9]);
                     // 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+tabs']) &&
                         !options.reactNavigation &&
@@ -86,41 +89,36 @@ var command = {
                     return [4 /*yield*/, (0, utilities_1.renderTitle)(toolbox)];
                 case 2:
                     _d.sent();
-                    // TODO: this is hacky, figure out a way to do this better
-                    // set timeout for 1 second so that the title can render before the CLI runs
-                    return [4 /*yield*/, new Promise(function (resolve) { return setTimeout(resolve, 200); })];
-                case 3:
-                    // TODO: this is hacky, figure out a way to do this better
-                    // set timeout for 1 second so that the title can render before the CLI runs
-                    _d.sent();
-                    if (!(!first && (options.ignite || !(useDefault || optionsPassedIn || skipCLI || useBlankTypescript)))) return [3 /*break*/, 5];
+                    if (!(!first && (options.ignite || !(useDefault || optionsPassedIn || skipCLI || useBlankTypescript)))) return [3 /*break*/, 4];
                     askName = {
                         type: 'input',
                         name: 'name',
                         message: "What do you want to name your project? (".concat(constants_1.DEFAULT_APP_NAME, ")")
                     };
                     return [4 /*yield*/, prompt.ask(askName)];
-                case 4:
+                case 3:
                     name = (_d.sent()).name;
                     // if name is undefined or empty string, use default name
                     cliResults.projectName = name || constants_1.DEFAULT_APP_NAME;
-                    return [3 /*break*/, 6];
-                case 5:
+                    return [3 /*break*/, 5];
+                case 4:
                     // 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;
+                    _d.label = 5;
+                case 5:
+                    // Validate the provided project name; check if the directory already exists
+                    // - We may or may not be interactive, so conditionally pass in prompt.
+                    // - Ignore validation if the overwrite option is passed in.
+                    if (options.overwrite) {
+                        cliResults.flags.overwrite = true;
+                    }
+                    return [4 /*yield*/, (0, validateProjectName_1.validateProjectName)(exists, removeAsync, !(useDefault || optionsPassedIn || skipCLI || useBlankTypescript) ? prompt : null, cliResults.projectName, success, cliResults.flags.overwrite)];
                 case 6:
-                    if (!options.overwrite) return [3 /*break*/, 7];
-                    cliResults.flags.overwrite = true;
-                    return [3 /*break*/, 9];
-                case 7: return [4 /*yield*/, (0, validateProjectName_1.validateProjectName)(exists, removeAsync, !(useDefault || optionsPassedIn || skipCLI || useBlankTypescript) ? prompt : null, cliResults.projectName)];
-                case 8:
                     _d.sent();
-                    _d.label = 9;
-                case 9: return [3 /*break*/, 11];
-                case 10:
+                    return [3 /*break*/, 9];
+                case 7:
                     err_1 = _d.sent();
                     if (err_1 === '') {
                         // user cancelled/exited the interactive CLI
@@ -130,31 +128,28 @@ var command = {
                         // 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);
+                    if (err_1.message.includes(projectNameValidationError)) {
+                        return [2 /*return*/, void success("\nCancelled... \uD83D\uDC4B \n")];
+                    }
+                    // Delete all files with projectName
+                    return [4 /*yield*/, removeAsync(cliResults.projectName)];
+                case 8:
+                    // Delete all files with projectName
+                    _d.sent();
                     printSomethingWentWrong();
                     throw err_1;
-                case 11:
-                    _d.trys.push([11, 18, , 19]);
-                    if (!options.ignite) return [3 /*break*/, 13];
+                case 9:
+                    _d.trys.push([9, 16, , 18]);
+                    if (!options.ignite) return [3 /*break*/, 11];
                     return [4 /*yield*/, (0, utilities_1.runIgnite)(toolbox, cliResults.projectName, cliResults)];
-                case 12:
+                case 10:
                     _d.sent();
-                    return [3 /*break*/, 17];
-                case 13:
+                    return [3 /*break*/, 15];
+                case 11:
                     // Check if the user wants to not install dependencies and/or not initialize git, update cliResults accordingly
                     cliResults.flags.noInstall =
                         options.noInstall || (typeof options.install === 'boolean' && !options.install) || false;
                     cliResults.flags.noGit = options.noGit || (typeof options.git === 'boolean' && !options.git) || false;
-                    cliResults.flags.packageManager = options.bun
-                        ? 'bun'
-                        : options.pnpm
-                            ? 'pnpm'
-                            : options.npm
-                                ? 'npm'
-                                : options.yarn
-                                    ? 'yarn'
-                                    : undefined;
                     // Validate import alias string forward slash and asterisk
                     if (typeof options.importAlias === 'string') {
                         if (!options.importAlias.endsWith('/*')) {
@@ -162,16 +157,13 @@ var command = {
                         }
                     }
                     cliResults.flags.importAlias = options.importAlias !== false && options['import-alias'] !== false;
-                    if (!!(useDefault || optionsPassedIn || skipCLI || useBlankTypescript)) return [3 /*break*/, 15];
+                    if (!!(useDefault || optionsPassedIn || skipCLI || useBlankTypescript)) return [3 /*break*/, 13];
                     return [4 /*yield*/, (0, utilities_1.runCLI)(toolbox, cliResults.projectName)];
-                case 14:
+                case 12:
                     //  Run the CLI to prompt the user for input
                     cliResults = _d.sent();
-                    _d.label = 15;
-                case 15:
-                    if (!cliResults.flags.packageManager) {
-                        cliResults.flags.packageManager = 'npm';
-                    }
+                    _d.label = 13;
+                case 13:
                     // Update the cliResults with the options passed in via the command
                     // Navigation packages
                     if (options.reactNavigation || options['react-navigation'] || options.reactnavigation) {
@@ -322,24 +314,30 @@ var command = {
                     formattedFiles = [];
                     formattedFiles = (0, utilities_1.generateProjectFiles)(authenticationPackage, cliResults, files, formattedFiles, navigationPackage, packageManager, stylingPackage, toolbox, internalizationPackage);
                     return [4 /*yield*/, (0, utilities_1.printOutput)(cliResults, formattedFiles, toolbox, stylingPackage)];
-                case 16:
+                case 14:
                     _d.sent();
-                    _d.label = 17;
-                case 17: return [3 /*break*/, 19];
-                case 18:
+                    _d.label = 15;
+                case 15: return [3 /*break*/, 18];
+                case 16:
                     err_2 = _d.sent();
                     if (err_2 === '') {
                         // user cancelled/exited the interactive CLI
                         return [2 /*return*/, void success("\nCancelled... \uD83D\uDC4B \n")];
                     }
-                    // TODO: delete all files with projectName
-                    // await removeAsync(cliResults.projectName);
+                    if (err_2.message.includes(bunInstallationError)) {
+                        return [2 /*return*/, void success("\nUser cancelled to install recommended version of Bun... \uD83D\uDC4B \n")];
+                    }
+                    // Delete all files with projectName
+                    return [4 /*yield*/, removeAsync(cliResults.projectName)];
+                case 17:
+                    // Delete all files with projectName
+                    _d.sent();
                     printSomethingWentWrong();
                     throw err_2;
-                case 19: return [2 /*return*/];
+                case 18: 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":"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"}
+//# 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,yBAAyB,GAAG,oHAAoH,CAAC;AACvJ,IAAM,0BAA0B,GAAG,yBAAyB,CAAC;AAC7D,IAAM,oBAAoB,GAAG,uDAAuD,CAAC;AAErF,IAAM,OAAO,GAAmB;IAC9B,IAAI,EAAE,mBAAmB;IACzB,WAAW,EAAE,2BAA2B;IACxC,GAAG,EAAE,UAAO,OAAO;;;;;oBAEf,KAIE,OAAO,WAJ0B,EAArB,MAAM,YAAA,EAAE,WAAW,iBAAA,EACjC,KAGE,OAAO,WAHqB,EAAhB,KAAK,WAAA,EAAE,OAAO,aAAA,EAC5B,KAEE,OAAO,MAF0C,EAA1C,KAAK,WAAA,EAAE,IAAI,UAAA,EAAE,SAAS,eAAA,EAAE,OAAO,aAAA,EAAE,OAAO,aAAA,EACjD,MAAM,GACJ,OAAO,OADH,CACI;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;oBAC5C,UAAU,CAAC,KAAK,CAAC,cAAc,GAAG,IAAA,6BAAiB,EAAC,OAAO,EAAE,UAAU,CAAC,CAAC;;;;oBAIvE,kJAAkJ;oBAClJ,IACE,CAAC,OAAO,CAAC,IAAI,IAAI,OAAO,CAAC,aAAa,CAAC,CAAC;wBACxC,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,uCAAuC;wBACvC,MAAM,yBAAyB,CAAC;oBAClC,CAAC;oBAED,qBAAM,IAAA,uBAAW,EAAC,OAAO,CAAC,EAAA;;oBAA1B,SAA0B,CAAC;yBAIvB,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;;;oBAElD,kFAAkF;oBAClF,UAAU,CAAC,WAAW,GAAG,KAAK,IAAI,4BAAgB,CAAC;oBAC7C,YAAY,GAAG,UAAU,CAAC,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;oBACvD,UAAU,CAAC,WAAW,GAAG,YAAY,CAAC,GAAG,EAAE,CAAC,CAAC,uCAAuC;;;oBAGtF,4EAA4E;oBAC5E,uEAAuE;oBACvE,4DAA4D;oBAC5D,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC;wBACtB,UAAU,CAAC,KAAK,CAAC,SAAS,GAAG,IAAI,CAAC;oBACpC,CAAC;oBAED,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,EACtB,OAAO,EACP,UAAU,CAAC,KAAK,CAAC,SAAS,CAC3B,EAAA;;oBAPD,SAOC,CAAC;;;;oBAEF,IAAI,KAAG,KAAK,EAAE,EAAE,CAAC;wBACf,4CAA4C;wBAC5C,sBAAO,KAAK,OAAO,CAAC,gCAAsB,CAAC,EAAC;oBAC9C,CAAC;oBACD,IAAI,KAAG,KAAK,yBAAyB,EAAE,CAAC;wBACtC,qGAAqG;wBACrG,sBAAO,KAAK,KAAK,CAAC,YAAK,yBAAyB,OAAI,CAAC,EAAC;oBACxD,CAAC;oBACD,IAAI,KAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,0BAA0B,CAAC,EAAE,CAAC;wBACrD,sBAAO,KAAK,OAAO,CAAC,gCAAsB,CAAC,EAAC;oBAC9C,CAAC;oBAED,oCAAoC;oBACpC,qBAAM,WAAW,CAAC,UAAU,CAAC,WAAW,CAAC,EAAA;;oBADzC,oCAAoC;oBACpC,SAAyC,CAAC;oBAE1C,uBAAuB,EAAE,CAAC;oBAC1B,MAAM,KAAG,CAAC;;;yBAON,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;oBAEtG,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,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,aAAa,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,OAAO;6BACjF;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,aAAa,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,OAAO;6BACjF;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,2BAA2B;oBAC3B,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;wBACpB,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC;4BACvB,IAAI,EAAE,SAAS;4BACf,IAAI,EAAE,sBAAsB;yBAC7B,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,eAAe,EAAE,CAAC;oCAC/C,MAAM,IAAI,gBAAgB,CAAC;gCAC7B,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;oBAC5D,sBAAsB,GAAG,QAAQ,CAAC,IAAI,CAAC,UAAC,CAAC,IAAK,OAAA,CAAC,CAAC,IAAI,KAAK,sBAAsB,EAAjC,CAAiC,CAAC,CAAC;oBAEnF,KAAK,GAAa,EAAE,CAAC;oBAEzB,KAAK,GAAG,IAAA,iCAAqB,EAC3B,qBAAqB,EACrB,KAAK,EACL,iBAAiB,EACjB,cAAc,EACd,OAAO,EACP,UAAU,EACV,sBAAsB,CACvB,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,EACP,sBAAsB,CACvB,CAAC;oBAEF,qBAAM,IAAA,uBAAW,EAAC,UAAU,EAAE,cAAc,EAAE,OAAO,EAAE,cAAc,CAAC,EAAA;;oBAAtE,SAAsE,CAAC;;;;;oBAGzE,IAAI,KAAG,KAAK,EAAE,EAAE,CAAC;wBACf,4CAA4C;wBAC5C,sBAAO,KAAK,OAAO,CAAC,gCAAsB,CAAC,EAAC;oBAC9C,CAAC;oBAED,IAAI,KAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAAC,EAAE,CAAC;wBAC/C,sBAAO,KAAK,OAAO,CAAC,2EAAiE,CAAC,EAAC;oBACzF,CAAC;oBAED,oCAAoC;oBACpC,qBAAM,WAAW,CAAC,UAAU,CAAC,WAAW,CAAC,EAAA;;oBADzC,oCAAoC;oBACpC,SAAyC,CAAC;oBAE1C,uBAAuB,EAAE,CAAC;oBAC1B,MAAM,KAAG,CAAC;;;;SAEb;CACF,CAAC;AAEF,kBAAe,OAAO,CAAC"}

package/build/templates/base/components/Container.tsx.ejs

@@ -0,0 +1,13 @@
+import { StyleSheet, SafeAreaView } from 'react-native';
+
+export const Container = ({ children }: { children: React.ReactNode }) => {
+  return <SafeAreaView style={styles.container}>{children}</View>;
+};
+
+const styles = StyleSheet.create({
+  container: {
+    flex: 1,
+    padding: 24,
+  },
+});
+

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

@@ -98,7 +98,7 @@
     "expo": "~50.0.7",
     "expo-status-bar": "~1.11.1",
     "react": "18.2.0",
-    "react-native": "0.73.4"
+    "react-native": "0.73.6"
   },
   "devDependencies": {
   <%# patch for this issue : https://github.com/expo/expo/issues/26641 %>

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

@@ -1,22 +1,15 @@
 import { Stack } from 'expo-router';
-import { StyleSheet, View } from 'react-native';
 
+import { Container } from '~/components/Container';
 import { ScreenContent } from '~/components/ScreenContent';
 
 export default function Home() {
   return (
     <>
       <Stack.Screen options={{ title: 'Tab One' }} />
-      <View style={styles.container}>
+      <Container>
         <ScreenContent path="app/(drawer)/(tabs)/index.tsx" title="Tab One" />
-      </View>
+      </Container>
     </>
   );
 }
-
-const styles = StyleSheet.create({
-  container: {
-    flex: 1,
-    padding: 24,
-  },
-});

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

@@ -1,22 +1,15 @@
 import { Stack } from 'expo-router';
-import { StyleSheet, View } from 'react-native';
 
+import { Container } from '~/components/Container';
 import { ScreenContent } from '~/components/ScreenContent';
 
 export default function Home() {
   return (
     <>
       <Stack.Screen options={{ title: 'Tab Two' }} />
-      <View style={styles.container}>
+      <Container>
         <ScreenContent path="app/(drawer)/(tabs)/two.tsx" title="Tab Two" />
-      </View>
+      </Container>
     </>
   );
-}
-
-const styles = StyleSheet.create({
-  container: {
-    flex: 1,
-    padding: 24,
-  },
-});
+}

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

@@ -1,22 +1,16 @@
 import { Stack } from 'expo-router';
 import { StyleSheet, View } from 'react-native';
 
+import { Container } from '~/components/Container';
 import { ScreenContent } from '~/components/ScreenContent';
 
 export default function Home() {
   return (
     <>
       <Stack.Screen options={{ title: 'Home' }} />
-      <View style={styles.container}>
+      <Container>
         <ScreenContent path="app/(drawer)/(tabs)/index.tsx" title="Home" />
-      </View>
+      </Container>
     </>
   );
-}
-
-const styles = StyleSheet.create({
-  container: {
-    flex: 1,
-    padding: 24,
-  },
-});
+}

package/build/templates/packages/expo-router/drawer/app/+not-found.tsx.ejs

@@ -1,16 +1,24 @@
 import { Link, Stack } from 'expo-router';
 <% if (props.stylingPackage?.name === "nativewind") {%>
-  import { Text, View } from 'react-native';
+  import { Text } from 'react-native';
+
+  import { Container } from '~/components/Container';
 <% } else if (props.stylingPackage?.name === "unistyles") { %>
   import { createStyleSheet, useStyles } from 'react-native-unistyles'
-  import { Text, View } from 'react-native';
+  import { Text } from 'react-native';
+
+  import { Container } from '~/components/Container';
 <% } else if (props.stylingPackage?.name === "stylesheet") { %>
-  import { StyleSheet, Text, View } from 'react-native';
+  import { StyleSheet, Text } from 'react-native';
+
+  import { Container } from '~/components/Container';
 <% } else if (props.stylingPackage?.name === "tamagui") { %>
   import { YStack } from "tamagui";
 	import { Container, Main, Subtitle, Title } from "../tamagui.config";
 <% } else if (props.stylingPackage?.name === "restyle") { %>
   import { Box, Text, makeStyles } from 'theme';
+
+  import { Container } from '~/components/Container';
 <% } %>
 
 export default function NotFoundScreen() {
@@ -24,12 +32,12 @@ export default function NotFoundScreen() {
       <% if (props.stylingPackage?.name === "nativewind") {%>
         <>
           <Stack.Screen options={{ title: "Oops!" }} />
-          <View className={styles.container}>
+          <Container>
             <Text className={styles.title}>This screen doesn't exist.</Text>
             <Link href="/" className={styles.link}>
               <Text className={styles.linkText}>Go to home screen!</Text>
             </Link>
-          </View>
+          </Container>
         </>
       <% } else if (props.stylingPackage?.name === "tamagui") {%>
         <Container>
@@ -46,24 +54,24 @@ export default function NotFoundScreen() {
       <% } else if (props.stylingPackage?.name === "restyle") {%>
         <>
           <Stack.Screen options={{ title: 'Oops!' }} />
-          <Box flex={1} justifyContent="center" alignItems="center" padding="ml_24">
+          <Container>
             <Text variant="title">This screen doesn't exist.</Text>
             <Link href="/" style={styles.link}>
               <Text variant="body" color="blue">
                 Go to home screen!
               </Text>
             </Link>
-          </Box>
+          </Container>
         </>
       <% } else { %>
         <>
           <Stack.Screen options={{ title: "Oops!" }} />
-          <View style={styles.container}>
+          <Container>
             <Text style={styles.title}>This screen doesn't exist.</Text>
             <Link href="/" style={styles.link}>
               <Text style={styles.linkText}>Go to home screen!</Text>
             </Link>
-          </View>
+          </Container>
         </>
       <% } %>
   );
@@ -71,19 +79,12 @@ export default function NotFoundScreen() {
 
 <% if (props.stylingPackage?.name === "nativewind") { %>
   const styles = {
-		container: `items-center flex-1 justify-center p-5`,
     title: `text-xl font-bold`,
     link: `mt-4 pt-4`,
     linkText: `text-base text-[#2e78b7]`,
 	};
 <% } else if (props.stylingPackage?.name === "unistyles") { %>
   const stylesheet = createStyleSheet((theme) => ({
-    container: {
-      flex: 1,
-      alignItems: 'center',
-      justifyContent: 'center',
-      padding: 20,
-    },
     title: {
       fontSize: 20,
       fontWeight: 'bold',
@@ -99,12 +100,6 @@ export default function NotFoundScreen() {
   }));
 <% } else if (props.stylingPackage?.name === "stylesheet") { %>
   const styles = StyleSheet.create({
-    container: {
-      flex: 1,
-      alignItems: 'center',
-      justifyContent: 'center',
-      padding: 20,
-    },
     title: {
       fontSize: 20,
       fontWeight: 'bold',

package/build/templates/packages/expo-router/drawer/app/modal.tsx.ejs

@@ -1,7 +1,8 @@
-import { ScreenContent } from 'components/ScreenContent';
 import { StatusBar } from 'expo-status-bar';
 import { Platform } from 'react-native';
 
+import { ScreenContent } from '~/components/ScreenContent';
+
 <% if (props.internalizationPackage?.name === "i18next") { %>
   import { InternalizationExample } from 'components/InternalizationExample';
 <% } %>

package/build/templates/packages/expo-router/stack/app/+not-found.tsx.ejs

@@ -1,16 +1,24 @@
 import { Link, Stack } from 'expo-router';
 <% if (props.stylingPackage?.name === "nativewind") {%>
-  import { Text, View } from 'react-native';
+  import { Text } from 'react-native';
+
+  import { Container } from '~/components/Container';
 <% } else if (props.stylingPackage?.name === "unistyles") { %>
   import { createStyleSheet, useStyles } from 'react-native-unistyles'
   import { Text, View } from 'react-native';
+
+  import { Container } from '~/components/Container';
 <% } else if (props.stylingPackage?.name === "stylesheet") { %>
   import { StyleSheet, Text, View } from 'react-native';
+
+  import { Container } from '~/components/Container';
 <% } else if (props.stylingPackage?.name === "tamagui") { %>
   import { YStack } from "tamagui";
 	import { Container, Main, Subtitle, Title } from "../tamagui.config";
 <% } else if (props.stylingPackage?.name === "restyle") { %>
   import { Box, Text, makeStyles } from 'theme';
+
+  import { Container } from '~/components/Container';
 <% } %>
 
 export default function NotFoundScreen() {
@@ -26,12 +34,12 @@ export default function NotFoundScreen() {
       <% if (props.stylingPackage?.name === "nativewind") {%>
         <>
           <Stack.Screen options={{ title: "Oops!" }} />
-          <View className={styles.container}>
+          <Container>
             <Text className={styles.title}>This screen doesn't exist.</Text>
             <Link href="/" className={styles.link}>
               <Text className={styles.linkText}>Go to home screen!</Text>
             </Link>
-          </View>
+          </Container>
         </>
       <% } else if (props.stylingPackage?.name === "tamagui") {%>
         <Container>
@@ -60,12 +68,12 @@ export default function NotFoundScreen() {
       <% } else { %>
         <>
           <Stack.Screen options={{ title: "Oops!" }} />
-          <View style={styles.container}>
+          <Container>
             <Text style={styles.title}>This screen doesn't exist.</Text>
             <Link href="/" style={styles.link}>
               <Text style={styles.linkText}>Go to home screen!</Text>
             </Link>
-          </View>
+          </Container>
         </>
       <% } %>
   );
@@ -73,19 +81,12 @@ export default function NotFoundScreen() {
 
 <% if (props.stylingPackage?.name === "nativewind") { %>
   const styles = {
-		container: `items-center flex-1 justify-center p-5`,
     title: `text-xl font-bold`,
     link: `mt-4 pt-4`,
     linkText: `text-base text-[#2e78b7]`,
 	};
 <% } else if (props.stylingPackage?.name === "unistyles") { %>
   const stylesheet = createStyleSheet({
-    container: {
-      flex: 1,
-      alignItems: 'center',
-      justifyContent: 'center',
-      padding: 20,
-    },
     title: {
       fontSize: 20,
       fontWeight: 'bold',
@@ -101,12 +102,6 @@ export default function NotFoundScreen() {
   });
 <% } else if (props.stylingPackage?.name === "stylesheet") { %>
   const styles = StyleSheet.create({
-    container: {
-      flex: 1,
-      alignItems: 'center',
-      justifyContent: 'center',
-      padding: 20,
-    },
     title: {
       fontSize: 20,
       fontWeight: 'bold',

package/build/templates/packages/expo-router/stack/app/details.tsx.ejs

@@ -1,6 +1,7 @@
-import { ScreenContent } from 'components/ScreenContent';
 import { Stack, useLocalSearchParams } from 'expo-router';
-import { StyleSheet, View } from 'react-native';
+
+import { Container } from '~/components/Container';
+import { ScreenContent } from '~/components/ScreenContent';
 
 export default function Details() {
   const { name } = useLocalSearchParams();
@@ -8,16 +9,9 @@ export default function Details() {
   return (
     <>
       <Stack.Screen options={{ title: 'Details' }} />
-      <View style={styles.container}>
+      <Container>
         <ScreenContent path="screens/details.tsx" title={`Showing details for user ${name}`} />
-      </View>
+      </Container>
     </>
   );
-}
-
-const styles = StyleSheet.create({
-  container: {
-    flex: 1,
-    padding: 24,
-  },
-});
+}

package/build/templates/packages/expo-router/stack/app/index.tsx.ejs

@@ -1,8 +1,7 @@
 import { Stack, Link } from 'expo-router';
-import { StyleSheet, View } from 'react-native';
-
-import { Button } from '../components/Button';
 
+import { Button } from '~/components/Button';
+import { Container } from '~/components/Container';
 import { ScreenContent } from '~/components/ScreenContent';
 
 <% if (props.internalizationPackage?.name === "i18next") { %>
@@ -13,7 +12,7 @@ export default function Home() {
   return (
     <>
       <Stack.Screen options={{ title: 'Home' }} />
-      <View style={styles.container}>
+      <Container>
         <ScreenContent path="app/index.tsx" title="Home">
         <% if (props.internalizationPackage?.name === "i18next") { %>
           <InternalizationExample />
@@ -22,14 +21,7 @@ export default function Home() {
         <Link href={{ pathname: '/details', params: { name: 'Dan' } }} asChild>
           <Button title="Show Details" />
         </Link>
-      </View>
+      </Container>
     </>
   );
-}
-
-const styles = StyleSheet.create({
-  container: {
-    flex: 1,
-    padding: 24,
-  },
-});
+}

package/build/templates/packages/expo-router/tabs/app/modal.tsx.ejs

@@ -1,7 +1,8 @@
-import { ScreenContent } from 'components/ScreenContent';
 import { StatusBar } from 'expo-status-bar';
 import { Platform } from 'react-native';
 
+import { ScreenContent } from '~/components/ScreenContent';
+
 <% if (props.internalizationPackage?.name === "i18next") { %>
   import { InternalizationExample } from 'components/InternalizationExample';
 <% } %>

package/build/templates/packages/nativewind/components/Button.tsx.ejs

@@ -1,6 +1,6 @@
 import { Text, TouchableOpacity } from 'react-native';
 
-export const Button = ({ onPress, title }: { onPress: () => void; title: string }) => {
+export const Button = ({ onPress, title }: { onPress?: () => void; title: string }) => {
   return (
     <TouchableOpacity className={styles.button} onPress={onPress}>
       <Text className={styles.buttonText}>{title}</Text>
@@ -8,7 +8,7 @@ export const Button = ({ onPress, title }: { onPress: () => void; title: string
   );
 };
 
-export const styles = {
+const styles = {
   button: 'items-center bg-indigo-500 rounded-[28px] shadow-md p-4',
   buttonText: 'text-white text-lg font-semibold text-center',
 };