HTMLBars package cleanup (#13471)

Start removing circular refs between ember-views and ember-htmlbars and create a cleaner separation between ember-glimmer and ember-htmlbars, for the ember-templates PR.

lib/packages.js

@@ -7,14 +7,13 @@ var packages = {
   'ember-environment':          {trees: null,  requirements: [], skipTests: true},
   'ember-console':              {trees: null,  requirements: [], skipTests: true},
   'ember-metal':                {trees: null,  requirements: ['ember-environment'], vendorRequirements: ['backburner']},
-  'ember-metal-views':          {trees: null,  vendorRequirements: ['dom-helper', 'morph-range', 'morph-attr']},
   'ember-debug':                {trees: null,  requirements: ['ember-metal'], testing: true},
   'ember-runtime':              {trees: null,  vendorRequirements: ['rsvp'], requirements: ['container', 'ember-environment', 'ember-console', 'ember-metal']},
-  'ember-views':                {trees: null,  requirements: ['ember-runtime', 'ember-metal-views']},
+  'ember-views':                {trees: null,  requirements: ['ember-runtime']},
   'ember-extension-support':    {trees: null,  requirements: ['ember-application']},
   'ember-testing':              {trees: null,  requirements: ['ember-application', 'ember-routing'], testing: true},
   'ember-template-compiler':    {trees: null,  requirements: ['ember-metal', 'ember-environment', 'ember-console'], vendorRequirements: ['htmlbars-runtime'], templateCompilerVendor: ['simple-html-tokenizer', 'morph-range', 'htmlbars-runtime', 'htmlbars-util', 'htmlbars-compiler', 'htmlbars-syntax', 'htmlbars-test-helpers', 'backburner']},
-  'ember-htmlbars':             {trees: null,  vendorRequirements: ['htmlbars-util', 'htmlbars-runtime'], requirements: ['ember-metal-views'], testingVendorRequirements: [ 'htmlbars-test-helpers'], hasTemplates: true},
+  'ember-htmlbars':             {trees: null,  vendorRequirements: ['dom-helper', 'morph-range', 'morph-attr', 'htmlbars-util', 'htmlbars-runtime'], requirements: [], 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']},

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

@@ -14,7 +14,7 @@ import { runLoadHooks } from 'ember-runtime/system/lazy_load';
 import run from 'ember-metal/run_loop';
 import Controller from 'ember-runtime/controllers/controller';
 import HTMLBarsDOMHelper from 'ember-htmlbars/system/dom-helper';
-import * as HTMLBarsRenderer from 'ember-metal-views';
+import * as HTMLBarsRenderer from 'ember-htmlbars/renderer';
 import topLevelViewTemplate from 'ember-htmlbars/templates/top-level-view';
 import { OutletView as HTMLBarsOutletView } from 'ember-routing-views/views/outlet';
 import EmberView from 'ember-views/views/view';
@@ -1129,7 +1129,7 @@ function glimmerSetupRegistry(registry) {
   let OutletView = require('ember-glimmer/ember-routing-view').OutletView;
   registry.register('view:-outlet', OutletView);
 
-  let { InteractiveRenderer, InertRenderer } = require('ember-glimmer/ember-metal-views');
+  let { InteractiveRenderer, InertRenderer } = require('ember-glimmer/renderer');
   registry.register('renderer:-dom', InteractiveRenderer);
   registry.register('renderer:-inert', InertRenderer);
 

packages/ember-glimmer/lib/ember-metal-views/index.js → packages/ember-glimmer/lib/renderer.js

@@ -1,4 +1,4 @@
-import { RootReference } from '../utils/references';
+import { RootReference } from './utils/references';
 import run from 'ember-metal/run_loop';
 import { CURRENT_TAG } from 'glimmer-reference';
 

packages/ember-glimmer/tests/utils/helpers.js

@@ -1,5 +1,5 @@
 export { default as Helper, helper } from 'ember-glimmer/helper';
 export { default as Component } from 'ember-glimmer/ember-views/component';
 export { DOMHelper } from 'glimmer-runtime';
-export { InteractiveRenderer, InertRenderer } from 'ember-glimmer/ember-metal-views';
+export { InteractiveRenderer, InertRenderer } from 'ember-glimmer/renderer';
 export { default as compile } from 'ember-glimmer/ember-template-compiler/system/compile';

packages/ember-htmlbars/lib/glimmer-component.js

@@ -1,7 +1,6 @@
 import CoreView from 'ember-views/views/core_view';
 import ViewChildViewsSupport from 'ember-views/mixins/view_child_views_support';
 import ViewStateSupport from 'ember-views/mixins/view_state_support';
-import TemplateRenderingSupport from 'ember-views/mixins/template_rendering_support';
 import ClassNamesSupport from 'ember-views/mixins/class_names_support';
 import InstrumentationSupport from 'ember-views/mixins/instrumentation_support';
 import AriaRoleSupport from 'ember-views/mixins/aria_role_support';
@@ -11,7 +10,6 @@ import EmberView from 'ember-views/views/view';
 export default CoreView.extend(
   ViewChildViewsSupport,
   ViewStateSupport,
-  TemplateRenderingSupport,
   ClassNamesSupport,
   InstrumentationSupport,
   AriaRoleSupport,

packages/ember-htmlbars/lib/hooks/component.js

@@ -1,7 +1,7 @@
 import isEnabled from 'ember-metal/features';
 import { assert } from 'ember-metal/debug';
 import ComponentNodeManager from 'ember-htmlbars/node-managers/component-node-manager';
-import buildComponentTemplate, { buildHTMLTemplate } from 'ember-views/system/build-component-template';
+import buildComponentTemplate, { buildHTMLTemplate } from 'ember-htmlbars/system/build-component-template';
 import lookupComponent from 'ember-htmlbars/utils/lookup-component';
 import assign from 'ember-metal/assign';
 import EmptyObject from 'ember-metal/empty_object';

packages/ember-htmlbars/lib/node-managers/component-node-manager.js

@@ -1,5 +1,5 @@
 import { assert, warn, runInDebug } from 'ember-metal/debug';
-import buildComponentTemplate from 'ember-views/system/build-component-template';
+import buildComponentTemplate from 'ember-htmlbars/system/build-component-template';
 import getCellOrValue from 'ember-htmlbars/hooks/get-cell-or-value';
 import { get } from 'ember-metal/property_get';
 import { set } from 'ember-metal/property_set';

packages/ember-htmlbars/lib/node-managers/view-node-manager.js

@@ -1,6 +1,6 @@
 import assign from 'ember-metal/assign';
 import { assert, warn } from 'ember-metal/debug';
-import buildComponentTemplate from 'ember-views/system/build-component-template';
+import buildComponentTemplate from 'ember-htmlbars/system/build-component-template';
 import { get } from 'ember-metal/property_get';
 import { set } from 'ember-metal/property_set';
 import setProperties from 'ember-metal/set_properties';

packages/ember-metal-views/lib/htmlbars-renderer.js → packages/ember-htmlbars/lib/renderer.js

@@ -3,9 +3,10 @@ import { get } from 'ember-metal/property_get';
 import { set } from 'ember-metal/property_set';
 import assign from 'ember-metal/assign';
 import setProperties from 'ember-metal/set_properties';
-import buildComponentTemplate from 'ember-views/system/build-component-template';
+import buildComponentTemplate from 'ember-htmlbars/system/build-component-template';
 import { environment } from 'ember-environment';
 import { internal } from 'htmlbars-runtime';
+import { renderHTMLBarsBlock } from 'ember-htmlbars/system/render-view';
 
 export function Renderer(domHelper, { destinedForDOM } = {}) {
   this._dom = domHelper;
@@ -39,7 +40,7 @@ Renderer.prototype.prerenderTopLevelView =
       templates: template ? { default: template.raw } : undefined
     }).block;
 
-    view.renderBlock(block, renderNode);
+    renderHTMLBarsBlock(view, block, renderNode);
     view.lastResult = renderNode.lastResult;
     this.clearRenderedViews(view.env);
   };

packages/ember-htmlbars/lib/system/render-env.js

@@ -1,5 +1,5 @@
 import defaultEnv from 'ember-htmlbars/env';
-import { MorphSet } from 'ember-metal-views';
+import { MorphSet } from 'ember-htmlbars/renderer';
 import { getOwner } from 'container/owner';
 
 export default function RenderEnv(options) {

packages/ember-htmlbars/tests/attr_nodes/data_test.js

@@ -2,7 +2,7 @@ import EmberView from 'ember-views/views/view';
 import run from 'ember-metal/run_loop';
 import EmberObject from 'ember-runtime/system/object';
 import compile from 'ember-template-compiler/system/compile';
-import { InteractiveRenderer } from 'ember-metal-views';
+import { InteractiveRenderer } from 'ember-htmlbars/renderer';
 import { equalInnerHTML } from 'htmlbars-test-helpers';
 import { domHelper as dom } from 'ember-htmlbars/env';
 import { runAppend, runDestroy } from 'ember-runtime/tests/utils';

packages/ember-htmlbars/tests/utils/helpers.js

@@ -1,5 +1,5 @@
 export { default as Helper, helper } from 'ember-htmlbars/helper';
 export { default as DOMHelper } from 'ember-htmlbars/system/dom-helper';
 export { default as Component } from 'ember-views/components/component';
-export { InteractiveRenderer, InertRenderer } from 'ember-metal-views';
+export { InteractiveRenderer, InertRenderer } from 'ember-htmlbars/renderer';
 export { default as compile } from 'ember-template-compiler/system/compile';

packages/ember-views/lib/index.js

@@ -13,7 +13,7 @@ import {
 } from 'ember-views/system/utils';
 import 'ember-views/system/ext';  // for the side effect of extending Ember.run.queues
 
-import { Renderer } from 'ember-metal-views';
+import { Renderer } from 'ember-htmlbars/renderer';
 import Component from 'ember-views/components/component';
 
 import EventDispatcher from 'ember-views/system/event_dispatcher';

packages/ember-views/lib/views/core_view.js

@@ -6,7 +6,7 @@ import Evented from 'ember-runtime/mixins/evented';
 import ActionHandler, { deprecateUnderscoreActions } from 'ember-runtime/mixins/action_handler';
 import { typeOf } from 'ember-runtime/utils';
 
-import { InteractiveRenderer } from 'ember-metal-views';
+import { InteractiveRenderer } from 'ember-htmlbars/renderer';
 import { cloneStates, states } from 'ember-views/views/states';
 import { internal } from 'htmlbars-runtime';
 import require from 'require';

packages/ember-views/lib/views/view.js

@@ -5,7 +5,6 @@ import ViewContextSupport from 'ember-views/mixins/view_context_support';
 import ViewChildViewsSupport from 'ember-views/mixins/view_child_views_support';
 import ViewLegacyChildViewsSupport from 'ember-views/mixins/legacy_child_views_support';
 import ViewStateSupport from 'ember-views/mixins/view_state_support';
-import TemplateRenderingSupport from 'ember-views/mixins/template_rendering_support';
 import ClassNamesSupport from 'ember-views/mixins/class_names_support';
 import LegacyViewSupport from 'ember-views/mixins/legacy_view_support';
 import InstrumentationSupport from 'ember-views/mixins/instrumentation_support';
@@ -633,7 +632,6 @@ import ViewMixin from 'ember-views/mixins/view_support';
   @uses Ember.ViewSupport
   @uses Ember.ViewContextSupport
   @uses Ember.ViewChildViewsSupport
-  @uses Ember.TemplateRenderingSupport
   @uses Ember.ClassNamesSupport
   @uses Ember.AttributeBindingsSupport
   @uses Ember.LegacyViewSupport
@@ -648,7 +646,6 @@ var View = CoreView.extend(
   ViewChildViewsSupport,
   ViewLegacyChildViewsSupport,
   ViewStateSupport,
-  TemplateRenderingSupport,
   ClassNamesSupport,
   LegacyViewSupport,
   InstrumentationSupport,
@@ -723,4 +720,4 @@ View.reopenClass({
 
 export default View;
 
-export { ViewContextSupport, ViewChildViewsSupport, ViewStateSupport, TemplateRenderingSupport, ClassNamesSupport };
+export { ViewContextSupport, ViewChildViewsSupport, ViewStateSupport, ClassNamesSupport };