Embed the htmlbars-runtime into the ember-template-compiler package.

emberjs · Feb 12, 2015 · a4d363e · a4d363e
1 parent 82845b7
commit a4d363e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/Brocfile.js b/Brocfile.js
@@ -15,7 +15,7 @@ var vendoredES6Package = require('emberjs-build/lib/es6-vendored-package');
 var emberBuild = new EmberBuild({
   htmlbars: require('htmlbars'),
   packages: packages,
-  _vendoredPackages: {
+  vendoredPackages: {
       'loader':                vendoredPackage('loader'),
       'rsvp':                  vendoredES6Package('rsvp'),
       'backburner':            vendoredES6Package('backburner'),
@@ -25,6 +25,7 @@ var emberBuild = new EmberBuild({
       'dom-helper':            htmlbarsPackage('dom-helper'),
       'morph-range':           htmlbarsPackage('morph-range'),
       'morph-attr':            htmlbarsPackage('morph-attr'),
+      'htmlbars-runtime':      htmlbarsPackage('htmlbars-runtime'),
       'htmlbars-compiler':     htmlbarsPackage('htmlbars-compiler'),
       'htmlbars-syntax':       htmlbarsPackage('htmlbars-syntax'),
       'simple-html-tokenizer': htmlbarsPackage('simple-html-tokenizer'),

diff --git a/lib/packages.js b/lib/packages.js
@@ -7,7 +7,7 @@ module.exports = {
   'ember-views':                {trees: null,  requirements: ['ember-runtime', 'ember-metal-views']},
   'ember-extension-support':    {trees: null,  requirements: ['ember-application']},
   'ember-testing':              {trees: null,  requirements: ['ember-application', 'ember-routing'], testing: true},
-  'ember-template-compiler':    {trees: null,  templateCompilerVendor: ['simple-html-tokenizer', 'htmlbars-util', 'htmlbars-compiler', 'htmlbars-syntax', 'htmlbars-test-helpers']},
+  'ember-template-compiler':    {trees: null,  templateCompilerVendor: ['simple-html-tokenizer', 'htmlbars-runtime', 'htmlbars-util', 'htmlbars-compiler', 'htmlbars-syntax', 'htmlbars-test-helpers']},
   'ember-htmlbars':             {trees: null,  vendorRequirements: ['htmlbars-util'], requirements: ['ember-metal-views'], testingVendorRequirements: [ 'htmlbars-test-helpers'], hasTemplates: true},
   'ember-routing':              {trees: null,  vendorRequirements: ['router', 'route-recognizer'],
                                                requirements: ['ember-runtime', 'ember-views']},

diff --git a/package.json b/package.json
@@ -17,7 +17,7 @@
     "ember-cli": "0.1.12",
     "ember-cli-yuidoc": "^0.4.0",
     "ember-publisher": "0.0.7",
-    "emberjs-build": "0.0.28",
+    "emberjs-build": "0.0.30",
     "express": "^4.5.0",
     "github": "^0.2.3",
     "glob": "~4.3.2",