create-payload-app 0.2.0 → 0.3.4

package/dist/lib/createProject.js

@@ -50,19 +50,19 @@ var log_1 = require("../utils/log");
 var usage_1 = require("../utils/usage");
 function createProjectDir(projectDir) {
     return __awaiter(this, void 0, void 0, function () {
-        var readDir;
+        var pathExists;
         return __generator(this, function (_a) {
             switch (_a.label) {
-                case 0: return [4 /*yield*/, fs_extra_1.default.mkdir(projectDir)];
+                case 0: return [4 /*yield*/, fs_extra_1.default.pathExists(projectDir)];
                 case 1:
-                    _a.sent();
-                    return [4 /*yield*/, fs_extra_1.default.readdir(projectDir)];
-                case 2:
-                    readDir = _a.sent();
-                    if (readDir && readDir.length > 0) {
-                        log_1.error("The project directory '" + projectDir + "' is not empty");
+                    pathExists = _a.sent();
+                    if (pathExists) {
+                        log_1.error("The project directory '" + projectDir + "' already exists");
                         process.exit(1);
                     }
+                    return [4 /*yield*/, fs_extra_1.default.mkdir(projectDir)];
+                case 2:
+                    _a.sent();
                     return [2 /*return*/];
             }
         });
@@ -95,14 +95,20 @@ function installDeps(args, dir, packageManager) {
         });
     });
 }
