Merge pull request #14061 from rwjblue/provide-correct-glimmer-templa…

…te-compiler Update emberjs-build to v0.14.0.
emberjs · Aug 14, 2016 · fe04569 · fe04569
2 parents 31d3ba7 + 18678b7
commit fe04569
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/ember-cli-build.js b/ember-cli-build.js
@@ -143,6 +143,7 @@ module.exports = function() {
       production: getFeatures('production')
     },
     htmlbars: require('htmlbars'),
+    glimmer: require('glimmer-engine'),
     packages: getPackages(features),
     vendoredPackages: vendorPackages,
     version: version

diff --git a/package.json b/package.json
@@ -33,13 +33,13 @@
     "ember-cli-sauce": "^1.4.2",
     "ember-cli-yuidoc": "0.8.4",
     "ember-publisher": "0.0.7",
-    "emberjs-build": "0.13.5",
+    "emberjs-build": "0.14.0",
     "express": "^4.5.0",
     "finalhandler": "^0.4.0",
     "git-repo-info": "^1.1.4",
     "git-repo-version": "^0.3.1",
     "github": "^0.2.3",
-    "glimmer-engine": "tildeio/glimmer#f961049",
+    "glimmer-engine": "0.7.0",
     "glob": "^5.0.13",
     "htmlbars": "0.14.24",
     "mocha": "^2.4.5",