emberjs · mixonic · Dec 9, 2014 · Dec 7, 2014
diff --git a/Brocfile.js b/Brocfile.js
@@ -43,7 +43,6 @@ if (process.env.DEFEATUREIFY === 'true') {
   disableDefeatureify = env === 'development';
 }
 
-var generateTemplateCompiler = require('./lib/broccoli-ember-template-compiler-generator');
 var inlineTemplatePrecompiler = require('./lib/broccoli-ember-inline-template-precompiler');
 
 /*
@@ -265,7 +264,6 @@ s3TestRunner = replace(s3TestRunner, {
     { match: new RegExp('../ember', 'g'), replacement: './ember' },
     { match: new RegExp('../qunit/qunit.css', 'g'), replacement: 'http://code.jquery.com/qunit/qunit-1.15.0.css' },
     { match: new RegExp('../qunit/qunit.js', 'g'), replacement: 'http://code.jquery.com/qunit/qunit-1.15.0.js' },
-    { match: new RegExp('../handlebars/handlebars.js', 'g'), replacement: 'http://builds.handlebarsjs.com.s3.amazonaws.com/handlebars-v2.0.0.js' },
     { match: new RegExp('../jquery/jquery.js', 'g'), replacement: 'http://code.jquery.com/jquery-1.11.1.js'}
   ]
 });
@@ -309,12 +307,6 @@ var bowerFiles = [
     files: ['jquery.js'],
     srcDir: '/',
     destDir: '/jquery'
-  }),
-
-  pickFiles('bower_components/handlebars', {
-    files: ['handlebars.js'],
-    srcDir: '/',
-    destDir: '/handlebars'
   })
 ];
 
@@ -341,11 +333,6 @@ var iifeStop  = writeFile('iife-stop', '})();');
       'ember-metal': {trees: null,  vendorRequirements: ['backburner']}
     ```
  */
