language stringclasses 1 value | owner stringlengths 2 15 | repo stringlengths 2 21 | sha stringlengths 45 45 | message stringlengths 7 36.3k | path stringlengths 1 199 | patch stringlengths 15 102k | is_multipart bool 2 classes |
|---|---|---|---|---|---|---|---|
Other | emberjs | ember.js | 797120fd25ffaae91372580ef4d09ebe6cae5cb5.json | Use main entry points only inside ember-glimmer. | packages/ember-glimmer/lib/helpers/get.js | @@ -1,4 +1,4 @@
-import { set } from 'ember-metal/property_set';
+import { set } from 'ember-metal';
import { CachedReference, UPDATE } from '../utils/references';
import { CONSTANT_TAG, UpdatableTag, combine, isConst, referenceFromParts } from 'glimmer-reference';
| true |
Other | emberjs | ember.js | 797120fd25ffaae91372580ef4d09ebe6cae5cb5.json | Use main entry points only inside ember-glimmer. | packages/ember-glimmer/lib/helpers/if-unless.js | @@ -3,7 +3,7 @@
@submodule ember-templates
*/
-import { assert } from 'ember-metal/debug';
+import { assert } from 'ember-metal';
import { UNDEFINED_REFERENCE, CachedReference, ConditionalReference } from '../utils/references';
import { CONSTANT_TAG, UpdatableTag, combine, isConst } from 'glimmer-reference';
| true |
Other | emberjs | ember.js | 797120fd25ffaae91372580ef4d09ebe6cae5cb5.json | Use main entry points only inside ember-glimmer. | packages/ember-glimmer/lib/helpers/loc.js | @@ -1,5 +1,5 @@
import { helper } from '../helper';
-import { loc } from 'ember-runtime/system/string';
+import { String as StringUtils } from 'ember-runtime';
/**
@module ember
@@ -39,7 +39,7 @@ import { loc } from 'ember-runtime/system/string';
@public
*/
function locHelper(params) {
- return loc.apply(null, params);
+ return StringUtils.loc.apply(null, params);
}
export default helper(locHelper); | true |
Other | emberjs | ember.js | 797120fd25ffaae91372580ef4d09ebe6cae5cb5.json | Use main entry points only inside ember-glimmer. | packages/ember-glimmer/lib/helpers/mut.js | @@ -1,5 +1,4 @@
-import symbol from 'ember-metal/symbol';
-import { assert } from 'ember-metal/debug';
+import { symbol, assert } from 'ember-metal';
import { UPDATE } from '../utils/references';
import { INVOKE } from './action';
| true |
Other | emberjs | ember.js | 797120fd25ffaae91372580ef4d09ebe6cae5cb5.json | Use main entry points only inside ember-glimmer. | packages/ember-glimmer/lib/helpers/query-param.js | @@ -1,7 +1,6 @@
import { InternalHelperReference } from '../utils/references';
-import { assert } from 'ember-metal/debug';
-import QueryParams from 'ember-routing/system/query_params';
-import assign from 'ember-metal/assign';
+import { assert, assign } from 'ember-metal';
+import { QueryParams } from 'ember-routing';
function queryParams({ positional, named }) {
assert('The `query-params` helper only accepts hash parameters, e.g. (query-params queryParamPropertyName=\'foo\') as opposed to just (query-params \'foo\')', positional.value().length === 0); | true |
Other | emberjs | ember.js | 797120fd25ffaae91372580ef4d09ebe6cae5cb5.json | Use main entry points only inside ember-glimmer. | packages/ember-glimmer/lib/helpers/unbound.js | @@ -3,7 +3,7 @@
@submodule ember-templates
*/
-import { assert } from 'ember-metal/debug';
+import { assert } from 'ember-metal';
import { UnboundReference } from '../utils/references';
/** | true |
Other | emberjs | ember.js | 797120fd25ffaae91372580ef4d09ebe6cae5cb5.json | Use main entry points only inside ember-glimmer. | packages/ember-glimmer/lib/make-bound-helper.js | @@ -2,7 +2,7 @@
@module ember
@submodule ember-templates
*/
-import { deprecate } from 'ember-metal/debug';
+import { deprecate } from 'ember-metal';
import { helper } from './helper';
/** | true |
Other | emberjs | ember.js | 797120fd25ffaae91372580ef4d09ebe6cae5cb5.json | Use main entry points only inside ember-glimmer. | packages/ember-glimmer/lib/modifiers/action.js | @@ -1,9 +1,13 @@
-import { assert } from 'ember-metal/debug';
-import run from 'ember-metal/run_loop';
-import { uuid } from 'ember-metal/utils';
-import { isSimpleClick } from 'ember-views/system/utils';
-import ActionManager from 'ember-views/system/action_manager';
-import { flaggedInstrument } from 'ember-metal/instrumentation';
+import {
+ assert,
+ run,
+ uuid,
+ flaggedInstrument
+} from 'ember-metal';
+import {
+ isSimpleClick,
+ ActionManager
+} from 'ember-views';
import { INVOKE } from '../helpers/action';
const MODIFIERS = ['alt', 'shift', 'meta', 'ctrl']; | true |
Other | emberjs | ember.js | 797120fd25ffaae91372580ef4d09ebe6cae5cb5.json | Use main entry points only inside ember-glimmer. | packages/ember-glimmer/lib/renderer.js | @@ -1,19 +1,23 @@
import { RootReference } from './utils/references';
-import run from 'ember-metal/run_loop';
-import { setHasViews } from 'ember-metal/tags';
+import {
+ run,
+ setHasViews,
+ assert,
+ runInTransaction as _runInTransaction,
+ isFeatureEnabled
+} from 'ember-metal';
import { CURRENT_TAG, UNDEFINED_REFERENCE } from 'glimmer-reference';
-import fallbackViewRegistry from 'ember-views/compat/fallback-view-registry';
-import { assert } from 'ember-metal/debug';
-import _runInTransaction from 'ember-metal/transaction';
-import isEnabled from 'ember-metal/features';
+import {
+ fallbackViewRegistry,
+ getViewId
+} from 'ember-views';
import { BOUNDS } from './component';
import { RootComponentDefinition } from './syntax/curly-component';
-import { getViewId } from 'ember-views/system/utils';
let runInTransaction;
-if (isEnabled('ember-glimmer-detect-backtracking-rerender') ||
- isEnabled('ember-glimmer-allow-backtracking-rerender')) {
+if (isFeatureEnabled('ember-glimmer-detect-backtracking-rerender') ||
+ isFeatureEnabled('ember-glimmer-allow-backtracking-rerender')) {
runInTransaction = _runInTransaction;
} else {
runInTransaction = (context, methodName) => { | true |
Other | emberjs | ember.js | 797120fd25ffaae91372580ef4d09ebe6cae5cb5.json | Use main entry points only inside ember-glimmer. | packages/ember-glimmer/lib/syntax/curly-component.js | @@ -1,14 +1,25 @@
-import { StatementSyntax, ValueReference, EvaluatedArgs, EvaluatedNamedArgs, EvaluatedPositionalArgs } from 'glimmer-runtime';
+import {
+ StatementSyntax,
+ ValueReference,
+ EvaluatedArgs,
+ EvaluatedNamedArgs,
+ EvaluatedPositionalArgs,
+ ComponentDefinition
+} from 'glimmer-runtime';
import { AttributeBinding, ClassNameBinding, IsVisibleBinding } from '../utils/bindings';
import { ROOT_REF, DIRTY_TAG, IS_DISPATCHING_ATTRS, HAS_BLOCK, BOUNDS } from '../component';
-import { assert, runInDebug } from 'ember-metal/debug';
+import {
+ assert,
+ runInDebug,
+ assign,
+ get,
+ _instrumentStart
+} from 'ember-metal';
import processArgs from '../utils/process-args';
-import { privatize as P } from 'container';
-import assign from 'ember-metal/assign';
-import get from 'ember-metal/property_get';
-import { _instrumentStart } from 'ember-metal/instrumentation';
-import { ComponentDefinition } from 'glimmer-runtime';
-import { OWNER } from 'container';
+import {
+ privatize as P,
+ OWNER
+} from 'container';
import { environment } from 'ember-environment';
const DEFAULT_LAYOUT = P`template:components/-default`; | true |
Other | emberjs | ember.js | 797120fd25ffaae91372580ef4d09ebe6cae5cb5.json | Use main entry points only inside ember-glimmer. | packages/ember-glimmer/lib/syntax/dynamic-component.js | @@ -6,7 +6,7 @@ import {
isComponentDefinition
} from 'glimmer-runtime';
import { UNDEFINED_REFERENCE } from 'glimmer-reference';
-import { assert } from 'ember-metal/debug';
+import { assert } from 'ember-metal';
function dynamicComponentFor(vm, symbolTable) {
let env = vm.env; | true |
Other | emberjs | ember.js | 797120fd25ffaae91372580ef4d09ebe6cae5cb5.json | Use main entry points only inside ember-glimmer. | packages/ember-glimmer/lib/syntax/input.js | @@ -1,4 +1,4 @@
-import { assert } from 'ember-metal/debug';
+import { assert } from 'ember-metal';
import { CurlyComponentSyntax } from './curly-component';
import { DynamicComponentSyntax } from './dynamic-component';
import { wrapComponentClassAttribute } from '../utils/bindings'; | true |
Other | emberjs | ember.js | 797120fd25ffaae91372580ef4d09ebe6cae5cb5.json | Use main entry points only inside ember-glimmer. | packages/ember-glimmer/lib/syntax/mount.js | @@ -1,8 +1,12 @@
-import { ArgsSyntax, StatementSyntax } from 'glimmer-runtime';
+import {
+ ArgsSyntax,
+ StatementSyntax,
+ ComponentDefinition
+} from 'glimmer-runtime';
import { UNDEFINED_REFERENCE } from 'glimmer-reference';
-import { assert } from 'ember-metal/debug';
+import { assert } from 'ember-metal';
import { RootReference } from '../utils/references';
-import { generateControllerFactory } from 'ember-routing/system/generate_controller';
+import { generateControllerFactory } from 'ember-routing';
import { OutletLayoutCompiler } from './outlet';
export class MountSyntax extends StatementSyntax {
@@ -83,8 +87,6 @@ class MountManager {
const MOUNT_MANAGER = new MountManager();
-import { ComponentDefinition } from 'glimmer-runtime';
-
class MountDefinition extends ComponentDefinition {
constructor(name, env) {
super(name, MOUNT_MANAGER, null); | true |
Other | emberjs | ember.js | 797120fd25ffaae91372580ef4d09ebe6cae5cb5.json | Use main entry points only inside ember-glimmer. | packages/ember-glimmer/lib/syntax/outlet.js | @@ -1,8 +1,14 @@
-import { ArgsSyntax, StatementSyntax } from 'glimmer-runtime';
-import { generateGuid, guidFor } from 'ember-metal/utils';
-import { _instrumentStart } from 'ember-metal/instrumentation';
+import {
+ ArgsSyntax,
+ StatementSyntax,
+ ComponentDefinition
+} from 'glimmer-runtime';
+import {
+ generateGuid,
+ guidFor,
+ _instrumentStart
+} from 'ember-metal';
import { RootReference } from '../utils/references';
-
import {
UpdatableTag,
ConstReference,
@@ -214,8 +220,6 @@ class OutletComponentManager extends AbstractOutletComponentManager {
const MANAGER = new OutletComponentManager();
-import { ComponentDefinition } from 'glimmer-runtime';
-
class AbstractOutletComponentDefinition extends ComponentDefinition {
constructor(manager, outletName, template) {
super('outlet', manager, null); | true |
Other | emberjs | ember.js | 797120fd25ffaae91372580ef4d09ebe6cae5cb5.json | Use main entry points only inside ember-glimmer. | packages/ember-glimmer/lib/syntax/render.js | @@ -1,8 +1,12 @@
-import { ArgsSyntax, StatementSyntax } from 'glimmer-runtime';
+import {
+ ArgsSyntax,
+ StatementSyntax,
+ ComponentDefinition
+} from 'glimmer-runtime';
import { ConstReference, isConst } from 'glimmer-reference';
-import { assert } from 'ember-metal/debug';
+import { assert } from 'ember-metal';
import { RootReference } from '../utils/references';
-import { generateControllerFactory } from 'ember-routing/system/generate_controller';
+import { generateControllerFactory } from 'ember-routing';
import { OutletLayoutCompiler } from './outlet';
function makeComponentDefinition(vm) {
@@ -128,8 +132,6 @@ class NonSingletonRenderManager extends AbstractRenderManager {
const NON_SINGLETON_RENDER_MANAGER = new NonSingletonRenderManager();
-import { ComponentDefinition } from 'glimmer-runtime';
-
class RenderDefinition extends ComponentDefinition {
constructor(name, template, env, manager) {
super('render', manager, null); | true |
Other | emberjs | ember.js | 797120fd25ffaae91372580ef4d09ebe6cae5cb5.json | Use main entry points only inside ember-glimmer. | packages/ember-glimmer/lib/utils/bindings.js | @@ -1,7 +1,6 @@
import { HelperSyntax } from 'glimmer-runtime';
-import get from 'ember-metal/property_get';
-import { assert } from 'ember-metal/debug';
-import { dasherize } from 'ember-runtime/system/string';
+import { get, assert } from 'ember-metal';
+import { String as StringUtils } from 'ember-runtime';
import { CachedReference, map, referenceFromParts } from 'glimmer-reference';
import { ROOT_REF } from '../component';
import { htmlSafe, isHTMLSafe } from './string';
@@ -164,7 +163,7 @@ class SimpleClassNameBindingReference extends CachedReference {
if (value === true) {
let { path, dasherizedPath } = this;
- return dasherizedPath || (this.dasherizedPath = dasherize(path));
+ return dasherizedPath || (this.dasherizedPath = StringUtils.dasherize(path));
} else if (value || value === 0) {
return value;
} else { | true |
Other | emberjs | ember.js | 797120fd25ffaae91372580ef4d09ebe6cae5cb5.json | Use main entry points only inside ember-glimmer. | packages/ember-glimmer/lib/utils/iterable.js | @@ -1,9 +1,14 @@
-import { get } from 'ember-metal/property_get';
-import { guidFor } from 'ember-metal/utils';
-import { tagFor } from 'ember-metal/tags';
-import Dict from 'ember-metal/empty_object';
-import { objectAt, isEmberArray } from 'ember-runtime/mixins/array';
-import { isProxy } from 'ember-runtime/mixins/-proxy';
+import {
+ get,
+ guidFor,
+ tagFor,
+ EmptyObject
+} from 'ember-metal';
+import {
+ objectAt,
+ isEmberArray,
+ isProxy
+} from 'ember-runtime';
import { UpdatableReference, UpdatablePrimitiveReference } from './references';
import { isEachIn } from '../helpers/each-in';
import { CONSTANT_TAG, UpdatableTag, combine } from 'glimmer-reference';
@@ -77,7 +82,7 @@ class ArrayIterator {
this.length = array.length;
this.keyFor = keyFor;
this.position = 0;
- this.seen = new Dict();
+ this.seen = new EmptyObject();
}
isEmpty() {
@@ -105,7 +110,7 @@ class EmberArrayIterator {
this.length = get(array, 'length');
this.keyFor = keyFor;
this.position = 0;
- this.seen = new Dict();
+ this.seen = new EmptyObject();
}
isEmpty() {
@@ -133,7 +138,7 @@ class ObjectKeysIterator {
this.values = values;
this.keyFor = keyFor;
this.position = 0;
- this.seen = new Dict();
+ this.seen = new EmptyObject();
}
isEmpty() { | true |
Other | emberjs | ember.js | 797120fd25ffaae91372580ef4d09ebe6cae5cb5.json | Use main entry points only inside ember-glimmer. | packages/ember-glimmer/lib/utils/process-args.js | @@ -1,9 +1,8 @@
import { CONSTANT_TAG } from 'glimmer-reference';
-import symbol from 'ember-metal/symbol';
-import EmptyObject from 'ember-metal/empty_object';
+import { symbol, EmptyObject} from 'ember-metal';
import { ARGS } from '../component';
import { UPDATE } from './references';
-import { MUTABLE_CELL } from 'ember-views/compat/attrs-proxy';
+import { MUTABLE_CELL } from 'ember-views';
export default function processArgs(args, positionalParamsDefinition) {
if (!positionalParamsDefinition || positionalParamsDefinition.length === 0 || args.positional.length === 0) { | true |
Other | emberjs | ember.js | 797120fd25ffaae91372580ef4d09ebe6cae5cb5.json | Use main entry points only inside ember-glimmer. | packages/ember-glimmer/lib/utils/references.js | @@ -1,17 +1,19 @@
-import { get } from 'ember-metal/property_get';
-import { set } from 'ember-metal/property_set';
-import { tagFor } from 'ember-metal/tags';
-import { didRender } from 'ember-metal/transaction';
-import symbol from 'ember-metal/symbol';
-import EmptyObject from 'ember-metal/empty_object';
+import {
+ get,
+ set,
+ tagFor,
+ didRender,
+ symbol,
+ EmptyObject,
+ meta as metaFor,
+ watchKey,
+ isFeatureEnabled
+} from 'ember-metal';
import { CONSTANT_TAG, ConstReference, DirtyableTag, UpdatableTag, combine, isConst } from 'glimmer-reference';
import { ConditionalReference as GlimmerConditionalReference, NULL_REFERENCE, UNDEFINED_REFERENCE } from 'glimmer-runtime';
import emberToBool from './to-bool';
import { RECOMPUTE_TAG } from '../helper';
-import { meta as metaFor } from 'ember-metal/meta';
-import { watchKey } from 'ember-metal/watch_key';
-import isEnabled from 'ember-metal/features';
-import { isProxy } from 'ember-runtime/mixins/-proxy';
+import { isProxy } from 'ember-runtime';
export const UPDATE = symbol('UPDATE');
@@ -77,8 +79,8 @@ export class RootReference extends ConstReference {
let TwoWayFlushDetectionTag;
-if (isEnabled('ember-glimmer-detect-backtracking-rerender') ||
- isEnabled('ember-glimmer-allow-backtracking-rerender')) {
+if (isFeatureEnabled('ember-glimmer-detect-backtracking-rerender') ||
+ isFeatureEnabled('ember-glimmer-allow-backtracking-rerender')) {
TwoWayFlushDetectionTag = class {
constructor(tag, key, ref) {
this.tag = tag;
@@ -131,23 +133,23 @@ export class RootPropertyReference extends PropertyReference {
this._parentValue = parentValue;
this._propertyKey = propertyKey;
- if (isEnabled('ember-glimmer-detect-backtracking-rerender') ||
- isEnabled('ember-glimmer-allow-backtracking-rerender')) {
+ if (isFeatureEnabled('ember-glimmer-detect-backtracking-rerender') ||
+ isFeatureEnabled('ember-glimmer-allow-backtracking-rerender')) {
this.tag = new TwoWayFlushDetectionTag(tagFor(parentValue), propertyKey, this);
} else {
this.tag = tagFor(parentValue);
}
- if (isEnabled('mandatory-setter')) {
+ if (isFeatureEnabled('mandatory-setter')) {
watchKey(parentValue, propertyKey, metaFor(parentValue));
}
}
compute() {
let { _parentValue, _propertyKey } = this;
- if (isEnabled('ember-glimmer-detect-backtracking-rerender') ||
- isEnabled('ember-glimmer-allow-backtracking-rerender')) {
+ if (isFeatureEnabled('ember-glimmer-detect-backtracking-rerender') ||
+ isFeatureEnabled('ember-glimmer-allow-backtracking-rerender')) {
this.tag.didCompute(_parentValue);
}
@@ -170,8 +172,8 @@ export class NestedPropertyReference extends PropertyReference {
this._parentObjectTag = parentObjectTag;
this._propertyKey = propertyKey;
- if (isEnabled('ember-glimmer-detect-backtracking-rerender') ||
- isEnabled('ember-glimmer-allow-backtracking-rerender')) {
+ if (isFeatureEnabled('ember-glimmer-detect-backtracking-rerender') ||
+ isFeatureEnabled('ember-glimmer-allow-backtracking-rerender')) {
let tag = combine([parentReferenceTag, parentObjectTag]);
this.tag = new TwoWayFlushDetectionTag(tag, propertyKey, this);
} else {
@@ -187,13 +189,13 @@ export class NestedPropertyReference extends PropertyReference {
_parentObjectTag.update(tagFor(parentValue));
if (typeof parentValue === 'object' && parentValue) {
- if (isEnabled('mandatory-setter')) {
+ if (isFeatureEnabled('mandatory-setter')) {
let meta = metaFor(parentValue);
watchKey(parentValue, _propertyKey, meta);
}
- if (isEnabled('ember-glimmer-detect-backtracking-rerender') ||
- isEnabled('ember-glimmer-allow-backtracking-rerender')) {
+ if (isFeatureEnabled('ember-glimmer-detect-backtracking-rerender') ||
+ isFeatureEnabled('ember-glimmer-allow-backtracking-rerender')) {
this.tag.didCompute(parentValue);
}
| true |
Other | emberjs | ember.js | 797120fd25ffaae91372580ef4d09ebe6cae5cb5.json | Use main entry points only inside ember-glimmer. | packages/ember-glimmer/lib/utils/string.js | @@ -3,8 +3,7 @@
@submodule ember-glimmer
*/
-import isEnabled from 'ember-metal/features';
-import { deprecate } from 'ember-metal/debug';
+import { isFeatureEnabled, deprecate } from 'ember-metal';
export class SafeString {
constructor(string) {
@@ -23,7 +22,7 @@ export class SafeString {
export function getSafeString() {
deprecate(
'Ember.Handlebars.SafeString is deprecated in favor of Ember.String.htmlSafe',
- !isEnabled('ember-string-ishtmlsafe'),
+ !isFeatureEnabled('ember-string-ishtmlsafe'),
{
id: 'ember-htmlbars.ember-handlebars-safestring',
until: '3.0.0', | true |
Other | emberjs | ember.js | 797120fd25ffaae91372580ef4d09ebe6cae5cb5.json | Use main entry points only inside ember-glimmer. | packages/ember-glimmer/lib/utils/to-bool.js | @@ -1,5 +1,5 @@
-import { isArray } from 'ember-runtime/utils';
-import { get } from 'ember-metal/property_get';
+import { isArray } from 'ember-runtime';
+import { get } from 'ember-metal';
export default function toBool(predicate) {
if (!predicate) { | true |
Other | emberjs | ember.js | 797120fd25ffaae91372580ef4d09ebe6cae5cb5.json | Use main entry points only inside ember-glimmer. | packages/ember-glimmer/lib/views/outlet.js | @@ -1,6 +1,5 @@
-import assign from 'ember-metal/assign';
+import { assign, EmptyObject } from 'ember-metal';
import { DirtyableTag } from 'glimmer-reference';
-import EmptyObject from 'ember-metal/empty_object';
import { environment } from 'ember-environment';
/** | true |
Other | emberjs | ember.js | 797120fd25ffaae91372580ef4d09ebe6cae5cb5.json | Use main entry points only inside ember-glimmer. | packages/ember-metal/lib/index.js | @@ -23,6 +23,8 @@ export {
} from './debug';
export {
instrument,
+ flaggedInstrument,
+ _instrumentStart,
reset as instrumentationReset,
subscribe as instrumentationSubscribe,
unsubscribe as instrumentationUnsubscribe
@@ -92,7 +94,8 @@ export {
endPropertyChanges,
overrideChains,
propertyDidChange,
- propertyWillChange
+ propertyWillChange,
+ PROPERTY_DID_CHANGE
} from './property_events';
export {
defineProperty,
@@ -162,8 +165,17 @@ export { default as symbol } from './symbol';
export { default as dictionary } from './dictionary';
export { default as EmptyObject } from './empty_object';
export { default as InjectedProperty } from './injected_property';
-export { tagFor, markObjectAsDirty } from './tags';
+export {
+ setHasViews,
+ tagFor,
+ markObjectAsDirty
+} from './tags';
export { default as replace } from './replace';
+export {
+ default as runInTransaction,
+ didRender,
+ assertNotRendered
+} from './transaction';
// TODO: this needs to be deleted once we refactor the build tooling | true |
Other | emberjs | ember.js | 797120fd25ffaae91372580ef4d09ebe6cae5cb5.json | Use main entry points only inside ember-glimmer. | packages/ember-routing/lib/index.js | @@ -19,3 +19,4 @@ export { default as controllerFor } from './system/controller_for';
export { default as RouterDSL } from './system/dsl';
export { default as Router } from './system/router';
export { default as Route } from './system/route';
+export { default as QueryParams } from './system/query_params'; | true |
Other | emberjs | ember.js | 797120fd25ffaae91372580ef4d09ebe6cae5cb5.json | Use main entry points only inside ember-glimmer. | packages/ember-runtime/lib/index.js | @@ -13,7 +13,11 @@ export { default as copy } from './copy';
export { default as inject } from './inject';
export { default as compare } from './compare';
export { default as isEqual } from './is-equal';
-export { default as Array } from './mixins/array';
+export {
+ default as Array,
+ objectAt,
+ isEmberArray
+} from './mixins/array';
export { default as Comparable } from './mixins/comparable';
export {
default as Namespace,
@@ -22,7 +26,10 @@ export {
} from './system/namespace';
export { default as ArrayProxy } from './system/array_proxy';
export { default as ObjectProxy } from './system/object_proxy';
-export { default as CoreObject } from './system/core_object';
+export {
+ default as CoreObject,
+ POST_INIT
+} from './system/core_object';
export { default as NativeArray, A } from './system/native_array';
export {
default as ActionHandler,
@@ -34,7 +41,10 @@ export {
Freezable,
FROZEN_ERROR
} from './mixins/freezable';
-export { default as _ProxyMixin } from './mixins/-proxy';
+export {
+ default as _ProxyMixin,
+ isProxy
+} from './mixins/-proxy';
export {
onLoad,
runLoadHooks | true |
Other | emberjs | ember.js | 797120fd25ffaae91372580ef4d09ebe6cae5cb5.json | Use main entry points only inside ember-glimmer. | packages/ember-views/lib/index.js | @@ -10,10 +10,29 @@ export {
getViewClientRects,
getViewBoundingClientRect,
getRootViews,
- getChildViews
+ getChildViews,
+ STYLE_WARNING,
+ getViewId
} from './system/utils';
export { default as EventDispatcher } from './system/event_dispatcher';
export { default as ComponentLookup } from './component_lookup';
export { default as TextSupport } from './mixins/text_support';
+export { default as CoreView } from './views/core_view';
+export { default as ClassNamesSupport } from './mixins/class_names_support';
+export { default as ChildViewsSupport } from './mixins/child_views_support';
+export { default as ViewStateSupport } from './mixins/view_state_support';
+export { default as ViewMixin } from './mixins/view_support';
+export { default as ActionSupport } from './mixins/action_support';
+export {
+ getAttrFor,
+ MUTABLE_CELL
+} from './compat/attrs-proxy';
+export {
+ default as lookupPartial,
+ hasPartial
+} from './system/lookup_partial';
+export { default as lookupComponent } from './utils/lookup-component';
+export { default as ActionManager } from './system/action_manager';
+export { default as fallbackViewRegistry } from './compat/fallback-view-registry';
import './system/ext'; // for the side effect of extending Ember.run.queues | true |
Other | emberjs | ember.js | 20151a75d9276ed92497ed3d01b0b2766c9fe3ec.json | Use main entry points from ember-runtime. | packages/ember-metal/lib/index.js | @@ -30,6 +30,7 @@ export {
export {
intern,
GUID_KEY,
+ GUID_KEY_PROPERTY,
apply,
applyStr,
canInvoke,
@@ -48,7 +49,8 @@ export {
} from './testing';
export {
getOnerror,
- setOnerror
+ setOnerror,
+ dispatchError
} from './error_handler';
export {
META_DESC,
@@ -133,16 +135,23 @@ export {
_suspendObservers,
addObserver,
observersFor,
- removeObserver
+ removeObserver,
+ _addBeforeObserver,
+ _removeBeforeObserver
} from './observer';
export {
NAME_KEY,
Mixin,
aliasMethod,
_immediateObserver,
+ _beforeObserver,
mixin,
observer,
- required
+ required,
+ REQUIRED,
+ hasUnprocessedMixins,
+ clearUnprocessedMixins,
+ detectBinding
} from './mixin';
export {
Binding,
@@ -154,6 +163,9 @@ export {
export { default as symbol } from './symbol';
export { default as dictionary } from './dictionary';
export { default as EmptyObject } from './empty_object';
+export { default as InjectedProperty } from './injected_property';
+export { tagFor, markObjectAsDirty } from './tags';
+export { default as replace } from './replace';
// TODO: this needs to be deleted once we refactor the build tooling | true |
Other | emberjs | ember.js | 20151a75d9276ed92497ed3d01b0b2766c9fe3ec.json | Use main entry points from ember-runtime. | packages/ember-runtime/lib/computed/computed_macros.js | @@ -1,11 +1,14 @@
-import { assert, deprecate } from 'ember-metal/debug';
-import { get } from 'ember-metal/property_get';
-import { set } from 'ember-metal/property_set';
-import { computed } from 'ember-metal/computed';
-import isEmpty from 'ember-metal/is_empty';
-import isNone from 'ember-metal/is_none';
-import alias from 'ember-metal/alias';
-import expandProperties from 'ember-metal/expand_properties';
+import {
+ assert,
+ deprecate,
+ get,
+ set,
+ computed,
+ isEmpty,
+ isNone,
+ alias,
+ expandProperties
+} from 'ember-metal';
/**
@module ember | true |
Other | emberjs | ember.js | 20151a75d9276ed92497ed3d01b0b2766c9fe3ec.json | Use main entry points from ember-runtime. | packages/ember-runtime/lib/computed/reduce_computed_macros.js | @@ -3,19 +3,23 @@
@submodule ember-runtime
*/
-import { assert } from 'ember-metal/debug';
-import { get } from 'ember-metal/property_get';
-import EmberError from 'ember-metal/error';
-import { ComputedProperty, computed } from 'ember-metal/computed';
-import { addObserver, removeObserver } from 'ember-metal/observer';
+import {
+ assert,
+ get,
+ Error as EmberError,
+ ComputedProperty,
+ computed,
+ addObserver,
+ removeObserver,
+ isNone,
+ getProperties,
+ EmptyObject,
+ guidFor,
+ WeakMap
+} from 'ember-metal';
import compare from '../compare';
import { isArray } from '../utils';
import { A as emberA } from '../system/native_array';
-import isNone from 'ember-metal/is_none';
-import getProperties from 'ember-metal/get_properties';
-import EmptyObject from 'ember-metal/empty_object';
-import { guidFor } from 'ember-metal/utils';
-import WeakMap from 'ember-metal/weak_map';
function reduceMacro(dependentKey, callback, initialValue) { | true |
Other | emberjs | ember.js | 20151a75d9276ed92497ed3d01b0b2766c9fe3ec.json | Use main entry points from ember-runtime. | packages/ember-runtime/lib/controllers/controller.js | @@ -1,4 +1,4 @@
-import { assert } from 'ember-metal/debug';
+import { assert } from 'ember-metal';
import EmberObject from '../system/object';
import Mixin from '../mixins/controller';
import { createInjectionHelper } from '../inject'; | true |
Other | emberjs | ember.js | 20151a75d9276ed92497ed3d01b0b2766c9fe3ec.json | Use main entry points from ember-runtime. | packages/ember-runtime/lib/copy.js | @@ -1,4 +1,4 @@
-import { assert } from 'ember-metal/debug';
+import { assert } from 'ember-metal';
import EmberObject from './system/object';
import Copyable from './mixins/copyable';
| true |
Other | emberjs | ember.js | 20151a75d9276ed92497ed3d01b0b2766c9fe3ec.json | Use main entry points from ember-runtime. | packages/ember-runtime/lib/ext/function.js | @@ -4,9 +4,12 @@
*/
import { ENV } from 'ember-environment';
-import { assert, deprecateFunc } from 'ember-metal/debug';
-import { computed } from 'ember-metal/computed';
-import { observer } from 'ember-metal/mixin';
+import {
+ assert,
+ deprecateFunc,
+ computed,
+ observer
+} from 'ember-metal';
const a_slice = Array.prototype.slice;
const FunctionPrototype = Function.prototype; | true |
Other | emberjs | ember.js | 20151a75d9276ed92497ed3d01b0b2766c9fe3ec.json | Use main entry points from ember-runtime. | packages/ember-runtime/lib/ext/rsvp.js | @@ -1,7 +1,9 @@
import * as RSVP from 'rsvp';
-import run from 'ember-metal/run_loop';
-import { assert } from 'ember-metal/debug';
-import { dispatchError } from 'ember-metal/error_handler';
+import {
+ run,
+ assert,
+ dispatchError
+} from 'ember-metal';
const backburner = run.backburner;
run._addQueue('rsvpAfter', 'destroy'); | true |
Other | emberjs | ember.js | 20151a75d9276ed92497ed3d01b0b2766c9fe3ec.json | Use main entry points from ember-runtime. | packages/ember-runtime/lib/inject.js | @@ -1,5 +1,7 @@
-import { assert } from 'ember-metal/debug';
-import InjectedProperty from 'ember-metal/injected_property';
+import {
+ assert,
+ InjectedProperty
+} from 'ember-metal';
/**
Namespace for injection helper methods. | true |
Other | emberjs | ember.js | 20151a75d9276ed92497ed3d01b0b2766c9fe3ec.json | Use main entry points from ember-runtime. | packages/ember-runtime/lib/mixins/-proxy.js | @@ -3,26 +3,26 @@
@submodule ember-runtime
*/
-import { assert, deprecate } from 'ember-metal/debug';
-import { get } from 'ember-metal/property_get';
-import { set } from 'ember-metal/property_set';
-import { meta } from 'ember-metal/meta';
import {
+ assert,
+ deprecate,
+ get,
+ set,
+ meta,
addObserver,
removeObserver,
_addBeforeObserver,
- _removeBeforeObserver
-} from 'ember-metal/observer';
-import {
+ _removeBeforeObserver,
propertyWillChange,
- propertyDidChange
-} from 'ember-metal/property_events';
+ propertyDidChange,
+ defineProperty,
+ Mixin,
+ observer,
+ tagFor,
+ symbol
+} from 'ember-metal';
import { bool } from '../computed/computed_macros';
import { POST_INIT } from '../system/core_object';
-import { defineProperty } from 'ember-metal/properties';
-import { Mixin, observer } from 'ember-metal/mixin';
-import { tagFor } from 'ember-metal/tags';
-import symbol from 'ember-metal/symbol';
import require, { has } from 'require';
const hasGlimmer = has('glimmer-reference'); | true |
Other | emberjs | ember.js | 20151a75d9276ed92497ed3d01b0b2766c9fe3ec.json | Use main entry points from ember-runtime. | packages/ember-runtime/lib/mixins/action_handler.js | @@ -3,9 +3,12 @@
@submodule ember-runtime
*/
-import { assert, deprecate } from 'ember-metal/debug';
-import { Mixin } from 'ember-metal/mixin';
-import { get } from 'ember-metal/property_get';
+import {
+ assert,
+ deprecate,
+ Mixin,
+ get
+} from 'ember-metal';
/**
`Ember.ActionHandler` is available on some familiar classes including | true |
Other | emberjs | ember.js | 20151a75d9276ed92497ed3d01b0b2766c9fe3ec.json | Use main entry points from ember-runtime. | packages/ember-runtime/lib/mixins/array.js | @@ -6,32 +6,27 @@
// ..........................................................
// HELPERS
//
-import Ember from 'ember-metal/core'; // ES6TODO: Ember.A
-
-import symbol from 'ember-metal/symbol';
-import { get } from 'ember-metal/property_get';
-import {
+import Ember, { // ES6TODO: Ember.A
+ symbol,
+ get,
computed,
- cacheFor
-} from 'ember-metal/computed';
-import isNone from 'ember-metal/is_none';
-import Enumerable from './enumerable';
-import { Mixin } from 'ember-metal/mixin';
-import {
+ cacheFor,
+ isNone,
+ Mixin,
propertyWillChange,
- propertyDidChange
-} from 'ember-metal/property_events';
-import {
+ propertyDidChange,
addListener,
removeListener,
sendEvent,
- hasListeners
-} from 'ember-metal/events';
-import { meta as metaFor } from 'ember-metal/meta';
-import { markObjectAsDirty } from 'ember-metal/tags';
+ hasListeners,
+ meta as metaFor,
+ markObjectAsDirty,
+ deprecate,
+ isFeatureEnabled
+} from 'ember-metal';
+
+import Enumerable from './enumerable';
import EachProxy from '../system/each_proxy';
-import { deprecate } from 'ember-metal/debug';
-import isEnabled from 'ember-metal/features';
function arrayObserversHelper(obj, target, opts, operation, notify) {
let willChange = (opts && opts.willChange) || 'arrayWillChange';
@@ -309,7 +304,7 @@ const ArrayMixin = Mixin.create(Enumerable, {
// optimized version from Enumerable
contains(obj) {
- if (isEnabled('ember-runtime-enumerable-includes')) {
+ if (isFeatureEnabled('ember-runtime-enumerable-includes')) {
deprecate(
'`Enumerable#contains` is deprecated, use `Enumerable#includes` instead.',
false,
@@ -588,7 +583,7 @@ const ArrayMixin = Mixin.create(Enumerable, {
}).volatile()
});
-if (isEnabled('ember-runtime-enumerable-includes')) {
+if (isFeatureEnabled('ember-runtime-enumerable-includes')) {
ArrayMixin.reopen({
/**
Returns `true` if the passed object can be found in the array. | true |
Other | emberjs | ember.js | 20151a75d9276ed92497ed3d01b0b2766c9fe3ec.json | Use main entry points from ember-runtime. | packages/ember-runtime/lib/mixins/comparable.js | @@ -1,4 +1,4 @@
-import { Mixin } from 'ember-metal/mixin';
+import { Mixin } from 'ember-metal';
/**
@module ember | true |
Other | emberjs | ember.js | 20151a75d9276ed92497ed3d01b0b2766c9fe3ec.json | Use main entry points from ember-runtime. | packages/ember-runtime/lib/mixins/container_proxy.js | @@ -2,9 +2,11 @@
@module ember
@submodule ember-runtime
*/
-import run from 'ember-metal/run_loop';
-import { deprecate } from 'ember-metal/debug';
-import { Mixin } from 'ember-metal/mixin';
+import {
+ deprecate,
+ Mixin,
+ run
+} from 'ember-metal';
/** | true |
Other | emberjs | ember.js | 20151a75d9276ed92497ed3d01b0b2766c9fe3ec.json | Use main entry points from ember-runtime. | packages/ember-runtime/lib/mixins/controller.js | @@ -1,5 +1,4 @@
-import { Mixin } from 'ember-metal/mixin';
-import alias from 'ember-metal/alias';
+import { Mixin, alias } from 'ember-metal';
import ActionHandler from './action_handler';
import ControllerContentModelAliasDeprecation from './controller_content_model_alias_deprecation';
| true |
Other | emberjs | ember.js | 20151a75d9276ed92497ed3d01b0b2766c9fe3ec.json | Use main entry points from ember-runtime. | packages/ember-runtime/lib/mixins/controller_content_model_alias_deprecation.js | @@ -1,5 +1,7 @@
-import { deprecate } from 'ember-metal/debug';
-import { Mixin } from 'ember-metal/mixin';
+import {
+ deprecate,
+ Mixin
+} from 'ember-metal';
/*
The ControllerContentModelAliasDeprecation mixin is used to provide a useful | true |
Other | emberjs | ember.js | 20151a75d9276ed92497ed3d01b0b2766c9fe3ec.json | Use main entry points from ember-runtime. | packages/ember-runtime/lib/mixins/copyable.js | @@ -3,11 +3,13 @@
@submodule ember-runtime
*/
-import { deprecate } from 'ember-metal/debug';
-import { get } from 'ember-metal/property_get';
-import { Mixin } from 'ember-metal/mixin';
+import {
+ deprecate,
+ get,
+ Mixin,
+ Error as EmberError
+} from 'ember-metal';
import { Freezable } from './freezable';
-import EmberError from 'ember-metal/error';
/**
Implements some standard methods for copying an object. Add this mixin to | true |
Other | emberjs | ember.js | 20151a75d9276ed92497ed3d01b0b2766c9fe3ec.json | Use main entry points from ember-runtime. | packages/ember-runtime/lib/mixins/enumerable.js | @@ -7,29 +7,26 @@
// HELPERS
//
-import { get } from 'ember-metal/property_get';
-import { set } from 'ember-metal/property_set';
import {
+ get,
+ set,
Mixin,
- aliasMethod
-} from 'ember-metal/mixin';
-import { guidFor } from 'ember-metal/utils';
-import { computed } from 'ember-metal/computed';
-import EmptyObject from 'ember-metal/empty_object';
-import isEnabled from 'ember-metal/features';
-import {
+ aliasMethod,
+ guidFor,
+ computed,
+ EmptyObject,
+ isFeatureEnabled,
propertyWillChange,
- propertyDidChange
-} from 'ember-metal/property_events';
-import {
+ propertyDidChange,
addListener,
removeListener,
sendEvent,
- hasListeners
-} from 'ember-metal/events';
+ hasListeners,
+ assert,
+ deprecate
+} from 'ember-metal';
import compare from '../compare';
import require from 'require';
-import { assert, deprecate } from 'ember-metal/debug';
let _emberA;
@@ -233,7 +230,7 @@ const Enumerable = Mixin.create({
@public
*/
contains(obj) {
- if (isEnabled('ember-runtime-enumerable-includes')) {
+ if (isFeatureEnabled('ember-runtime-enumerable-includes')) {
deprecate(
'`Enumerable#contains` is deprecated, use `Enumerable#includes` instead.',
false,
@@ -1077,7 +1074,7 @@ const Enumerable = Mixin.create({
});
-if (isEnabled('ember-runtime-computed-uniq-by')) {
+if (isFeatureEnabled('ember-runtime-computed-uniq-by')) {
Enumerable.reopen({
/**
Returns a new enumerable that contains only items containing a unique property value.
@@ -1110,7 +1107,7 @@ if (isEnabled('ember-runtime-computed-uniq-by')) {
});
}
-if (isEnabled('ember-runtime-enumerable-includes')) {
+if (isFeatureEnabled('ember-runtime-enumerable-includes')) {
Enumerable.reopen({
/**
Returns `true` if the passed object can be found in the enumerable. | true |
Other | emberjs | ember.js | 20151a75d9276ed92497ed3d01b0b2766c9fe3ec.json | Use main entry points from ember-runtime. | packages/ember-runtime/lib/mixins/evented.js | @@ -1,10 +1,10 @@
-import { Mixin } from 'ember-metal/mixin';
import {
+ Mixin,
addListener,
removeListener,
hasListeners,
sendEvent
-} from 'ember-metal/events';
+} from 'ember-metal';
/**
@module ember | true |
Other | emberjs | ember.js | 20151a75d9276ed92497ed3d01b0b2766c9fe3ec.json | Use main entry points from ember-runtime. | packages/ember-runtime/lib/mixins/freezable.js | @@ -3,10 +3,12 @@
@submodule ember-runtime
*/
-import { deprecate } from 'ember-metal/debug';
-import { Mixin } from 'ember-metal/mixin';
-import { get } from 'ember-metal/property_get';
-import { set } from 'ember-metal/property_set';
+import {
+ deprecate,
+ Mixin,
+ get,
+ set
+} from 'ember-metal';
/**
The `Ember.Freezable` mixin implements some basic methods for marking an | true |
Other | emberjs | ember.js | 20151a75d9276ed92497ed3d01b0b2766c9fe3ec.json | Use main entry points from ember-runtime. | packages/ember-runtime/lib/mixins/mutable_array.js | @@ -11,13 +11,15 @@ const EMPTY = [];
// HELPERS
//
-import { get } from 'ember-metal/property_get';
-import EmberError from 'ember-metal/error';
-import { Mixin } from 'ember-metal/mixin';
+import {
+ get,
+ Error as EmberError,
+ Mixin,
+ isFeatureEnabled
+} from 'ember-metal';
import EmberArray, { objectAt } from './array';
import MutableEnumerable from './mutable_enumerable';
import Enumerable from './enumerable';
-import isEnabled from 'ember-metal/features';
export function removeAt(array, start, len) {
if ('number' === typeof start) {
@@ -388,7 +390,7 @@ export default Mixin.create(EmberArray, MutableEnumerable, {
addObject(obj) {
let included;
- if (isEnabled('ember-runtime-enumerable-includes')) {
+ if (isFeatureEnabled('ember-runtime-enumerable-includes')) {
included = this.includes(obj);
} else {
included = this.contains(obj); | true |
Other | emberjs | ember.js | 20151a75d9276ed92497ed3d01b0b2766c9fe3ec.json | Use main entry points from ember-runtime. | packages/ember-runtime/lib/mixins/mutable_enumerable.js | @@ -1,6 +1,9 @@
import Enumerable from './enumerable';
-import { Mixin } from 'ember-metal/mixin';
-import {beginPropertyChanges, endPropertyChanges} from 'ember-metal/property_events';
+import {
+ Mixin,
+ beginPropertyChanges,
+ endPropertyChanges
+} from 'ember-metal';
/**
@module ember | true |
Other | emberjs | ember.js | 20151a75d9276ed92497ed3d01b0b2766c9fe3ec.json | Use main entry points from ember-runtime. | packages/ember-runtime/lib/mixins/observable.js | @@ -3,29 +3,25 @@
@submodule ember-runtime
*/
-import { assert } from 'ember-metal/debug';
import {
+ assert,
get,
- getWithDefault
-} from 'ember-metal/property_get';
-import { set } from 'ember-metal/property_set';
-import getProperties from 'ember-metal/get_properties';
-import setProperties from 'ember-metal/set_properties';
-import { Mixin } from 'ember-metal/mixin';
-import { hasListeners } from 'ember-metal/events';
-import {
+ getWithDefault,
+ set,
+ getProperties,
+ setProperties,
+ Mixin,
+ hasListeners,
beginPropertyChanges,
propertyWillChange,
propertyDidChange,
- endPropertyChanges
-} from 'ember-metal/property_events';
-import {
+ endPropertyChanges,
addObserver,
removeObserver,
- observersFor
-} from 'ember-metal/observer';
-import { cacheFor } from 'ember-metal/computed';
-import isNone from 'ember-metal/is_none';
+ observersFor,
+ cacheFor,
+ isNone
+} from 'ember-metal';
/**
## Overview | true |
Other | emberjs | ember.js | 20151a75d9276ed92497ed3d01b0b2766c9fe3ec.json | Use main entry points from ember-runtime. | packages/ember-runtime/lib/mixins/promise_proxy.js | @@ -1,9 +1,11 @@
-import { get } from 'ember-metal/property_get';
-import setProperties from 'ember-metal/set_properties';
-import { computed } from 'ember-metal/computed';
+import {
+ get,
+ setProperties,
+ computed,
+ Mixin,
+ Error as EmberError
+} from 'ember-metal';
import { not, or } from '../computed/computed_macros';
-import { Mixin } from 'ember-metal/mixin';
-import EmberError from 'ember-metal/error';
/**
@module ember | true |
Other | emberjs | ember.js | 20151a75d9276ed92497ed3d01b0b2766c9fe3ec.json | Use main entry points from ember-runtime. | packages/ember-runtime/lib/mixins/registry_proxy.js | @@ -3,8 +3,10 @@
@submodule ember-runtime
*/
-import { deprecate } from 'ember-metal/debug';
-import { Mixin } from 'ember-metal/mixin';
+import {
+ deprecate,
+ Mixin
+} from 'ember-metal';
/**
RegistryProxyMixin is used to provide public access to specific | true |
Other | emberjs | ember.js | 20151a75d9276ed92497ed3d01b0b2766c9fe3ec.json | Use main entry points from ember-runtime. | packages/ember-runtime/lib/mixins/target_action_support.js | @@ -4,10 +4,12 @@
*/
import { context } from 'ember-environment';
-import { assert } from 'ember-metal/debug';
-import { get } from 'ember-metal/property_get';
-import { Mixin } from 'ember-metal/mixin';
-import { computed } from 'ember-metal/computed';
+import {
+ assert,
+ get,
+ Mixin,
+ computed
+} from 'ember-metal';
/**
`Ember.TargetActionSupport` is a mixin that can be included in a class | true |
Other | emberjs | ember.js | 20151a75d9276ed92497ed3d01b0b2766c9fe3ec.json | Use main entry points from ember-runtime. | packages/ember-runtime/lib/system/array_proxy.js | @@ -1,22 +1,20 @@
-import { assert } from 'ember-metal/debug';
-import { get } from 'ember-metal/property_get';
-import {
- isArray
-} from '../utils';
-import { computed } from 'ember-metal/computed';
import {
+ assert,
+ get,
+ computed,
_beforeObserver,
- observer
-} from 'ember-metal/mixin';
-import {
+ observer,
beginPropertyChanges,
- endPropertyChanges
-} from 'ember-metal/property_events';
-import EmberError from 'ember-metal/error';
+ endPropertyChanges,
+ Error as EmberError,
+ alias
+} from 'ember-metal';
+import {
+ isArray
+} from '../utils';
import EmberObject from './object';
import MutableArray from '../mixins/mutable_array';
import Enumerable from '../mixins/enumerable';
-import alias from 'ember-metal/alias';
import {
addArrayObserver,
removeArrayObserver, | true |
Other | emberjs | ember.js | 20151a75d9276ed92497ed3d01b0b2766c9fe3ec.json | Use main entry points from ember-runtime. | packages/ember-runtime/lib/system/core_object.js | @@ -9,39 +9,34 @@
// using ember-metal/lib/main here to ensure that ember-debug is setup
// if present
-import { assert, runInDebug } from 'ember-metal/debug';
-import isEnabled from 'ember-metal/features';
-import assign from 'ember-metal/assign';
-
-// NOTE: this object should never be included directly. Instead use `Ember.Object`.
-// We only define this separately so that `Ember.Set` can depend on it.
-import { get } from 'ember-metal/property_get';
-import {
- guidFor
-} from 'ember-metal/utils';
import {
+ assert,
+ runInDebug,
+ isFeatureEnabled,
+ assign,
+ get,
+ guidFor,
generateGuid,
GUID_KEY_PROPERTY,
- makeArray
-} from 'ember-metal/utils';
-import { meta } from 'ember-metal/meta';
-import { finishChains } from 'ember-metal/chains';
-import { sendEvent } from 'ember-metal/events';
-import {
+ makeArray,
+ meta,
+ finishChains,
+ sendEvent,
detectBinding,
Mixin,
- REQUIRED
-} from 'ember-metal/mixin';
-import EmberError from 'ember-metal/error';
+ REQUIRED,
+ Error as EmberError,
+ defineProperty,
+ Binding,
+ ComputedProperty,
+ computed,
+ InjectedProperty,
+ run,
+ destroy,
+ symbol
+} from 'ember-metal';
import ActionHandler from '../mixins/action_handler';
-import { defineProperty } from 'ember-metal/properties';
-import { Binding } from 'ember-metal/binding';
-import { ComputedProperty, computed } from 'ember-metal/computed';
-import InjectedProperty from 'ember-metal/injected_property';
-import run from 'ember-metal/run_loop';
-import { destroy } from 'ember-metal/watching';
import { validatePropertyInjections } from '../inject';
-import symbol from 'ember-metal/symbol';
export let POST_INIT = symbol('POST_INIT');
var schedule = run.schedule;
@@ -153,7 +148,7 @@ function makeCtor() {
if (typeof this.setUnknownProperty === 'function' && !(keyName in this)) {
this.setUnknownProperty(keyName, value);
} else {
- if (isEnabled('mandatory-setter')) {
+ if (isFeatureEnabled('mandatory-setter')) {
defineProperty(this, keyName, null, value); // setup mandatory setter
} else {
this[keyName] = value; | true |
Other | emberjs | ember.js | 20151a75d9276ed92497ed3d01b0b2766c9fe3ec.json | Use main entry points from ember-runtime. | packages/ember-runtime/lib/system/each_proxy.js | @@ -1,16 +1,14 @@
-import { assert } from 'ember-metal/debug';
-import { get } from 'ember-metal/property_get';
import {
+ assert,
+ get,
_addBeforeObserver,
_removeBeforeObserver,
addObserver,
- removeObserver
-} from 'ember-metal/observer';
-import {
+ removeObserver,
propertyDidChange,
- propertyWillChange
-} from 'ember-metal/property_events';
-import EmptyObject from 'ember-metal/empty_object';
+ propertyWillChange,
+ EmptyObject
+} from 'ember-metal';
import { objectAt } from '../mixins/array';
/** | true |
Other | emberjs | ember.js | 20151a75d9276ed92497ed3d01b0b2766c9fe3ec.json | Use main entry points from ember-runtime. | packages/ember-runtime/lib/system/namespace.js | @@ -2,18 +2,15 @@
@module ember
@submodule ember-runtime
*/
-import Ember from 'ember-metal/core'; // Preloaded into namespaces
-import { context } from 'ember-environment';
-import { get } from 'ember-metal/property_get';
-import {
- guidFor
-} from 'ember-metal/utils';
-import {
+import Ember, {
+ get,
+ guidFor,
Mixin,
hasUnprocessedMixins,
clearUnprocessedMixins,
NAME_KEY
-} from 'ember-metal/mixin';
+} from 'ember-metal'; // Preloaded into namespaces
+import { context } from 'ember-environment';
import EmberObject from './object';
| true |
Other | emberjs | ember.js | 20151a75d9276ed92497ed3d01b0b2766c9fe3ec.json | Use main entry points from ember-runtime. | packages/ember-runtime/lib/system/native_array.js | @@ -2,11 +2,12 @@
@module ember
@submodule ember-runtime
*/
-import Ember from 'ember-metal/core'; // Ember.A circular
+import Ember, { // Ember.A circular
+ replace,
+ get,
+ Mixin
+} from 'ember-metal';
import { ENV } from 'ember-environment';
-import replace from 'ember-metal/replace';
-import { get } from 'ember-metal/property_get';
-import { Mixin } from 'ember-metal/mixin';
import EmberArray, {
arrayContentDidChange,
arrayContentWillChange | true |
Other | emberjs | ember.js | 20151a75d9276ed92497ed3d01b0b2766c9fe3ec.json | Use main entry points from ember-runtime. | packages/ember-runtime/lib/system/string.js | @@ -2,17 +2,16 @@
@module ember
@submodule ember-runtime
*/
-import { deprecate } from 'ember-metal/debug';
import {
- inspect as emberInspect
-} from 'ember-metal/utils';
+ deprecate,
+ inspect as emberInspect,
+ Cache
+} from 'ember-metal';
import { isArray } from '../utils';
import {
get as getString
} from '../string_registry';
-import Cache from 'ember-metal/cache';
-
const STRING_DASHERIZE_REGEXP = (/[ _]/g);
const STRING_DASHERIZE_CACHE = new Cache(1000, function(key) { | true |
Other | emberjs | ember.js | 20151a75d9276ed92497ed3d01b0b2766c9fe3ec.json | Use main entry points from ember-runtime. | packages/ember/lib/index.js | @@ -4,6 +4,12 @@ import isEnabled from 'ember-metal/features';
// ****ember-environment****
import { ENV, context } from 'ember-environment';
+import {
+ Registry,
+ Container,
+ getOwner,
+ setOwner
+} from 'container';
// ****ember-metal****
import Ember, * as metal from 'ember-metal';
@@ -244,12 +250,6 @@ Ember.Backburner = function() {
Ember._Backburner = Backburner;
-import {
- Registry,
- Container,
- getOwner,
- setOwner
-} from 'container';
Ember.Container = Container;
Ember.Registry = Registry; | true |
Other | emberjs | ember.js | b5790dc2e120415e6f08ccb8bb8c4ea367867fef.json | Add support for appending multiple roots.
In order to support rendering multiple roots the `Renderer` must be
updated to track each root and rerender them. As of this implementation,
all roots will be revalidated if any are (we are not tracking
revisions per root). | packages/ember-glimmer/lib/renderer.js | @@ -16,8 +16,8 @@ if (isEnabled('ember-glimmer-detect-backtracking-rerender') ||
isEnabled('ember-glimmer-allow-backtracking-rerender')) {
runInTransaction = _runInTransaction;
} else {
- runInTransaction = callback => {
- callback();
+ runInTransaction = (context, methodName) => {
+ context[methodName]();
return false;
};
}
@@ -49,59 +49,42 @@ class DynamicScope {
}
}
-let nextRootId = 0;
class RootState {
- constructor(env, root, template, self, parentElement, dynamicScope) {
- this.id = ++nextRootId;
- this.env = env;
+ constructor(root, env, template, self, parentElement, dynamicScope) {
+ assert(`You cannot render \`${self.value()}\` without a template.`, template);
+
+ this.id = getViewId(root);
this.root = root;
- this.template = template;
- this.self = self;
- this.parentElement = parentElement;
- this.dynamicScope = dynamicScope;
+ this.result = undefined;
+ this.shouldReflush = false;
- this.options = {
+ let options = this.options = {
alwaysRevalidate: false
};
- this.render = this.initialRender;
- this.lastRevision = undefined;
- this.result = undefined;
- }
- isFor(possibleRoot) {
- return this.root === possibleRoot;
- }
+ this.render = () => {
+ let result = this.result = template.asEntryPoint().render(self, env, {
+ appendTo: parentElement,
+ dynamicScope
+ });
- initialRender() {
- let { self, template, env, parentElement, dynamicScope } = this;
- assert(`You cannot render \`${self.value()}\` without a template.`, template);
-
- this.result = this.template.asEntryPoint().render(self, env, {
- appendTo: parentElement,
- dynamicScope
- });
- this.lastRevision = CURRENT_TAG.value();
-
- // change next render to use `rerender`
- this.render = this.rerender;
+ // override .render function after initial render
+ this.render = () => {
+ result.rerender(options);
+ };
+ };
}
- rerender() {
- this.result.rerender(this.options);
- this.lastRevision = CURRENT_TAG.value();
+ isFor(possibleRoot) {
+ return this.root === possibleRoot;
}
destroy() {
let { result } = this;
- this.env = null;
this.root = null;
- this.template = null;
- this.self = null;
- this.parentElement = null;
- this.dynamicScope = null;
- this.lastRevision = null;
this.result = null;
+ this.render = null;
if (result) {
result.destroy();
@@ -159,8 +142,8 @@ export class Renderer {
this._viewRegistry = _viewRegistry;
this._destinedForDOM = destinedForDOM;
this._destroyed = false;
- this._root = null;
- this._transaction = null;
+ this._roots = [];
+ this._lastRevision = null;
}
// renderer HOOKS
@@ -170,7 +153,7 @@ export class Renderer {
let targetObject = view.outletState.render.controller;
let ref = view.toReference();
let dynamicScope = new DynamicScope(null, ref, ref, true, targetObject);
- let root = new RootState(this._env, view, view.template, self, target, dynamicScope);
+ let root = new RootState(view, this._env, view.template, self, target, dynamicScope);
this._renderRoot(root);
}
@@ -179,7 +162,7 @@ export class Renderer {
let rootDef = new RootComponentDefinition(view);
let self = new RootReference(rootDef);
let dynamicScope = new DynamicScope(null, UNDEFINED_REFERENCE, UNDEFINED_REFERENCE, true, null);
- let root = new RootState(this._env, view, this._rootTemplate, self, target, dynamicScope);
+ let root = new RootState(view, this._env, this._rootTemplate, self, target, dynamicScope);
this._renderRoot(root);
}
@@ -212,8 +195,22 @@ export class Renderer {
view.trigger('willClearRender');
view._transitionTo('destroying');
- if (this._root && this._root.isFor(view)) {
- this._clearRoot();
+ let roots = this._roots;
+
+ // traverse in reverse so we can remove items
+ // without mucking up the index
+ let i = this._roots.length;
+ while (i--) {
+ let root = roots[i];
+ // check if the view being removed is a root view
+ if (root.isFor(view)) {
+ root.destroy();
+ roots.splice(i, 1);
+ }
+ }
+
+ if (this._roots.length === 0) {
+ deregister(this);
}
if (!view.isDestroying) {
@@ -226,7 +223,7 @@ export class Renderer {
return;
}
this._destroyed = true;
- this._clearRoot();
+ this._clearAllRoots();
}
getBounds(view) {
@@ -244,44 +241,74 @@ export class Renderer {
}
_renderRoot(root) {
- assert('Cannot append multiple root views', !this._root);
+ let { _roots: roots } = this;
+
+ roots.push(root);
- let { _env: env } = this;
+ if (roots.length === 1) {
+ register(this);
+ }
+
+ this._renderRootsTransaction();
+ }
- this._root = root;
+ _renderRoots() {
+ let { _roots: roots, _env: env } = this;
+ let globalShouldReflush;
- register(this);
+ // ensure that for the first iteration of the loop
+ // each root is processed
+ let initial = true;
+
+ do {
+ env.begin();
+ globalShouldReflush = false;
+
+ for (let i = 0; i < roots.length; i++) {
+ let root = roots[i];
+ let { shouldReflush } = root;
+
+ // when processing non-initial reflush loops,
+ // do not process more roots than needed
+ if (!initial && !shouldReflush) {
+ continue;
+ }
- let transaction = () => {
- let shouldReflush = false;
- do {
- env.begin();
root.options.alwaysRevalidate = shouldReflush;
- shouldReflush = runInTransaction(root, 'render');
- env.commit();
- } while (shouldReflush);
- };
+ // track shouldReflush based on this roots render result
+ shouldReflush = root.shouldReflush = runInTransaction(root, 'render');
- this._transaction = () => {
- try {
- transaction();
- } catch (e) {
- this.destroy();
- throw e;
+ // globalShouldReflush should be `true` if *any* of
+ // the roots need to reflush
+ globalShouldReflush = globalShouldReflush || shouldReflush;
}
- };
- this._transaction();
+ this._lastRevision = CURRENT_TAG.value();
+ env.commit();
+
+ initial = false;
+ } while (globalShouldReflush);
+ }
+
+ _renderRootsTransaction() {
+ try {
+ this._renderRoots();
+ } catch (e) {
+ this.destroy();
+ throw e;
+ }
}
- _clearRoot() {
- let root = this._root;
- this._root = null;
- this._transaction = null;
+ _clearAllRoots() {
+ let roots = this._roots;
+ for (let i = 0; i < roots.length; i++) {
+ let root = roots[i];
+ root.destroy();
+ }
+ this._roots = null;
- if (root) {
+ if (roots.length) {
deregister(this);
- root.destroy();
}
}
@@ -290,14 +317,14 @@ export class Renderer {
}
_isValid() {
- return !this._root || CURRENT_TAG.validate(this._root.lastRevision);
+ return this._destroyed || this._roots.length === 0 || CURRENT_TAG.validate(this._lastRevision);
}
_revalidate() {
if (this._isValid()) {
return;
}
- this._transaction();
+ this._renderRootsTransaction();
}
}
| true |
Other | emberjs | ember.js | b5790dc2e120415e6f08ccb8bb8c4ea367867fef.json | Add support for appending multiple roots.
In order to support rendering multiple roots the `Renderer` must be
updated to track each root and rerender them. As of this implementation,
all roots will be revalidated if any are (we are not tracking
revisions per root). | packages/ember-glimmer/tests/integration/components/append-test.js | @@ -101,7 +101,7 @@ class AbstractAppendTest extends RenderingTest {
this.assert.equal(willDestroyCalled, 1);
}
- ['@skip appending, updating and destroying multiple components'](assert) {
+ ['@test appending, updating and destroying multiple components'](assert) {
let willDestroyCalled = 0;
this.registerComponent('x-first', { | true |
Other | emberjs | ember.js | 0b9af9c82181840d89dd42fc228fe2cb626b52a3.json | Fix usage of bound outlet name.
Previously, we were eagerly evaluating the bound reference and passing
the final value around instead of the reference to the final outlet name
value. This means that given `{{outlet foo}}` when the property `foo`
changes then no updates would be made.
The fix is to avoid eagerly evaluating the reference, band and ensure
that the `ComponentDefition` includes a tag the represents both the
outlet name and the outlet state.
While debugging this, I also came across an untested scenario where we
coerced any falsy values for outlet name into `'main'`. However, we
should only be defaulting to `'main'` if no positional argument is present. | packages/ember-glimmer/lib/syntax/outlet.js | @@ -3,21 +3,35 @@ import { generateGuid, guidFor } from 'ember-metal/utils';
import { _instrumentStart } from 'ember-metal/instrumentation';
import { RootReference } from '../utils/references';
+import {
+ UpdatableTag,
+ ConstReference,
+ combine
+} from 'glimmer-reference';
+
function outletComponentFor(vm) {
let { outletState, isTopLevel } = vm.dynamicScope();
if (isTopLevel) {
return new TopLevelOutletComponentReference(outletState);
} else {
let args = vm.getArgs();
- let outletName = args.positional.at(0).value() || 'main';
- return new OutletComponentReference(outletName, outletState.get(outletName));
+ let outletNameRef;
+ if (args.positional.length === 0) {
+ outletNameRef = new ConstReference('main');
+ } else {
+ outletNameRef = args.positional.at(0);
+ }
+
+ return new OutletComponentReference(outletNameRef, outletState);
}
}
export class OutletSyntax extends StatementSyntax {
static create(environment, args, templates, symbolTable) {
- return new this(environment, args, templates, symbolTable);
+ let definitionArgs = ArgsSyntax.fromPositionalArgs(args.positional.slice(0, 1));
+
+ return new this(environment, definitionArgs, templates, symbolTable);
}
constructor(environment, args, templates, symbolTable) {
@@ -56,17 +70,25 @@ class TopLevelOutletComponentReference {
}
class OutletComponentReference {
- constructor(outletName, reference) {
- this.outletName = outletName;
- this.reference = reference;
+ constructor(outletNameRef, parentOutletStateRef) {
+ this.outletNameRef = outletNameRef;
+ this.parentOutletStateRef = parentOutletStateRef;
this.definition = null;
this.lastState = null;
- this.tag = reference.tag;
+ let outletStateTag = this.outletStateTag = new UpdatableTag(parentOutletStateRef.tag);
+ this.tag = combine([outletStateTag.tag, outletNameRef.tag]);
}
value() {
- let { outletName, reference, definition, lastState } = this;
- let newState = this.lastState = reference.value();
+ let { outletNameRef, parentOutletStateRef, definition, lastState } = this;
+
+
+ let outletName = outletNameRef.value();
+ let outletStateRef = parentOutletStateRef.get(outletName);
+ let newState = this.lastState = outletStateRef.value();
+
+ this.outletStateTag.update(outletStateRef.tag);
+
definition = revalidate(definition, lastState, newState);
let hasTemplate = newState && newState.render.template; | true |
Other | emberjs | ember.js | 0b9af9c82181840d89dd42fc228fe2cb626b52a3.json | Fix usage of bound outlet name.
Previously, we were eagerly evaluating the bound reference and passing
the final value around instead of the reference to the final outlet name
value. This means that given `{{outlet foo}}` when the property `foo`
changes then no updates would be made.
The fix is to avoid eagerly evaluating the reference, band and ensure
that the `ComponentDefition` includes a tag the represents both the
outlet name and the outlet state.
While debugging this, I also came across an untested scenario where we
coerced any falsy values for outlet name into `'main'`. However, we
should only be defaulting to `'main'` if no positional argument is present. | packages/ember-glimmer/tests/integration/outlet-test.js | @@ -156,7 +156,49 @@ moduleFor('outlet view', class extends RenderingTest {
this.assertText('HIBYE');
}
- ['@skip should support bound outlet name']() {
+ ['@test does not default outlet name when positional argument is present']() {
+ this.registerTemplate('application', '<h1>HI</h1>{{outlet someUndefinedThing}}');
+ let outletState = {
+ render: {
+ owner: this.owner,
+ into: undefined,
+ outlet: 'main',
+ name: 'application',
+ controller: {},
+ ViewClass: undefined,
+ template: this.owner.lookup('template:application')
+ },
+ outlets: Object.create(null)
+ };
+
+ this.runTask(() => this.component.setOutletState(outletState));
+
+ runAppend(this.component);
+
+ this.assertText('HI');
+
+ this.assertStableRerender();
+
+ this.registerTemplate('special', '<p>BYE</p>');
+ outletState.outlets.main = {
+ render: {
+ owner: this.owner,
+ into: undefined,
+ outlet: 'main',
+ name: 'special',
+ controller: {},
+ ViewClass: undefined,
+ template: this.owner.lookup('template:special')
+ },
+ outlets: Object.create(null)
+ };
+
+ this.runTask(() => this.component.setOutletState(outletState));
+
+ this.assertText('HI');
+ }
+
+ ['@test should support bound outlet name']() {
let controller = { outletName: 'foo' };
this.registerTemplate('application', '<h1>HI</h1>{{outlet outletName}}');
let outletState = {
@@ -165,7 +207,7 @@ moduleFor('outlet view', class extends RenderingTest {
into: undefined,
outlet: 'main',
name: 'application',
- controller: controller,
+ controller,
ViewClass: undefined,
template: this.owner.lookup('template:application')
}, | true |
Other | emberjs | ember.js | b4f73c32d3299bd6131aa4ed88d64bbcc0adc390.json | Fix a few skipped/invalid tests. | packages/ember-glimmer/tests/integration/components/curly-components-test.js | @@ -3,6 +3,7 @@ import isEnabled from 'ember-metal/features';
import { set } from 'ember-metal/property_set';
import { get } from 'ember-metal/property_get';
import { observer } from 'ember-metal/mixin';
+import { on } from 'ember-metal/events';
import EmberObject from 'ember-runtime/system/object';
import { Component, compile, htmlSafe } from '../../utils/helpers';
import { A as emberA } from 'ember-runtime/system/native_array';
@@ -2648,4 +2649,18 @@ moduleFor('Components test: curly components', class extends RenderingTest {
this.assert.ok(true, 'no errors during teardown');
}
+
+ ['@test using didInitAttrs as an event is deprecated'](assert) {
+ this.registerComponent('foo-bar', {
+ ComponentClass: Component.extend({
+ foo: on('didInitAttrs', function() {
+ assert.ok(true, 'should fire `didInitAttrs` event');
+ })
+ })
+ });
+
+ expectDeprecation(() => {
+ this.render('{{foo-bar}}');
+ }, /didInitAttrs called/);
+ }
}); | true |
Other | emberjs | ember.js | b4f73c32d3299bd6131aa4ed88d64bbcc0adc390.json | Fix a few skipped/invalid tests. | packages/ember-glimmer/tests/integration/helpers/closure-action-test.js | @@ -8,8 +8,7 @@ import { Component, INVOKE } from '../../utils/helpers';
if (isEnabled('ember-improved-instrumentation')) {
moduleFor('Helpers test: closure {{action}} improved instrumentation', class extends RenderingTest {
- // Skipped since features flags during tests are tricky.
- ['@skip action should fire interaction event']() {
+ ['@test action should fire interaction event']() {
let subscriberCalled = false;
let actionCalled = false;
| true |
Other | emberjs | ember.js | b4f73c32d3299bd6131aa4ed88d64bbcc0adc390.json | Fix a few skipped/invalid tests. | packages/ember-glimmer/tests/integration/helpers/render-test.js | @@ -2,8 +2,6 @@ import { observer } from 'ember-metal/mixin';
import Controller from 'ember-runtime/controllers/controller';
import { RenderingTest, moduleFor } from '../../utils/test-case';
import { set } from 'ember-metal/property_set';
-import EmberRouter from 'ember-routing/system/router';
-
moduleFor('Helpers test: {{render}}', class extends RenderingTest {
['@test should render given template']() {
@@ -262,16 +260,6 @@ moduleFor('Helpers test: {{render}}', class extends RenderingTest {
}, 'The second argument of {{render}} must be a path, e.g. {{render "post" post}}.');
}
- ['@skip should render a template without a model only once']() {
- this.owner.register('controller:home', Controller.extend());
- this.owner.register('router:main', EmberRouter.extend());
- this.registerTemplate('home', '<p>BYE</p>');
-
- expectAssertion(() => {
- this.render(`<h1>HI</h1>{{render 'home'}}<hr/>{{render 'home'}}`);
- }, /\{\{render\}\} helper once/i);
- }
-
['@test should set router as target when action not found on parentController is not found'](assert) {
let postController;
this.registerTemplate('post', 'post template'); | true |
Other | emberjs | ember.js | b4f73c32d3299bd6131aa4ed88d64bbcc0adc390.json | Fix a few skipped/invalid tests. | packages/ember-metal/tests/events_test.js | @@ -1,6 +1,5 @@
import { Mixin } from 'ember-metal/mixin';
import { meta } from 'ember-metal/meta';
-import { Component } from 'ember-glimmer';
import {
on,
@@ -261,11 +260,3 @@ QUnit.test('a listener added as part of a mixin may be overridden', function() {
sendEvent(obj, 'baz');
equal(triggered, 1, 'should invoke from subclass property');
});
-
-QUnit.skip('DEPRECATED: adding didInitAttrs as a listener is deprecated', function() {
- let obj = Component.create();
-
- expectDeprecation(() => {
- addListener(obj, 'didInitAttrs');
- }, /didInitAttrs called in <\Ember.Component\:ember[\d+]+>\./);
-}); | true |
Other | emberjs | ember.js | aad49ed20ba01f8235140977acf07e6a23a4789e.json | Destroy the instance since we don’t expose it | packages/ember-application/lib/system/application.js | @@ -973,9 +973,14 @@ const Application = Engine.extend({
*/
visit(url, options) {
return this.boot().then(() => {
- return this.buildInstance().boot(options).then((instance) => {
- return instance.visit(url);
- });
+ let instance = this.buildInstance();
+
+ return instance.boot(options)
+ .then(() => instance.visit(url))
+ .catch(error => {
+ run(instance, 'destroy');
+ throw error;
+ });
});
}
}); | false |
Other | emberjs | ember.js | 22e1612ad07249fddb6a1e0bb2344eba638fab46.json | Remove remnants of HTMLBars. | ember-cli-build.js | @@ -128,15 +128,7 @@ module.exports = function() {
'router': vendoredES6Package('router.js'),
'dag-map': vendoredES6Package('dag-map'),
'route-recognizer': htmlbarsPackage('route-recognizer', { libPath: 'node_modules/route-recognizer/dist/es6/' }),
- 'dom-helper': htmlbarsPackage('dom-helper'),
- 'morph-range': htmlbarsPackage('morph-range'),
- 'morph-attr': htmlbarsPackage('morph-attr'),
- 'htmlbars-runtime': htmlbarsPackage('htmlbars-runtime'),
- 'htmlbars-compiler': htmlbarsPackage('htmlbars-compiler'),
- 'htmlbars-syntax': htmlbarsPackage('htmlbars-syntax'),
- 'simple-html-tokenizer': htmlbarsPackage('simple-html-tokenizer'),
- 'htmlbars-test-helpers': htmlbarsPackage('htmlbars-test-helpers', { singleFile: true }),
- 'htmlbars-util': htmlbarsPackage('htmlbars-util')
+ 'simple-html-tokenizer': htmlbarsPackage('simple-html-tokenizer', { libPath: 'node_modules/glimmer-engine/dist/es6'})
};
var glimmerStatus = features['ember-glimmer'];
@@ -162,7 +154,6 @@ module.exports = function() {
development: getFeatures('development'),
production: getFeatures('production')
},
- htmlbars: require('htmlbars'),
glimmer: require('glimmer-engine'),
packages: getPackages(features),
vendoredPackages: vendorPackages, | true |
Other | emberjs | ember.js | 22e1612ad07249fddb6a1e0bb2344eba638fab46.json | Remove remnants of HTMLBars. | lib/packages.js | @@ -26,19 +26,15 @@ module.exports = function(features) {
};
var includeGlimmer = false;
- var includeHTMLBars = false;
var glimmerStatus = features['ember-glimmer'];
if (glimmerStatus === null) {
includeGlimmer = true;
- includeHTMLBars = true;
} else if (glimmerStatus === true) {
includeGlimmer = true;
- includeHTMLBars = false;
} else if (glimmerStatus === false) {
includeGlimmer = false;
- includeHTMLBars = true;
}
if (includeGlimmer) {
@@ -75,25 +71,5 @@ module.exports = function(features) {
packages['ember-template-compiler'].requirements.push('ember-glimmer-template-compiler');
}
- if (includeHTMLBars) {
- packages['ember-htmlbars-template-compiler'] = {
- trees: null,
- templateCompilerOnly: true,
- requirements: [],
- vendorRequirements: ['htmlbars-runtime'],
- templateCompilerVendor: ['htmlbars-runtime', 'htmlbars-util', 'htmlbars-compiler', 'htmlbars-syntax', 'htmlbars-test-helpers', 'morph-range']
- };
-
- packages['ember-htmlbars'] = {
- trees: null,
- vendorRequirements: ['dom-helper', 'morph-range', 'morph-attr', 'htmlbars-util', 'htmlbars-runtime'],
- requirements: ['ember-routing', 'ember-metal'],
- testingVendorRequirements: ['htmlbars-test-helpers'],
- hasTemplates: true
- };
-
- packages['ember-template-compiler'].requirements.push('ember-htmlbars-template-compiler');
- }
-
return packages;
} | true |
Other | emberjs | ember.js | 22e1612ad07249fddb6a1e0bb2344eba638fab46.json | Remove remnants of HTMLBars. | package.json | @@ -42,7 +42,6 @@
"glimmer-engine": "0.11.3",
"glob": "^5.0.13",
"html-differ": "^1.3.4",
- "htmlbars": "0.14.24",
"mocha": "^2.4.5",
"qunit-extras": "^1.5.0",
"qunitjs": "^1.22.0", | true |
Other | emberjs | ember.js | 22e1612ad07249fddb6a1e0bb2344eba638fab46.json | Remove remnants of HTMLBars. | packages/ember-application/lib/system/application.js | @@ -28,9 +28,8 @@ import { buildFakeRegistryWithDeprecations } from 'ember-runtime/mixins/registry
import { privatize as P } from 'container';
import { environment } from 'ember-environment';
import RSVP from 'ember-runtime/ext/rsvp';
-import Engine, { GLIMMER } from './engine';
-import require from 'require';
-import isEnabled from 'ember-metal/features';
+import Engine from './engine';
+import { setupApplicationRegistry } from 'ember-glimmer/setup-registry';
let librariesRegistered = false;
@@ -1020,18 +1019,7 @@ Application.reopenClass({
commonSetupRegistry(registry);
- if (isEnabled('ember-glimmer')) {
- let glimmerSetupRegistry = require('ember-glimmer/setup-registry').setupApplicationRegistry;
- glimmerSetupRegistry(registry);
- } else {
- if (options[GLIMMER]) {
- let glimmerSetupRegistry = require('ember-glimmer/setup-registry').setupApplicationRegistry;
- glimmerSetupRegistry(registry);
- } else {
- let htmlbarsSetupRegistry = require('ember-htmlbars/setup-registry').setupApplicationRegistry;
- htmlbarsSetupRegistry(registry);
- }
- }
+ setupApplicationRegistry(registry);
return registry;
} | true |
Other | emberjs | ember.js | 22e1612ad07249fddb6a1e0bb2344eba638fab46.json | Remove remnants of HTMLBars. | packages/ember-application/lib/system/engine.js | @@ -16,15 +16,11 @@ import { canInvoke } from 'ember-metal/utils';
import EmptyObject from 'ember-metal/empty_object';
import DefaultResolver from './resolver';
import EngineInstance from './engine-instance';
-import isEnabled from 'ember-metal/features';
-import symbol from 'ember-metal/symbol';
import Controller from 'ember-runtime/controllers/controller';
import RoutingService from 'ember-routing/services/routing';
import ContainerDebugAdapter from 'ember-extension-support/container_debug_adapter';
import ComponentLookup from 'ember-views/component_lookup';
-import require from 'require';
-
-export const GLIMMER = symbol('GLIMMER');
+import { setupEngineRegistry } from 'ember-glimmer/setup-registry';
function props(obj) {
var properties = [];
@@ -58,10 +54,6 @@ const Engine = Namespace.extend(RegistryProxy, {
init() {
this._super(...arguments);
- if (this[GLIMMER] === undefined) {
- this[GLIMMER] = isEnabled('ember-glimmer');
- }
-
this.buildRegistry();
},
@@ -107,9 +99,7 @@ const Engine = Namespace.extend(RegistryProxy, {
@return {Ember.Registry} the configured registry
*/
buildRegistry() {
- let registry = this.__registry__ = this.constructor.buildRegistry(this, {
- [GLIMMER]: this[GLIMMER]
- });
+ let registry = this.__registry__ = this.constructor.buildRegistry(this);
return registry;
},
@@ -404,19 +394,7 @@ Engine.reopenClass({
registry.register('application:main', namespace, { instantiate: false });
commonSetupRegistry(registry);
-
- if (isEnabled('ember-glimmer')) {
- let glimmerSetupRegistry = require('ember-glimmer/setup-registry').setupEngineRegistry;
- glimmerSetupRegistry(registry);
- } else {
- if (options[GLIMMER]) {
- let glimmerSetupRegistry = require('ember-glimmer/setup-registry').setupEngineRegistry;
- glimmerSetupRegistry(registry);
- } else {
- let htmlbarsSetupRegistry = require('ember-htmlbars/setup-registry').setupEngineRegistry;
- htmlbarsSetupRegistry(registry);
- }
- }
+ setupEngineRegistry(registry);
return registry;
}, | true |
Other | emberjs | ember.js | 22e1612ad07249fddb6a1e0bb2344eba638fab46.json | Remove remnants of HTMLBars. | packages/ember-glimmer-template-compiler/tests/plugins-test.js | @@ -25,7 +25,7 @@ QUnit.module(`ember-${packageName}: Registering AST Plugins`, {
}
});
-QUnit.test('registering a plugin adds it to htmlbars-compiler options', function() {
+QUnit.test('registering a plugin adds it to compiler options', function() {
expect(2);
registerPlugin('ast', TestPlugin); | true |
Other | emberjs | ember.js | 22e1612ad07249fddb6a1e0bb2344eba638fab46.json | Remove remnants of HTMLBars. | packages/ember-glimmer/tests/integration/application/engine-test.js | @@ -1,4 +1,3 @@
-import packageName from '../../utils/package-name';
import { moduleFor, ApplicationTest } from '../../utils/test-case';
import { strip } from '../../utils/abstract-test-case';
import { compile } from '../../utils/helpers';
@@ -7,14 +6,7 @@ import Engine from 'ember-application/system/engine';
import Route from 'ember-routing/system/route';
import isEnabled from 'ember-metal/features';
-// only run these tests for ember-glimmer when the feature is enabled, or for
-// ember-htmlbars when the feature is not enabled
-const shouldRun = isEnabled('ember-application-engines') && (
- (
- (isEnabled('ember-glimmer') && packageName === 'glimmer') ||
- (!isEnabled('ember-glimmer') && packageName === 'htmlbars')
- )
-);
+const shouldRun = isEnabled('ember-application-engines');
if (shouldRun) {
moduleFor('Application test: engine rendering', class extends ApplicationTest { | true |
Other | emberjs | ember.js | 22e1612ad07249fddb6a1e0bb2344eba638fab46.json | Remove remnants of HTMLBars. | packages/ember-glimmer/tests/integration/components/attribute-bindings-test.js | @@ -2,8 +2,6 @@ import { moduleFor, RenderingTest } from '../../utils/test-case';
import { Component } from '../../utils/helpers';
import { strip } from '../../utils/abstract-test-case';
import { set } from 'ember-metal/property_set';
-import { observersFor } from 'ember-metal/observer';
-
moduleFor('Attribute bindings integration', class extends RenderingTest {
['@test it can have attribute bindings']() {
@@ -357,13 +355,9 @@ moduleFor('Attribute bindings integration', class extends RenderingTest {
this.assertComponentElement(this.firstChild, { tagName: 'div', attrs: { 'id': 'special-sauce' } });
- // Should not be able to update id post creation. The change is correctly ignored in Glimmer, but
- // HTMLBars does not handle that.
- if (this.isGlimmer) {
- this.runTask(() => set(this.context, 'sauce', 'foo'));
+ this.runTask(() => set(this.context, 'sauce', 'foo'));
- this.assertComponentElement(this.firstChild, { tagName: 'div', attrs: { 'id': 'special-sauce' } });
- }
+ this.assertComponentElement(this.firstChild, { tagName: 'div', attrs: { 'id': 'special-sauce' } });
this.runTask(() => set(this.context, 'sauce', 'special-sauce'));
@@ -397,29 +391,6 @@ moduleFor('Attribute bindings integration', class extends RenderingTest {
this.assertComponentElement(this.firstChild, { tagName: 'div', attrs: { href: 'cat.html' } });
}
- // Note: There are no observers in Glimmer
- ['@htmlbars should teardown observers'](assert) {
- let component;
- let FooBarComponent = Component.extend({
- attributeBindings: ['foo'],
- foo: 'bar',
- init() {
- this._super(...arguments);
- component = this;
- }
- });
-
- this.registerComponent('foo-bar', { ComponentClass: FooBarComponent });
-
- this.render('{{foo-bar}}');
-
- assert.equal(observersFor(component, 'foo').length, 1);
-
- this.runTask(() => this.rerender());
-
- assert.equal(observersFor(component, 'foo').length, 1);
- }
-
['@test it can set attribute bindings in the constructor']() {
let FooBarComponent = Component.extend({
init() { | true |
Other | emberjs | ember.js | 22e1612ad07249fddb6a1e0bb2344eba638fab46.json | Remove remnants of HTMLBars. | packages/ember-glimmer/tests/integration/components/attrs-lookup-test.js | @@ -128,12 +128,7 @@ moduleFor('Components test: attrs lookup', class extends RenderingTest {
}
['@test getAttr() should return the same value as get()'](assert) {
- if (this.isGlimmer) {
- assert.expect(18);
- } else {
- // HTMLBars runs `didReceiveAttrs` on `rerender`
- assert.expect(20);
- }
+ assert.expect(18);
let instance;
let FooBarComponent = Component.extend({ | true |
Other | emberjs | ember.js | 22e1612ad07249fddb6a1e0bb2344eba638fab46.json | Remove remnants of HTMLBars. | packages/ember-glimmer/tests/integration/components/curly-components-test.js | @@ -1073,7 +1073,7 @@ moduleFor('Components test: curly components', class extends RenderingTest {
this.assertText('In layout - someProp: wycats');
// Note: Hooks are not fired in Glimmer for idempotent re-renders
- expectHooks({ willUpdate: this.isHTMLBars, didReceiveAttrs: this.isHTMLBars }, () => {
+ expectHooks({ willUpdate: false, didReceiveAttrs: false }, () => {
this.runTask(() => this.rerender());
});
@@ -1086,7 +1086,7 @@ moduleFor('Components test: curly components', class extends RenderingTest {
this.assertText('In layout - someProp: tomdale');
// Note: Hooks are not fired in Glimmer for idempotent re-renders
- expectHooks({ willUpdate: this.isHTMLBars, didReceiveAttrs: this.isHTMLBars }, () => {
+ expectHooks({ willUpdate: false, didReceiveAttrs: false }, () => {
this.runTask(() => this.rerender());
});
@@ -1956,7 +1956,7 @@ moduleFor('Components test: curly components', class extends RenderingTest {
}
['@test when a property is changed during children\'s rendering'](assert) {
- if (this.isHTMLBars || isEnabled('ember-glimmer-allow-backtracking-rerender')) {
+ if (isEnabled('ember-glimmer-allow-backtracking-rerender')) {
expectDeprecation(/modified value twice in a single render/);
}
@@ -2029,7 +2029,7 @@ moduleFor('Components test: curly components', class extends RenderingTest {
}
['@test when a shared dependency is changed during children\'s rendering'](assert) {
- if (this.isHTMLBars || isEnabled('ember-glimmer-allow-backtracking-rerender')) {
+ if (isEnabled('ember-glimmer-allow-backtracking-rerender')) {
expectDeprecation(/modified wrapper.content twice in a single render/);
}
| true |
Other | emberjs | ember.js | 22e1612ad07249fddb6a1e0bb2344eba638fab46.json | Remove remnants of HTMLBars. | packages/ember-glimmer/tests/integration/components/life-cycle-test.js | @@ -72,10 +72,6 @@ class LifeCycleHooksTest extends RenderingTest {
let assertParentView = (hookName, instance) => {
this.assert.ok(instance.parentView, `parentView should be present in ${hookName}`);
-
- if (this.isHTMLBars) {
- this.assert.ok(instance.ownerView, `ownerView should be present in ${hookName}`);
- }
};
let assertElement = (hookName, instance) => {
@@ -271,60 +267,19 @@ class LifeCycleHooksTest extends RenderingTest {
bottomAttrs = { oldAttrs: { website: 'tomdale.net' }, newAttrs: { website: 'tomdale.net' } };
- // The original implementation of the hooks in HTMLBars does a
- // deeper walk than necessary (using the AlwaysDirty validator),
- // resulting in executing the experimental "new hooks" too often.
- //
- // In particular, hooks were executed downstream from the original
- // call to `rerender()` even if the rerendering component did not
- // use `this.set()` to update the arguments of downstream components.
- //
- // Because Glimmer uses a pull-based model instead of a blunt
- // push-based model, we can avoid a deeper traversal than is
- // necessary.
-
- if (this.isHTMLBars) {
- this.assertHooks(
-
- 'after no-op rerender (middle)',
-
- // Sync hooks
-
- ['the-middle', 'willUpdate'],
- ['the-middle', 'willRender'],
-
- ['the-bottom', 'didUpdateAttrs', bottomAttrs],
- ['the-bottom', 'didReceiveAttrs', bottomAttrs],
-
- ['the-bottom', 'willUpdate'],
- ['the-bottom', 'willRender'],
-
- // Async hooks
-
- ['the-bottom', 'didUpdate'],
- ['the-bottom', 'didRender'],
-
- ['the-middle', 'didUpdate'],
- ['the-middle', 'didRender']
-
- );
- } else {
- this.assertHooks(
-
- 'after no-op rerender (middle)',
-
- // Sync hooks
+ this.assertHooks(
+ 'after no-op rerender (middle)',
- ['the-middle', 'willUpdate'],
- ['the-middle', 'willRender'],
+ // Sync hooks
- // Async hooks
+ ['the-middle', 'willUpdate'],
+ ['the-middle', 'willRender'],
- ['the-middle', 'didUpdate'],
- ['the-middle', 'didRender']
+ // Async hooks
- );
- }
+ ['the-middle', 'didUpdate'],
+ ['the-middle', 'didRender']
+ );
this.runTask(() => this.components['the-top'].rerender());
@@ -333,57 +288,19 @@ class LifeCycleHooksTest extends RenderingTest {
middleAttrs = { oldAttrs: { name: 'Tom Dale' }, newAttrs: { name: 'Tom Dale' } };
- if (this.isHTMLBars) {
- this.assertHooks(
-
- 'after no-op rerender (top)',
-
- // Sync hooks
-
- ['the-top', 'willUpdate'],
- ['the-top', 'willRender'],
-
- ['the-middle', 'didUpdateAttrs', middleAttrs],
- ['the-middle', 'didReceiveAttrs', middleAttrs],
-
- ['the-middle', 'willUpdate'],
- ['the-middle', 'willRender'],
-
- ['the-bottom', 'didUpdateAttrs', bottomAttrs],
- ['the-bottom', 'didReceiveAttrs', bottomAttrs],
-
- ['the-bottom', 'willUpdate'],
- ['the-bottom', 'willRender'],
-
- // Async hooks
-
- ['the-bottom', 'didUpdate'],
- ['the-bottom', 'didRender'],
-
- ['the-middle', 'didUpdate'],
- ['the-middle', 'didRender'],
-
- ['the-top', 'didUpdate'],
- ['the-top', 'didRender']
-
- );
- } else {
- this.assertHooks(
-
- 'after no-op rerender (top)',
-
- // Sync hooks
+ this.assertHooks(
+ 'after no-op rerender (top)',
- ['the-top', 'willUpdate'],
- ['the-top', 'willRender'],
+ // Sync hooks
- // Async hooks
+ ['the-top', 'willUpdate'],
+ ['the-top', 'willRender'],
- ['the-top', 'didUpdate'],
- ['the-top', 'didRender']
+ // Async hooks
- );
- }
+ ['the-top', 'didUpdate'],
+ ['the-top', 'didRender']
+ );
this.runTask(() => set(this.context, 'twitter', '@horsetomdale'));
@@ -553,46 +470,7 @@ class LifeCycleHooksTest extends RenderingTest {
middleAttrs = { oldAttrs: { twitterTop: '@horsetomdale' }, newAttrs: { twitterTop: '@horsetomdale' } };
bottomAttrs = { oldAttrs: { twitterMiddle: '@horsetomdale' }, newAttrs: { twitterMiddle: '@horsetomdale' } };
- if (this.isHTMLBars) {
- this.assertHooks(
-
- 'after no-op rernder (root)',
-
- // Sync hooks
-
- ['the-top', 'didUpdateAttrs', topAttrs],
- ['the-top', 'didReceiveAttrs', topAttrs],
-
- ['the-top', 'willUpdate'],
- ['the-top', 'willRender'],
-
- ['the-middle', 'didUpdateAttrs', middleAttrs],
- ['the-middle', 'didReceiveAttrs', middleAttrs],
-
- ['the-middle', 'willUpdate'],
- ['the-middle', 'willRender'],
-
- ['the-bottom', 'didUpdateAttrs', bottomAttrs],
- ['the-bottom', 'didReceiveAttrs', bottomAttrs],
-
- ['the-bottom', 'willUpdate'],
- ['the-bottom', 'willRender'],
-
- // Async hooks
-
- ['the-bottom', 'didUpdate'],
- ['the-bottom', 'didRender'],
-
- ['the-middle', 'didUpdate'],
- ['the-middle', 'didRender'],
-
- ['the-top', 'didUpdate'],
- ['the-top', 'didRender']
-
- );
- } else {
- this.assertHooks('after no-op rernder (root)');
- }
+ this.assertHooks('after no-op rernder (root)');
this.teardownAssertions.push(() => {
this.assertHooks( | true |
Other | emberjs | ember.js | 22e1612ad07249fddb6a1e0bb2344eba638fab46.json | Remove remnants of HTMLBars. | packages/ember-glimmer/tests/integration/components/local-lookup-test.js | @@ -1,7 +1,6 @@
import { moduleFor, RenderingTest } from '../../utils/test-case';
import { Component } from '../../utils/helpers';
-// copied from ember-htmlbars/tests/integration/local-lookup-test.js
function buildResolver() {
let resolver = {
resolve() { }, | true |
Other | emberjs | ember.js | 22e1612ad07249fddb6a1e0bb2344eba638fab46.json | Remove remnants of HTMLBars. | packages/ember-glimmer/tests/integration/content-test.js | @@ -215,8 +215,7 @@ class DynamicContentTest extends RenderingTest {
this.assertInvariants();
}
- // HTMLBars fail the DOM node stability test in the last step
- ['@glimmer it can read from a proxy object']() {
+ ['@test it can read from a proxy object']() {
this.renderPath('proxy.name', { proxy: ObjectProxy.create({ content: { name: 'Tom Dale' } }) });
this.assertContent('Tom Dale');
@@ -248,7 +247,7 @@ class DynamicContentTest extends RenderingTest {
this.assertInvariants();
}
- ['@glimmer it can read from a nested path in a proxy object']() {
+ ['@test it can read from a nested path in a proxy object']() {
this.renderPath('proxy.name.last', { proxy: ObjectProxy.create({ content: { name: { first: 'Tom', last: 'Dale' } } }) });
this.assertContent('Dale');
@@ -289,7 +288,7 @@ class DynamicContentTest extends RenderingTest {
this.assertInvariants();
}
- ['@glimmer it can read from a path flipping between a proxy and a real object']() {
+ ['@test it can read from a path flipping between a proxy and a real object']() {
this.renderPath('proxyOrObject.name.last', { proxyOrObject: ObjectProxy.create({ content: { name: { first: 'Tom', last: 'Dale' } } }) });
this.assertContent('Dale');
@@ -334,7 +333,7 @@ class DynamicContentTest extends RenderingTest {
this.assertInvariants();
}
- ['@glimmer it can read from a path flipping between a real object and a proxy']() {
+ ['@test it can read from a path flipping between a real object and a proxy']() {
this.renderPath('objectOrProxy.name.last', { objectOrProxy: { name: { first: 'Tom', last: 'Dale' } } });
this.assertContent('Dale');
@@ -490,7 +489,7 @@ let GlimmerContentTestCases = new ContentTestGenerator([
[Object.create(null), EMPTY, 'an object with no toString']
-], '@glimmer');
+]);
if (typeof Symbol !== 'undefined') {
GlimmerContentTestCases.cases.push([Symbol('debug'), 'Symbol(debug)', 'a symbol']);
@@ -834,8 +833,6 @@ moduleFor('Dynamic content tests (integration)', class extends RenderingTest {
this.runTask(() => set(this.context, 'fooBar', false));
- // HTMLBars differs in behavior here as it leaves the empty
- // class attribute.
assert.equal(this.firstChild.className, '');
this.runTask(() => set(this.context, 'fooBar', true)); | true |
Other | emberjs | ember.js | 22e1612ad07249fddb6a1e0bb2344eba638fab46.json | Remove remnants of HTMLBars. | packages/ember-glimmer/tests/integration/helpers/closure-action-test.js | @@ -252,16 +252,9 @@ moduleFor('Helpers test: closure {{action}}', class extends RenderingTest {
template: '{{inner-component submit=(action somethingThatIsUndefined)}}'
});
- // The assertion is different because in the HTMLBars case, the value is always a stream,
- // whether or not the path read actually has value.
- // In the Glimmer case, we're checking the value and not the reference, which could be undefined
- // and thus throws the correct error.
this.assert.throws(() => {
this.render('{{outer-component}}');
- }, this.isGlimmer ?
- /Action passed is null or undefined in \(action[^)]*\) from .*\./ :
- /An action could not be made for `.*` in .*\. Please confirm that you are using either a quoted action name \(i\.e\. `\(action '.*'\)`\) or a function available in .*\./
- );
+ }, /Action passed is null or undefined in \(action[^)]*\) from .*\./);
}
['@test an error is triggered when bound action being passed in is a non-function']() { | true |
Other | emberjs | ember.js | 22e1612ad07249fddb6a1e0bb2344eba638fab46.json | Remove remnants of HTMLBars. | packages/ember-glimmer/tests/integration/helpers/mut-test.js | @@ -250,11 +250,7 @@ moduleFor('Helpers test: {{mut}}', class extends RenderingTest {
this.assertStableRerender();
- if (this.isHTMLBars) {
- this.assert.deepEqual(willRender, [12, 12], 'willReceive is [12, 12]');
- } else {
- this.assert.deepEqual(willRender, [12], 'willReceive is [12]');
- }
+ this.assert.deepEqual(willRender, [12], 'willReceive is [12]');
this.assert.deepEqual(didInsert, [12], 'didInsert is [12]');
this.assert.strictEqual(get(bottom, 'setMe'), 12, 'the data propagated');
| true |
Other | emberjs | ember.js | 22e1612ad07249fddb6a1e0bb2344eba638fab46.json | Remove remnants of HTMLBars. | packages/ember-glimmer/tests/integration/syntax/each-in-test.js | @@ -95,12 +95,6 @@ moduleFor('Syntax test: {{#each-in}}', class extends BasicEachInTest {
this.runTask(() => {
set(this.context, 'categories.Smartphones', 100);
set(this.context, 'categories.Tweets', 443115);
-
- if (this.isHTMLBars) {
- // {{#each-in}} in HTMLBars does not observe internal mutations to the
- // hash so we manually trigger a rerender.
- this.rerender();
- }
});
this.assertHTML(strip`
@@ -154,12 +148,6 @@ moduleFor('Syntax test: {{#each-in}}', class extends BasicEachInTest {
this.runTask(() => {
set(this.context, 'categories.Smartphones', 100);
set(this.context, 'categories.Tweets', 443115);
-
- if (this.isHTMLBars) {
- // {{#each-in}} in HTMLBars does not observe internal mutations to the
- // hash so we manually trigger a rerender.
- this.rerender();
- }
});
this.assertHTML(strip`
@@ -270,12 +258,6 @@ moduleFor('Syntax test: {{#each-in}}', class extends BasicEachInTest {
this.runTask(() => {
set(protoCategories, 'Robots', 666);
set(categories, 'Tweets', 443115);
-
- if (this.isHTMLBars) {
- // {{#each-in}} in HTMLBars does not observe internal mutations to the
- // hash so we manually trigger a rerender.
- this.rerender();
- }
});
this.assertHTML(strip`
@@ -402,12 +384,6 @@ moduleFor('Syntax test: {{#each-in}}', class extends BasicEachInTest {
this.runTask(() => {
set(arr, 'zomg', 'lol');
-
- if (this.isHTMLBars) {
- // {{#each-in}} in HTMLBars does not observe internal mutations to the
- // hash so we manually trigger a rerender.
- this.rerender();
- }
});
this.assertText('[0:1][1:2][2:3][foo:bar][zomg:lol]'); | true |
Other | emberjs | ember.js | 22e1612ad07249fddb6a1e0bb2344eba638fab46.json | Remove remnants of HTMLBars. | packages/ember-glimmer/tests/utils/abstract-test-case.js | @@ -51,11 +51,6 @@ export function moduleFor(description, TestClass, ...mixins) {
let modulePackagePrefix = modulePackagePrefixMatch ? modulePackagePrefixMatch[1] : '';
let descriptionWithoutPackagePrefix = description.replace(/^@\w* /, '');
- if (isEnabled('ember-glimmer') && packageName === 'htmlbars') {
- // disable htmlbars tests when running with the ember-glimmer feature enabled
- return;
- }
-
QUnit.module(`[${packageName}] ${descriptionWithoutPackagePrefix}`, {
setup() {
context = new TestClass();
@@ -99,10 +94,6 @@ export class TestCase {
this.assert = QUnit.config.current.assert;
}
- get isHTMLBars() {
- return packageName === 'htmlbars';
- }
-
get isGlimmer() {
return packageName === 'glimmer';
} | true |
Other | emberjs | ember.js | 22e1612ad07249fddb6a1e0bb2344eba638fab46.json | Remove remnants of HTMLBars. | packages/ember-template-compiler/lib/compat/precompile.js | @@ -1,34 +0,0 @@
-/**
-@module ember
-@submodule ember-template-compiler
-*/
-import require, { has } from 'require';
-import isEnabled from 'ember-metal/features';
-
-
-let compile, compileSpec, compileOptions;
-
-// Note we don't really want to expose this from main file
-if (isEnabled('ember-glimmer')) {
- compileOptions = require('ember-glimmer-template-compiler/system/compile-options').default;
-} else {
- compileOptions = require('ember-htmlbars-template-compiler/system/compile-options').default;
-}
-
-export default function(string) {
- if ((!compile || !compileSpec) && has('htmlbars-compiler/compiler')) {
- let Compiler = require('htmlbars-compiler/compiler');
-
- compile = Compiler.compile;
- compileSpec = Compiler.compileSpec;
- }
-
- if (!compile || !compileSpec) {
- throw new Error('Cannot call `precompile` without the template compiler loaded. Please load `ember-template-compiler.js` prior to calling `precompile`.');
- }
-
- let asObject = arguments[1] === undefined ? true : arguments[1];
- let compileFunc = asObject ? compile : compileSpec;
-
- return compileFunc(string, compileOptions());
-} | true |
Other | emberjs | ember.js | 22e1612ad07249fddb6a1e0bb2344eba638fab46.json | Remove remnants of HTMLBars. | packages/ember-template-compiler/lib/compiler.js | @@ -1,13 +1,5 @@
-import isEnabled from 'ember-metal/features';
-import require from 'require';
+import * as compiler from 'ember-glimmer-template-compiler';
export default function pickCompiler() {
- let compiler;
- if (isEnabled('ember-glimmer')) {
- compiler = require('ember-glimmer-template-compiler');
- } else {
- compiler = require('ember-htmlbars-template-compiler');
- }
-
return compiler;
} | true |
Other | emberjs | ember.js | 22e1612ad07249fddb6a1e0bb2344eba638fab46.json | Remove remnants of HTMLBars. | packages/ember-template-compiler/tests/system/bootstrap-test.js | @@ -4,15 +4,7 @@ import Component from 'ember-templates/component';
import { runAppend, runDestroy } from 'ember-runtime/tests/utils';
import bootstrap from 'ember-template-compiler/system/bootstrap';
import { setTemplates, get as getTemplate } from 'ember-templates/template_registry';
-import isEnabled from 'ember-metal/features';
-import require from 'require';
-
-let buildOwner;
-if (isEnabled('ember-glimmer')) {
- buildOwner = require('ember-glimmer/tests/utils/helpers').buildOwner;
-} else {
- buildOwner = require('ember-htmlbars/tests/utils/helpers').buildOwner;
-}
+import { buildOwner } from 'ember-glimmer/tests/utils/helpers';
const { trim } = jQuery;
@@ -41,7 +33,7 @@ function checkTemplate(templateName) {
runDestroy(component);
}
-QUnit.module('ember-htmlbars: bootstrap', {
+QUnit.module('ember-templates: bootstrap', {
setup() {
fixture = document.getElementById('qunit-fixture');
}, | true |
Other | emberjs | ember.js | 22e1612ad07249fddb6a1e0bb2344eba638fab46.json | Remove remnants of HTMLBars. | packages/ember-template-compiler/tests/utils/helpers.js | @@ -1,13 +1 @@
-import isEnabled from 'ember-metal/features';
-import require from 'require';
-
-export function compile(string, options) {
- let compiler;
- if (isEnabled('ember-glimmer')) {
- compiler = require('ember-glimmer-template-compiler/tests/utils/helpers').compile;
- } else {
- compiler = require('ember-htmlbars-template-compiler/tests/utils/helpers').compile;
- }
-
- return compiler(string, options);
-}
+export { compile } from 'ember-glimmer-template-compiler/tests/utils/helpers'; | true |
Other | emberjs | ember.js | 22e1612ad07249fddb6a1e0bb2344eba638fab46.json | Remove remnants of HTMLBars. | packages/ember-templates/lib/component.js | @@ -1,10 +1 @@
-import isEnabled from 'ember-metal/features';
-import require from 'require';
-
-export default (function () {
- if (isEnabled('ember-glimmer')) {
- return require('ember-glimmer/component').default;
- } else {
- return require('ember-htmlbars/component').default;
- }
-}());
+export { default } from 'ember-glimmer/component'; | true |
Other | emberjs | ember.js | 22e1612ad07249fddb6a1e0bb2344eba638fab46.json | Remove remnants of HTMLBars. | packages/ember-templates/lib/components/checkbox.js | @@ -1,10 +1 @@
-import isEnabled from 'ember-metal/features';
-import require from 'require';
-
-export default (function () {
- if (isEnabled('ember-glimmer')) {
- return require('ember-glimmer/components/checkbox').default;
- } else {
- return require('ember-htmlbars/components/checkbox').default;
- }
-}());
+export { default } from 'ember-glimmer/components/checkbox'; | true |
Other | emberjs | ember.js | 22e1612ad07249fddb6a1e0bb2344eba638fab46.json | Remove remnants of HTMLBars. | packages/ember-templates/lib/components/link-to.js | @@ -1,10 +1 @@
-import isEnabled from 'ember-metal/features';
-import require from 'require';
-
-export default (function () {
- if (isEnabled('ember-glimmer')) {
- return require('ember-glimmer/components/link-to').default;
- } else {
- return require('ember-htmlbars/components/link-to').default;
- }
-}());
+export { default } from 'ember-glimmer/components/link-to'; | true |
Other | emberjs | ember.js | 22e1612ad07249fddb6a1e0bb2344eba638fab46.json | Remove remnants of HTMLBars. | packages/ember-templates/lib/components/text_area.js | @@ -1,10 +1 @@
-import isEnabled from 'ember-metal/features';
-import require from 'require';
-
-export default (function () {
- if (isEnabled('ember-glimmer')) {
- return require('ember-glimmer/components/text_area').default;
- } else {
- return require('ember-htmlbars/components/text_area').default;
- }
-}());
+export { default } from 'ember-glimmer/components/text_area'; | true |
Other | emberjs | ember.js | 22e1612ad07249fddb6a1e0bb2344eba638fab46.json | Remove remnants of HTMLBars. | packages/ember-templates/lib/components/text_field.js | @@ -1,10 +1 @@
-import isEnabled from 'ember-metal/features';
-import require from 'require';
-
-export default (function () {
- if (isEnabled('ember-glimmer')) {
- return require('ember-glimmer/components/text_field').default;
- } else {
- return require('ember-htmlbars/components/text_field').default;
- }
-}());
+export { default } from 'ember-glimmer/components/text_field'; | true |
Other | emberjs | ember.js | 22e1612ad07249fddb6a1e0bb2344eba638fab46.json | Remove remnants of HTMLBars. | packages/ember-templates/lib/dom-helper.js | @@ -1,10 +1 @@
-import isEnabled from 'ember-metal/features';
-import require from 'require';
-
-export default (function () {
- if (isEnabled('ember-glimmer')) {
- return require('ember-glimmer/dom').NodeDOMTreeConstruction;
- } else {
- return require('ember-htmlbars/system/dom-helper').default;
- }
-}());
+export { NodeDOMTreeConstruction as default } from 'ember-glimmer/dom'; | true |
Other | emberjs | ember.js | 22e1612ad07249fddb6a1e0bb2344eba638fab46.json | Remove remnants of HTMLBars. | packages/ember-templates/lib/helper.js | @@ -1,18 +1,4 @@
-import isEnabled from 'ember-metal/features';
-import require from 'require';
-
-export default (function () {
- if (isEnabled('ember-glimmer')) {
- return require('ember-glimmer/helper').default;
- } else {
- return require('ember-htmlbars/helper').default;
- }
-}());
-
-export const helper = (function () {
- if (isEnabled('ember-glimmer')) {
- return require('ember-glimmer/helper').helper;
- } else {
- return require('ember-htmlbars/helper').helper;
- }
-}());
+export {
+ default,
+ helper
+} from 'ember-glimmer/helper'; | true |
Other | emberjs | ember.js | 22e1612ad07249fddb6a1e0bb2344eba638fab46.json | Remove remnants of HTMLBars. | packages/ember-templates/lib/make-bound-helper.js | @@ -1,10 +1 @@
-import isEnabled from 'ember-metal/features';
-import require from 'require';
-
-export default (function () {
- if (isEnabled('ember-glimmer')) {
- return require('ember-glimmer/make-bound-helper').default;
- } else {
- return require('ember-htmlbars/make-bound-helper').default;
- }
-}());
+export { default } from 'ember-glimmer/make-bound-helper'; | true |
Other | emberjs | ember.js | 22e1612ad07249fddb6a1e0bb2344eba638fab46.json | Remove remnants of HTMLBars. | packages/ember-templates/lib/renderer.js | @@ -1,26 +1,5 @@
-import isEnabled from 'ember-metal/features';
-import require from 'require';
-
-export const InteractiveRenderer = (function () {
- if (isEnabled('ember-glimmer')) {
- return require('ember-glimmer/renderer').InteractiveRenderer;
- } else {
- return require('ember-htmlbars/renderer').InteractiveRenderer;
- }
-}());
-
-export const InertRenderer = (function () {
- if (isEnabled('ember-glimmer')) {
- return require('ember-glimmer/renderer').InertRenderer;
- } else {
- return require('ember-htmlbars/renderer').InertRenderer;
- }
-}());
-
-export const Renderer = (function () {
- if (isEnabled('ember-glimmer')) {
- return require('ember-glimmer/renderer').Renderer;
- } else {
- return require('ember-htmlbars/renderer').Renderer;
- }
-}());
+export {
+ InertRenderer,
+ InteractiveRenderer,
+ Renderer
+} from 'ember-glimmer/renderer'; | true |
Other | emberjs | ember.js | 22e1612ad07249fddb6a1e0bb2344eba638fab46.json | Remove remnants of HTMLBars. | packages/ember-templates/lib/template.js | @@ -1,15 +1 @@
-import isEnabled from 'ember-metal/features';
-import require, { has } from 'require';
-
-let htmlbarsTemplate, glimmerTemplate;
-if (has('ember-htmlbars')) {
- htmlbarsTemplate = require('ember-htmlbars').template;
-}
-
-if (has('ember-glimmer')) {
- glimmerTemplate = require('ember-glimmer').template;
-}
-
-let template = isEnabled('ember-glimmer') ? glimmerTemplate : htmlbarsTemplate;
-
-export default template;
+export { template as default } from 'ember-glimmer'; | true |
Other | emberjs | ember.js | 22e1612ad07249fddb6a1e0bb2344eba638fab46.json | Remove remnants of HTMLBars. | packages/ember-views/lib/views/core_view.js | @@ -4,16 +4,7 @@ import EmberObject from 'ember-runtime/system/object';
import Evented from 'ember-runtime/mixins/evented';
import ActionHandler, { deprecateUnderscoreActions } from 'ember-runtime/mixins/action_handler';
import { typeOf } from 'ember-runtime/utils';
-
import { cloneStates, states } from './states';
-import require from 'require';
-
-// Normally, the renderer is injected by the container when the view is looked
-// up. However, if someone creates a view without looking it up via the
-// container (e.g. `Ember.View.create().append()`) then we create a fallback
-// DOM renderer that is shared. In general, this path should be avoided since
-// views created this way cannot run in a node environment.
-let renderer;
/**
`Ember.CoreView` is an abstract class that exists to give view-like behavior
@@ -51,11 +42,8 @@ const CoreView = EmberObject.extend(Evented, ActionHandler, {
this._env = null;
this._isVisible = get(this, 'isVisible');
- // Fallback for legacy cases where the view was created directly
- // via `create()` instead of going through the container.
if (!this.renderer) {
- renderer = renderer || htmlbarsRenderer();
- this.renderer = renderer;
+ throw new Error(`Cannot instantiate a component without a renderer. Please ensure that you are creating ${this} with a proper container/registry.`);
}
},
@@ -111,12 +99,4 @@ CoreView.reopenClass({
isViewFactory: true
});
-let InteractiveRenderer, DOMHelper;
-function htmlbarsRenderer() {
- DOMHelper = DOMHelper || require('ember-htmlbars/system/dom-helper').default;
- InteractiveRenderer = InteractiveRenderer || require('ember-htmlbars/renderer').InteractiveRenderer;
-
- return InteractiveRenderer.create({ dom: new DOMHelper() });
-}
-
export default CoreView; | true |
Other | emberjs | ember.js | 22e1612ad07249fddb6a1e0bb2344eba638fab46.json | Remove remnants of HTMLBars. | packages/ember/lib/index.js | @@ -8,12 +8,7 @@ import 'ember-views';
import 'ember-routing';
import 'ember-application';
import 'ember-extension-support';
-if (has('ember-htmlbars')) {
- require('ember-htmlbars');
-}
-if (has('ember-glimmer')) {
- require('ember-glimmer');
-}
+import 'ember-glimmer';
import 'ember-templates';
import { runLoadHooks } from 'ember-runtime/system/lazy_load'; | true |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.