Implement Glimmer Engine

.jshintrc

@@ -6,7 +6,6 @@
         "Ember",
         "DS",
         "Handlebars",
-        "Metamorph",
         "RSVP",
         "require",
         "requireModule",

bin/bower_ember_build

@@ -28,6 +28,8 @@ case $TRAVIS_BRANCH in
     CHANNEL="release" ;;
   "metal-views" )
     CHANNEL="metal-views" ;;
+  "idempotent-rerender" )
+    CHANNEL="glimmer" ;;
   * )
     echo "Not a bower release branch.  Exiting!"
     exit 0 ;;

config/s3ProjectConfig.js

@@ -18,6 +18,10 @@ function fileObject(baseName, extension, contentType, currentRevision, tag, date
   var obj =  {
     contentType: contentType,
       destinations: {
+        glimmer: [
+          "glimmer" + fullName,
+          "canary/shas/" + currentRevision + fullName
+        ],
         canary: [
           "latest" + fullName,
           "canary" + fullName,

lib/packages.js

@@ -7,8 +7,8 @@ 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-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-template-compiler':    {trees: null,  vendorRequirements: ['htmlbars-runtime'], templateCompilerVendor: ['simple-html-tokenizer', 'morph-range', 'htmlbars-runtime', 'htmlbars-util', 'htmlbars-compiler', 'htmlbars-syntax', 'htmlbars-test-helpers']},
+  'ember-htmlbars':             {trees: null,  vendorRequirements: ['htmlbars-util', 'htmlbars-runtime'], requirements: ['ember-metal-views'], testingVendorRequirements: [ 'htmlbars-test-helpers'], hasTemplates: true},
   'ember-routing':              {trees: null,  vendorRequirements: ['router', 'route-recognizer'],
                                                requirements: ['ember-runtime', 'ember-views']},
   'ember-routing-htmlbars':     {trees: null,  requirements: ['ember-routing', 'ember-htmlbars']},

package.json

@@ -19,11 +19,11 @@
     "ember-cli-sauce": "^1.0.0",
     "ember-cli-yuidoc": "^0.4.0",
     "ember-publisher": "0.0.7",
-    "emberjs-build": "0.0.47",
+    "emberjs-build": "0.1.1",
     "express": "^4.5.0",
     "github": "^0.2.3",
     "glob": "~4.3.2",
-    "htmlbars": "0.11.3",
+    "htmlbars": "0.13.12",
     "qunit-extras": "^1.3.0",
     "qunitjs": "^1.16.0",
     "route-recognizer": "0.1.5",

packages/container/lib/registry.js

@@ -37,6 +37,7 @@ function Registry(options) {
 
   this._normalizeCache        = dictionary(null);
   this._resolveCache          = dictionary(null);
+  this._failCache             = dictionary(null);
 
   this._options               = dictionary(null);
   this._typeOptions           = dictionary(null);
@@ -225,6 +226,7 @@ Registry.prototype = {
       throw new Error('Cannot re-register: `' + fullName +'`, as it has already been resolved.');
     }
 
+    delete this._failCache[normalizedName];
     this.registrations[normalizedName] = factory;
     this._options[normalizedName] = (options || {});
   },
@@ -252,6 +254,7 @@ Registry.prototype = {
 
     delete this.registrations[normalizedName];
     delete this._resolveCache[normalizedName];
+    delete this._failCache[normalizedName];
     delete this._options[normalizedName];
   },
 
@@ -744,9 +747,15 @@ Registry.prototype = {
 function resolve(registry, normalizedName) {
   var cached = registry._resolveCache[normalizedName];
   if (cached) { return cached; }
+  if (registry._failCache[normalizedName]) { return; }
 
   var resolved = registry.resolver(normalizedName) || registry.registrations[normalizedName];
-  registry._resolveCache[normalizedName] = resolved;
+
+  if (resolved) {
+    registry._resolveCache[normalizedName] = resolved;
+  } else {
+    registry._failCache[normalizedName] = true;
+  }
 
   return resolved;
 }

packages/ember-application/lib/system/application.js

@@ -19,12 +19,11 @@ import Controller from "ember-runtime/controllers/controller";
 import EnumerableUtils from "ember-metal/enumerable_utils";
 import ObjectController from "ember-runtime/controllers/object_controller";
 import ArrayController from "ember-runtime/controllers/array_controller";
-import Renderer from "ember-views/system/renderer";
-import DOMHelper from "dom-helper";
+import Renderer from "ember-metal-views/renderer";
+import DOMHelper from "ember-htmlbars/system/dom-helper";
 import SelectView from "ember-views/views/select";
 import { OutletView } from "ember-routing-views/views/outlet";
 import EmberView from "ember-views/views/view";
-import _MetamorphView from "ember-views/views/metamorph_view";
 import EventDispatcher from "ember-views/system/event_dispatcher";
 import jQuery from "ember-views/system/jquery";
 import Route from "ember-routing/system/route";
@@ -1016,7 +1015,6 @@ Application.reopenClass({
 
     registry.injection('view', '_viewRegistry', '-view-registry:main');
 
-    registry.register('view:default', _MetamorphView);
     registry.register('view:toplevel', EmberView.extend());
 
     registry.register('route:basic', Route, { instantiate: false });

packages/ember-application/tests/system/application_test.js

@@ -86,7 +86,6 @@ QUnit.test("you cannot make two default applications without a rootElement error
 
 QUnit.test("acts like a namespace", function() {
   var lookup = Ember.lookup = {};
-  var app;
 
   run(function() {
     app = lookup.TestApp = Application.create({ rootElement: '#two', router: false });
@@ -139,7 +138,7 @@ QUnit.test("initialize application via initialize call", function() {
     });
 
     app.ApplicationView = View.extend({
-      template() { return "<h1>Hello!</h1>"; }
+      template: compile("<h1>Hello!</h1>")
     });
   });
 
@@ -160,9 +159,7 @@ QUnit.test("initialize application with stateManager via initialize call from Ro
       location: 'none'
     });
 
-    app.register('template:application', function() {
-      return "<h1>Hello!</h1>";
-    });
+    app.register('template:application', compile("<h1>Hello!</h1>"));
   });
 
   var router = app.__container__.lookup('router:main');
@@ -177,9 +174,7 @@ QUnit.test("ApplicationView is inserted into the page", function() {
     });
 
     app.ApplicationView = View.extend({
-      render(buffer) {
-        buffer.push("<h1>Hello!</h1>");
-      }
+      template: compile("<h1>Hello!</h1>")
     });
 
     app.ApplicationController = Controller.extend();

packages/ember-application/tests/system/dependency_injection/custom_resolver_test.js

@@ -2,12 +2,13 @@ import jQuery from "ember-views/system/jquery";
 import run from "ember-metal/run_loop";
 import Application from "ember-application/system/application";
 import DefaultResolver from "ember-application/system/resolver";
+import compile from "ember-template-compiler/system/compile";
 
 var application;
 
 QUnit.module("Ember.Application Dependency Injection – customResolver", {
   setup() {
-    function fallbackTemplate() { return "<h1>Fallback</h1>"; }
+    var fallbackTemplate = compile("<h1>Fallback</h1>");
 
     var Resolver = DefaultResolver.extend({
       resolveTemplate(resolvable) {

packages/ember-application/tests/system/initializers_test.js

@@ -237,6 +237,7 @@ QUnit.test("initializers set on Application subclasses should not be shared betw
   var firstInitializerRunCount = 0;
   var secondInitializerRunCount = 0;
   var FirstApp = Application.extend();
+  var firstApp, secondApp;
   FirstApp.initializer({
     name: 'first',
     initialize(registry) {
@@ -252,27 +253,32 @@ QUnit.test("initializers set on Application subclasses should not be shared betw
   });
   jQuery('#qunit-fixture').html('<div id="first"></div><div id="second"></div>');
   run(function() {
-    FirstApp.create({
+    firstApp = FirstApp.create({
       router: false,
       rootElement: '#qunit-fixture #first'
     });
   });
   equal(firstInitializerRunCount, 1, 'first initializer only was run');
   equal(secondInitializerRunCount, 0, 'first initializer only was run');
   run(function() {
-    SecondApp.create({
+    secondApp = SecondApp.create({
       router: false,
       rootElement: '#qunit-fixture #second'
     });
   });
   equal(firstInitializerRunCount, 1, 'second initializer only was run');
   equal(secondInitializerRunCount, 1, 'second initializer only was run');
+  run(function() {
+    firstApp.destroy();
+    secondApp.destroy();
+  });
 });
 
 QUnit.test("initializers are concatenated", function() {
   var firstInitializerRunCount = 0;
   var secondInitializerRunCount = 0;
   var FirstApp = Application.extend();
+  var firstApp, secondApp;
   FirstApp.initializer({
     name: 'first',
     initialize(registry) {
@@ -290,7 +296,7 @@ QUnit.test("initializers are concatenated", function() {
 
   jQuery('#qunit-fixture').html('<div id="first"></div><div id="second"></div>');
   run(function() {
-    FirstApp.create({
+    firstApp = FirstApp.create({
       router: false,
       rootElement: '#qunit-fixture #first'
     });
@@ -299,13 +305,17 @@ QUnit.test("initializers are concatenated", function() {
   equal(secondInitializerRunCount, 0, 'first initializer only was run when base class created');
   firstInitializerRunCount = 0;
   run(function() {
-    SecondApp.create({
+    secondApp = SecondApp.create({
       router: false,
       rootElement: '#qunit-fixture #second'
     });
   });
   equal(firstInitializerRunCount, 1, 'first initializer was run when subclass created');
   equal(secondInitializerRunCount, 1, 'second initializers was run when subclass created');
+  run(function() {
+    firstApp.destroy();
+    secondApp.destroy();
+  });
 });
 
 QUnit.test("initializers are per-app", function() {

packages/ember-application/tests/system/instance_initializers_test.js

@@ -241,6 +241,8 @@ if (Ember.FEATURES.isEnabled('ember-application-instance-initializers')) {
     var firstInitializerRunCount = 0;
     var secondInitializerRunCount = 0;
     var FirstApp = Application.extend();
+    var firstApp, secondApp;
+
     FirstApp.instanceInitializer({
       name: 'first',
       initialize(registry) {
@@ -256,27 +258,34 @@ if (Ember.FEATURES.isEnabled('ember-application-instance-initializers')) {
     });
     jQuery('#qunit-fixture').html('<div id="first"></div><div id="second"></div>');
     run(function() {
-      FirstApp.create({
+      firstApp = FirstApp.create({
         router: false,
         rootElement: '#qunit-fixture #first'
       });
     });
     equal(firstInitializerRunCount, 1, 'first initializer only was run');
     equal(secondInitializerRunCount, 0, 'first initializer only was run');
     run(function() {
-      SecondApp.create({
+      secondApp = SecondApp.create({
         router: false,
         rootElement: '#qunit-fixture #second'
       });
     });
     equal(firstInitializerRunCount, 1, 'second initializer only was run');
     equal(secondInitializerRunCount, 1, 'second initializer only was run');
+    run(function() {
+    firstApp.destroy();
+    secondApp.destroy();
+  });
+
   });
 
   QUnit.test("initializers are concatenated", function() {
     var firstInitializerRunCount = 0;
     var secondInitializerRunCount = 0;
     var FirstApp = Application.extend();
+    var firstApp, secondApp;
+
     FirstApp.instanceInitializer({
       name: 'first',
       initialize(registry) {
@@ -294,7 +303,7 @@ if (Ember.FEATURES.isEnabled('ember-application-instance-initializers')) {
 
     jQuery('#qunit-fixture').html('<div id="first"></div><div id="second"></div>');
     run(function() {
-      FirstApp.create({
+      firstApp = FirstApp.create({
         router: false,
         rootElement: '#qunit-fixture #first'
       });
@@ -303,13 +312,17 @@ if (Ember.FEATURES.isEnabled('ember-application-instance-initializers')) {
     equal(secondInitializerRunCount, 0, 'first initializer only was run when base class created');
     firstInitializerRunCount = 0;
     run(function() {
-      SecondApp.create({
+      secondApp = SecondApp.create({
         router: false,
         rootElement: '#qunit-fixture #second'
       });
     });
     equal(firstInitializerRunCount, 1, 'first initializer was run when subclass created');
     equal(secondInitializerRunCount, 1, 'second initializers was run when subclass created');
+    run(function() {
+      firstApp.destroy();
+      secondApp.destroy();
+    });
   });
 
   QUnit.test("initializers are per-app", function() {

packages/ember-application/tests/system/logging_test.js

@@ -212,12 +212,12 @@ QUnit.test("log which view is used with a template", function() {
   }
 
   App.register('template:application', compile('{{outlet}}'));
-  App.register('template:foo', function() { return 'Template with custom view'; });
+  App.register('template:foo', compile('Template with custom view'));
   App.register('view:posts', View.extend({ templateName: 'foo' }));
   run(App, 'advanceReadiness');
 
   visit('/posts').then(function() {
-    equal(logs['view:application'], 1, 'expected: Should log use of default view');
+    equal(logs['view:application'], 1, 'toplevel view always get an element');
     equal(logs['view:index'], undefined, 'expected: Should not log when index is not present.');
     equal(logs['view:posts'], 1, 'expected: Rendering posts with PostsView.');
   });

packages/ember-htmlbars/lib/compat/handlebars-get.js

@@ -18,5 +18,5 @@
 export default function handlebarsGet(root, path, options) {
   Ember.deprecate('Usage of Ember.Handlebars.get is deprecated, use a Component or Ember.Handlebars.makeBoundHelper instead.');
 
-  return options.data.view.getStream(path).value();
+  return options.legacyGetPath(path);
 }