create-payload-app 0.3.3 → 0.3.6

package/dist/lib/createProject.js

@@ -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) {
@@ -181,7 +188,7 @@ function createProject(args, projectDir, template, packageManager) {
                     return [3 /*break*/, 6];
                 case 6:
                     spinner = ora_1.default('Checking latest Payload version...').start();
-                    return [4 /*yield*/, updatePayloadVersion(projectDir)];
+                    return [4 /*yield*/, updatePayloadVersion(projectDir, args['--beta'])];
                 case 7:
                     _a.sent();
                     spinner.text = 'Installing dependencies...';

package/dist/lib/createProject.test.js

@@ -46,10 +46,16 @@ describe('createProject', function () {
     var projectDir = path_1.default.resolve(__dirname, './tmp');
     beforeAll(function () {
         console.log = jest.fn();
-        fs_extra_1.default.rmdirSync(projectDir, { recursive: true });
+    });
+    beforeEach(function () {
+        if (fs_extra_1.default.existsSync(projectDir)) {
+            fs_extra_1.default.rmdirSync(projectDir, { recursive: true });
+        }
     });
     afterEach(function () {
-        fs_extra_1.default.rmdirSync(projectDir, { recursive: true });
+        if (fs_extra_1.default.existsSync(projectDir)) {
+            fs_extra_1.default.rmdirSync(projectDir, { recursive: true });
+        }
     });
     describe('#createProject', function () {
         var args = { _: ['project-name'], '--no-deps': true };

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-blog/collections/Users.js

@@ -1,11 +1,3 @@
-const onlyNameIfPublic = ({ req: { user }, doc }) => {
-  // Only return name if not logged in
-  if (!user) {
-    return { name: doc.name };
-  }
-  return doc;
-};
-
 const Users = {
   slug: 'users',
   auth: true,
@@ -15,9 +7,6 @@ const Users = {
   access: {
     read: () => true,
   },
-  hooks: {
-    beforeRead: [onlyNameIfPublic]
-  },
   fields: [
     // Email added by default
     {

package/dist/templates/ts-blog/src/collections/Users.ts

@@ -1,14 +1,5 @@
-import { BeforeReadHook } from 'payload/dist/collections/config/types';
 import { CollectionConfig } from 'payload/types';
 
-const onlyNameIfPublic: BeforeReadHook = ({ req: { user }, doc }) => {
-  // Only return name if not logged in
-  if (!user) {
-    return { name: doc.name };
-  }
-  return doc;
-};
-
 const Users: CollectionConfig = {
   slug: 'users',
   auth: true,
@@ -18,9 +9,6 @@ const Users: CollectionConfig = {
   access: {
     read: () => true,
   },
-  hooks: {
-    beforeRead: [onlyNameIfPublic]
-  },
   fields: [
     // Email added by default
     {

package/dist/utils/messages.js

@@ -60,7 +60,7 @@ function helpMessage() {
                 case 0: return [4 /*yield*/, templates_1.getValidTemplates()];
                 case 1:
                     validTemplates = _a.sent();
-                    return [2 /*return*/, 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.join(', '))];
+                    return [2 /*return*/, 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(', '))];
             }
         });
     });

package/package.json

@@ -31,7 +31,7 @@
     "prompts": "^2.4.0",
     "terminal-link": "^2.1.1"
   },
-  "version": "0.3.3",
+  "version": "0.3.6",
   "devDependencies": {
     "@types/command-exists": "^1.2.0",
     "@types/degit": "^2.8.3",

package/dist/lib/github.js

@@ -1,130 +0,0 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        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 };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.createProjectFromGitHub = void 0;
-var node_fetch_1 = __importDefault(require("node-fetch"));
-var path_1 = __importDefault(require("path"));
-var fs_extra_1 = __importStar(require("fs-extra"));
-var stream_1 = require("stream");
-var util_1 = require("util");
-var streamPipeline = util_1.promisify(stream_1.pipeline);
-function createProjectFromGitHub(sha, remoteFilePath, dest) {
-    return __awaiter(this, void 0, void 0, function () {
-        var latestCommitSha, res, tree;
-        var _this = this;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0: return [4 /*yield*/, getLatestCommitSha()];
-                case 1:
-                    latestCommitSha = _a.sent();
-                    return [4 /*yield*/, node_fetch_1.default("https://api.github.com/repos/payloadcms/payload/git/trees/" + latestCommitSha + "?recursive=1")];
-                case 2:
-                    res = _a.sent();
-                    return [4 /*yield*/, res.json()];
-                case 3:
-                    tree = (_a.sent()).tree;
-                    return [4 /*yield*/, Promise.all(tree.map(function (item) { return __awaiter(_this, void 0, void 0, function () {
-                            var destFile, fileDetails, fileContent;
-                            return __generator(this, function (_a) {
-                                switch (_a.label) {
-                                    case 0:
-                                        console.log(item.path);
-                                        if (!(item.type === 'blob' && item.path.startsWith(remoteFilePath))) return [3 /*break*/, 5];
-                                        destFile = path_1.default.join(dest, item.path.replace(remoteFilePath, ''));
-                                        return [4 /*yield*/, fs_extra_1.default.ensureDir(path_1.default.dirname(destFile))];
-                                    case 1:
-                                        _a.sent();
-                                        return [4 /*yield*/, node_fetch_1.default(item.url)];
-                                    case 2: return [4 /*yield*/, (_a.sent()).json()];
-                                    case 3:
-                                        fileDetails = (_a.sent());
-                                        fileContent = Buffer.from(fileDetails.content, 'base64').toString();
-                                        return [4 /*yield*/, streamPipeline(fileContent, fs_extra_1.createWriteStream(destFile))];
-                                    case 4:
-                                        _a.sent();
-                                        _a.label = 5;
-                                    case 5: return [2 /*return*/];
-                                }
-                            });
-                        }); }))];
-                case 4:
-                    _a.sent();
-                    return [2 /*return*/];
-            }
-        });
-    });
-}
-exports.createProjectFromGitHub = createProjectFromGitHub;
-function getLatestCommitSha() {
-    return __awaiter(this, void 0, void 0, function () {
-        var res, commits;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0: return [4 /*yield*/, node_fetch_1.default("https://api.github.com/repos/payloadcms/payload/commits")];
-                case 1:
-                    res = _a.sent();
-                    return [4 /*yield*/, res.json()];
-                case 2:
-                    commits = _a.sent();
-                    return [2 /*return*/, commits[0].sha];
-            }
-        });
-    });
-}