create-strapi-app 4.0.0-next.7 → 4.0.1

package/create-strapi-app.js

@@ -1,14 +1,24 @@
 'use strict';
 
-// FIXME
-/* eslint-disable import/extensions */
+const { resolve } = require('path');
 const commander = require('commander');
-const generateNewApp = require('@strapi/generate-new');
+const { checkInstallPath, generateNewApp } = require('@strapi/generate-new');
 const promptUser = require('./utils/prompt-user');
 const packageJson = require('./package.json');
 
 const program = new commander.Command(packageJson.name);
 
+const databaseOptions = [
+  'dbclient',
+  'dbhost',
+  'dbport',
+  'dbname',
+  'dbusername',
+  'dbpassword',
+  'dbssl',
+  'dbfile',
+];
+
 program
   .version(packageJson.version)
   .arguments('[directory]')
@@ -35,7 +45,6 @@ program
 function generateApp(projectName, options) {
   if (!projectName) {
     console.error('Please specify the <directory> of your project when using --quickstart');
-    // eslint-disable-next-line no-process-exit
     process.exit(1);
   }
 
@@ -47,16 +56,37 @@ function generateApp(projectName, options) {
 }
 
 async function initProject(projectName, program) {
+  if (projectName) {
+    await checkInstallPath(resolve(projectName));
+  }
+
+  const hasDatabaseOptions = databaseOptions.some(opt => program[opt]);
+
+  if (program.quickstart && hasDatabaseOptions) {
+    console.error(
+      `The quickstart option is incompatible with the following options: ${databaseOptions.join(
+        ', '
+      )}`
+    );
+    process.exit(1);
+  }
+
+  if (hasDatabaseOptions) {
+    program.quickstart = false; // Will disable the quickstart question because != 'undefined'
+  }
+
   if (program.quickstart) {
     return generateApp(projectName, program);
   }
 
-  const prompt = await promptUser(projectName, program.template);
+  const prompt = await promptUser(projectName, program);
 
   const directory = prompt.directory || projectName;
+  await checkInstallPath(resolve(directory));
+
   const options = {
-    template: prompt.template || program.template,
-    quickstart: prompt.quick,
+    template: program.template,
+    quickstart: prompt.quick || program.quickstart,
   };
 
   const generateStrapiAppOptions = {

package/package.json

@@ -1,9 +1,7 @@
 {
   "name": "create-strapi-app",
-  "version": "4.0.0-next.7",
+  "version": "4.0.1",
   "description": "Generate a new Strapi application.",
-  "license": "SEE LICENSE IN LICENSE",
-  "homepage": "https://strapi.io",
   "keywords": [
     "create-strapi-app",
     "create",
@@ -11,36 +9,42 @@
     "generate",
     "strapi"
   ],
-  "main": "./index.js",
-  "bin": {
-    "create-strapi-app": "./index.js"
-  },
-  "dependencies": {
-    "@strapi/generate-new": "4.0.0-next.7",
-    "chalk": "4.1.1",
-    "commander": "6.1.0",
-    "inquirer": "8.1.0",
-    "js-yaml": "4.1.0",
-    "node-fetch": "^2.6.1"
+  "homepage": "https://strapi.io",
+  "bugs": {
+    "url": "https://github.com/strapi/strapi/issues"
   },
-  "scripts": {
-    "test": "echo \"no tests yet\""
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/strapi/strapi.git"
   },
+  "license": "SEE LICENSE IN LICENSE",
   "author": {
+    "name": "Strapi Solutions SAS",
     "email": "hi@strapi.io",
-    "name": "Strapi team",
     "url": "https://strapi.io"
   },
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/strapi/strapi.git"
+  "maintainers": [
+    {
+      "name": "Strapi Solutions SAS",
+      "email": "hi@strapi.io",
+      "url": "https://strapi.io"
+    }
+  ],
+  "main": "./index.js",
+  "bin": {
+    "create-strapi-app": "./index.js"
   },
-  "bugs": {
-    "url": "https://github.com/strapi/strapi/issues"
+  "scripts": {
+    "test": "echo \"no tests yet\""
+  },
+  "dependencies": {
+    "@strapi/generate-new": "4.0.1",
+    "commander": "6.1.0",
+    "inquirer": "8.2.0"
   },
   "engines": {
     "node": ">=12.x.x <=16.x.x",
     "npm": ">=6.0.0"
   },
-  "gitHead": "522d6afd54b68ed3376dd0c807fab6c1315f1931"
+  "gitHead": "e2cd01e8c6cbfeba15ad7787e38b6eebcbb92221"
 }

package/utils/prompt-user.js

@@ -1,66 +1,23 @@
 'use strict';
 
 const inquirer = require('inquirer');
-const fetch = require('node-fetch');
-const yaml = require('js-yaml');
 
 /**
  * @param {string|null} projectName - The name/path of project
  * @param {string|null} template - The Github repo of the template
  * @returns Object containting prompt answers
  */
-module.exports = async function promptUser(projectName, template) {
-  const questions = await getPromptQuestions(projectName, template);
-  const [initialResponse, templateQuestion] = await Promise.all([
-    inquirer.prompt(questions),
-    getTemplateQuestion(),
-  ]);
-
-  if (initialResponse.useTemplate) {
-    const updatedResponse = await inquirer.prompt(templateQuestion);
-    return { ...initialResponse, ...updatedResponse };
-  }
-
-  return initialResponse;
+module.exports = async function promptUser(projectName, program) {
+  const questions = await getPromptQuestions(projectName, program);
+  return inquirer.prompt(questions);
 };
 
 /**
- *
- * @returns Prompt question object
- */
-async function getTemplateQuestion() {
-  const content = await getTemplateData();
-  // Fallback to manual input when fetch fails
-  if (!content) {
-    return {
-      name: 'template',
-      type: 'input',
-      message: 'Please provide the GitHub URL for your template:',
-    };
-  }
-
-  const choices = content.map(option => {
-    const name = option.title.replace('Template', '');
-    return {
-      name,
-      value: `https://github.com/${option.repo}`,
-    };
-  });
-
-  return {
-    name: 'template',
-    type: 'list',
-    message: `Select a template`,
-    pageSize: choices.length,
-    choices,
-  };
-}
-
-/**
- *
+ * @param {string|null} projectName - The name of the project
+ * @param {string|null} template - The template the project should use
  * @returns Array of prompt question objects
  */
-async function getPromptQuestions(projectName, template) {
+async function getPromptQuestions(projectName, program) {
   return [
     {
       type: 'input',
@@ -73,6 +30,7 @@ async function getPromptQuestions(projectName, template) {
       type: 'list',
       name: 'quick',
       message: 'Choose your installation type',
+      when: !program.quickstart,
       choices: [
         {
           name: 'Quickstart (recommended)',
@@ -84,31 +42,5 @@ async function getPromptQuestions(projectName, template) {
         },
       ],
     },
-    {
-      type: 'confirm',
-      name: 'useTemplate',
-      when: !template,
-      message:
-        'Would you like to use a template? (Templates are Strapi configurations designed for a specific use case)',
-    },
   ];
 }
-
-/**
- *
- * @returns JSON template data
- */
-async function getTemplateData() {
-  const response = await fetch(
-    `https://api.github.com/repos/strapi/community-content/contents/templates/templates.yml`
-  );
-  if (!response.ok) {
-    return null;
-  }
-
-  const { content } = await response.json();
-  const buff = Buffer.from(content, 'base64');
-  const stringified = buff.toString('utf-8');
-
-  return yaml.load(stringified);
-}