Merge branch 'fa5' into update-fa5

userfrosting · Jul 14, 2019 · 1e07b98 · 1e07b98
2 parents 007e9cb + 706caa4
commit 1e07b98
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -20,6 +20,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Updated league/csv to 9.2.1
 - Updated symfony/console to 4.3
 - Updated vlucas/phpdotenv to 3.4.0
+- [Frontend] Updated handlebar from 3.0.x to 4.1.2
 
 ### Added
 - Separated `BakeCommand` class into multiple methods to make it easier for sprinkle to add custom command to the `bake` command.
@@ -28,6 +29,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ### Fix
 - `bake` command return error if account sprinkle is not included ([#944])
 - Email is case-sensitive ([#881]; [#1012])
+- Update vulnerable handlebars@^3.0.3 to ^4.0.12 ([#921])
+- Moved `handlebars-helpers.js` from `core` to `admin` sprinkle ([#897])
 
 ### Changed
 - Account sprinkle now extend the Core `BakeCommand` class to add the `create-admin` to the general bake command. Any sprinkle already extending the Core `BakeCommand` might need adjustments.
@@ -792,7 +795,9 @@ See [http://learn.userfrosting.com/upgrading/40-to-41](Upgrading 4.0.x to 4.1.x
 [#881]: https://github.com/userfrosting/UserFrosting/issues/881
 [#888]: https://github.com/userfrosting/UserFrosting/issues/888
 [#893]: https://github.com/userfrosting/UserFrosting/issues/893
+[#897]: https://github.com/userfrosting/UserFrosting/issues/897
 [#919]: https://github.com/userfrosting/UserFrosting/issues/919
+[#921]: https://github.com/userfrosting/UserFrosting/issues/921
 [#940]: https://github.com/userfrosting/UserFrosting/issues/940
 [#950]: https://github.com/userfrosting/UserFrosting/issues/950
 [#951]: https://github.com/userfrosting/UserFrosting/issues/951

diff --git a/app/sprinkles/admin/asset-bundles.json b/app/sprinkles/admin/asset-bundles.json
@@ -167,4 +167,4 @@
             }
         }
     }
-}
+}
diff --git a/...ets/userfrosting/js/handlebars-helpers.js → ...ets/userfrosting/js/handlebars-helpers.js b/...ets/userfrosting/js/handlebars-helpers.js → ...ets/userfrosting/js/handlebars-helpers.js
diff --git a/app/sprinkles/core/package.json b/app/sprinkles/core/package.json
@@ -5,7 +5,7 @@
     "bootstrap": "^3.3.6",
     "clipboard": "^1.5.16",
     "fastclick": "^1.0.6",
-    "handlebars": "^3.0.3",
+    "handlebars": "^4.1.2",
     "icheck": "^1.0.1",
     "ionicons": "^2.0.1",
     "jquery": "^3.2.1",
-Original file line number
+Diff line change
@@ Expand Up / @@ -167,4 +167,4 @@ @@
                 }
             }
         }
-    }
+    }