Skip to content

feature: Installing dependencies with yarn #31

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.

Sign up for GitHub

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

Closed
rkostrzewski wants to merge 13 commits into from
Closed

feature: Installing dependencies with yarn #31

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
c4931dd
feat(Yarn): Adds support for installing dependencies with yarn
rkostrzewski May 20, 2017
7c8ddd3
refactor: generic isCommandAvailable function
rkostrzewski May 21, 2017
130dac3
Merge branch 'developit/master' into feature/yarn-install
rkostrzewski May 21, 2017
42da57d
refactor: Remove npm helper from create command & use async await
rkostrzewski May 22, 2017
e0029ee
fix: Fix PostCSS 6 issues in dependency chain
rkostrzewski May 22, 2017
c6a19d1
feature(Yarn): npm-install-loader -> dependency-install-loader with Y…
rkostrzewski May 27, 2017
0e0f569
Merge remote-tracking branch 'developit/master' into feature/yarn-ins…
rkostrzewski May 27, 2017
d8b57b6
Merge remote-tracking branch 'developit/master' into feature/yarn-ins…
rkostrzewski Jun 1, 2017
2c12da7
Merge remote-tracking branch 'developit/master' into feature/yarn-ins…
rkostrzewski Jun 10, 2017
3541f93
Merge remote-tracking branch 'developit/master' into feature/yarn-ins…
rkostrzewski Jun 23, 2017
1fc3a4c
chore: Remove redundant file
rkostrzewski Jun 24, 2017
05c4522
fix: Dependency install loader for sass
rkostrzewski Jun 24, 2017
a6bcbec
Merge branch 'master' into feature/yarn-install
reznord Jun 28, 2017
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
1 change: 1 addition & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,7 @@
"url-loader": "^0.5.8",
"webpack": "^2.3.3",
"webpack-dev-server": "^2.4.5",
"which": "^1.2.14",
"yargs": "^8.0.1"
}
}
35 changes: 28 additions & 7 deletions src/commands/create.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import ora from 'ora';
import promisify from 'es6-promisify';
import spawn from 'cross-spawn-promise';
import path from 'path';
import which from 'which';

const TEMPLATES = {
default: 'examples/root',
Expand Down Expand Up @@ -83,7 +84,7 @@ export default asyncCommand({

spinner.text = 'Initializing project';

await npm(target, ['init', '-y']);
await spawn('npm', ['init', '-y'], { cwd: target, stdio: 'ignore' })
Copy link
Member

@developit developit May 25, 2017 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lol this is what it used to be 😆

does Yarn not include an init functionality like npm's?

Copy link
Collaborator

@thangngoc89 thangngoc89 May 25, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@developit yes it does

Copy link
Member

@developit developit May 25, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

future thing to do might be to move the which check up and use yarn here too. For now anyone running yarn would have npm installed anyway.


let pkg = JSON.parse(await fs.readFile(path.resolve(target, 'package.json')));

Expand All @@ -103,8 +104,7 @@ export default asyncCommand({

spinner.text = 'Installing dev dependencies';

await npm(target, [
'install', '--save-dev',
await install(target, [
'preact-cli',
'if-env',
'eslint',
Expand All @@ -121,12 +121,11 @@ export default asyncCommand({
'less',
'less-loader'
] : [])
].filter(Boolean));
].filter(Boolean), 'dev');

spinner.text = 'Installing dependencies';

await npm(target, [
'install', '--save',
await install(target, [
'preact',
'preact-compat',
'preact-router'
Expand All @@ -150,5 +149,27 @@ export default asyncCommand({
}
})

const install = async (cwd, packages, env) => {
const isDev = env === 'dev' ? true : false
const isYarnAvailable = await isCommandAvailable('yarn')

const npm = (cwd, args) => spawn('npm', args, { cwd, stdio: 'ignore' });
if(isYarnAvailable) {
const args = ['add']
if(isDev) {
args.push('-D')
}

Copy link
Member

@developit developit May 25, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can slim this down by moving the .filter(Boolean) into install, but I'll just slip that in post-merge :)

return await spawn('yarn', [...args, ...packages], { cwd, stdio: 'ignore' })
}

await spawn('npm', ['install', isDev ? '--save-dev' : '--save', ...packages], { cwd, stdio: 'ignore' })
}

const isCommandAvailable = async cmd => {
try {
await promisify(which)(cmd)
return true;
} catch(e){
return false
}
}
15 changes: 7 additions & 8 deletions src/lib/run-webpack.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ export function showStats(stats) {
return stats;
}

export function writeJsonStats(stats) {
export async function writeJsonStats(stats) {
const outputPath = resolve(process.cwd(), 'stats.json')
const jsonStats = stats.toJson({
json: true,
Expand All @@ -66,13 +66,12 @@ export function writeJsonStats(stats) {
jsonStats.modules.forEach(normalizeModule)
jsonStats.chunks.forEach(c => c.modules.forEach(normalizeModule))

return fs.writeFile(outputPath, JSON.stringify(jsonStats))
Copy link
Collaborator Author

@rkostrzewski rkostrzewski May 22, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sneaky refactor 👣

Copy link
Member

@developit developit May 25, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

well-earned, I'd say ;)

.then(() => {
process.stdout.write('\nWebpack output stats generated.\n\n')
process.stdout.write('You can upload your stats.json to:\n')
process.stdout.write('- https://chrisbateman.github.io/webpack-visualizer/\n')
process.stdout.write('- https://webpack.github.io/analyse/\n')
})
await fs.writeFile(outputPath, JSON.stringify(jsonStats))

process.stdout.write('\nWebpack output stats generated.\n\n')
process.stdout.write('You can upload your stats.json to:\n')
process.stdout.write('- https://chrisbateman.github.io/webpack-visualizer/\n')
process.stdout.write('- https://webpack.github.io/analyse/\n')
}

const normalizeModule = m => {
Expand Down