Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use Yarn for installing dependencies #213

Closed
wants to merge 6 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
86 changes: 49 additions & 37 deletions src/createProject.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import {
} from './constants'
import {UserError} from './errors'
import pkg from '../package.json'
import {installInferno, installPreact, installReact, typeOf} from './utils'
import {installAppDependencies, typeOf} from './utils'

let nwbVersion = pkg.version.split('.').slice(0, 2).concat('x').join('.')

Expand Down Expand Up @@ -120,15 +120,18 @@ const PROJECT_CREATORS = {
copyTemplateDir(templateDir, targetDir, templateVars, (err, createdFiles) => {
if (err) return cb(err)
logCreatedFiles(targetDir, createdFiles)
console.log('Installing dependencies...')
try {
installInferno({cwd: targetDir, version, save: true})
}
catch (e) {
return cb(e)
}
initGit(args, targetDir)
cb()
installAppDependencies({
cwd: targetDir,
version,
save: true,
dependencies: [
`inferno@${version}`,
`inferno-component@${version}`
]
}).then(() => {
initGit(args, targetDir)
cb()
}).catch(err => cb(err))
})
},

Expand All @@ -139,15 +142,17 @@ const PROJECT_CREATORS = {
copyTemplateDir(templateDir, targetDir, templateVars, (err, createdFiles) => {
if (err) return cb(err)
logCreatedFiles(targetDir, createdFiles)
console.log('Installing dependencies...')
try {
installPreact({cwd: targetDir, version, save: true})
}
catch (e) {
return cb(e)
}
initGit(args, targetDir)
cb()
installAppDependencies({
cwd: targetDir,
version,
save: true,
dependencies: [
`preact@${version}`
]
}).then(() => {
initGit(args, targetDir)
cb()
}).catch(err => cb(err))
})
},

Expand All @@ -158,15 +163,18 @@ const PROJECT_CREATORS = {
copyTemplateDir(templateDir, targetDir, templateVars, (err, createdFiles) => {
if (err) return cb(err)
logCreatedFiles(targetDir, createdFiles)
console.log('Installing dependencies...')
try {
installReact({cwd: targetDir, version: reactVersion, save: true})
}
catch (e) {
return cb(e)
}
initGit(args, targetDir)
cb()
installAppDependencies({
cwd: targetDir,
version: reactVersion,
save: true,
dependencies: [
`react@${reactVersion}`,
`react-dom@${reactVersion}`
]
}).then(() => {
initGit(args, targetDir)
cb()
}).catch(err => cb(err))
})
},

Expand Down Expand Up @@ -194,15 +202,19 @@ const PROJECT_CREATORS = {
return cb(e)
}
logCreatedFiles(targetDir, createdFiles)
console.log('Installing dependencies...')
try {
installReact({cwd: targetDir, version: reactVersion, dev: true, save: true})
}
catch (e) {
return cb(e)
}
initGit(args, targetDir)
cb()
installAppDependencies({
cwd: targetDir,
dev: true,
version: reactVersion,
save: true,
dependencies: [
`react@${reactVersion}`,
`react-dom@${reactVersion}`
]
}).then(() => {
initGit(args, targetDir)
cb()
}).catch(err => cb(err))
})
})
},
Expand Down
57 changes: 35 additions & 22 deletions src/utils.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import {execSync} from 'child_process'
import {exec, execSync} from 'child_process'
import util from 'util'

import argvSetEnv from 'argv-set-env'
import ora from 'ora'

import debug from './debug'

Expand Down Expand Up @@ -68,33 +69,45 @@ export function endsWith(s1, s2) {
}

/**
* Install Inferno for the user when it's needed.
* Checks if the package manager `yarn` is available
* @return {Boolean}
*/
export function installInferno({dev = false, save = false, cwd = process.cwd(), version = 'latest'} = {}) {
let saveArg = save ? ` --save${dev ? '-dev' : ''}` : ''
let command = `npm install${saveArg} inferno@${version} inferno-component@${version}`
debug(`${cwd} $ ${command}`)
execSync(command, {cwd, stdio: 'inherit'})
export function isYarnAvailable() {
try {
execSync('yarn --version', {stdio: 'ignore'})
return true
}
catch (e) {
return false
}
}

/**
* Install Preact for the user when it's needed.
* Install all App dependencies
*/
export function installPreact({dev = false, save = false, cwd = process.cwd(), version = 'latest'} = {}) {
let saveArg = save ? ` --save${dev ? '-dev' : ''}` : ''
let command = `npm install${saveArg} preact@${version}`
debug(`${cwd} $ ${command}`)
execSync(command, {cwd, stdio: 'inherit'})
}
export function installAppDependencies({dev = false, save = false, cwd = process.cwd(), version = 'latest', dependencies = []} = {}) {
const saveArg = save ? ` --save${dev ? '-dev' : ''}` : ''
let command = `npm install${saveArg} ${dependencies.join(' ')}`

/**
* Install React for the user when it's needed.
*/
export function installReact({dev = false, save = false, cwd = process.cwd(), version = 'latest'} = {}) {
let saveArg = save ? ` --save${dev ? '-dev' : ''}` : ''
let command = `npm install${saveArg} react@${version} react-dom@${version}`
debug(`${cwd} $ ${command}`)
execSync(command, {cwd, stdio: 'inherit'})
if (isYarnAvailable()) {
command = `yarn add ${dependencies.join(' ')} ${dev ? '--dev' : ''}`
}
console.log()
const spinner = ora(`Installing dependencies using ${isYarnAvailable() ? 'yarn' : 'npm'}`).start()

return new Promise((resolve, reject) => {
debug(`${cwd} $ ${command}`)
exec(command, {cwd, stdio: 'ignore'}, (err) => {
if (err) {
spinner.fail()
reject(err)
}
else {
spinner.succeed()
resolve()
}
})
})
}

/**
Expand Down
4 changes: 2 additions & 2 deletions tests/commands/new-init-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ function reactAppAssertions(dir, name, err, done) {
expect(glob.sync('**', {
dot: true,
cwd: path.resolve(dir),
ignore: 'node_modules/**'
ignore: ['node_modules/**', 'yarn.lock']
})).toEqual([
'.gitignore',
'.travis.yml',
Expand Down Expand Up @@ -53,7 +53,7 @@ function reactComponentAssertions(dir, name, err, done) {
expect(glob.sync('**', {
cwd: path.resolve(dir),
dot: true,
ignore: 'node_modules/**'
ignore: ['node_modules/**', 'yarn.lock']
})).toEqual([
'.gitignore',
'.travis.yml',
Expand Down