Make npm the default to make release non-breaking

Avoid breaking workflow of users using the new version.

Author: jvanbruegge

package.json

@@ -17,8 +17,14 @@
   },
   "author": "Geovani Souza <[email protected]>",
   "contributors": [
-    { "name": "Geovani Souza", "email": "[email protected]" },
-    { "name": "Nick Balestra", "email": "[email protected]" }
+    {
+      "name": "Geovani Souza",
+      "email": "[email protected]"
+    },
+    {
+      "name": "Nick Balestra",
+      "email": "[email protected]"
+    }
   ],
   "license": "ISC",
   "bugs": {

packages/create-cycle-app/index.js

@@ -10,7 +10,7 @@ const VERSION = require(path.resolve(__dirname, 'package.json')).version
 const validCommands = {
   'verbose': true,
   'flavor': true,
-  'noyarn': true,
+  'yarn': true,
   'forceprompt': true
 }
 
@@ -21,7 +21,7 @@ if (commands.length === 0) {
     console.log(chalk.green(`create-cycle-app version: ${VERSION}`))
     process.exit()
   }
-  console.error(chalk.red('Usage: create-cycle-app <project-directory> [--flavor] [--verbose]'))
+  console.error(chalk.red('Usage: create-cycle-app <project-directory> [--flavor] [--verbose] [--yarn]'))
   process.exit(1)
 }
 
@@ -38,9 +38,9 @@ Object.keys(argv)
 
 const flavor = argv.flavor || 'core'
 const verbose = argv.verbose || false
-const noyarn = argv.noyarn || false
+const yarn = argv.yarn || false
 const forceprompt = argv.forceprompt || false
 const name = commands[0]
 
 // Parse the command line options and run the setup
-createApp(name, verbose, flavor, noyarn, forceprompt)
+createApp(name, verbose, flavor, yarn, forceprompt)

packages/create-cycle-app/package.json

@@ -22,14 +22,26 @@
     "create-cycle-app": "./index.js"
   },
   "dependencies": {
+    "@cycle/dom": "^18.0.0",
+    "@cycle/http": "^14.0.0",
+    "@cycle/isolate": "^3.0.0",
+    "@cycle/run": "^3.1.0",
+    "@cycle/time": "^0.8.0",
     "chalk": "^1.1.3",
     "cross-spawn": "^4.0.2",
-    "inquirer": "^3.0.6",
-    "minimist": "^1.2.0"
+    "cycle-onionify": "^3.3.0",
+    "inquirer": "^3.3.0",
+    "minimist": "^1.2.0",
+    "xstream": "^10.9.0"
   },
   "devDependencies": {
-    "fs-extra": "^2.0.0",
-    "jest": "^18.1.0"
+    "cycle-restart": "^0.2.2",
+    "cyclejs-test-helpers": "^1.3.0",
+    "fs-extra": "^2.1.2",
+    "html-looks-like": "^1.0.3",
+    "jest": "^18.1.0",
+    "jsverify": "^0.8.2",
+    "snabbdom-to-html": "^3.2.0"
   },
   "repository": {
     "type": "git",

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

@@ -8,14 +8,14 @@ const installScripts = require('./installScripts')
 const createPackageJson = require('./createPackageJson')
 const shouldUseYarn = require('./shouldUseYarn')
 
-module.exports = function createApp (name, verbose, flavor, noyarn, forceprompt) {
+module.exports = function createApp (name, verbose, flavor, yarn, 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()) {
+  if (yarn || shouldUseYarn()) {
     cli = 'yarn'
   }
   // console.log(cli)

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

@@ -2,11 +2,14 @@
 
 const path = require('path')
 
+const packageRegex = /(@[\w-]+\/)?[\w-]+/
+
 module.exports = function getPackageName (installPackage) {
   if (/.tgz$/.test(installPackage)) {
     return installPackage.match(/^(.*)-.*tgz$/)[1]
-  } else if (~installPackage.indexOf('@')) {
-    return installPackage.split('@')[0]
+  } else if (/^\.\/|\//.test(installPackage)) {
+    return require(path.resolve(installPackage, 'package.json')).name
+  } else {
+    return installPackage.match(packageRegex)[0]
   }
-  return path.basename(installPackage)
 }

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

@@ -2,9 +2,9 @@ const execSync = require('child_process').execSync
 
 module.exports = function shouldUseYarn () {
   try {
-    execSync('yarnpkg --version', { stdio: 'ignore' })
-    return true
-  } catch (e) {
+    execSync('npm --version', { stdio: 'ignore' })
     return false
+  } catch (e) {
+    return true
   }
 }

packages/create-cycle-app/test/integration/createCycleApp.spec.js

@@ -36,8 +36,7 @@ describe('create-cycle-app', () => {
         path.resolve(__dirname, '../../index.js'),
         appName,
         '--flavor',
-        '[email protected]',
-        '--noyarn'
+        '[email protected]'
       ])
       dir = fs.readdirSync(appName)
       done()
@@ -48,13 +47,13 @@ describe('create-cycle-app', () => {
     })
 
     test('it generate the correct folder structure and install dependencies', () => {
-      expect(dir).toMatchObject([
+      expect(dir).toEqual(expect.arrayContaining([
         '.gitignore',
         'node_modules',
         'package.json',
         'public',
         'src'
-      ])
+      ]))
     })
 
     test('it generate a correct package.json file', () => {

packages/cycle-scripts/package.json

@@ -30,20 +30,20 @@
     "cycle-scripts": "./index.js"
   },
   "dependencies": {
-    "babel-core": "^6.24.1",
+    "babel-core": "^6.26.0",
     "babel-loader": "^6.4.1",
-    "babel-plugin-transform-object-rest-spread": "^6.23.0",
+    "babel-plugin-transform-object-rest-spread": "^6.26.0",
     "babel-plugin-transform-react-jsx": "^6.24.1",
-    "babel-preset-env": "^1.3.3",
+    "babel-preset-env": "^1.6.0",
     "chalk": "^1.1.3",
     "cross-spawn": "^5.1.0",
     "fs-extra": "^2.1.2",
-    "html-webpack-plugin": "^2.28.0",
-    "inquirer": "^3.0.6",
+    "html-webpack-plugin": "^2.30.1",
+    "inquirer": "^3.3.0",
     "jest": "^19.0.2",
     "react-dev-utils": "^0.5.2",
-    "snabbdom-pragma": "^1.8.0",
-    "webpack": "^2.3.3",
-    "webpack-dev-server": "^2.4.2"
+    "snabbdom-pragma": "^1.10.0",
+    "webpack": "^2.7.0",
+    "webpack-dev-server": "^2.9.1"
   }
 }