Use relative imports in ember-htmlbars.

emberjs · Aug 28, 2016 · 94d379d · 94d379d
1 parent e7d3881
commit 94d379d
Show file tree

Hide file tree

Showing 38 changed files with 136 additions and 136 deletions.
diff --git a/packages/ember-htmlbars/lib/env.js b/packages/ember-htmlbars/lib/env.js
@@ -4,37 +4,37 @@ import { hooks } from 'htmlbars-runtime';
 import assign from 'ember-metal/assign';
 import isEnabled from 'ember-metal/features';
 
-import subexpr from 'ember-htmlbars/hooks/subexpr';
-import concat from 'ember-htmlbars/hooks/concat';
-import linkRenderNode from 'ember-htmlbars/hooks/link-render-node';
-import createFreshScope, { createChildScope } from 'ember-htmlbars/hooks/create-fresh-scope';
-import bindShadowScope from 'ember-htmlbars/hooks/bind-shadow-scope';
-import bindSelf from 'ember-htmlbars/hooks/bind-self';
-import bindScope from 'ember-htmlbars/hooks/bind-scope';
-import bindLocal from 'ember-htmlbars/hooks/bind-local';
-import bindBlock from 'ember-htmlbars/hooks/bind-block';
-import updateSelf from 'ember-htmlbars/hooks/update-self';
-import getRoot from 'ember-htmlbars/hooks/get-root';
-import getChild from 'ember-htmlbars/hooks/get-child';
-import getBlock from 'ember-htmlbars/hooks/get-block';
-import getValue from 'ember-htmlbars/hooks/get-value';
-import getCellOrValue from 'ember-htmlbars/hooks/get-cell-or-value';
-import cleanupRenderNode from 'ember-htmlbars/hooks/cleanup-render-node';
-import destroyRenderNode from 'ember-htmlbars/hooks/destroy-render-node';
-import didRenderNode from 'ember-htmlbars/hooks/did-render-node';
-import willCleanupTree from 'ember-htmlbars/hooks/will-cleanup-tree';
-import didCleanupTree from 'ember-htmlbars/hooks/did-cleanup-tree';
-import classify from 'ember-htmlbars/hooks/classify';
-import component from 'ember-htmlbars/hooks/component';
-import lookupHelper from 'ember-htmlbars/hooks/lookup-helper';
-import hasHelper from 'ember-htmlbars/hooks/has-helper';
-import invokeHelper from 'ember-htmlbars/hooks/invoke-helper';
-import element from 'ember-htmlbars/hooks/element';
+import subexpr from './hooks/subexpr';
+import concat from './hooks/concat';
+import linkRenderNode from './hooks/link-render-node';
+import createFreshScope, { createChildScope } from './hooks/create-fresh-scope';
+import bindShadowScope from './hooks/bind-shadow-scope';
+import bindSelf from './hooks/bind-self';
+import bindScope from './hooks/bind-scope';
+import bindLocal from './hooks/bind-local';
+import bindBlock from './hooks/bind-block';
+import updateSelf from './hooks/update-self';
+import getRoot from './hooks/get-root';
+import getChild from './hooks/get-child';
+import getBlock from './hooks/get-block';
+import getValue from './hooks/get-value';
+import getCellOrValue from './hooks/get-cell-or-value';
+import cleanupRenderNode from './hooks/cleanup-render-node';
+import destroyRenderNode from './hooks/destroy-render-node';
+import didRenderNode from './hooks/did-render-node';
+import willCleanupTree from './hooks/will-cleanup-tree';
+import didCleanupTree from './hooks/did-cleanup-tree';
+import classify from './hooks/classify';
+import component from './hooks/component';
+import lookupHelper from './hooks/lookup-helper';
+import hasHelper from './hooks/has-helper';
+import invokeHelper from './hooks/invoke-helper';
+import element from './hooks/element';
 
-import helpers from 'ember-htmlbars/helpers';
-import keywords, { registerKeyword } from 'ember-htmlbars/keywords';
+import helpers from './helpers';
+import keywords, { registerKeyword } from './keywords';
 
-import DOMHelper from 'ember-htmlbars/system/dom-helper';
+import DOMHelper from './system/dom-helper';
 
 const emberHooks = assign({}, hooks);
 emberHooks.keywords = keywords;
@@ -69,23 +69,23 @@ assign(emberHooks, {
   element
 });
 
