Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix Ember._Renderer export issue. #14208

Merged
merged 1 commit into from
Sep 3, 2016
Merged

Fix Ember._Renderer export issue. #14208

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion packages/ember-glimmer/lib/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,11 @@ export {
isHTMLSafe,
getSafeString as _getSafeString
} from './utils/string';
export { default as _Renderer } from './renderer';
export {
Renderer,
InertRenderer,
InteractiveRenderer
} from './renderer';
export {
getTemplate,
setTemplate,
Expand Down
2 changes: 0 additions & 2 deletions packages/ember-metal/lib/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,12 @@ export {
intern,
GUID_KEY,
GUID_KEY_PROPERTY,
apply,
applyStr,
canInvoke,
generateGuid,
guidFor,
inspect,
makeArray,
deprecatedTryCatchFinally,
tryInvoke,
uuid,
wrap
Expand Down
6 changes: 2 additions & 4 deletions packages/ember/lib/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,10 @@ Ember.GUID_KEY = metal.GUID_KEY;
Ember.guidFor = metal.guidFor;
Ember.inspect = metal.inspect;

Ember.tryCatchFinally = metal.deprecatedTryCatchFinally;
Ember.makeArray = metal.makeArray;
Ember.canInvoke = metal.canInvoke;
Ember.tryInvoke = metal.tryInvoke;
Ember.wrap = metal.wrap;
Ember.apply = metal.apply;
Ember.applyStr = metal.applyStr;
Ember.uuid = metal.uuid;
Ember.Error = metal.Error;
Expand Down Expand Up @@ -469,7 +467,7 @@ import {
getTemplates,
setTemplates,
_getSafeString,
_Renderer
Renderer
} from 'ember-glimmer';

Ember.Component = Component;
Expand All @@ -479,7 +477,7 @@ Ember.Checkbox = Checkbox;
Ember.TextField = TextField;
Ember.TextArea = TextArea;
Ember.LinkComponent = LinkComponent;
Ember._Renderer = _Renderer;
Ember._Renderer = Renderer;

if (ENV.EXTEND_PROTOTYPES.String) {
String.prototype.htmlSafe = function() {
Expand Down
5 changes: 1 addition & 4 deletions packages/ember/tests/reexports_test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,10 @@ QUnit.module('ember reexports');
['GUID_KEY', 'ember-metal'],
['guidFor', 'ember-metal'],
['inspect', 'ember-metal'],
['tryCatchFinally', 'ember-metal', 'deprecatedTryCatchFinally'],
['makeArray', 'ember-metal'],
['canInvoke', 'ember-metal'],
['tryInvoke', 'ember-metal'],
['wrap', 'ember-metal'],
['apply', 'ember-metal'],
['applyStr', 'ember-metal'],
['uuid', 'ember-metal'],
['testing', 'ember-metal', { get: 'isTesting', set: 'setTesting' }],
Expand Down Expand Up @@ -94,7 +92,6 @@ QUnit.module('ember reexports');
['watch', 'ember-metal'],
['isWatching', 'ember-metal'],
['unwatch', 'ember-metal'],
['rewatch', 'ember-metal'],
['destroy', 'ember-metal'],
['libraries', 'ember-metal'],
['OrderedSet', 'ember-metal'],
Expand Down Expand Up @@ -132,7 +129,7 @@ QUnit.module('ember reexports');
['EventDispatcher', 'ember-views'],

// ember-glimmer
['_Renderer', 'ember-glimmer', '_Renderer'],
['_Renderer', 'ember-glimmer', 'Renderer'],
['Component', 'ember-glimmer', 'Component'],
['Helper', 'ember-glimmer', 'Helper'],
['Helper.helper', 'ember-glimmer', 'helper'],
Expand Down
8 changes: 7 additions & 1 deletion packages/internal-test-helpers/lib/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,15 @@ export function confirmExport(Ember, assert, path, moduleId, exportName) {
let mod = require(moduleId);
if (typeof exportName === 'string') {
assert.equal(desc.value, mod[exportName], `Ember.${path} is exported correctly`);
assert.notEqual(mod[exportName], undefined, `Ember.${path} is not \`undefined\``);
} else {
assert.equal(desc.get, mod[exportName.get], `Ember.${path} getter is exported correctly`);
assert.equal(desc.set, mod[exportName.set], `Ember.${path} setter is exported correctly`);
assert.notEqual(desc.get, undefined, `Ember.${path} getter is not undefined`);

if (exportName.set) {
assert.equal(desc.set, mod[exportName.set], `Ember.${path} setter is exported correctly`);
assert.notEqual(desc.set, undefined, `Ember.${path} setter is not undefined`);
}
}
}

Expand Down