Merge pull request #14853 from Turbo87/handlebars

Update "handlebars" to v4.0.6
emberjs · Feb 25, 2017 · 0cda591 · 0cda591
2 parents 1c4bbba + 41a7e72
commit 0cda591
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/ember-cli-build.js b/ember-cli-build.js
@@ -274,13 +274,16 @@ function qunit() {
 }
 
 function handlebarsFix() {
-  var HANDLEBARS_UTIL = /\/utils.js$/;
+  var HANDLEBARS_PARSER = /\/parser.js$/;
   return {
     load: function(id) {
-      if (HANDLEBARS_UTIL.test(id)) {
+      if (HANDLEBARS_PARSER.test(id)) {
         var code = fs.readFileSync(id, 'utf8');
         return {
-          code: code.replace(/export var isFunction/, 'export { isFunction }'),
+          code: code
+            .replace('exports.__esModule = true;', '')
+            .replace('exports[\'default\'] = handlebars;', 'export default handlebars;'),
+
           map: { mappings: null }
         };
       }

diff --git a/package.json b/package.json
@@ -49,7 +49,7 @@
     "ember-cli-test-info": "^1.0.0",
     "ember-cli-valid-component-name": "^1.0.0",
     "ember-cli-version-checker": "^1.1.7",
-    "handlebars": "~3",
+    "handlebars": "^4.0.6",
     "jquery": "^3.1.1",
     "resolve": "^1.1.7",
     "rsvp": "^3.3.3",

diff --git a/yarn.lock b/yarn.lock
@@ -2865,7 +2865,7 @@ growly@^1.2.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/growly/-/growly-1.3.0.tgz#f10748cbe76af964b7c96c93c6bcc28af120c081"
 
-handlebars@^3.0.1, handlebars@^3.0.3, handlebars@~3:
+handlebars@^3.0.1, handlebars@^3.0.3:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-3.0.3.tgz#0e09651a2f0fb3c949160583710d551f92e6d2ad"
   dependencies:
@@ -2874,7 +2874,7 @@ handlebars@^3.0.1, handlebars@^3.0.3, handlebars@~3:
   optionalDependencies:
     uglify-js "~2.3"
 
-handlebars@^4.0.4:
+handlebars@^4.0.4, handlebars@^4.0.6:
   version "4.0.6"
   resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.0.6.tgz#2ce4484850537f9c97a8026d5399b935c4ed4ed7"
   dependencies: