diff --git a/lib/packages.js b/lib/packages.js index 07fd4e92cac..5a64e26e0d6 100644 --- a/lib/packages.js +++ b/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']}, diff --git a/packages/ember-application/lib/system/application.js b/packages/ember-application/lib/system/application.js index 2b0fbe5c22e..ad68a1688bf 100644 --- a/packages/ember-application/lib/system/application.js +++ b/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); diff --git a/packages/ember-glimmer/lib/ember-metal-views/index.js b/packages/ember-glimmer/lib/renderer.js similarity index 98% rename from packages/ember-glimmer/lib/ember-metal-views/index.js rename to packages/ember-glimmer/lib/renderer.js index 55a0a0181f2..66588ae65c2 100644 --- a/packages/ember-glimmer/lib/ember-metal-views/index.js +++ b/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'; diff --git a/packages/ember-glimmer/tests/utils/helpers.js b/packages/ember-glimmer/tests/utils/helpers.js index cf35a66f1ac..80a22c7747d 100644 --- a/packages/ember-glimmer/tests/utils/helpers.js +++ b/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'; diff --git a/packages/ember-htmlbars/lib/glimmer-component.js b/packages/ember-htmlbars/lib/glimmer-component.js index e6120f76f2d..f4df163a93a 100644 --- a/packages/ember-htmlbars/lib/glimmer-component.js +++ b/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, diff --git a/packages/ember-htmlbars/lib/hooks/component.js b/packages/ember-htmlbars/lib/hooks/component.js index 872b53b03be..44183464854 100644 --- a/packages/ember-htmlbars/lib/hooks/component.js +++ b/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'; diff --git a/packages/ember-htmlbars/lib/node-managers/component-node-manager.js b/packages/ember-htmlbars/lib/node-managers/component-node-manager.js index 886250ac685..bd438b38313 100644 --- a/packages/ember-htmlbars/lib/node-managers/component-node-manager.js +++ b/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'; diff --git a/packages/ember-htmlbars/lib/node-managers/view-node-manager.js b/packages/ember-htmlbars/lib/node-managers/view-node-manager.js index 6afced7af59..3bdbe1f1882 100644 --- a/packages/ember-htmlbars/lib/node-managers/view-node-manager.js +++ b/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'; diff --git a/packages/ember-metal-views/lib/htmlbars-renderer.js b/packages/ember-htmlbars/lib/renderer.js similarity index 97% rename from packages/ember-metal-views/lib/htmlbars-renderer.js rename to packages/ember-htmlbars/lib/renderer.js index b612512adc5..456d7c3d257 100755 --- a/packages/ember-metal-views/lib/htmlbars-renderer.js +++ b/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); }; diff --git a/packages/ember-views/lib/system/build-component-template.js b/packages/ember-htmlbars/lib/system/build-component-template.js similarity index 100% rename from packages/ember-views/lib/system/build-component-template.js rename to packages/ember-htmlbars/lib/system/build-component-template.js diff --git a/packages/ember-htmlbars/lib/system/render-env.js b/packages/ember-htmlbars/lib/system/render-env.js index 448181c0905..7cbf2f44408 100644 --- a/packages/ember-htmlbars/lib/system/render-env.js +++ b/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) { diff --git a/packages/ember-htmlbars/tests/attr_nodes/data_test.js b/packages/ember-htmlbars/tests/attr_nodes/data_test.js index b21ca351398..be948dc84bd 100644 --- a/packages/ember-htmlbars/tests/attr_nodes/data_test.js +++ b/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'; diff --git a/packages/ember-htmlbars/tests/utils/helpers.js b/packages/ember-htmlbars/tests/utils/helpers.js index 2a1017f4e54..a9e7663d7e2 100644 --- a/packages/ember-htmlbars/tests/utils/helpers.js +++ b/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'; diff --git a/packages/ember-metal-views/lib/index.js b/packages/ember-metal-views/lib/index.js deleted file mode 100755 index 30db6614ae9..00000000000 --- a/packages/ember-metal-views/lib/index.js +++ /dev/null @@ -1 +0,0 @@ -export * from './htmlbars-renderer'; diff --git a/packages/ember-metal-views/tests/.gitkeep b/packages/ember-metal-views/tests/.gitkeep deleted file mode 100755 index e69de29bb2d..00000000000 diff --git a/packages/ember-views/lib/index.js b/packages/ember-views/lib/index.js index 003477b6767..7012f811606 100644 --- a/packages/ember-views/lib/index.js +++ b/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'; diff --git a/packages/ember-views/lib/mixins/template_rendering_support.js b/packages/ember-views/lib/mixins/template_rendering_support.js deleted file mode 100644 index c4547b16088..00000000000 --- a/packages/ember-views/lib/mixins/template_rendering_support.js +++ /dev/null @@ -1,40 +0,0 @@ -/** -@module ember -@submodule ember-views -*/ -import { Mixin } from 'ember-metal/mixin'; -import require from 'require'; - -// Circular dep -var _renderView; - -/** - @class TemplateRenderingSupport - @namespace Ember - @private -*/ -var TemplateRenderingSupport = Mixin.create({ - /** - Called on your view when it should push strings of HTML into a - `Ember.RenderBuffer`. Most users will want to override the `template` - or `templateName` properties instead of this method. - - By default, `Ember.View` will look for a function in the `template` - property and invoke it with the value of `context`. The value of - `context` will be the view's controller unless you override it. - - @method renderBlock - @param {Ember.RenderBuffer} buffer The render buffer - @private - */ - - renderBlock(block, renderNode) { - if (_renderView === undefined) { - _renderView = require('ember-htmlbars/system/render-view'); - } - - return _renderView.renderHTMLBarsBlock(this, block, renderNode); - } -}); - -export default TemplateRenderingSupport; diff --git a/packages/ember-views/lib/views/core_view.js b/packages/ember-views/lib/views/core_view.js index 2a19a93eb13..f94aaddd26c 100644 --- a/packages/ember-views/lib/views/core_view.js +++ b/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'; diff --git a/packages/ember-views/lib/views/view.js b/packages/ember-views/lib/views/view.js index a72b14cfaab..37cdf5ea9a8 100644 --- a/packages/ember-views/lib/views/view.js +++ b/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 };