create-payload-app 0.3.18 → 0.3.20

package/dist/lib/common-files/Dockerfile.template

@@ -0,0 +1,26 @@
+FROM node:18.8-alpine as base
+
+FROM base as builder
+
+WORKDIR /home/node/app
+COPY package*.json ./
+
+COPY . .
+RUN {{installCmd}}
+RUN {{buildCmd}}
+
+FROM base as runtime
+
+ENV NODE_ENV=production
+ENV PAYLOAD_CONFIG_PATH=dist/payload.config.js
+
+WORKDIR /home/node/app
+COPY package*.json  ./
+
+RUN {{installCmd}} --production
+COPY --from=builder /home/node/app/dist ./dist
+COPY --from=builder /home/node/app/build ./build
+
+EXPOSE 3000
+
+CMD ["node", "dist/server.js"]

package/dist/lib/common-files/README.template.md

@@ -6,4 +6,14 @@ This project was created using create-payload-app using the {{templateName}} tem
 
 `yarn dev` will start up your application and reload on any changes.
 
+### Docker
+
 If you have docker and docker-compose installed, you can run `docker-compose up`
+
+To build the docker image, run `docker build -t my-tag .`
+
+Ensure you are passing all needed environment variables when starting up your container via `--env-file` or setting them with your deployment.
+
+The 3 typical env vars will be `MONGODB_URI`, `PAYLOAD_SECRET`, and `PAYLOAD_CONFIG_PATH`
+
+`docker run --env-file .env -p 3000:3000 my-tag`

package/dist/lib/common-files/typescript/package.template.json

