Fix for merge bundling rule, and version bump (fixes #660)

Author: Silic0nS0ldier

CHANGELOG.md

@@ -1,5 +1,8 @@
 # Change Log
 
+## v4.1.16-alpha
+- Fix for `merge` bundling rule (#660)
+
 ## v4.1.15-alpha
 - Refactor `Password` into a instantiable `Hasher` class, service, and `Password` facade (#827)
 - Change default hash cost back to 10 and fix legacy hash detection issue

app/defines.php

@@ -3,7 +3,7 @@
 namespace UserFrosting;
 
 // Some standard defines
-define('UserFrosting\VERSION', '4.1.15-alpha');
+define('UserFrosting\VERSION', '4.1.16-alpha');
 define('UserFrosting\DS', '/');
 define('UserFrosting\PHP_MIN_VERSION', '5.6');
 define('UserFrosting\DEBUG_CONFIG', false);

build/gulpfile.js

@@ -102,7 +102,7 @@ gulp.task('bundle-build', () => {
                         case 'merge':
                             // If using this collision rule, keep in mind any bundling options will also be merged.
                             // Inspect the produced 'bundle.config.json' file in the 'build' folder to ensure options are correct.
-                            config.bundle[bundleName] = merge(config.bundle[bundleName], currentConfig.bundle[bundleName]);
+                            config.bundle[bundleName] = merge(currentConfig.bundle[bundleName], config.bundle[bundleName]);
                             break;
                         case 'ignore':
                             // Do nothing. This simply exists to prevent falling through to error catchment.