-function getLatestPayloadVersion() {
+function getLatestPayloadVersion(betaFlag) {
+    if (betaFlag === void 0) { betaFlag = false; }
     return __awaiter(this, void 0, void 0, function () {
-        var stdout, error_2;
+        var packageWithTag, stdout, error_2;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
                     _a.trys.push([0, 2, , 3]);
-                    return [4 /*yield*/, execa_1.default('npm info payload version', [], { shell: true })];
+                    packageWithTag = 'payload';
+                    if (betaFlag)
+                        packageWithTag += '@beta';
+                    return [4 /*yield*/, execa_1.default("npm info " + packageWithTag + " version", [], {
+                            shell: true,
+                        })];
                 case 1:
                     stdout = (_a.sent()).stdout;
                     return [2 /*return*/, "^" + stdout];
@@ -115,12 +121,13 @@ function getLatestPayloadVersion() {
     });
 }
 exports.getLatestPayloadVersion = getLatestPayloadVersion;
-function updatePayloadVersion(projectDir) {
+function updatePayloadVersion(projectDir, betaFlag) {
+    if (betaFlag === void 0) { betaFlag = false; }
     return __awaiter(this, void 0, void 0, function () {
         var payloadVersion, packageJsonPath, packageObj, err_1;
         return __generator(this, function (_a) {
             switch (_a.label) {
-                case 0: return [4 /*yield*/, getLatestPayloadVersion()];
+                case 0: return [4 /*yield*/, getLatestPayloadVersion(betaFlag)];
                 case 1:
                     payloadVersion = _a.sent();
                     if (!payloadVersion) {
@@ -155,37 +162,38 @@ function createProject(args, projectDir, template, packageManager) {
         var templateDir, emitter, err_2, msg, spinner, result;
         return __generator(this, function (_a) {
             switch (_a.label) {
-                case 0:
-                    createProjectDir(projectDir);
+                case 0: return [4 /*yield*/, createProjectDir(projectDir)];
+                case 1:
+                    _a.sent();
                     templateDir = path_1.default.resolve(__dirname, "../templates/" + template.name);
                     console.log("\n  Creating a new Payload app in " + chalk_1.default.green(path_1.default.resolve(projectDir)) + "\n");
-                    if (!(template.type === 'starter')) return [3 /*break*/, 2];
+                    if (!(template.type === 'starter')) return [3 /*break*/, 3];
                     emitter = degit_1.default(template.url);
                     return [4 /*yield*/, emitter.clone(projectDir)];
-                case 1:
-                    _a.sent();
-                    return [3 /*break*/, 5];
                 case 2:
-                    _a.trys.push([2, 4, , 5]);
-                    return [4 /*yield*/, fs_extra_1.default.copy(templateDir, projectDir, { recursive: true })];
+                    _a.sent();
+                    return [3 /*break*/, 6];
                 case 3:
+                    _a.trys.push([3, 5, , 6]);
+                    return [4 /*yield*/, fs_extra_1.default.copy(templateDir, projectDir, { recursive: true })];
+                case 4:
                     _a.sent();
                     log_1.success('Project directory created');
-                    return [3 /*break*/, 5];
-                case 4:
+                    return [3 /*break*/, 6];
+                case 5:
                     err_2 = _a.sent();
                     msg = 'Unable to copy template files. Please check template name or directory permissions.';
                     log_1.error(msg);
                     process.exit(1);
-                    return [3 /*break*/, 5];
-                case 5:
-                    spinner = ora_1.default('Checking latest Payload version...').start();
-                    return [4 /*yield*/, updatePayloadVersion(projectDir)];
+                    return [3 /*break*/, 6];
                 case 6:
+                    spinner = ora_1.default('Checking latest Payload version...').start();
+                    return [4 /*yield*/, updatePayloadVersion(projectDir, args['--beta'])];
+                case 7:
                     _a.sent();
                     spinner.text = 'Installing dependencies...';
                     return [4 /*yield*/, installDeps(args, projectDir, packageManager)];
-                case 7:
+                case 8:
                     result = _a.sent();
                     spinner.stop();
                     spinner.clear();

package/dist/main.js

@@ -65,6 +65,7 @@ var Main = /** @class */ (function () {
             '--use-npm': Boolean,
             '--no-deps': Boolean,
             '--dry-run': Boolean,
+            '--beta': Boolean,
             '-h': '--help',
             '-n': '--name',
             '-t': '--template',

package/dist/templates/js-blank/package.json

@@ -10,7 +10,7 @@
     "serve": "NODE_ENV=production node server.js"
   },
   "dependencies": {
-    "payload": "0.1.145",
+    "payload": "0.13.6",
     "dotenv": "^8.2.0",
     "express": "^4.17.1"
   },

package/dist/templates/js-blank/server.js

@@ -4,6 +4,11 @@ const payload = require('payload');
 require('dotenv').config();
 const app = express();
 
+// Redirect root to Admin panel
+app.get('/', (_, res) => {
+  res.redirect('/admin');
+});
+
 // Initialize Payload
 payload.init({
   secret: process.env.PAYLOAD_SECRET,

package/dist/templates/js-blog/package.json

@@ -10,7 +10,7 @@
     "serve": "NODE_ENV=production node server.js"
   },
   "dependencies": {
-    "payload": "0.1.145",
+    "payload": "0.13.6",
     "dotenv": "^8.2.0",
     "express": "^4.17.1"
   },

package/dist/templates/js-blog/server.js

@@ -4,6 +4,11 @@ const payload = require('payload');
 require('dotenv').config();
 const app = express();
 
+// Redirect root to Admin panel
+app.get('/', (_, res) => {
+  res.redirect('/admin');
+});
+
 // Initialize Payload
 payload.init({
   secret: process.env.PAYLOAD_SECRET,

package/dist/templates/js-todo/package.json

@@ -10,7 +10,7 @@
     "serve": "NODE_ENV=production node server.js"
   },
   "dependencies": {
-    "payload": "0.1.145",
+    "payload": "0.13.6",
     "dotenv": "^8.2.0",
     "express": "^4.17.1"
   },

package/dist/templates/js-todo/server.js

@@ -4,6 +4,11 @@ const payload = require('payload');
 require('dotenv').config();
 const app = express();
 
+// Redirect root to Admin panel
+app.get('/', (_, res) => {
+  res.redirect('/admin');
+});
+
 // Initialize Payload
 payload.init({
   secret: process.env.PAYLOAD_SECRET,

package/dist/templates/ts-blank/package.json

@@ -9,10 +9,11 @@
     "build:payload": "cross-env PAYLOAD_CONFIG_PATH=src/payload.config.ts payload build",
     "build:server": "tsc",
     "build": "yarn build:payload && yarn build:server",
-    "serve": "cross-env PAYLOAD_CONFIG_PATH=dist/payload.config.js NODE_ENV=production node dist/server.js"
+    "serve": "cross-env PAYLOAD_CONFIG_PATH=dist/payload.config.js NODE_ENV=production node dist/server.js",
+    "generate:types": "cross-env PAYLOAD_CONFIG_PATH=src/payload.config.ts payload generate:types"
   },
   "dependencies": {
-    "payload": "0.1.145",
+    "payload": "0.13.6",
     "dotenv": "^8.2.0",
     "express": "^4.17.1"
   },

package/dist/templates/ts-blank/src/payload.config.ts

@@ -1,4 +1,5 @@
 import { buildConfig } from 'payload/config';
+import path from 'path';
 // import Examples from './collections/Examples';
 import Users from './collections/Users';
 
@@ -12,4 +13,7 @@ export default buildConfig({
     // Add Collections here
     // Examples,
   ],
+  typescript: {
+    outputFile: path.resolve(__dirname, 'payload-types.ts')
+  },
 });

package/dist/templates/ts-blank/src/server.ts

@@ -4,6 +4,11 @@ import payload from 'payload';
 require('dotenv').config();
 const app = express();
 
+// Redirect root to Admin panel
+app.get('/', (_, res) => {
+  res.redirect('/admin');
+});
+
 // Initialize Payload
 payload.init({
   secret: process.env.PAYLOAD_SECRET,

package/dist/templates/ts-blog/package.json

@@ -9,10 +9,11 @@
     "build:payload": "cross-env PAYLOAD_CONFIG_PATH=src/payload.config.ts payload build",
     "build:server": "tsc",
     "build": "yarn build:payload && yarn build:server",
-    "serve": "cross-env PAYLOAD_CONFIG_PATH=dist/payload.config.js NODE_ENV=production node dist/server.js"
+    "serve": "cross-env PAYLOAD_CONFIG_PATH=dist/payload.config.js NODE_ENV=production node dist/server.js",
+    "generate:types": "cross-env PAYLOAD_CONFIG_PATH=src/payload.config.ts payload generate:types"
   },
   "dependencies": {
-    "payload": "0.1.144",
+    "payload": "0.13.6",
     "dotenv": "^8.2.0",
     "express": "^4.17.1"
   },

package/dist/templates/ts-blog/src/payload.config.ts

@@ -1,4 +1,5 @@
 import { buildConfig } from 'payload/config';
+import path from 'path';
 import Categories from './collections/Categories';
 import Posts from './collections/Posts';
 import Tags from './collections/Tags';
@@ -15,4 +16,7 @@ export default buildConfig({
     Tags,
     Users,
   ],
+  typescript: {
+    outputFile: path.resolve(__dirname, 'payload-types.ts')
+  },
 });

package/dist/templates/ts-blog/src/server.ts

@@ -4,6 +4,11 @@ import payload from 'payload';
 require('dotenv').config();
 const app = express();
 
+// Redirect root to Admin panel
+app.get('/', (_, res) => {
+  res.redirect('/admin');
+});
+
 // Initialize Payload
 payload.init({
   secret: process.env.PAYLOAD_SECRET,

package/dist/templates/ts-todo/package.json

@@ -9,10 +9,11 @@
     "build:payload": "cross-env PAYLOAD_CONFIG_PATH=src/payload.config.ts payload build",
     "build:server": "tsc",
     "build": "yarn build:payload && yarn build:server",
-    "serve": "cross-env PAYLOAD_CONFIG_PATH=dist/payload.config.js NODE_ENV=production node dist/server.js"
+    "serve": "cross-env PAYLOAD_CONFIG_PATH=dist/payload.config.js NODE_ENV=production node dist/server.js",
+    "generate:types": "cross-env PAYLOAD_CONFIG_PATH=src/payload.config.ts payload generate:types"
   },
   "dependencies": {
-    "payload": "0.1.145",
+    "payload": "0.13.6",
     "dotenv": "^8.2.0",
     "express": "^4.17.1"
   },

package/dist/templates/ts-todo/src/payload.config.ts

@@ -1,4 +1,5 @@
 import { buildConfig } from 'payload/config';
+import path from 'path';
 import TodoLists from './collections/TodoLists';
 import Users from './collections/Users';
 
@@ -11,4 +12,7 @@ export default buildConfig({
     TodoLists,
     Users,
   ],
+  typescript: {
+    outputFile: path.resolve(__dirname, 'payload-types.ts')
+  },
 });

package/dist/templates/ts-todo/src/server.ts

@@ -4,6 +4,11 @@ import payload from 'payload';
 require('dotenv').config();
 const app = express();
 
+// Redirect root to Admin panel
+app.get('/', (_, res) => {
+  res.redirect('/admin');
+});
+
 // Initialize Payload
 payload.init({
   secret: process.env.PAYLOAD_SECRET,

package/package.json

@@ -8,7 +8,9 @@
     "build": "tsc && yarn copyfiles",
     "copyfiles": "copyfiles -u 1 \"src/templates/**\" dist",
     "typecheck": "tsc --noEmit",
-    "lint": "eslint \"src/**/*.ts\""
+    "lint": "eslint \"src/**/*.ts\"",
+    "test": "jest",
+    "prepublish": "yarn test && yarn build"
   },
   "files": [
     "package.json",
@@ -29,12 +31,12 @@
     "prompts": "^2.4.0",
     "terminal-link": "^2.1.1"
   },
-  "version": "0.2.0",
+  "version": "0.3.4",
   "devDependencies": {
     "@types/command-exists": "^1.2.0",
     "@types/degit": "^2.8.3",
     "@types/fs-extra": "^9.0.12",
-    "@types/jest": "^27.0.1",
+    "@types/jest": "^27.0.3",
     "@types/node": "^16.6.2",
     "@types/prompts": "^2.4.0",
     "@typescript-eslint/eslint-plugin": "^4.29.2",
@@ -44,9 +46,9 @@
     "eslint-config-airbnb-base": "^14.2.1",
     "eslint-config-prettier": "^8.3.0",
     "eslint-plugin-prettier": "^3.4.0",
-    "jest": "^27.0.6",
+    "jest": "^27.4.5",
     "prettier": "^2.3.2",
-    "ts-jest": "^27.0.5",
+    "ts-jest": "^27.1.1",
     "typescript": "^4.3.5"
   }
 }