-import debuggerKeyword from 'ember-htmlbars/keywords/debugger';
-import withKeyword from 'ember-htmlbars/keywords/with';
-import outlet from 'ember-htmlbars/keywords/outlet';
-import unbound from 'ember-htmlbars/keywords/unbound';
-import componentKeyword from 'ember-htmlbars/keywords/component';
-import elementComponent from 'ember-htmlbars/keywords/element-component';
-import mount from 'ember-htmlbars/keywords/mount';
-import partial from 'ember-htmlbars/keywords/partial';
-import input from 'ember-htmlbars/keywords/input';
-import textarea from 'ember-htmlbars/keywords/textarea';
-import yieldKeyword from 'ember-htmlbars/keywords/yield';
-import mut, { privateMut } from 'ember-htmlbars/keywords/mut';
-import readonly from 'ember-htmlbars/keywords/readonly';
-import getKeyword from 'ember-htmlbars/keywords/get';
-import actionKeyword from 'ember-htmlbars/keywords/action';
-import renderKeyword from 'ember-htmlbars/keywords/render';
-import elementActionKeyword from 'ember-htmlbars/keywords/element-action';
+import debuggerKeyword from './keywords/debugger';
+import withKeyword from './keywords/with';
+import outlet from './keywords/outlet';
+import unbound from './keywords/unbound';
+import componentKeyword from './keywords/component';
+import elementComponent from './keywords/element-component';
+import mount from './keywords/mount';
+import partial from './keywords/partial';
+import input from './keywords/input';
+import textarea from './keywords/textarea';
+import yieldKeyword from './keywords/yield';
+import mut, { privateMut } from './keywords/mut';
+import readonly from './keywords/readonly';
+import getKeyword from './keywords/get';
+import actionKeyword from './keywords/action';
+import renderKeyword from './keywords/render';
+import elementActionKeyword from './keywords/element-action';
 
 registerKeyword('debugger', debuggerKeyword);
 registerKeyword('with', withKeyword);

diff --git a/packages/ember-htmlbars/lib/helpers/each.js b/packages/ember-htmlbars/lib/helpers/each.js
@@ -4,7 +4,7 @@
 */
 
 import shouldDisplay from '../streams/should_display';
-import decodeEachKey from 'ember-htmlbars/utils/decode-each-key';
+import decodeEachKey from '../utils/decode-each-key';
 
 /**
   The `{{#each}}` helper loops over elements in a collection. It is an extension

diff --git a/packages/ember-htmlbars/lib/hooks/classify.js b/packages/ember-htmlbars/lib/hooks/classify.js
@@ -3,7 +3,7 @@
 @submodule ember-htmlbars
 */
 
