Develop jordan (#930)

- Updated latest `CHANGELOG` entry to align with http://keepachangelog.com/en/1.0.0/ standards
- Updated Jordan's (@Silic0nS0ldier) bio
- Added fix for `npm` dependency installation issues to `CHANGELOG`
- Added new `NoCache` middleware to `CHANGELOG`
- Added branch status summary to `README`

Author: Silic0nS0ldier

CHANGELOG.md

@@ -8,8 +8,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ## 4.2.0-beta.2
 
 ### Added
-- Added `sprinkle:list` bakery command
-- Changed the sprinkle list in the bakery `debug` command to use the new `sprinkle:list` table
+- `sprinkle:list` bakery command
+- `NoCache` middleware to prevent caching of routes with dynamic content
+
+### Changed
+- Sprinkle list in the bakery `debug` command to uses the new `sprinkle:list` table
 
 ### Fix
 - Fix for `Test` Bakery command
@@ -25,6 +28,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
     - Added public `getSprinklesPath` & `setSprinklesPath` to return or set the path to the sprinkle dir (`app/sprinkles/`)
     - Added `JsonException` if `sprinkles.json` doesn't contain valid json.
     - Added specific tests for sprinkleManager with 100% test coverage
+- Ignore existing `package-lock.json` which caused incorrect dependencies to be installed when upgrading from older versions of UserFrosting.
 
 ## 4.2.0-beta.1
 

README.md

@@ -2,13 +2,16 @@
 
 [![Latest Version](https://img.shields.io/github/release/userfrosting/UserFrosting.svg)](https://github.com/userfrosting/UserFrosting/releases)
 [![Software License](https://img.shields.io/badge/license-MIT-brightgreen.svg)](LICENSE.md)
-[![Build Status](https://travis-ci.org/userfrosting/UserFrosting.svg?branch=master)](https://travis-ci.org/userfrosting/UserFrosting)
-[![codecov](https://codecov.io/gh/userfrosting/userfrosting/branch/master/graph/badge.svg)](https://codecov.io/gh/userfrosting/userfrosting)
 [![Join the chat at https://chat.userfrosting.com/channel/support](https://demo.rocket.chat/images/join-chat.svg)](https://chat.userfrosting.com/channel/support)
 [![Backers on Open Collective](https://opencollective.com/userfrosting/backers/badge.svg)](#backers)
 [![Sponsors on Open Collective](https://opencollective.com/userfrosting/sponsors/badge.svg)](#sponsors)
 [![Donate](https://img.shields.io/badge/Open%20Collective-Donate-blue.svg)](https://opencollective.com/userfrosting#backer)
 
+| Branch | Status |
+| ------ | ------ |
+| master | [![Build Status](https://travis-ci.org/userfrosting/UserFrosting.svg?branch=master)](https://travis-ci.org/userfrosting/UserFrosting) [![codecov](https://codecov.io/gh/userfrosting/userfrosting/branch/master/graph/badge.svg)](https://codecov.io/gh/userfrosting/userfrosting/branch/master) |
+| develop | [![Build Status](https://travis-ci.org/userfrosting/UserFrosting.svg?branch=develop)](https://travis-ci.org/userfrosting/UserFrosting) [![codecov](https://codecov.io/gh/userfrosting/userfrosting/branch/develop/graph/badge.svg)](https://codecov.io/gh/userfrosting/userfrosting/branch/develop) |
+
 [https://www.userfrosting.com](https://www.userfrosting.com)
 
 If you simply want to show that you like this project, or want to remember it for later, you should **star**, not **fork**, this repository.  Forking is only for when you are ready to create your own copy of the code to work on.
@@ -77,7 +80,7 @@ Louis's a civil engineer in Montréal, Québec who also has a passion for coding
 
 ### Jordan Mele
 
-Jordan's a former developer of Mayvin Training and a student studying Computer Science at the University of Wollongong, Australia. His passion is creating software-based solutions to overcomplicated problems, while keeping the user in control.
+Jordan's an Australian PHP Developer at [4mation](https://www.4mation.com.au) in Surry Hills, NSW. His passion is creating simple yet intuitive software-based solutions for problems that would otherwise be tedious and overcomplicated to address, while keeping the user in control.
 
 ### Sarah Baghdadi
 

build/gulpfile.esm.js

@@ -267,6 +267,7 @@ export function bundle() {
          * @param {string} path Absolute path to resolve.
          */
         function resolveToAssetPath(path) {
+            // TODO There is a significant amount of duplicated code here. We can do better.
             if (path.startsWith(resolvePath(sprinklesDir))) {
                 // Handle sprinkle path
                 for (const sprinkle of sprinkles) {