-var handlebarsConfig = {
-  libPath: 'node_modules/handlebars/dist',
-  mainFile: 'handlebars.amd.js'
-};
-
 var vendoredPackages = {
   'loader':                vendoredPackage('loader'),
   'rsvp':                  vendoredEs6Package('rsvp'),
@@ -359,16 +346,8 @@ var vendoredPackages = {
   'simple-html-tokenizer': htmlbarsPackage('simple-html-tokenizer'),
   'htmlbars-test-helpers': htmlbarsPackage('htmlbars-test-helpers', { singleFile: true } ),
   'htmlbars-util':         htmlbarsPackage('htmlbars-util'),
-  'handlebars':            vendoredPackage('handlebars', handlebarsConfig)
 };
 
-var emberHandlebarsCompiler = pickFiles('packages/ember-handlebars-compiler/lib', {
-  files: ['main.js'],
-  srcDir: '/',
-  destDir: '/'
-});
-var templateCompilerTree = generateTemplateCompiler(emberHandlebarsCompiler, { srcFile: 'main.js'});
-
 var packages = require('./lib/packages');
 
 function es6Package(packageName) {
@@ -462,24 +441,11 @@ function es6Package(packageName) {
 
   if (pkg.hasTemplates) {
     /*
-       Add templateCompiler to libTree.  This is done to ensure that the templates
-       are precompiled with the local version of `ember-handlebars-compiler` (NOT
-       the `npm` version), and includes any changes.  Specifically, so that you
-       can work on the template compiler and still have functional builds.
-    */
-    libTree = mergeTrees([libTree, templateCompilerTree]);
-
-    /*
-      Utilizing the templateCompiler to compile inline handlebars templates to
-      handlebar template functions.  This is done so that only Handlebars runtime
-      is required instead of all of Handlebars.
+      Utilizing the templateCompiler to compile inline templates to
+      template functions.  This is done so that HTMLBars compiler is
+      not required for running Ember.
     */
     libTree = inlineTemplatePrecompiler(libTree);
-
-    // Remove templateCompiler from libTree as it is no longer needed.
-    libTree = removeFile(libTree, {
-      srcFile: 'ember-template-compiler.js'
-    });
   }
 
   var testTree = pickFiles('packages/' + packageName + '/tests', {
@@ -798,7 +764,7 @@ var prodCompiledTests = concatES6(testTrees, {
   }
 });
 
-var distTrees = [templateCompilerTree, compiledSource, compiledTests, testingCompiledSource, testConfig, bowerFiles];
+var distTrees = [compiledSource, compiledTests, testingCompiledSource, testConfig, bowerFiles];
 
 // If you are not running in dev add Production and Minify build to distTrees.
 // This ensures development build speed is not affected by unnecessary

diff --git a/lib/broccoli-ember-inline-template-precompiler.js b/lib/broccoli-ember-inline-template-precompiler.js
@@ -19,11 +19,11 @@ EmberTemplatePrecompiler.prototype.extensions = ['hbs'];
 EmberTemplatePrecompiler.prototype.targetExtension = 'js';
 
 EmberTemplatePrecompiler.prototype.processString = function(content, relativePath) {
-  var handlebarsCompilerPath = path.join(this._srcDir, this.handlebarsCompilerPath);
-  var handlebarsCompiler = require(path.resolve(handlebarsCompilerPath));
-
   var template;
   if (relativePath.match(/handlebars/)) {
+    var handlebarsCompilerPath = path.join(this._srcDir, this.handlebarsCompilerPath);
+    var handlebarsCompiler = require(path.resolve(handlebarsCompilerPath));
+
     template = 'import EmberHandlebars from "ember-handlebars-compiler";\n';
     template += "export default EmberHandlebars.template(" + handlebarsCompiler.precompile(content, false) + ");";
   } else if (relativePath.match(/htmlbars/)) {

diff --git a/lib/packages.js b/lib/packages.js
@@ -7,12 +7,9 @@ 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'], developmentOnly: true},
-  'ember-handlebars-compiler':  {trees: null,  requirements: ['ember-views']},
-  'ember-handlebars':           {trees: null,  requirements: ['ember-views', 'ember-handlebars-compiler'], hasTemplates: true},
-  'ember-htmlbars':             {trees: null,  vendorRequirements: ['handlebars', 'simple-html-tokenizer', 'htmlbars-util', 'htmlbars-compiler', 'htmlbars-syntax', 'htmlbars-test-helpers'], requirements: ['ember-metal-views'], hasTemplates: true},
+  'ember-htmlbars':             {trees: null,  vendorRequirements: ['simple-html-tokenizer', 'htmlbars-util', 'htmlbars-compiler', 'htmlbars-syntax', 'htmlbars-test-helpers'], requirements: ['ember-metal-views'], hasTemplates: true},
   'ember-routing':              {trees: null,  vendorRequirements: ['router', 'route-recognizer'],
                                                requirements: ['ember-runtime', 'ember-views']},
-  'ember-routing-handlebars':   {trees: null,  requirements: ['ember-routing', 'ember-handlebars']},
   'ember-routing-htmlbars':     {trees: null,  requirements: ['ember-routing', 'ember-htmlbars']},
   'ember-routing-views':        {trees: null,  requirements: ['ember-routing']},
   'ember-application':          {trees: null,  vendorRequirements: ['dag-map'], requirements: ['ember-routing']},

diff --git a/package.json b/package.json
@@ -41,10 +41,7 @@
     "express": "^4.5.0",
     "git-repo-version": "0.0.1",
     "glob": "~3.2.8",
-    "handlebars": "^2.0",
-    "htmlbars": "0.4.0",
-    "ncp": "~0.5.1",
-    "rimraf": "~2.2.8",
+    "htmlbars": "0.4.1",
     "rsvp": "~3.0.6"
   }
 }
diff --git a/packages/ember-application/lib/system/application.js b/packages/ember-application/lib/system/application.js
@@ -41,7 +41,6 @@ import ContainerDebugAdapter from "ember-extension-support/container_debug_adapt
 import {
   K
 } from 'ember-metal/core';
-import EmberHandlebars from "ember-handlebars-compiler";
 
 function props(obj) {
   var properties = [];
@@ -277,7 +276,6 @@ var Application = Namespace.extend(DeferredMixin, {
 
     if (!librariesRegistered) {
       librariesRegistered = true;
-      Ember.libraries.registerCoreLibrary('Handlebars' + (EmberHandlebars.compile ? '' : '-runtime'), EmberHandlebars.VERSION);
       Ember.libraries.registerCoreLibrary('jQuery', jQuery().jquery);
     }
 

diff --git a/packages/ember-application/lib/system/resolver.js b/packages/ember-application/lib/system/resolver.js
@@ -13,7 +13,7 @@ import {
 } from 'ember-runtime/system/string';
 import EmberObject from 'ember-runtime/system/object';
 import Namespace from 'ember-runtime/system/namespace';
-import EmberHandlebars from 'ember-handlebars';
+import helpers from 'ember-htmlbars/helpers';
 
 export var Resolver = EmberObject.extend({
   /**
@@ -350,7 +350,7 @@ export default EmberObject.extend({
     @method resolveHelper
   */
   resolveHelper: function(parsedName) {
-    return this.resolveOther(parsedName) || EmberHandlebars.helpers[parsedName.fullNameWithoutType];
+    return this.resolveOther(parsedName) || helpers[parsedName.fullNameWithoutType];
   },
   /**
     Look up the specified object (from parsedName) on the appropriate

diff --git a/packages/ember-application/tests/system/application_test.js b/packages/ember-application/tests/system/application_test.js
@@ -8,17 +8,14 @@ import Router from "ember-routing/system/router";
 import View from "ember-views/views/view";
 import Controller from "ember-runtime/controllers/controller";
 import NoneLocation from "ember-routing/location/none_location";
-import EmberHandlebars from "ember-handlebars";
 import EmberObject from "ember-runtime/system/object";
 import jQuery from "ember-views/system/jquery";
+import compile from "ember-htmlbars/system/compile";
 
 var trim = jQuery.trim;
 
 var app, application, originalLookup, originalDebug;
 
-var compile = EmberHandlebars.compile;
-
-
 QUnit.module("Ember.Application", {
   setup: function() {
     originalLookup = Ember.lookup;
@@ -229,10 +226,9 @@ test('enable log of libraries with an ENV var', function() {
     });
   });
 
-  equal(messages[1], "Ember      : " + Ember.VERSION);
-  equal(messages[2], "Handlebars : " + EmberHandlebars.VERSION);
-  equal(messages[3], "jQuery     : " + jQuery().jquery);
-  equal(messages[4], "my-lib     : " + "2.0.0a");
+  equal(messages[1], "Ember  : " + Ember.VERSION);
+  equal(messages[2], "jQuery : " + jQuery().jquery);
+  equal(messages[3], "my-lib : " + "2.0.0a");
 
   Ember.libraries.deRegister("my-lib");
   Ember.LOG_VERSION = false;

diff --git a/packages/ember-application/tests/system/dependency_injection/default_resolver_test.js b/packages/ember-application/tests/system/dependency_injection/default_resolver_test.js
@@ -3,15 +3,11 @@ import run from "ember-metal/run_loop";
 import Logger from "ember-metal/logger";
 import Controller from "ember-runtime/controllers/controller";
 import EmberObject from "ember-runtime/system/object";
-import EmberHandlebars from "ember-handlebars";
 import Namespace from "ember-runtime/system/namespace";
 import Application from "ember-application/system/application";
-
-var compile, registerHelper;
-compile = EmberHandlebars.compile;
-registerHelper = function(name, fn) {
-  EmberHandlebars.registerHelper(name, fn);
-};
+import {
+  registerHelper
+} from "ember-htmlbars/helpers";
 
 var locator, application, originalLookup, originalLoggerInfo;
 

diff --git a/packages/ember-htmlbars/lib/compat.js b/packages/ember-htmlbars/lib/compat.js
@@ -1,4 +1,4 @@
-import EmberHandlebars from "ember-handlebars";
+import Ember from "ember-metal/core";
 import helpers from "ember-htmlbars/helpers";
 import template from "ember-htmlbars/system/template";
 import compile from "ember-htmlbars/system/compile";
@@ -12,7 +12,9 @@ import compatRegisterBoundHelper from "ember-htmlbars/compat/register-bound-help
 import compatPrecompile from "ember-htmlbars/compat/precompile";
 import makeViewHelper from "ember-htmlbars/system/make-view-helper";
 
+var EmberHandlebars;
 if (Ember.FEATURES.isEnabled('ember-htmlbars')) {
+  EmberHandlebars = Ember.Handlebars = { };
   EmberHandlebars.helpers = helpers;
   EmberHandlebars.helper = compatHandlebarsHelper;
   EmberHandlebars.registerHelper = compatRegisterHelper;

diff --git a/packages/ember-htmlbars/lib/helpers/collection.js b/packages/ember-htmlbars/lib/helpers/collection.js
@@ -4,8 +4,6 @@
 */
 
 import Ember from "ember-metal/core"; // Ember.assert, Ember.deprecate
-import EmberHandlebars from "ember-handlebars-compiler";
-
 import { IS_BINDING } from "ember-metal/mixin";
 import { fmt } from "ember-runtime/system/string";
 import { get } from "ember-metal/property_get";
@@ -219,7 +217,7 @@ export function collectionHelper(params, hash, options, env) {
   }
 
   var emptyViewClass;
-  if (inverse && inverse !== EmberHandlebars.VM.noop) {
+  if (inverse) {
     emptyViewClass = get(collectionPrototype, 'emptyViewClass');
     emptyViewClass = emptyViewClass.extend({
           template: inverse,

diff --git a/packages/ember-htmlbars/lib/utils/string.js b/packages/ember-htmlbars/lib/utils/string.js
@@ -4,7 +4,10 @@
 */
 
 // required so we can extend this object.
-import SafeString from "htmlbars-util/safe-string";
+import {
+  SafeString,
+  escapeExpression
+} from "htmlbars-util";
 import EmberStringUtils from "ember-runtime/system/string";
 
 /**
@@ -53,4 +56,8 @@ if (Ember.EXTEND_PROTOTYPES === true || Ember.EXTEND_PROTOTYPES.String) {
   };
 }
 
-export { SafeString, htmlSafe };
+export {
+  SafeString,
+  htmlSafe,
+  escapeExpression
+};
diff --git a/packages/ember-htmlbars/tests/compat/make-view-helper_test.js b/packages/ember-htmlbars/tests/compat/make-view-helper_test.js
@@ -1,20 +1,13 @@
 import EmberView from "ember-views/views/view";
 import Container from 'container/container';
-import EmberHandlebars from 'ember-handlebars-compiler';
-import htmlbarsCompile from "ember-htmlbars/system/compile";
+import compile from "ember-htmlbars/system/compile";
+import makeViewHelper from "ember-htmlbars/system/make-view-helper";
 import Component from "ember-views/views/component";
 import { runAppend, runDestroy } from "ember-runtime/tests/utils";
 
-var compile;
-if (Ember.FEATURES.isEnabled('ember-htmlbars')) {
-  compile = htmlbarsCompile;
-} else {
-  compile = EmberHandlebars.compile;
-}
-
 var container, view;
 
-QUnit.module('ember-htmlbars: Ember.Handlebars.makeViewHelper compat', {
+QUnit.module('ember-htmlbars: makeViewHelper compat', {
   setup: function() {
     container = new Container();
     container.optionsForType('helper', { instantiate: false });
@@ -26,13 +19,13 @@ QUnit.module('ember-htmlbars: Ember.Handlebars.makeViewHelper compat', {
   }
 });
 
-test('EmberHandlebars.makeViewHelper', function() {
+test('makeViewHelper', function() {
   expect(1);
 
   var ViewHelperComponent = Component.extend({
     layout: compile('woot!')
   });
-  var helper = EmberHandlebars.makeViewHelper(ViewHelperComponent);
+  var helper = makeViewHelper(ViewHelperComponent);
   container.register('helper:view-helper', helper);
 
   view = EmberView.extend({

diff --git a/packages/ember-htmlbars/tests/compat/precompile_test.js b/packages/ember-htmlbars/tests/compat/precompile_test.js
@@ -1,4 +1,5 @@
-import EmberHandlebars from "ember-handlebars-compiler";
+import EmberHandlebars from "ember-htmlbars/compat";
+
 var precompile = EmberHandlebars.precompile;
 var parse = EmberHandlebars.parse;
 var template = 'Hello World';

diff --git a/packages/ember-htmlbars/tests/helper_test.js b/packages/ember-htmlbars/tests/helper_test.js
@@ -1,26 +1,14 @@
 import EmberView from "ember-views/views/view";
 import run from "ember-metal/run_loop";
 import EmberObject from "ember-runtime/system/object";
-import EmberHandlebars from "ember-handlebars-compiler";
 import { set } from "ember-metal/property_set";
 import { runAppend, runDestroy } from "ember-runtime/tests/utils";
 
 import {
-  default as htmlbarsHelpers,
-  helper as htmlbarsHelper
+  default as helpers,
+  helper
 } from "ember-htmlbars/helpers";
-import htmlbarsCompile from "ember-htmlbars/system/compile";
-
-var compile, helper, helpers;
-if (Ember.FEATURES.isEnabled('ember-htmlbars')) {
-  compile = htmlbarsCompile;
-  helpers = htmlbarsHelpers;
-  helper = htmlbarsHelper;
-} else {
-  compile = EmberHandlebars.compile;
-  helper = EmberHandlebars.helper;
-  helpers = EmberHandlebars.helpers;
-}
+import compile from "ember-htmlbars/system/compile";
 
 var view;
 

diff --git a/packages/ember-htmlbars/tests/helpers/bind_attr_test.js b/packages/ember-htmlbars/tests/helpers/bind_attr_test.js
@@ -4,7 +4,6 @@ import run from "ember-metal/run_loop";
 import Namespace from "ember-runtime/system/namespace";
 import EmberView from "ember-views/views/view";
 import _MetamorphView from "ember-views/views/metamorph_view";
-import EmberHandlebars from "ember-handlebars";
 import EmberObject from "ember-runtime/system/object";
 import { A } from "ember-runtime/system/native_array";
 import { computed } from "ember-metal/computed";
@@ -13,19 +12,8 @@ import Container from "ember-runtime/system/container";
 import { set } from "ember-metal/property_set";
 import { runAppend, runDestroy } from "ember-runtime/tests/utils";
 
-import {
-  default as htmlbarsHelpers
-} from "ember-htmlbars/helpers";
-import htmlbarsCompile from "ember-htmlbars/system/compile";
-
-var compile, helpers;
-if (Ember.FEATURES.isEnabled('ember-htmlbars')) {
-  compile = htmlbarsCompile;
-  helpers = htmlbarsHelpers;
-} else {
-  compile = EmberHandlebars.compile;
-  helpers = EmberHandlebars.helpers;
-}
+import helpers from "ember-htmlbars/helpers";
+import compile from "ember-htmlbars/system/compile";
 
 var view;