Skip to content

Commit

Permalink
v6.59.3. Bugfix.
Browse files Browse the repository at this point in the history
- v6.59.3 December 20, 2013
	- Fixed uninstalled dev dependency plugins (e.g. livereload), from
being reinstalled on the next install
		- Thanks to [Alan Languirand](https://github.com/alanguir), [Eduán
Lávaque](https://github.com/Greduan) for [issue
#744](#744)
  • Loading branch information
balupton committed Dec 19, 2013
1 parent b9754fd commit 8264603
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 11 deletions.
4 changes: 4 additions & 0 deletions HISTORY.md
@@ -1,5 +1,9 @@
# History

- v6.59.3 December 20, 2013
- Fixed uninstalled dev dependency plugins (e.g. livereload), from being reinstalled on the next install
- Thanks to [Alan Languirand](https://github.com/alanguir), [Eduán Lávaque](https://github.com/Greduan) for [issue #744](https://github.com/bevry/docpad/issues/744)

- v6.59.2 December 19, 2013
- More reliable delay of requests while the initial generation is still performing
- Removed the deprecated `writeSource` meta data header, `writeSource` is now only available via the API usage
Expand Down
2 changes: 1 addition & 1 deletion package.json
@@ -1,7 +1,7 @@
{
"title": "DocPad. Streamlined web development.",
"name": "docpad",
"version": "6.59.2",
"version": "6.59.3",
"description": "DocPad is a next generation web architecture that lets you create fast static websites with dynamic abilities and powerful abstractions. Write your website as files on your computer, entries in a database, or even RSS feeds and DocPad will import it, generate & render it, then output a static website for deployment anywhere or a dynamic node website for advanced server-side functionality. Use it as a module or standalone. It's purely awesome. Check it out.",
"homepage": "http://docpad.org",
"installUrl": "http://docpad.org/install",
Expand Down
28 changes: 18 additions & 10 deletions src/lib/docpad.coffee
Expand Up @@ -2032,10 +2032,14 @@ class DocPad extends EventEmitterGrouped
opts.cwd ?= config.rootPath
opts.output ?= docpad.getDebugging()
opts.args ?= []

opts.global ?= false
opts.global = '--global' if opts.global is true
opts.global = ['--global'] if opts.global is true
opts.global = [opts.global] if opts.global and Array.isArray(opts.global) is false

opts.save ?= !opts.global
opts.save = '--save' if opts.save is true
opts.save = ['--save', '--save-dev'] if opts.save is true
opts.save = [opts.save] if opts.save and Array.isArray(opts.save) is false

# Command
command = ['npm', 'install']
Expand All @@ -2054,10 +2058,10 @@ class DocPad extends EventEmitterGrouped

# Arguments
command.push(opts.args...)
command.push('--force') if config.force
command.push('--no-registry') if config.offline
command.push(opts.save) if opts.save
command.push(opts.global) if opts.global
command.push('--force') if config.force
command.push('--no-registry') if config.offline
command.push(opts.save...) if opts.save
command.push(opts.global...) if opts.global

# Log
docpad.log('info', command.join(' ')) if opts.output
Expand All @@ -2080,10 +2084,14 @@ class DocPad extends EventEmitterGrouped
opts.cwd ?= config.rootPath
opts.output ?= docpad.getDebugging()
opts.args ?= []

opts.global ?= false
opts.global = '--global' if opts.global is true
opts.global = ['--global'] if opts.global is true
opts.global = [opts.global] if opts.global and Array.isArray(opts.global) is false

opts.save ?= !opts.global
opts.save = '--save' if opts.save is true
opts.save = ['--save', '--save-dev'] if opts.save is true
opts.save = [opts.save] if opts.save and Array.isArray(opts.save) is false

# Command
command = ['npm', 'uninstall']
Expand All @@ -2094,8 +2102,8 @@ class DocPad extends EventEmitterGrouped

# Arguments
command.push(opts.args...)
command.push(opts.save) if opts.save
command.push(opts.global) if opts.global
command.push(opts.save...) if opts.save
command.push(opts.global...) if opts.global

# Log
docpad.log('info', command.join(' ')) if opts.output
Expand Down

0 comments on commit 8264603

Please sign in to comment.