Merge pull request #91 from cyclejs-community/new-scripts

Toward next Major version. This contains some braking changes and is a major version. Will be released until we some more 'diversity' PRs in

Author: nickbalestra

packages/create-cycle-app/index.js

@@ -9,7 +9,9 @@ const VERSION = require(path.resolve(__dirname, 'package.json')).version
 
 const validCommands = {
   'verbose': true,
-  'flavor': true
+  'flavor': true,
+  'noyarn': true,
+  'forceprompt': true
 }
 
 // Command line prelude (version and usage)
@@ -34,9 +36,11 @@ Object.keys(argv)
     return true
   })
 
-const flavor = argv.flavor || 'cycle-scripts@>=1.0.0 <2.0.0'
+const flavor = argv.flavor || 'core'
 const verbose = argv.verbose || false
+const noyarn = argv.noyarn || false
+const forceprompt = argv.forceprompt || false
 const name = commands[0]
 
 // Parse the command line options and run the setup
-createApp(name, verbose, flavor)
+createApp(name, verbose, flavor, noyarn, forceprompt)

packages/create-cycle-app/package.json

@@ -24,6 +24,7 @@
   "dependencies": {
     "chalk": "^1.1.3",
     "cross-spawn": "^4.0.2",
+    "inquirer": "^3.0.6",
     "minimist": "^1.2.0"
   },
   "devDependencies": {

packages/create-cycle-app/src/createApp.js

@@ -1,15 +1,41 @@
 'use strict'
+
 const path = require('path')
-const preparePackageJson = require('./preparePackageJson')
-const createProjectIn = require('./createProjectIn')
-const installScripts = require('./installScripts')
 
-module.exports = function createApp (name, verbose, flavor) {
-  const appFolder = path.resolve(name)
-  const appName = path.basename(appFolder)
+const createAppDir = require('./createAppDir')
+const initQuestions = require('./initQuestions')
+const installScripts = require('./installScripts')
+const createPackageJson = require('./createPackageJson')
+const shouldUseYarn = require('./shouldUseYarn')
 
-  createProjectIn(appFolder)
-  preparePackageJson(appFolder, appName, () => {
-    installScripts(appFolder, appName, flavor, verbose)
-  })
+module.exports = function createApp (name, verbose, flavor, noyarn, forceprompt) {
+  // The path where the cycle app will be created
+  const appPath = path.resolve(name)
+  // The name of the cycle app to create
+  const appName = path.basename(appPath)
+  // Which CLi to use (yarn or npm)
+  let cli = 'npm'
+  if (!noyarn && shouldUseYarn()) {
+    cli = 'yarn'
+  }
+  // console.log(cli)
+  // If no --flavor is passed (flavor === 'core')
+  // We prompt for language and stream library
+  // We set the flavor to be 'cycle-scripts'
+  if (flavor === 'core' || forceprompt) {
+    if (flavor === 'core') {
+      flavor = 'cycle-scripts@>=2.0.0'
+    }
+    initQuestions(answers => {
+      createAppDir(appPath)
+      createPackageJson(appPath, appName)
+      installScripts(appPath, appName, { flavor, verbose, answers, cli })
+    })
+  // If a --flavor is passed we don't prompt the user
+  // We delegate every task to the flavor's init() method itself.
+  } else {
+    createAppDir(appPath)
+    createPackageJson(appPath, appName)
+    installScripts(appPath, appName, { flavor, verbose, answers: false, cli })
+  }
 }

packages/create-cycle-app/src/createAppDir.js

@@ -0,0 +1,21 @@
+'use strict'
+
+const chalk = require('chalk')
+const console = require('console')
+const fs = require('fs')
+
+const isSafeToCreateApp = require('./isSafeToCreateApp')
+
+module.exports = function createProjectIn (appPath) {
+  if (!fs.existsSync(appPath)) {
+    fs.mkdirSync(appPath)
+    return
+  }
+
+  if (isSafeToCreateApp(appPath)) {
+    return
+  } else {
+    console.log(chalk.red(`The directory \`${appPath}\` contains file(s) that could conflict. Aborting.`))
+    process.exit(1)
+  }
+}

packages/create-cycle-app/src/createPackageJson.js

@@ -0,0 +1,24 @@
+'use strict'
+
+const chalk = require('chalk')
+const console = require('console')
+const fs = require('fs')
+const path = require('path')
+
+module.exports = function createPackageJson (appPath, appName) {
+  // Prepare package.json
+  const content = {
+    name: appName,
+    version: '0.1.0',
+    private: true
+  }
+  const packageJsonContent = JSON.stringify(content, null, 2)
+
+  // Write package.json in the app folder
+  console.log(chalk.green(`Creating a new Cycle.js app in ${appPath}.`))
+  console.log()
+  fs.writeFileSync(
+    path.join(appPath, 'package.json'),
+    packageJsonContent
+  )
+}

packages/create-cycle-app/src/createProjectIn.js

@@ -1,4 +1,5 @@
 'use strict'
+
 const path = require('path')
 
 module.exports = function getPackageName (installPackage) {

packages/create-cycle-app/src/getPackageName.js

@@ -0,0 +1,46 @@
+'use strict'
+
+const inquirer = require('inquirer')
+
+const initQuestions = [
+  {
+    type: 'list',
+    name: 'language',
+    default: 0,
+    choices: [
+      {
+        name: 'JavaScript',
+        value: 'javascript'
+      },
+      {
+        name: 'TypeScript',
+        value: 'typescript'
+      }
+    ],
+    message: 'Which language do you want to use to write your cycle app?'
+  },
+  {
+    type: 'list',
+    name: 'streamLib',
+    default: 0,
+    choices: [
+      {
+        name: 'XStream, tailored for Cycle.js',
+        value: 'xstream'
+      },
+      {
+        name: 'Most.js, a blazing fast stream library',
+        value: 'most'
+      },
+      {
+        name: 'RxJS',
+        value: 'rxjs'
+      }
+    ],
+    message: 'Which reactive stream library do you want to use?'
+  }
+]
+
+module.exports = cb => {
+  inquirer.prompt(initQuestions).then(cb)
+}

packages/create-cycle-app/src/initQuestions.js

@@ -1,50 +1,61 @@
 'use strict'
-const path = require('path')
+
 const chalk = require('chalk')
 const spawn = require('cross-spawn')
-const getPackageName = require('./getPackageName')
 const console = require('console')
-const process = require('process')
+const path = require('path')
+
+const getPackageName = require('./getPackageName')
 
-module.exports = function installScripts (appFolder, appName, flavor, verbose) {
-  const originalDirectory = process.cwd()
-  process.chdir(appFolder)
+module.exports = function installScripts (appFolder, appName, options) {
+  const verbose = options.verbose
+  const flavor = options.flavor
+  const cli = options.cli
 
-  // Find the right version
+  // Check if the the the flavor to be used is local
   const local = /^\.\/|^\//.test(flavor)
+  // Get the right name of the flavor package
   const packageName = getPackageName(flavor)
-
   // Install dependencies
+  const args = {
+    npm: [
+      'install',
+      verbose && '--verbose',
+      '--save-dev',
+      '--save-exact',
+      flavor
+    ].filter(a => a),
+    yarn: [
+      'add',
+      '--exact',
+      verbose && '--verbose',
+      local ? 'file:' + flavor : flavor
+    ].filter(a => a)
+  }
+
+  // Trigger npm installation
   console.log(chalk.green('Installing packages. This might take a couple minutes.'))
   console.log(chalk.green(`Installing ${packageName} from ${(local ? 'local' : 'npm')} ...`))
   console.log()
 
-  const args = [
-    'install',
-    verbose && '--verbose',
-    '--save-dev',
-    '--save-exact',
-    local ? path.resolve(originalDirectory, flavor) : flavor
-  ].filter(function (a) { return a })
-
-  // Trigger npm installation
-  const proc = spawn('npm', args, {stdio: 'inherit'})
+  const proc = spawn(cli, args[cli], {stdio: 'inherit', cwd: appFolder})
+  proc.on('error', (e) => console.log(e))
   proc.on('close', function (code) {
     if (code !== 0) {
-      console.error(chalk.red(`npm \`${args.join(' ')}\` failed`))
+      console.error(chalk.red(`${cli} \`${args[cli].join(' ')}\` failed`))
       return
     }
 
     const initScriptPath = path.resolve(
-      process.cwd(),
+      appFolder,
       'node_modules',
       packageName,
       'scripts',
       'init.js'
     )
     const init = require(initScriptPath)
 
-    // Execute the cycle-scripts's specific initialization
-    init(appFolder, appName, verbose, originalDirectory)
+    // Execute the flavor's specific initialization
+    init(appFolder, appName, options)
   })
 }

packages/create-cycle-app/src/installScripts.js

@@ -1,7 +1,8 @@
 'use strict'
+
 const fs = require('fs')
 
-module.exports = function isSafeToCreateProjectIn (appFolder) {
+module.exports = function isSafeToCreateApp (appFolder) {
   const whitelist = [
     '.DS_Store',
     'Thumbs.db',