Merge pull request #111 from odecee/feature/webpack-2.2

Feature/webpack 2.2

README.md

@@ -11,6 +11,8 @@
 [![Dependencies status](https://david-dm.org/odecee/generator-confit/status.svg?theme=shields.io)](https://david-dm.org/odecee/generator-confit#info=dependencies)
 [![Dev Dependencies status](https://david-dm.org/odecee/generator-confit/dev-status.svg?theme=shields.io)](https://david-dm.org/odecee/generator-confit#info=devDependencies)
 [![Checklist](https://img.shields.io/badge/follows-npm%20checklist-brightgreen.svg)](CHECKLIST.md)
+[![Commitizen friendly](https://img.shields.io/badge/commitizen-friendly-brightgreen.svg)](http://commitizen.github.io/cz-cli/)
+[![NPM monthly downloads](https://img.shields.io/npm/dm/generator-confit.svg?style=flat-square)](https://www.npmjs.com/package/generator-confit)
 
 ![terminal](terminal.gif)
 

docs/content/architecture.md

@@ -31,10 +31,13 @@ The `app` generator is all about capturing application-wide settings and generat
 - The `Latest` build profile is an alias to the newest set of tools and config recommended for projects. It will change every few months as new & better tooling arrives.
 - The other profiles will show the date that they were added. This allows projects to update their Confit-generator version but continue to use the same set of tools that were used by Confit on a certain date.
 
-**Where will this project be hosted?** [**GitHub**, Other] `app.repositoryType`
-- Repositories hosted on Github can take advantage of GitHub-specific integrations. E.g. *semantic-release* can generate release information within the "Releases" tab in GitHub.
-- Non-GitHub repositories have fewer integration options. 
-- Repositories hosted on "GitHub Enterprise" should choose "Other", as enterprise repositories are typically not public
+**Where will this project be hosted?** [**GitHub**, BitBucket, Other] `app.repositoryType`
+- Repositories hosted on Github or BitBucket can take advantage of repository-specific integrations. E.g. *semantic-release* can generate release information within the "Releases" tab in GitHub.
+- Other repositories have fewer integration options. 
+
+**Is this repository public?** [**true**, false] `app.publicRepository`
+- Public repositories are repositories that are viewable by everyone.
+- This setting affects what Readme badges can be generated, as some badges only work with public repositories
 
 **Choose a license**: [**UNLICENSED**, *common SPDX licences*, *full SPDX licence list*] `app.license`
 - Sets the `package.json` `license` field and optionally generates the license file (for every license type other than "UNLICENSED").

docs/content/upgrading.md

@@ -1,4 +1,4 @@
-## Upgrading to 7.x from earlier versions
+## Upgrading *to* 7.x from earlier versions
 
 Key changes:
 - Webpack 2.1.0 beta 21. See [what's new in Webpack 2](https://gist.github.com/sokra/27b24881210b56bbaff7)
@@ -7,6 +7,6 @@ Key changes:
 - support for documentation generation using Swanky (beta)
 - Grunt has been deprecated
 
-## Upgrading from 7.x
+## Upgrading *from* 7.x
 
 Please refer to the [release log](https://github.com/odecee/confit/releases).

docs/content/usage.md

@@ -1,9 +1,9 @@
 ## Installation
 
-Install Node.js 4+ or 6+ (this can be easily automated with tools such as [nvm](https://github.com/creationix/nvm))
+Install Node.js 4+ (this can be easily automated with tools such as [nvm](https://github.com/creationix/nvm))
 
 ```bash
-nvm install 6
+nvm install 7
 #   OR
 nvm install 4
 ```
@@ -67,7 +67,7 @@ Depending on your configuration, you may delegate this process to your continuou
 or you can publish manually (not recommended).
 
 `npm run pre-release` runs all of the unit tests, verifies code, checks test coverage and builds your software for production. If there were
-no errors, you can then run `npm run semantic-release` if using semantic releasing.
+no errors, you can then run `npm run semantic-release` (if using semantic releasing).
 
 If you are not using semantic releasing, you must define your own `release` task in `package.json` and then call it yourself.
 

lib/buildTool/npm/npmResources.yml

@@ -166,6 +166,11 @@ release:
               features:
                 - Asks questions about the change to generate a valid conventional commit message
                 - Can be customised by modifying <%- link(paths.config.configDir + resources.release.configSubDir + 'commitMessageConfig.js') %>
+      readmeBadges:
+        - name: Commitizen friendly
+          image: https://img.shields.io/badge/commitizen-friendly-brightgreen.svg
+          url: http://commitizen.github.io/cz-cli/
+          priority: 90
       onInstall:
         - cmd: git    # It is safe to run this multiple times
           args: ['init']

lib/core/packages.yml

@@ -553,11 +553,11 @@ $packages:
 
   - &pkg_webpack
     name: webpack
-    version: 2.2.0-rc.3
+    version: 2.2.0
 
   - &pkg_webpack-dev-server
     name: webpack-dev-server
-    version: 2.2.0-rc.0
+    version: 2.2.0
 
   - &pkg_whatwg-fetch   # Polyfill for fetch() API
     name: whatwg-fetch