@@ -1,5 +1,5 @@
 {
-  "name": "payload-template-{{templateName}}",
+  "name": "{{projectName}}",
   "description": "Payload project created from {{templateName}} template",
   "version": "1.0.0",
   "main": "dist/server.js",
@@ -8,7 +8,7 @@
     "dev": "cross-env PAYLOAD_CONFIG_PATH=src/payload.config.ts nodemon",
     "build:payload": "cross-env PAYLOAD_CONFIG_PATH=src/payload.config.ts payload build",
     "build:server": "tsc",
-    "build": "yarn copyfiles && yarn build:payload && yarn build:server",
+    "build": "{{runCommand}} copyfiles && {{runCommand}} build:payload && {{runCommand}} build:server",
     "serve": "cross-env PAYLOAD_CONFIG_PATH=dist/payload.config.js NODE_ENV=production node dist/server.js",
     "copyfiles": "copyfiles -u 1 \"src/**/*.{html,css,scss,ttf,woff,woff2,eot,svg,jpg,png}\" dist/",
     "generate:types": "cross-env PAYLOAD_CONFIG_PATH=src/payload.config.ts payload generate:types",

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

@@ -79,8 +79,9 @@ describe('createProject', function () {
                         packageJsonPath = path_1.default.resolve(projectDir, 'package.json');
                         packageJson = fs_extra_1.default.readJsonSync(packageJsonPath);
                         expect(packageJson.dependencies.payload).toBe(expectedPayloadVersion);
-                        // Check package name comtains template name
-                        expect(packageJson.name).toContain('ts-todo');
+                        // Check package name and description
+                        expect(packageJson.name).toEqual(path_1.default.basename(projectDir));
+                        expect(packageJson.description).toContain('ts-todo');
                         // Check all common files are create
                         assertProjectFileExists('.npmrc');
                         assertProjectFileExists('.gitignore');

package/dist/lib/get-db-connection.js

@@ -57,7 +57,7 @@ function getDatabaseConnection(args, projectName) {
                             initial: "mongodb://localhost/".concat(projectName === '.'
                                 ? "payload-".concat(getRandomDigitSuffix())
                                 : (0, slugify_1.default)(projectName)),
-                            validate: function (value) { return value.length; },
+                            validate: function (value) { return !!value.length; },
                         }, {
                             onCancel: function () {
                                 process.exit(0);

package/dist/lib/parse-language.js

@@ -63,7 +63,7 @@ function parseLanguage(args) {
                                     value: 'ts',
                                 },
                             ],
-                            validate: function (value) { return value.length; },
+                            validate: function (value) { return !!value.length; },
                         }, {
                             onCancel: function () {
                                 process.exit(0);

package/dist/lib/parse-project-name.js

@@ -55,7 +55,7 @@ function parseProjectName(args) {
                             type: 'text',
                             name: 'value',
                             message: 'Project name?',
-                            validate: function (value) { return value.length; },
+                            validate: function (value) { return !!value.length; },
                         }, {
                             onCancel: function () {
                                 process.exit(0);

package/dist/lib/parse-template.js

@@ -64,7 +64,7 @@ function parseTemplate(args, validTemplates, language) {
                             choices: filteredTemplates.map(function (p) {
                                 return { title: p, value: "".concat(language, "-").concat(p) };
                             }),
-                            validate: function (value) { return value.length; },
+                            validate: function (value) { return !!value.length; },
                         }, {
                             onCancel: function () {
                                 process.exit(0);

package/dist/lib/write-common-files.js

@@ -45,7 +45,7 @@ var fs_extra_1 = __importDefault(require("fs-extra"));
 var handlebars_1 = __importDefault(require("handlebars"));
 function writeCommonFiles(projectDir, template, packageManager) {
     return __awaiter(this, void 0, void 0, function () {
-        var commonFilesDir, npmrc, npmrcDest, gi, giDest, packageJsonTemplate, packageJson, nodemon, nodemonDest, readmeTemplate, readme, tsconfig, tsconfigDest, dockerComposeTemplate, dockerCompose;
+        var commonFilesDir, npmrc, npmrcDest, gi, giDest, packageJsonTemplate, packageJson, nodemon, nodemonDest, readmeTemplate, readme, tsconfig, tsconfigDest, dockerComposeTemplate, dockerCompose, dockerfileTemplate, dockerfile;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
@@ -68,7 +68,9 @@ function writeCommonFiles(projectDir, template, packageManager) {
                 case 3:
                     packageJsonTemplate = _a.sent();
                     packageJson = handlebars_1.default.compile(packageJsonTemplate)({
+                        projectName: path_1.default.basename(projectDir),
                         templateName: template.name,
+                        runCommand: packageManager === 'yarn' ? 'yarn' : 'npm run',
                     });
                     return [4 /*yield*/, fs_extra_1.default.writeFile(path_1.default.resolve(projectDir, 'package.json'), packageJson)
                         // nodemon.json
@@ -107,8 +109,19 @@ function writeCommonFiles(projectDir, template, packageManager) {
                     dockerCompose = handlebars_1.default.compile(dockerComposeTemplate)(packageManager === 'yarn'
                         ? { installCmd: 'yarn install', devCmd: 'yarn dev' }
                         : { installCmd: 'npm install', devCmd: 'npm run dev' });
-                    return [4 /*yield*/, fs_extra_1.default.writeFile(path_1.default.resolve(projectDir, 'docker-compose.yml'), dockerCompose)];
+                    return [4 /*yield*/, fs_extra_1.default.writeFile(path_1.default.resolve(projectDir, 'docker-compose.yml'), dockerCompose)
+                        // Dockerfile
+                    ];
                 case 11:
+                    _a.sent();
+                    return [4 /*yield*/, fs_extra_1.default.readFile(path_1.default.resolve(commonFilesDir, 'Dockerfile.template'), 'utf8')];
+                case 12:
+                    dockerfileTemplate = _a.sent();
+                    dockerfile = handlebars_1.default.compile(dockerfileTemplate)(packageManager === 'yarn'
+                        ? { installCmd: 'yarn install', buildCmd: 'yarn build' }
+                        : { installCmd: 'npm install', buildCmd: 'npm run build' });
+                    return [4 /*yield*/, fs_extra_1.default.writeFile(path_1.default.resolve(projectDir, 'Dockerfile'), dockerfile)];
+                case 13:
                     _a.sent();
                     return [2 /*return*/];
             }

package/package.json

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