-import isComponent from 'ember-htmlbars/utils/is-component';
+import isComponent from '../utils/is-component';
 
 export default function classify(env, scope, path) {
   if (isComponent(env, scope, path)) {

diff --git a/packages/ember-htmlbars/lib/hooks/component.js b/packages/ember-htmlbars/lib/hooks/component.js
@@ -1,20 +1,20 @@
 import { assert } from 'ember-metal/debug';
-import ComponentNodeManager from 'ember-htmlbars/node-managers/component-node-manager';
+import ComponentNodeManager from '../node-managers/component-node-manager';
 import lookupComponent from 'ember-views/utils/lookup-component';
 import assign from 'ember-metal/assign';
 import EmptyObject from 'ember-metal/empty_object';
 import {
   CONTAINS_DOT_CACHE
-} from 'ember-htmlbars/system/lookup-helper';
-import extractPositionalParams from 'ember-htmlbars/utils/extract-positional-params';
+} from '../system/lookup-helper';
+import extractPositionalParams from '../utils/extract-positional-params';
 import {
   COMPONENT_HASH,
   COMPONENT_PATH,
   COMPONENT_POSITIONAL_PARAMS,
   isComponentCell,
   mergeInNewHash,
   processPositionalParamsFromCell,
-} from 'ember-htmlbars/keywords/closure-component';
+} from '../keywords/closure-component';
 
 export default function componentHook(renderNode, env, scope, _tagName, params, _attrs, templates, visitor) {
   let state = renderNode.getState();

diff --git a/packages/ember-htmlbars/lib/hooks/element.js b/packages/ember-htmlbars/lib/hooks/element.js
@@ -3,9 +3,9 @@
 @submodule ember-htmlbars
 */
 
-import { findHelper } from 'ember-htmlbars/system/lookup-helper';
+import { findHelper } from '../system/lookup-helper';
 import { handleRedirect } from 'htmlbars-runtime/hooks';
-import { buildHelperStream } from 'ember-htmlbars/system/invoke-helper';
+import { buildHelperStream } from '../system/invoke-helper';
 
 export default function emberElement(morph, env, scope, path, params, hash, visitor) {
   if (handleRedirect(morph, env, scope, path, params, hash, null, null, visitor)) {

diff --git a/packages/ember-htmlbars/lib/hooks/get-cell-or-value.js b/packages/ember-htmlbars/lib/hooks/get-cell-or-value.js
@@ -1,5 +1,5 @@
 import { read } from '../streams/utils';
-import { MUTABLE_REFERENCE } from 'ember-htmlbars/keywords/mut';
+import { MUTABLE_REFERENCE } from '../keywords/mut';
 
 export default function getCellOrValue(ref) {
   if (ref && ref[MUTABLE_REFERENCE]) {

diff --git a/packages/ember-htmlbars/lib/hooks/has-helper.js b/packages/ember-htmlbars/lib/hooks/has-helper.js
@@ -1,4 +1,4 @@
-import { validateLazyHelperName } from 'ember-htmlbars/system/lookup-helper';
+import { validateLazyHelperName } from '../system/lookup-helper';
 
 export default function hasHelperHook(env, scope, helperName) {
   if (env.helpers[helperName]) {

diff --git a/packages/ember-htmlbars/lib/hooks/invoke-helper.js b/packages/ember-htmlbars/lib/hooks/invoke-helper.js
@@ -1,5 +1,5 @@
-import { buildHelperStream } from 'ember-htmlbars/system/invoke-helper';
-import subscribe from 'ember-htmlbars/utils/subscribe';
+import { buildHelperStream } from '../system/invoke-helper';
+import subscribe from '../utils/subscribe';
 
 export default function invokeHelper(morph, env, scope, visitor, params, hash, helper, templates, context) {
   let helperStream = buildHelperStream(helper, params, hash, templates, env, scope);

diff --git a/packages/ember-htmlbars/lib/hooks/link-render-node.js b/packages/ember-htmlbars/lib/hooks/link-render-node.js
@@ -3,15 +3,15 @@
 @submodule ember-htmlbars
 */
 
-import subscribe from 'ember-htmlbars/utils/subscribe';
+import subscribe from '../utils/subscribe';
 import { isArray } from 'ember-runtime/utils';
 import { chain, read, isStream, addDependency } from '../streams/utils';
-import { CONTAINS_DOT_CACHE } from 'ember-htmlbars/system/lookup-helper';
+import { CONTAINS_DOT_CACHE } from '../system/lookup-helper';
 import {
   COMPONENT_HASH,
   isComponentCell,
   mergeInNewHash
-} from 'ember-htmlbars/keywords/closure-component';
+} from '../keywords/closure-component';
 
 export default function linkRenderNode(renderNode, env, scope, path, params, hash) {
   if (renderNode.streamUnsubscribers) {

diff --git a/packages/ember-htmlbars/lib/hooks/lookup-helper.js b/packages/ember-htmlbars/lib/hooks/lookup-helper.js
@@ -1,4 +1,4 @@
-import lookupHelper from 'ember-htmlbars/system/lookup-helper';
+import lookupHelper from '../system/lookup-helper';
 
 export default function lookupHelperHook(env, scope, helperName) {
   return lookupHelper(helperName, scope.getSelf(), env);

diff --git a/packages/ember-htmlbars/lib/hooks/subexpr.js b/packages/ember-htmlbars/lib/hooks/subexpr.js
@@ -3,13 +3,13 @@
 @submodule ember-htmlbars
 */
 
-import lookupHelper from 'ember-htmlbars/system/lookup-helper';
-import { buildHelperStream } from 'ember-htmlbars/system/invoke-helper';
+import lookupHelper from '../system/lookup-helper';
+import { buildHelperStream } from '../system/invoke-helper';
 import {
   labelsFor,
   labelFor
 } from '../streams/utils';
-import { linkParamsFor } from 'ember-htmlbars/hooks/link-render-node';
+import { linkParamsFor } from './link-render-node';
 
 export default function subexpr(env, scope, helperName, params, hash) {
   // TODO: Keywords and helper invocation should be integrated into

diff --git a/packages/ember-htmlbars/lib/index.js b/packages/ember-htmlbars/lib/index.js
@@ -98,23 +98,23 @@ import Ember from 'ember-metal/core'; // exposing Ember.HTMLBars
 
 import {
   registerHelper
-} from 'ember-htmlbars/helpers';
+} from './helpers';
 import {
   ifHelper,
   unlessHelper
-} from 'ember-htmlbars/helpers/if_unless';
-import withHelper from 'ember-htmlbars/helpers/with';
-import locHelper from 'ember-htmlbars/helpers/loc';
-import logHelper from 'ember-htmlbars/helpers/log';
-import eachHelper from 'ember-htmlbars/helpers/each';
-import eachInHelper from 'ember-htmlbars/helpers/each-in';
-import normalizeClassHelper from 'ember-htmlbars/helpers/-normalize-class';
-import concatHelper from 'ember-htmlbars/helpers/concat';
-import joinClassesHelper from 'ember-htmlbars/helpers/-join-classes';
-import htmlSafeHelper from 'ember-htmlbars/helpers/-html-safe';
-import hashHelper from 'ember-htmlbars/helpers/hash';
-import queryParamsHelper from 'ember-htmlbars/helpers/query-params';
-import DOMHelper from 'ember-htmlbars/system/dom-helper';
+} from './helpers/if_unless';
+import withHelper from './helpers/with';
+import locHelper from './helpers/loc';
+import logHelper from './helpers/log';
+import eachHelper from './helpers/each';
+import eachInHelper from './helpers/each-in';
+import normalizeClassHelper from './helpers/-normalize-class';
+import concatHelper from './helpers/concat';
+import joinClassesHelper from './helpers/-join-classes';
+import htmlSafeHelper from './helpers/-html-safe';
+import hashHelper from './helpers/hash';
+import queryParamsHelper from './helpers/query-params';
+import DOMHelper from './system/dom-helper';
 
 export { default as template } from './system/template';
 

diff --git a/packages/ember-htmlbars/lib/keywords/action.js b/packages/ember-htmlbars/lib/keywords/action.js
@@ -4,7 +4,7 @@
 */
 
 import { keyword } from 'htmlbars-runtime/hooks';
-import closureAction from 'ember-htmlbars/keywords/closure-action';
+import closureAction from './closure-action';
 
 /**
   The `{{action}}` helper provides a way to pass triggers for behavior (usually

diff --git a/packages/ember-htmlbars/lib/keywords/closure-action.js b/packages/ember-htmlbars/lib/keywords/closure-action.js
@@ -1,12 +1,12 @@
-import { Stream } from 'ember-htmlbars/streams/stream';
+import { Stream } from '../streams/stream';
 import {
   read,
   readArray,
   labelFor
-} from 'ember-htmlbars/streams/utils';
+} from '../streams/utils';
 import symbol from 'ember-metal/symbol';
 import { get } from 'ember-metal/property_get';
-import { labelForSubexpr } from 'ember-htmlbars/hooks/subexpr';
+import { labelForSubexpr } from '../hooks/subexpr';
 import EmberError from 'ember-metal/error';
 import run from 'ember-metal/run_loop';
 import { flaggedInstrument } from 'ember-metal/instrumentation';

diff --git a/packages/ember-htmlbars/lib/keywords/closure-component.js b/packages/ember-htmlbars/lib/keywords/closure-component.js
@@ -10,9 +10,9 @@ import symbol from 'ember-metal/symbol';
 import BasicStream from '../streams/stream';
 import EmptyObject from 'ember-metal/empty_object';
 import { read } from '../streams/utils';
-import { labelForSubexpr } from 'ember-htmlbars/hooks/subexpr';
+import { labelForSubexpr } from '../hooks/subexpr';
 import assign from 'ember-metal/assign';
-import { isRestPositionalParams, processPositionalParams } from 'ember-htmlbars/utils/extract-positional-params';
+import { isRestPositionalParams, processPositionalParams } from '../utils/extract-positional-params';
 import lookupComponent from 'ember-views/utils/lookup-component';
 
 export const COMPONENT_REFERENCE = symbol('COMPONENT_REFERENCE');

diff --git a/packages/ember-htmlbars/lib/keywords/component.js b/packages/ember-htmlbars/lib/keywords/component.js
@@ -4,7 +4,7 @@
   @public
 */
 import { keyword } from 'htmlbars-runtime/hooks';
-import closureComponent from 'ember-htmlbars/keywords/closure-component';
+import closureComponent from './closure-component';
 import EmptyObject from 'ember-metal/empty_object';
 import assign from 'ember-metal/assign';
 

diff --git a/packages/ember-htmlbars/lib/keywords/element-action.js b/packages/ember-htmlbars/lib/keywords/element-action.js
@@ -1,8 +1,8 @@
 import { assert } from 'ember-metal/debug';
 import { uuid } from 'ember-metal/utils';
-import { labelFor, read } from 'ember-htmlbars/streams/utils';
+import { labelFor, read } from '../streams/utils';
 import run from 'ember-metal/run_loop';
-import { readUnwrappedModel } from 'ember-htmlbars/streams/utils';
+import { readUnwrappedModel } from '../streams/utils';
 import { isSimpleClick } from 'ember-views/system/utils';
 import ActionManager from 'ember-views/system/action_manager';
 import { flaggedInstrument } from 'ember-metal/instrumentation';

diff --git a/packages/ember-htmlbars/lib/keywords/element-component.js b/packages/ember-htmlbars/lib/keywords/element-component.js
@@ -8,7 +8,7 @@ import {
   processPositionalParamsFromCell,
 } from  './closure-component';
 import lookupComponent from 'ember-views/utils/lookup-component';
-import extractPositionalParams from 'ember-htmlbars/utils/extract-positional-params';
+import extractPositionalParams from '../utils/extract-positional-params';
 
 export default {
   setupState(lastState, env, scope, params, hash) {

diff --git a/packages/ember-htmlbars/lib/keywords/get.js b/packages/ember-htmlbars/lib/keywords/get.js
@@ -6,7 +6,7 @@
 import { assert } from 'ember-metal/debug';
 import BasicStream from '../streams/stream';
 import { isStream } from '../streams/utils';
-import subscribe from 'ember-htmlbars/utils/subscribe';
+import subscribe from '../utils/subscribe';
 import { get } from 'ember-metal/property_get';
 import { set } from 'ember-metal/property_set';
 import {

diff --git a/packages/ember-htmlbars/lib/keywords/mount.js b/packages/ember-htmlbars/lib/keywords/mount.js
@@ -3,8 +3,8 @@
 @submodule ember-templates
 */
 
-import ViewNodeManager from 'ember-htmlbars/node-managers/view-node-manager';
-import RenderEnv from 'ember-htmlbars/system/render-env';
+import ViewNodeManager from '../node-managers/view-node-manager';
+import RenderEnv from '../system/render-env';
 import { assert } from 'ember-metal/debug';
 import { getOwner, setOwner } from 'container/owner';
 import { isOutletStable } from './outlet';

diff --git a/packages/ember-htmlbars/lib/keywords/mut.js b/packages/ember-htmlbars/lib/keywords/mut.js
@@ -9,7 +9,7 @@ import ProxyStream from '../streams/proxy-stream';
 import BasicStream from '../streams/stream';
 import { isStream } from '../streams/utils';
 import { MUTABLE_CELL } from 'ember-views/compat/attrs-proxy';
-import { INVOKE, ACTION } from 'ember-htmlbars/keywords/closure-action';
+import { INVOKE, ACTION } from './closure-action';
 
 export let MUTABLE_REFERENCE = symbol('MUTABLE_REFERENCE');
 

diff --git a/packages/ember-htmlbars/lib/keywords/outlet.js b/packages/ember-htmlbars/lib/keywords/outlet.js
@@ -3,8 +3,8 @@
 @submodule ember-templates
 */
 
-import ViewNodeManager from 'ember-htmlbars/node-managers/view-node-manager';
-import topLevelViewTemplate from 'ember-htmlbars/templates/top-level-view';
+import ViewNodeManager from '../node-managers/view-node-manager';
+import topLevelViewTemplate from '../templates/top-level-view';
 import isEnabled from 'ember-metal/features';
 import VERSION from 'ember/version';
 

diff --git a/packages/ember-htmlbars/lib/keywords/readonly.js b/packages/ember-htmlbars/lib/keywords/readonly.js
@@ -3,7 +3,7 @@
 @submodule ember-templates
 */
 
-import { MUTABLE_REFERENCE } from 'ember-htmlbars/keywords/mut';
+import { MUTABLE_REFERENCE } from './mut';
 
 export default function readonly(morph, env, scope, originalParams, hash, template, inverse) {
   // If `morph` is `null` the keyword is being invoked as a subexpression.

diff --git a/packages/ember-htmlbars/lib/keywords/render.js b/packages/ember-htmlbars/lib/keywords/render.js
@@ -6,10 +6,10 @@
 import { assert } from 'ember-metal/debug';
 import EmptyObject from 'ember-metal/empty_object';
 import EmberError from 'ember-metal/error';
-import { isStream, read } from 'ember-htmlbars/streams/utils';
+import { isStream, read } from '../streams/utils';
 import generateController from 'ember-routing/system/generate_controller';
 import { generateControllerFactory } from 'ember-routing/system/generate_controller';
-import ViewNodeManager from 'ember-htmlbars/node-managers/view-node-manager';
+import ViewNodeManager from '../node-managers/view-node-manager';
 
 /**
   Calling ``{{render}}`` from within a template will insert another