create-payload-app 0.3.28 → 0.3.29-beta.1

package/dist/lib/create-project.js

@@ -160,13 +160,12 @@ function updatePayloadVersion(projectDir, betaFlag) {
 exports.updatePayloadVersion = updatePayloadVersion;
 function createProject(args, projectDir, template, packageManager) {
     return __awaiter(this, void 0, void 0, function () {
-        var templateDir, emitter, err_4, msg, spinner, result;
+        var emitter, templateDir, err_4, msg, spinner, result;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0: return [4 /*yield*/, createOrFindProjectDir(projectDir)];
                 case 1:
                     _a.sent();
-                    templateDir = path_1.default.resolve(__dirname, "../templates/".concat(template.name));
                     console.log("\n  Creating a new Payload app in ".concat(chalk_1.default.green(path_1.default.resolve(projectDir)), "\n"));
                     if (!(template.type === 'starter')) return [3 /*break*/, 3];
                     emitter = (0, degit_1.default)(template.url);
@@ -176,6 +175,7 @@ function createProject(args, projectDir, template, packageManager) {
                     return [3 /*break*/, 7];
                 case 3:
                     _a.trys.push([3, 6, , 7]);
+                    templateDir = path_1.default.resolve(__dirname, "../templates/".concat(template.directory));
                     return [4 /*yield*/, fs_extra_1.default.copy(templateDir, projectDir, { recursive: true })];
                 case 4:
                     _a.sent();
@@ -188,19 +188,20 @@ function createProject(args, projectDir, template, packageManager) {
                     err_4 = _a.sent();
                     msg = 'Unable to copy template files. Please check template name or directory permissions.';
                     (0, log_1.error)(msg);
-                    if (err_4 instanceof Error) {
-                        console.error({ err: err_4 });
-                    }
+                    console.error({ err: err_4 });
                     process.exit(1);
                     return [3 /*break*/, 7];
                 case 7:
                     spinner = (0, ora_1.default)('Checking latest Payload version...').start();
+                    if (!(template.type === 'static')) return [3 /*break*/, 9];
                     return [4 /*yield*/, updatePayloadVersion(projectDir, args['--beta'])];
                 case 8:
                     _a.sent();
+                    _a.label = 9;
+                case 9:
                     spinner.text = 'Installing dependencies...';
                     return [4 /*yield*/, installDeps(args, projectDir, packageManager)];
-                case 9:
+                case 10:
                     result = _a.sent();
                     spinner.stop();
                     spinner.clear();

package/dist/lib/create-project.test.js

@@ -72,6 +72,7 @@ describe('createProject', function () {
                         template = {
                             name: templateName,
                             type: 'static',
+                            directory: 'todo',
                         };
                         return [4 /*yield*/, (0, create_project_1.createProject)(args, projectDir, template, packageManager)];
                     case 2:

package/dist/lib/parse-template.js

@@ -43,7 +43,7 @@ exports.parseTemplate = void 0;
 var prompts_1 = __importDefault(require("prompts"));
 function parseTemplate(args, validTemplates) {
     return __awaiter(this, void 0, void 0, function () {
-        var templateName_1, template_1, filteredTemplates, response, template;
+        var templateName_1, template_1, response, template;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
@@ -54,13 +54,16 @@ function parseTemplate(args, validTemplates) {
                             throw new Error('Invalid template given');
                         return [2 /*return*/, template_1];
                     }
-                    filteredTemplates = validTemplates.map(function (t) { return t.name; });
                     return [4 /*yield*/, (0, prompts_1.default)({
                             type: 'select',
                             name: 'value',
                             message: 'Choose project template',
-                            choices: filteredTemplates.map(function (p) {
-                                return { title: p, value: p };
+                            choices: validTemplates.map(function (p) {
+                                return {
+                                    title: p.name,
+                                    value: p.name,
+                                    description: p.description,
+                                };
                             }),
                             validate: function (value) { return !!value.length; },
                         }, {

package/dist/lib/templates.js

@@ -35,13 +35,17 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
+var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
+    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+        if (ar || !(i in from)) {
+            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+            ar[i] = from[i];
+        }
+    }
+    return to.concat(ar || Array.prototype.slice.call(from));
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getValidTemplates = exports.validateTemplate = void 0;
-var path_1 = __importDefault(require("path"));
-var fs_1 = __importDefault(require("fs"));
 var log_1 = require("../utils/log");
 function validateTemplate(templateName) {
     return __awaiter(this, void 0, void 0, function () {
@@ -53,7 +57,7 @@ function validateTemplate(templateName) {
                     validTemplates = _a.sent();
                     if (!validTemplates.map(function (t) { return t.name; }).includes(templateName)) {
                         (0, log_1.error)("'".concat(templateName, "' is not a valid template."));
-                        (0, log_1.info)("Valid templates: ".concat(validTemplates.join(', ')));
+                        (0, log_1.info)("Valid templates: ".concat(validTemplates.map(function (t) { return t.name; }).join(', ')));
                         return [2 /*return*/, false];
                     }
                     return [2 /*return*/, true];
@@ -64,23 +68,62 @@ function validateTemplate(templateName) {
 exports.validateTemplate = validateTemplate;
 function getValidTemplates() {
     return __awaiter(this, void 0, void 0, function () {
-        var templateDir, dirs, templates;
+        var templates, starters;
         return __generator(this, function (_a) {
-            templateDir = path_1.default.resolve(__dirname, '../templates');
-            dirs = getDirectories(templateDir);
-            templates = dirs.map(function (name) {
-                return {
-                    name: name,
+            templates = [
+                {
+                    name: 'blank',
+                    type: 'static',
+                    description: 'Blank',
+                    directory: 'blank',
+                },
+                {
+                    name: 'todo',
+                    type: 'static',
+                    description: 'Todo list',
+                    directory: 'todo',
+                },
+                {
+                    name: 'blog',
                     type: 'static',
-                };
-            });
-            return [2 /*return*/, templates];
+                    description: 'Blog',
+                    directory: 'blog',
+                },
+            ];
+            starters = [
+                {
+                    name: 'payload-demo',
+                    type: 'starter',
+                    url: 'https://github.com/payloadcms/public-demo',
+                    description: 'Payload demo site at https://demo.payloadcms.com',
+                },
+                {
+                    name: 'payload-website',
+                    type: 'starter',
+                    url: 'https://github.com/payloadcms/website-cms',
+                    description: 'Payload website CMS at https://payloadcms.com',
+                },
+                {
+                    name: 'cloud-template-blank',
+                    type: 'starter',
+                    url: 'https://github.com/payloadcms/template-blank',
+                    description: 'Blank template for Payload Cloud',
+                },
+                {
+                    name: 'cloud-template-website',
+                    type: 'starter',
+                    url: 'https://github.com/payloadcms/template-website',
+                    description: 'Website template for Payload Cloud',
+                },
+                {
+                    name: 'cloud-template-ecommerce',
+                    type: 'starter',
+                    url: 'https://github.com/payloadcms/template-ecommerce',
+                    description: 'E-commerce template for Payload Cloud',
+                },
+            ];
+            return [2 /*return*/, __spreadArray(__spreadArray([], templates, true), starters, true)];
         });
     });
 }
 exports.getValidTemplates = getValidTemplates;
-function getDirectories(dir) {
-    return fs_1.default.readdirSync(dir).filter(function (file) {
-        return fs_1.default.statSync("".concat(dir, "/").concat(file)).isDirectory();
-    });
-}

package/dist/lib/write-env-file.js

@@ -40,34 +40,59 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.writeEnvFile = void 0;
-var slugify_1 = __importDefault(require("@sindresorhus/slugify"));
+var path_1 = __importDefault(require("path"));
 var fs_extra_1 = __importDefault(require("fs-extra"));
 var log_1 = require("../utils/log");
-function writeEnvFile(projectName, databaseUri, payloadSecret) {
+function writeEnvFile(args) {
     return __awaiter(this, void 0, void 0, function () {
-        var content, projectDir, err_1;
+        var databaseUri, payloadSecret, template, projectDir, envFile, envFileLines, envFilePairs, newEnvFilePairs, newEnvFileLines, content, err_1;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
-                    content = "MONGODB_URI=".concat(databaseUri, "\nPAYLOAD_SECRET=").concat(payloadSecret);
+                    databaseUri = args.databaseUri, payloadSecret = args.payloadSecret, template = args.template, projectDir = args.projectDir;
                     _a.label = 1;
                 case 1:
-                    _a.trys.push([1, 3, , 4]);
-                    projectDir = "./".concat((0, slugify_1.default)(projectName));
-                    return [4 /*yield*/, fs_extra_1.default.outputFile("".concat(projectDir, "/.env"), content)];
+                    _a.trys.push([1, 6, , 7]);
+                    if (!(template.type === 'starter' &&
+                        fs_extra_1.default.existsSync(path_1.default.join(projectDir, '.env.example')))) return [3 /*break*/, 4];
+                    return [4 /*yield*/, fs_extra_1.default.readFile(path_1.default.join(projectDir, '.env.example'), 'utf8')];
                 case 2:
+                    envFile = _a.sent();
+                    envFileLines = envFile.split('\n').filter(function (e) { return e; });
+                    envFilePairs = envFileLines.map(function (line) {
+                        var _a = line.split('='), key = _a[0], value = _a[1];
+                        return { key: key, value: value };
+                    });
+                    newEnvFilePairs = envFilePairs.map(function (pair) {
+                        if (pair.key === 'MONGODB_URI' || pair.key === 'MONGO_URL') {
+                            return { key: pair.key, value: databaseUri };
+                        }
+                        if (pair.key === 'PAYLOAD_SECRET' || pair.key === 'PAYLOAD_SECRET_KEY') {
+                            return { key: pair.key, value: payloadSecret };
+                        }
+                        return pair;
+                    });
+                    newEnvFileLines = newEnvFilePairs.map(function (pair) { return "".concat(pair.key, "=").concat(pair.value); });
+                    return [4 /*yield*/, fs_extra_1.default.writeFile(path_1.default.join(projectDir, '.env'), newEnvFileLines.join('\n'))];
+                case 3:
+                    _a.sent();
+                    return [2 /*return*/];
+                case 4:
+                    content = "MONGODB_URI=".concat(databaseUri, "\nPAYLOAD_SECRET=").concat(payloadSecret);
+                    return [4 /*yield*/, fs_extra_1.default.outputFile("".concat(projectDir, "/.env"), content)];
+                case 5:
                     _a.sent();
                     (0, log_1.success)('.env file created');
-                    return [3 /*break*/, 4];
-                case 3:
+                    return [3 /*break*/, 7];
+                case 6:
                     err_1 = _a.sent();
                     (0, log_1.error)('Unable to write .env file');
                     if (err_1 instanceof Error) {
                         (0, log_1.error)(err_1.message);
                     }
                     process.exit(1);
-                    return [3 /*break*/, 4];
-                case 4: return [2 /*return*/];
+                    return [3 /*break*/, 7];
+                case 7: return [2 /*return*/];
             }
         });
     });

package/dist/main.js

@@ -122,7 +122,12 @@ var Main = /** @class */ (function () {
                         return [4 /*yield*/, (0, create_project_1.createProject)(this.args, projectDir, template, packageManager)];
                     case 12:
                         _e.sent();
-                        return [4 /*yield*/, (0, write_env_file_1.writeEnvFile)(projectName, databaseUri, payloadSecret)];
+                        return [4 /*yield*/, (0, write_env_file_1.writeEnvFile)({
+                                databaseUri: databaseUri,
+                                payloadSecret: payloadSecret,
+                                template: template,
+                                projectDir: projectDir,
+                            })];
                     case 13:
                         _e.sent();
                         _e.label = 14;

package/dist/utils/messages.js

@@ -52,6 +52,7 @@ var header = function (message) {
     return "".concat(chalk_1.default.yellow(figures_1.default.star), " ").concat(chalk_1.default.bold(message));
 };
 exports.welcomeMessage = (0, chalk_1.default)(templateObject_1 || (templateObject_1 = __makeTemplateObject(["\n  {green Welcome to Payload. Let's create a project! }\n"], ["\n  {green Welcome to Payload. Let's create a project! }\n"])));
+var spacer = ' '.repeat(8);
 function helpMessage() {
     return __awaiter(this, void 0, void 0, function () {
         var validTemplates;
@@ -60,12 +61,17 @@ function helpMessage() {
                 case 0: return [4 /*yield*/, (0, templates_1.getValidTemplates)()];
                 case 1:
                     validTemplates = _a.sent();
-                    return [2 /*return*/, (0, chalk_1.default)(templateObject_2 || (templateObject_2 = __makeTemplateObject(["\n  {bold USAGE}\n\n      {dim $} {bold npx create-payload-app}\n\n  {bold OPTIONS}\n\n      --name {underline my-payload-app}              Set project name\n      --template {underline template_name}           Choose specific template\n\n        {dim Available templates: ", "}\n\n      --use-npm                          Use npm to install dependencies\n      --no-deps                          Do not install any dependencies\n      --help                             Show help\n"], ["\n  {bold USAGE}\n\n      {dim $} {bold npx create-payload-app}\n\n  {bold OPTIONS}\n\n      --name {underline my-payload-app}              Set project name\n      --template {underline template_name}           Choose specific template\n\n        {dim Available templates: ", "}\n\n      --use-npm                          Use npm to install dependencies\n      --no-deps                          Do not install any dependencies\n      --help                             Show help\n"])), validTemplates.map(function (t) { return t.name; }).join(', '))];
+                    return [2 /*return*/, (0, chalk_1.default)(templateObject_2 || (templateObject_2 = __makeTemplateObject(["\n  {bold USAGE}\n\n      {dim $} {bold npx create-payload-app}\n      {dim $} {bold npx create-payload-app} my-project\n      {dim $} {bold npx create-payload-app} -n my-project -t blog\n\n  {bold OPTIONS}\n\n      -n     {underline my-payload-app}       Set project name\n      -t     {underline template_name}        Choose specific template\n\n        {dim Available templates: ", "}\n\n      --use-npm                          Use npm to install dependencies\n      --no-deps                          Do not install any dependencies\n      -h                                 Show help\n"], ["\n  {bold USAGE}\n\n      {dim $} {bold npx create-payload-app}\n      {dim $} {bold npx create-payload-app} my-project\n      {dim $} {bold npx create-payload-app} -n my-project -t blog\n\n  {bold OPTIONS}\n\n      -n     {underline my-payload-app}       Set project name\n      -t     {underline template_name}        Choose specific template\n\n        {dim Available templates: ", "}\n\n      --use-npm                          Use npm to install dependencies\n      --no-deps                          Do not install any dependencies\n      -h                                 Show help\n"])), formatTemplates(validTemplates))];
             }
         });
     });
 }
 exports.helpMessage = helpMessage;
+function formatTemplates(templates) {
+    return "\n\n".concat(spacer).concat(templates
+        .map(function (t) { return "".concat(t.name).concat(' '.repeat(18 - t.name.length)).concat(t.description); })
+        .join("\n".concat(spacer)));
+}
 function successMessage(projectDir, packageManager) {
     return "\n  ".concat(header('Launch Application:'), "\n\n    - cd ").concat(projectDir, "\n    - ").concat(packageManager === 'yarn' ? 'yarn' : 'npm run', " dev\n\n  ").concat(header('Documentation:'), "\n\n    - ").concat(createTerminalLink('Getting Started', 'https://payloadcms.com/docs/getting-started/what-is-payload'), "\n    - ").concat(createTerminalLink('Configuration', 'https://payloadcms.com/docs/configuration/overview'), "\n\n");
 }

package/package.json

@@ -34,17 +34,17 @@
     "fs-extra": "^9.0.1",
     "handlebars": "^4.7.7",
     "ora": "^5.1.0",
-    "prompts": "^2.4.0",
+    "prompts": "^2.4.2",
     "terminal-link": "^2.1.1"
   },
-  "version": "0.3.28",
+  "version": "0.3.29-beta.1",
   "devDependencies": {
     "@types/command-exists": "^1.2.0",
     "@types/degit": "^2.8.3",
     "@types/fs-extra": "^9.0.12",
     "@types/jest": "^27.0.3",
     "@types/node": "^16.6.2",
-    "@types/prompts": "^2.4.0",
+    "@types/prompts": "^2.4.1",
     "@typescript-eslint/eslint-plugin": "^5.41.0",
     "@typescript-eslint/parser": "^5.41.0",
     "copyfiles": "^2.4.1",