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
|
a4fc9a5cdc9dacca9aa5e179d1885abb10e5c91a.json
|
start meta package
add types and change imports
|
packages/ember-metal/lib/watching.js
|
@@ -4,7 +4,7 @@
import { watchKey, unwatchKey } from './watch_key';
import { watchPath, unwatchPath } from './watch_path';
import { isPath } from './path_cache';
-import { peekMeta } from './meta';
+import { peekMeta } from 'ember-meta';
/**
Starts watching a property on an object. Whenever the property changes,
| true |
Other
|
emberjs
|
ember.js
|
d5a9092c3f97290fa40e65b15d03015909f98587.json
|
Fix browserstack tests.
|
testem.dist.js
|
@@ -100,7 +100,7 @@ module.exports = {
'--b',
'safari',
'--bv',
- '11',
+ 'latest',
'-t',
'1200',
'--u',
@@ -118,7 +118,7 @@ module.exports = {
'--b',
'safari',
'--bv',
- '10.1',
+ 'latest',
'-t',
'1200',
'--u',
| false |
Other
|
emberjs
|
ember.js
|
2eec20843c4f951eb52a32efeb06c57d6789509a.json
|
Add v3.2.0-beta.4 to CHANGELOG
[ci skip]
(cherry picked from commit 38cbfffda6dc04b6be4299eaa39848cca98c7a3d)
|
CHANGELOG.md
|
@@ -1,5 +1,10 @@
# Ember Changelog
+### v3.2.0-beta.4 (May 7, 2018)
+- [#16597](https://github.com/emberjs/ember.js/pull/16597) [BUGFIX] Ensure `Ember.run.cancelTimers` is present.
+- [#16605](https://github.com/emberjs/ember.js/pull/16605) [BUGFIX] Use resetCache on container destroy
+- [#16615](https://github.com/emberjs/ember.js/pull/16615) [BUGFIX] Fix NAMESPACES_BY_ID leaks
+
### v3.2.0-beta.3 (April 23, 2018)
- [#16539](https://github.com/emberjs/ember.js/pull/16539) [BUGFIX] Ember is already registered by the libraries registry already.
- [#16559](https://github.com/emberjs/ember.js/pull/16559) [BUGFIX] Fix property normalization, Update glimmer-vm to 0.34.0
| false |
Other
|
emberjs
|
ember.js
|
53a0166abc45632c78c7d065cc619873ac59513b.json
|
Add v3.1.2 and v3.1.1 to CHANGELOG.
[ci skip]
|
CHANGELOG.md
|
@@ -32,6 +32,12 @@
- [#16462](https://github.com/emberjs/ember.js/pull/16462) [CLEANUP] Remove deprecated `MODEL_FACTORY_INJECTIONS`
- [emberjs/rfcs#286](https://github.com/emberjs/rfcs/blob/master/text/0286-block-let-template-helper.md) [FEATURE] Enabled block `let` handlebars helper by default.
+### v3.1.2 (May 7, 2018)
+- [#16600](https://github.com/emberjs/ember.js/pull/16600) [BUGFIX] Fix SimpleHelper memory leak
+- [#16605](https://github.com/emberjs/ember.js/pull/16605) [BUGFIX] Use resetCache on container destroy.
+- [182fc3](https://github.com/emberjs/ember.js/commit/182fc315664e8b4847f03133cc01e38767cad41e) [BUGFIX] Update glimmer-vm to ensure arguments are properly garbage collected.
+- [#16281](https://github.com/emberjs/ember.js/pull/16281) [BUGFIX] Ensure warning from `{{#link-to` RE: loading state does not throw an assertion.
+
### v3.1.1 (April 23, 2018)
- [#16559](https://github.com/emberjs/ember.js/pull/16559) [BUGFIX] Fix property normalization, Update glimmer-vm to 0.34.0
- [#16493](https://github.com/emberjs/ember.js/pull/16493) [BUGFIX] Ensure proxies have access to `getOwner(this)`.
| false |
Other
|
emberjs
|
ember.js
|
d9ec0aac21a72e4fcb203ce0dd426a3db64fa8b8.json
|
Update code-quality to avoid needless build.
|
.travis.yml
|
@@ -74,6 +74,9 @@ jobs:
env: TEST_SUITE=each-package-tests
- env: TEST_SUITE=code-quality
+ script:
+ # avoiding `yarn test` here because pretest does a build, which isn't needed
+ - node bin/run-tests.js
- stage: additional tests
| false |
Other
|
emberjs
|
ember.js
|
8ef863f10275318241bc6cc33a7ff1517b052ce7.json
|
fix template only components
|
packages/ember/tests/component_registration_test.js
|
@@ -3,6 +3,7 @@ import Controller from '@ember/controller';
import { Component } from 'ember-glimmer';
import { compile } from 'ember-template-compiler';
import { moduleFor, ApplicationTestCase } from 'internal-test-helpers';
+import { ENV } from 'ember-environment';
moduleFor(
'Application Lifecycle - Component Registration',
@@ -12,7 +13,7 @@ moduleFor(
return super.createApplication(options, Application.extend());
}
- ['@feature(!ember-glimmer-template-only-components) The helper becomes the body of the component']() {
+ ['@test The helper becomes the body of the component']() {
this.addTemplate('components/expand-it', '<p>hello {{yield}}</p>');
this.addTemplate('application', 'Hello world {{#expand-it}}world{{/expand-it}}');
@@ -25,12 +26,14 @@ moduleFor(
});
}
- ['@feature(ember-glimmer-template-only-components) The helper becomes the body of the component']() {
+ ['@test The helper becomes the body of the component (ENV._TEMPLATE_ONLY_GLIMMER_COMPONENTS = true;)']() {
+ ENV._TEMPLATE_ONLY_GLIMMER_COMPONENTS = true;
this.addTemplate('components/expand-it', '<p>hello {{yield}}</p>');
this.addTemplate('application', 'Hello world {{#expand-it}}world{{/expand-it}}');
return this.visit('/').then(() => {
this.assertInnerHTML('Hello world <p>hello world</p>');
+ ENV._TEMPLATE_ONLY_GLIMMER_COMPONENTS = false;
});
}
| false |
Other
|
emberjs
|
ember.js
|
22ae321e3a671a66b8efc519e9183d6cc1fa30aa.json
|
move function meta data to WeakMap and WeakSet
|
packages/ember-metal/lib/events.js
|
@@ -3,6 +3,7 @@
*/
import { ENV } from 'ember-environment';
import { assert, deprecate } from '@ember/debug';
+import { setListeners } from 'ember-utils';
import { meta as metaFor, peekMeta } from './meta';
/*
@@ -196,6 +197,6 @@ export function on(...args) {
events.length > 0 && events.every(p => typeof p === 'string' && p.length)
);
- func.__ember_listens__ = events;
+ setListeners(func, events);
return func;
}
| true |
Other
|
emberjs
|
ember.js
|
22ae321e3a671a66b8efc519e9183d6cc1fa30aa.json
|
move function meta data to WeakMap and WeakSet
|
packages/ember-metal/lib/mixin.js
|
@@ -2,7 +2,16 @@
@module @ember/object
*/
import { assign } from '@ember/polyfills';
-import { guidFor, ROOT, wrap, makeArray, NAME_KEY } from 'ember-utils';
+import {
+ guidFor,
+ ROOT,
+ wrap,
+ makeArray,
+ NAME_KEY,
+ getObservers,
+ getListeners,
+ setObservers,
+} from 'ember-utils';
import { assert } from '@ember/debug';
import { DEBUG } from '@glimmer/env';
import { ENV } from 'ember-environment';
@@ -273,13 +282,13 @@ function updateObserversAndListeners(obj, key, paths, updateMethod) {
function replaceObserversAndListeners(obj, key, prev, next) {
if (typeof prev === 'function') {
- updateObserversAndListeners(obj, key, prev.__ember_observes__, removeObserver);
- updateObserversAndListeners(obj, key, prev.__ember_listens__, removeListener);
+ updateObserversAndListeners(obj, key, getObservers(prev), removeObserver);
+ updateObserversAndListeners(obj, key, getListeners(prev), removeListener);
}
if (typeof next === 'function') {
- updateObserversAndListeners(obj, key, next.__ember_observes__, addObserver);
- updateObserversAndListeners(obj, key, next.__ember_listens__, addListener);
+ updateObserversAndListeners(obj, key, getObservers(next), addObserver);
+ updateObserversAndListeners(obj, key, getListeners(next), addListener);
}
}
@@ -732,7 +741,7 @@ export function observer(...args) {
expandProperties(_paths[i], addWatchedProperty);
}
- func.__ember_observes__ = paths;
+ setObservers(func, paths);
return func;
}
| true |
Other
|
emberjs
|
ember.js
|
22ae321e3a671a66b8efc519e9183d6cc1fa30aa.json
|
move function meta data to WeakMap and WeakSet
|
packages/ember-utils/index.ts
|
@@ -12,7 +12,15 @@ export { default as symbol, isInternalSymbol } from './lib/symbol';
export { default as dictionary } from './lib/dictionary';
export { uuid, GUID_KEY, generateGuid, guidFor } from './lib/guid';
export { default as intern } from './lib/intern';
-export { checkHasSuper, ROOT, wrap } from './lib/super';
+export {
+ checkHasSuper,
+ ROOT,
+ wrap,
+ getObservers,
+ getListeners,
+ setObservers,
+ setListeners,
+} from './lib/super';
export { default as inspect } from './lib/inspect';
export { default as lookupDescriptor } from './lib/lookup-descriptor';
export { canInvoke, tryInvoke } from './lib/invoke';
| true |
Other
|
emberjs
|
ember.js
|
22ae321e3a671a66b8efc519e9183d6cc1fa30aa.json
|
move function meta data to WeakMap and WeakSet
|
packages/ember-utils/lib/super.ts
|
@@ -1,3 +1,5 @@
+import WeakSet from './weak_set';
+
const HAS_SUPER_PATTERN = /\.(_super|call\(this|apply\(this)/;
const fnToString = Function.prototype.toString;
@@ -20,19 +22,46 @@ export const checkHasSuper = (() => {
};
})();
-export const ROOT = function ROOT() {} as {
- (): void;
- __hasSuper: boolean;
-};
-ROOT.__hasSuper = false;
+const HAS_SUPER_MAP = new WeakMap();
+
+export const ROOT = Object.freeze(function() {});
+HAS_SUPER_MAP.set(ROOT, false);
+
+function hasSuper(func: Function) {
+ let hasSuper = HAS_SUPER_MAP.get(func);
+ if (hasSuper === undefined) {
+ hasSuper = checkHasSuper(func);
+ HAS_SUPER_MAP.set(func, hasSuper);
+ }
+ return hasSuper;
+}
+
+const OBSERVERS_MAP = new WeakMap();
-function hasSuper(func: Function & { __hasSuper?: boolean }) {
- if (func.__hasSuper === undefined) {
- func.__hasSuper = checkHasSuper(func);
+export function setObservers(func: Function, observers?: string[]) {
+ if (observers) {
+ OBSERVERS_MAP.set(func, observers);
}
- return func.__hasSuper;
}
+export function getObservers(func: Function) {
+ return OBSERVERS_MAP.get(func);
+}
+
+const LISTENERS_MAP = new WeakMap();
+
+export function setListeners(func: Function, listeners?: string[]) {
+ if (listeners) {
+ LISTENERS_MAP.set(func, listeners);
+ }
+}
+
+export function getListeners(func: Function) {
+ return LISTENERS_MAP.get(func);
+}
+
+const IS_WRAPPED_FUNCTION_SET = new WeakSet();
+
/**
Wraps the passed function so that `this._super` will point to the superFunc
when the function is invoked. This is the primitive we use to implement
@@ -50,7 +79,7 @@ export function wrap(func: Function, superFunc: Function) {
return func;
}
// ensure an unwrapped super that calls _super is wrapped with a terminal _super
- if (!(superFunc as any).wrappedFunction && hasSuper(superFunc)) {
+ if (!IS_WRAPPED_FUNCTION_SET.has(superFunc) && hasSuper(superFunc)) {
return _wrap(func, _wrap(superFunc, ROOT));
}
return _wrap(func, superFunc);
@@ -65,9 +94,9 @@ function _wrap(func: Function, superFunc: Function): Function {
return ret;
}
- (superWrapper as any).wrappedFunction = func;
- (superWrapper as any).__ember_observes__ = (func as any).__ember_observes__;
- (superWrapper as any).__ember_listens__ = (func as any).__ember_listens__;
+ IS_WRAPPED_FUNCTION_SET.add(superWrapper);
+ setObservers(superWrapper, getObservers(func));
+ setListeners(superWrapper, getListeners(func));
return superWrapper;
}
| true |
Other
|
emberjs
|
ember.js
|
856c5356a0d94bf46fb64fc0fd705306f8feb2b6.json
|
add a comma
|
packages/ember-runtime/lib/system/array_proxy.js
|
@@ -60,7 +60,7 @@ const ARRAY_OBSERVER_MAPPING = {
ap.get('firstObject'); // . 'DOG'
```
- When overriding this class it is important to place the call to
+ When overriding this class, it is important to place the call to
`_super` *after* setting `content` so the internal observers have
a chance to fire properly:
| false |
Other
|
emberjs
|
ember.js
|
2be3c32b34f63af631aaa39bb3c41b5d16afd106.json
|
use es6 default parameter wherever possible
|
packages/@ember/runloop/tests/later_test.js
|
@@ -1,15 +1,12 @@
import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
import { assign } from '@ember/polyfills';
-import { isNone } from 'ember-metal';
import { run, later, backburner, hasScheduledTimers, getCurrentRunLoop } from '..';
const originalSetTimeout = window.setTimeout;
const originalDateValueOf = Date.prototype.valueOf;
const originalPlatform = backburner._platform;
-function wait(callback, maxWaitCount) {
- maxWaitCount = isNone(maxWaitCount) ? 100 : maxWaitCount;
-
+function wait(callback, maxWaitCount = 100) {
originalSetTimeout(() => {
if (maxWaitCount > 0 && (hasScheduledTimers() || getCurrentRunLoop())) {
wait(callback, maxWaitCount - 1);
| true |
Other
|
emberjs
|
ember.js
|
2be3c32b34f63af631aaa39bb3c41b5d16afd106.json
|
use es6 default parameter wherever possible
|
packages/ember-runtime/lib/mixins/array.js
|
@@ -9,7 +9,6 @@ import {
objectAt,
replaceInNativeArray,
computed,
- isNone,
aliasMethod,
Mixin,
hasListeners,
@@ -226,17 +225,15 @@ const ArrayMixin = Mixin.create(Enumerable, {
@return {Array} New array with specified slice
@public
*/
- slice(beginIndex, endIndex) {
+ slice(beginIndex = 0, endIndex) {
let ret = A();
let length = this.length;
- if (isNone(beginIndex)) {
- beginIndex = 0;
- } else if (beginIndex < 0) {
+ if (beginIndex < 0) {
beginIndex = length + beginIndex;
}
- if (isNone(endIndex) || endIndex > length) {
+ if (endIndex === undefined || endIndex > length) {
endIndex = length;
} else if (endIndex < 0) {
endIndex = length + endIndex;
| true |
Other
|
emberjs
|
ember.js
|
2be3c32b34f63af631aaa39bb3c41b5d16afd106.json
|
use es6 default parameter wherever possible
|
packages/ember-runtime/lib/mixins/observable.js
|
@@ -18,7 +18,6 @@ import {
addObserver,
removeObserver,
getCachedValueFor,
- isNone,
} from 'ember-metal';
import { assert } from '@ember/debug';
@@ -419,10 +418,7 @@ export default Mixin.create({
@return {Number} The new property value
@public
*/
- incrementProperty(keyName, increment) {
- if (isNone(increment)) {
- increment = 1;
- }
+ incrementProperty(keyName, increment = 1) {
assert(
'Must pass a numeric value to incrementProperty',
!isNaN(parseFloat(increment)) && isFinite(increment)
@@ -444,10 +440,7 @@ export default Mixin.create({
@return {Number} The new property value
@public
*/
- decrementProperty(keyName, decrement) {
- if (isNone(decrement)) {
- decrement = 1;
- }
+ decrementProperty(keyName, decrement = 1) {
assert(
'Must pass a numeric value to decrementProperty',
!isNaN(parseFloat(decrement)) && isFinite(decrement)
| true |
Other
|
emberjs
|
ember.js
|
2cd2605db2643506f1a3bb5d9ad3447eaeb9a893.json
|
Add v3.1.1 to CHANGELOG
[ci skip]
(cherry picked from commit 508277bfcecddab6af233a89d2e7d7a5279f8aaf)
|
CHANGELOG.md
|
@@ -32,6 +32,17 @@
- [#16462](https://github.com/emberjs/ember.js/pull/16462) [CLEANUP] Remove deprecated `MODEL_FACTORY_INJECTIONS`
- [emberjs/rfcs#286](https://github.com/emberjs/rfcs/blob/master/text/0286-block-let-template-helper.md) [FEATURE] Enabled block `let` handlebars helper by default.
+### v3.1.1 (April 23, 2018)
+- [#16559](https://github.com/emberjs/ember.js/pull/16559) [BUGFIX] Fix property normalization, Update glimmer-vm to 0.34.0
+- [#16493](https://github.com/emberjs/ember.js/pull/16493) [BUGFIX] Ensure proxies have access to `getOwner(this)`.
+- [#16496](https://github.com/emberjs/ember.js/pull/16496) [BUGFIX] Add exception for `didRemoveListener` so evented proxy objects can function
+- [#16494](https://github.com/emberjs/ember.js/pull/16494) [BUGFIX] Adjust assertion to allow for either undefined or null
+- [#16558](https://github.com/emberjs/ember.js/pull/16558) [BUGFIX] Ensure ComponentDefinitions do not leak heap space.
+- [#16560](https://github.com/emberjs/ember.js/pull/16560) [BUGFIX] Avoid strict assertion when object proxy calls thru for function
+- [#16563](https://github.com/emberjs/ember.js/pull/16563) [BUGFIX] Ensure `ariaRole` can be initially false.
+- [#16564](https://github.com/emberjs/ember.js/pull/16564) [BUGFIX] Ensure Ember.isArray does not trigger proxy assertion.
+- [#16572](https://github.com/emberjs/ember.js/pull/16572) [BUGFIX] Fix curly component class reference setup
+
### v3.1.0 (April 10, 2018)
- [#16293](https://github.com/emberjs/ember.js/pull/16293) [BUGFIX] Ignore --pod for -addon blueprints: helper, initializer, and instance-initializer
- [#16312](https://github.com/emberjs/ember.js/pull/16312) [DEPRECATION] Deprecate `Route.prototype.router` in favor of `Route.prototype._router`
| false |
Other
|
emberjs
|
ember.js
|
7f310a6185aabf5a4b828ca64f78b0a22e3a8b74.json
|
Add 3.2.0-beta.3 to CHANGELOG
[ci skip]
(cherry picked from commit f894ff5d0662cc105ea4bd5e5b4f272045b7bbe8)
|
CHANGELOG.md
|
@@ -1,5 +1,16 @@
# Ember Changelog
+### v3.2.0-beta.3 (April 23, 2018)
+- [#16539](https://github.com/emberjs/ember.js/pull/16539) [BUGFIX] Ember is already registered by the libraries registry already.
+- [#16559](https://github.com/emberjs/ember.js/pull/16559) [BUGFIX] Fix property normalization, Update glimmer-vm to 0.34.0
+- [#16563](https://github.com/emberjs/ember.js/pull/16563) [BUGFIX] Ensure `ariaRole` can be initially false.
+- [#16550](https://github.com/emberjs/ember.js/pull/16550) [BUGFIX] Decrement counter of pending requests in the next tick
+- [#16551](https://github.com/emberjs/ember.js/pull/16551) [BUGFIX] Fix `proto` return value for native classes
+- [#16558](https://github.com/emberjs/ember.js/pull/16558) [BUGFIX] Ensure ComponentDefinitions do not leak heap space.
+- [#16560](https://github.com/emberjs/ember.js/pull/16560) [BUGFIX] avoid strict assertion when object proxy calls thru for function
+- [#16564](https://github.com/emberjs/ember.js/pull/16564) [BUGFIX] Ensure Ember.isArray does not trigger proxy assertion.
+- [#16572](https://github.com/emberjs/ember.js/pull/16572) [BUGFIX] Fix curly component class reference setup
+
### v3.2.0-beta.2 (April 16, 2018)
- [#16493](https://github.com/emberjs/ember.js/pull/16493) [BUGFIX] Ensure proxies have access to `getOwner(this)`.
| false |
Other
|
emberjs
|
ember.js
|
d8c983448cbcd419c7bde408ee550fcbf09be538.json
|
fix conditions in `lib/name`
|
packages/ember-utils/lib/name.ts
|
@@ -1,9 +1,9 @@
const NAMES = new WeakMap();
export function setName(obj: object, name: string) {
- if (obj !== null || typeof obj === 'object' || typeof obj === 'function') NAMES.set(obj, name);
+ if ((obj !== null && typeof obj === 'object') || typeof obj === 'function') NAMES.set(obj, name);
}
export function getName(obj: object) {
- if (obj !== null || typeof obj === 'object' || typeof obj === 'function') return NAMES.get(obj);
+ return NAMES.get(obj);
}
| false |
Other
|
emberjs
|
ember.js
|
f8adb1fdc1059127b1b66fb2a33b017f2ffe2e34.json
|
use hash for `seen` in `Unique`
|
packages/ember-glimmer/lib/utils/iterable.ts
|
@@ -139,18 +139,15 @@ class ObjectIterator extends BoundedIterator {
let keys: Opaque[] = [];
let values: Opaque[] = [];
let length = 0;
-
let isMapLike = false;
obj.forEach((value: Opaque, key: Opaque) => {
isMapLike = isMapLike || arguments.length >= 2;
if (isMapLike) {
keys.push(key);
- values.push(value);
- } else {
- values.push(value);
}
+ values.push(value);
length++;
});
@@ -452,7 +449,7 @@ function KeyPath(keyPath: string): KeyFor {
}
function Unique(func: KeyFor): KeyFor {
- let seen = new Set();
+ let seen = {};
return (value: Opaque, memo: Opaque, position: number) => {
let key = func(value, memo, position);
| false |
Other
|
emberjs
|
ember.js
|
e1c8e4fe41ad1856cba8a491d18229118ec8fb36.json
|
Update glimmer-vm to 0.33.7.
|
package.json
|
@@ -66,14 +66,14 @@
"resolve": "^1.6.0"
},
"devDependencies": {
- "@glimmer/compiler": "0.33.6",
+ "@glimmer/compiler": "0.33.7",
"@glimmer/env": "^0.1.7",
- "@glimmer/interfaces": "0.33.6",
- "@glimmer/node": "0.33.6",
- "@glimmer/opcode-compiler": "0.33.6",
- "@glimmer/program": "0.33.6",
- "@glimmer/reference": "0.33.6",
- "@glimmer/runtime": "0.33.6",
+ "@glimmer/interfaces": "0.33.7",
+ "@glimmer/node": "0.33.7",
+ "@glimmer/opcode-compiler": "0.33.7",
+ "@glimmer/program": "0.33.7",
+ "@glimmer/reference": "0.33.7",
+ "@glimmer/runtime": "0.33.7",
"@types/rsvp": "^4.0.1",
"amd-name-resolver": "^1.2.0",
"auto-dist-tag": "^0.1.5",
| true |
Other
|
emberjs
|
ember.js
|
e1c8e4fe41ad1856cba8a491d18229118ec8fb36.json
|
Update glimmer-vm to 0.33.7.
|
yarn.lock
|
@@ -2,105 +2,105 @@
# yarn lockfile v1
-"@glimmer/[email protected]":
- version "0.33.6"
- resolved "https://registry.yarnpkg.com/@glimmer/compiler/-/compiler-0.33.6.tgz#bb5948a7035f13a2c8406abffa89504d1a98ac51"
+"@glimmer/[email protected]":
+ version "0.33.7"
+ resolved "https://registry.yarnpkg.com/@glimmer/compiler/-/compiler-0.33.7.tgz#160fd07cf607c2c6aa05826e95f5028b0418021e"
dependencies:
- "@glimmer/interfaces" "^0.33.6"
- "@glimmer/syntax" "^0.33.6"
- "@glimmer/util" "^0.33.6"
- "@glimmer/wire-format" "^0.33.6"
+ "@glimmer/interfaces" "^0.33.7"
+ "@glimmer/syntax" "^0.33.7"
+ "@glimmer/util" "^0.33.7"
+ "@glimmer/wire-format" "^0.33.7"
-"@glimmer/encoder@^0.33.6":
- version "0.33.6"
- resolved "https://registry.yarnpkg.com/@glimmer/encoder/-/encoder-0.33.6.tgz#c6ab28950f3fc25bdcc3f265e52d1e6ce99739e0"
+"@glimmer/encoder@^0.33.7":
+ version "0.33.7"
+ resolved "https://registry.yarnpkg.com/@glimmer/encoder/-/encoder-0.33.7.tgz#6fbb130a6159892ffe8696547513f6f74005af69"
"@glimmer/env@^0.1.7":
version "0.1.7"
resolved "https://registry.yarnpkg.com/@glimmer/env/-/env-0.1.7.tgz#fd2d2b55a9029c6b37a6c935e8c8871ae70dfa07"
-"@glimmer/[email protected]", "@glimmer/interfaces@^0.33.6":
- version "0.33.6"
- resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.33.6.tgz#876edf185cfcde9a40ad087df18ad35a48735451"
+"@glimmer/[email protected]", "@glimmer/interfaces@^0.33.7":
+ version "0.33.7"
+ resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.33.7.tgz#0354a2a257e93709172fb9c03d43429e32915181"
dependencies:
- "@glimmer/wire-format" "^0.33.6"
+ "@glimmer/wire-format" "^0.33.7"
-"@glimmer/low-level@^0.33.6":
- version "0.33.6"
- resolved "https://registry.yarnpkg.com/@glimmer/low-level/-/low-level-0.33.6.tgz#39819ac3bcdfb4d5fdb3afff13f2ac7cf9dc123a"
+"@glimmer/low-level@^0.33.7":
+ version "0.33.7"
+ resolved "https://registry.yarnpkg.com/@glimmer/low-level/-/low-level-0.33.7.tgz#4590e86c767a5642a5e18a7b6684e8115588f1fa"
-"@glimmer/[email protected]":
- version "0.33.6"
- resolved "https://registry.yarnpkg.com/@glimmer/node/-/node-0.33.6.tgz#a5da2192df91a51c89fdd2d9749b716c12e540d7"
+"@glimmer/[email protected]":
+ version "0.33.7"
+ resolved "https://registry.yarnpkg.com/@glimmer/node/-/node-0.33.7.tgz#5f704b7b1243e13ed4f274d974ecfd321d93f4fe"
dependencies:
- "@glimmer/interfaces" "^0.33.6"
- "@glimmer/runtime" "^0.33.6"
+ "@glimmer/interfaces" "^0.33.7"
+ "@glimmer/runtime" "^0.33.7"
simple-dom "^0.3.0"
-"@glimmer/[email protected]":
- version "0.33.6"
- resolved "https://registry.yarnpkg.com/@glimmer/opcode-compiler/-/opcode-compiler-0.33.6.tgz#41c876042bee316c99e8ca0817c3b989609afcd4"
- dependencies:
- "@glimmer/encoder" "^0.33.6"
- "@glimmer/interfaces" "^0.33.6"
- "@glimmer/program" "^0.33.6"
- "@glimmer/reference" "^0.33.6"
- "@glimmer/util" "^0.33.6"
- "@glimmer/vm" "^0.33.6"
- "@glimmer/wire-format" "^0.33.6"
-
-"@glimmer/[email protected]", "@glimmer/program@^0.33.6":
- version "0.33.6"
- resolved "https://registry.yarnpkg.com/@glimmer/program/-/program-0.33.6.tgz#43336d47e3906e189d511620350fc9e6facb79ea"
- dependencies:
- "@glimmer/encoder" "^0.33.6"
- "@glimmer/interfaces" "^0.33.6"
- "@glimmer/util" "^0.33.6"
-
-"@glimmer/[email protected]", "@glimmer/reference@^0.33.6":
- version "0.33.6"
- resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.33.6.tgz#8117b5148548003f267b61b2cc7873a3baeb83c8"
- dependencies:
- "@glimmer/util" "^0.33.6"
-
-"@glimmer/[email protected]", "@glimmer/runtime@^0.33.6":
- version "0.33.6"
- resolved "https://registry.yarnpkg.com/@glimmer/runtime/-/runtime-0.33.6.tgz#cd9c7d848be9efd3cb808b3215cdf02de4eaacfb"
- dependencies:
- "@glimmer/interfaces" "^0.33.6"
- "@glimmer/low-level" "^0.33.6"
- "@glimmer/program" "^0.33.6"
- "@glimmer/reference" "^0.33.6"
- "@glimmer/util" "^0.33.6"
- "@glimmer/vm" "^0.33.6"
- "@glimmer/wire-format" "^0.33.6"
-
-"@glimmer/syntax@^0.33.6":
- version "0.33.6"
- resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.33.6.tgz#1a1839c5f3b80333a86bba110c2af649df41a917"
- dependencies:
- "@glimmer/interfaces" "^0.33.6"
- "@glimmer/util" "^0.33.6"
+"@glimmer/[email protected]":
+ version "0.33.7"
+ resolved "https://registry.yarnpkg.com/@glimmer/opcode-compiler/-/opcode-compiler-0.33.7.tgz#f7de676df837fc4c62585765be0d4c552ff9c4bb"
+ dependencies:
+ "@glimmer/encoder" "^0.33.7"
+ "@glimmer/interfaces" "^0.33.7"
+ "@glimmer/program" "^0.33.7"
+ "@glimmer/reference" "^0.33.7"
+ "@glimmer/util" "^0.33.7"
+ "@glimmer/vm" "^0.33.7"
+ "@glimmer/wire-format" "^0.33.7"
+
+"@glimmer/[email protected]", "@glimmer/program@^0.33.7":
+ version "0.33.7"
+ resolved "https://registry.yarnpkg.com/@glimmer/program/-/program-0.33.7.tgz#d15fd7bd5d4feda3cd08c5dbb51f2e53a0ec0e7a"
+ dependencies:
+ "@glimmer/encoder" "^0.33.7"
+ "@glimmer/interfaces" "^0.33.7"
+ "@glimmer/util" "^0.33.7"
+
+"@glimmer/[email protected]", "@glimmer/reference@^0.33.7":
+ version "0.33.7"
+ resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.33.7.tgz#733b0165291868dad89a289daffd7a7d1d840673"
+ dependencies:
+ "@glimmer/util" "^0.33.7"
+
+"@glimmer/[email protected]", "@glimmer/runtime@^0.33.7":
+ version "0.33.7"
+ resolved "https://registry.yarnpkg.com/@glimmer/runtime/-/runtime-0.33.7.tgz#2a136d34c567a356d71299b6baadad456ee9af60"
+ dependencies:
+ "@glimmer/interfaces" "^0.33.7"
+ "@glimmer/low-level" "^0.33.7"
+ "@glimmer/program" "^0.33.7"
+ "@glimmer/reference" "^0.33.7"
+ "@glimmer/util" "^0.33.7"
+ "@glimmer/vm" "^0.33.7"
+ "@glimmer/wire-format" "^0.33.7"
+
+"@glimmer/syntax@^0.33.7":
+ version "0.33.7"
+ resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.33.7.tgz#0775cc68bd873066b89c7c6c599928b74c672c97"
+ dependencies:
+ "@glimmer/interfaces" "^0.33.7"
+ "@glimmer/util" "^0.33.7"
handlebars "^4.0.6"
simple-html-tokenizer "^0.5.0"
-"@glimmer/util@^0.33.6":
- version "0.33.6"
- resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.33.6.tgz#cd8186286baa08ab5b754a1f49a385c312c72da0"
+"@glimmer/util@^0.33.7":
+ version "0.33.7"
+ resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.33.7.tgz#6717c669f9aeb5e248bfffbe7017f51d8a7841d4"
-"@glimmer/vm@^0.33.6":
- version "0.33.6"
- resolved "https://registry.yarnpkg.com/@glimmer/vm/-/vm-0.33.6.tgz#06dab512e94815f597a3294cfd4d4e35af80b614"
+"@glimmer/vm@^0.33.7":
+ version "0.33.7"
+ resolved "https://registry.yarnpkg.com/@glimmer/vm/-/vm-0.33.7.tgz#8dd28d1417f2dd2ace12482b4e4c10e8102be4a3"
dependencies:
- "@glimmer/interfaces" "^0.33.6"
- "@glimmer/program" "^0.33.6"
- "@glimmer/util" "^0.33.6"
+ "@glimmer/interfaces" "^0.33.7"
+ "@glimmer/program" "^0.33.7"
+ "@glimmer/util" "^0.33.7"
-"@glimmer/wire-format@^0.33.6":
- version "0.33.6"
- resolved "https://registry.yarnpkg.com/@glimmer/wire-format/-/wire-format-0.33.6.tgz#51eb651528572c23eba4601770529fa8c21f5303"
+"@glimmer/wire-format@^0.33.7":
+ version "0.33.7"
+ resolved "https://registry.yarnpkg.com/@glimmer/wire-format/-/wire-format-0.33.7.tgz#26a75294f6b1e403d4cf57c81f167708fc7f104a"
dependencies:
- "@glimmer/util" "^0.33.6"
+ "@glimmer/util" "^0.33.7"
"@types/acorn@^4.0.3":
version "4.0.3"
| true |
Other
|
emberjs
|
ember.js
|
37d0294d68fd83cca0819087f2ba8216e4e0f4ac.json
|
Move Cache from ember-metal to ember-utils.
Also remove usage of `UNDEFINED` symbol (just use Map behaviors).
|
packages/@ember/string/index.js
|
@@ -5,7 +5,7 @@
export { getStrings as _getStrings, setStrings as _setStrings } from './lib/string_registry';
import { ENV } from 'ember-environment';
-import { Cache } from 'ember-metal';
+import { Cache } from 'ember-utils';
import { getString } from './lib/string_registry';
const STRING_DASHERIZE_REGEXP = /[ _]/g;
| true |
Other
|
emberjs
|
ember.js
|
37d0294d68fd83cca0819087f2ba8216e4e0f4ac.json
|
Move Cache from ember-metal to ember-utils.
Also remove usage of `UNDEFINED` symbol (just use Map behaviors).
|
packages/ember-metal/index.d.ts
|
@@ -27,15 +27,5 @@ export function isNone(obj: any): boolean;
export function watchKey(obj: any, keyName: string, meta?: any): void;
-export class Cache<T, V> {
- constructor(
- limit: number,
- func: (obj: T) => V,
- key?: (obj: T) => string,
- store?: any
- );
- get(obj: T): V;
-}
-
export { tagForProperty, tagFor } from './lib/tags';
export { tracked } from './lib/tracked';
| true |
Other
|
emberjs
|
ember.js
|
37d0294d68fd83cca0819087f2ba8216e4e0f4ac.json
|
Move Cache from ember-metal to ember-utils.
Also remove usage of `UNDEFINED` symbol (just use Map behaviors).
|
packages/ember-metal/index.js
|
@@ -9,7 +9,6 @@ export {
export { default as alias } from './lib/alias';
export { deprecateProperty } from './lib/deprecate_property';
export { descriptorFor, meta, peekMeta, deleteMeta } from './lib/meta';
-export { default as Cache } from './lib/cache';
export { PROXY_CONTENT, _getPath, get, getWithDefault } from './lib/property_get';
export { set, trySet } from './lib/property_set';
export {
| true |
Other
|
emberjs
|
ember.js
|
37d0294d68fd83cca0819087f2ba8216e4e0f4ac.json
|
Move Cache from ember-metal to ember-utils.
Also remove usage of `UNDEFINED` symbol (just use Map behaviors).
|
packages/ember-metal/lib/cache.js
|
@@ -1,55 +0,0 @@
-import { UNDEFINED } from './meta';
-
-export default class Cache {
- constructor(limit, func, key, store) {
- this.size = 0;
- this.misses = 0;
- this.hits = 0;
- this.limit = limit;
- this.func = func;
- this.key = key;
- this.store = store || new Map();
- }
-
- get(obj) {
- let key = this.key === undefined ? obj : this.key(obj);
- let value = this.store.get(key);
- if (value === undefined) {
- this.misses++;
- value = this._set(key, this.func(obj));
- } else if (value === UNDEFINED) {
- this.hits++;
- value = undefined;
- } else {
- this.hits++;
- // nothing to translate
- }
-
- return value;
- }
-
- set(obj, value) {
- let key = this.key === undefined ? obj : this.key(obj);
- return this._set(key, value);
- }
-
- _set(key, value) {
- if (this.limit > this.size) {
- this.size++;
- if (value === undefined) {
- this.store.set(key, UNDEFINED);
- } else {
- this.store.set(key, value);
- }
- }
-
- return value;
- }
-
- purge() {
- this.store.clear();
- this.size = 0;
- this.hits = 0;
- this.misses = 0;
- }
-}
| true |
Other
|
emberjs
|
ember.js
|
37d0294d68fd83cca0819087f2ba8216e4e0f4ac.json
|
Move Cache from ember-metal to ember-utils.
Also remove usage of `UNDEFINED` symbol (just use Map behaviors).
|
packages/ember-metal/lib/path_cache.js
|
@@ -1,4 +1,4 @@
-import Cache from './cache';
+import { Cache } from 'ember-utils';
const firstDotIndexCache = new Cache(1000, key => key.indexOf('.'));
| true |
Other
|
emberjs
|
ember.js
|
37d0294d68fd83cca0819087f2ba8216e4e0f4ac.json
|
Move Cache from ember-metal to ember-utils.
Also remove usage of `UNDEFINED` symbol (just use Map behaviors).
|
packages/ember-utils/index.ts
|
@@ -23,6 +23,7 @@ export { HAS_NATIVE_SYMBOL } from './lib/symbol-utils';
export { HAS_NATIVE_PROXY } from './lib/proxy-utils';
export { default as WeakSet } from './lib/weak_set';
export { isProxy, setProxy } from './lib/is_proxy';
+export { default as Cache } from './lib/cache';
import symbol from './lib/symbol';
export const NAME_KEY = symbol('NAME_KEY');
| true |
Other
|
emberjs
|
ember.js
|
37d0294d68fd83cca0819087f2ba8216e4e0f4ac.json
|
Move Cache from ember-metal to ember-utils.
Also remove usage of `UNDEFINED` symbol (just use Map behaviors).
|
packages/ember-utils/lib/cache.ts
|
@@ -0,0 +1,39 @@
+export default class Cache<T, V> {
+ public size = 0;
+ public misses = 0;
+ public hits = 0;
+
+ constructor(private limit: number, private func: (obj: T) => V, private store?: any) {
+ this.store = store || new Map();
+ }
+
+ get(key: T): V {
+ let value = this.store.get(key);
+ if (this.store.has(key)) {
+ this.hits++;
+
+ return this.store.get(key);
+ } else {
+ this.misses++;
+ value = this.set(key, this.func(key));
+ }
+
+ return value;
+ }
+
+ set(key: T, value: V) {
+ if (this.limit > this.size) {
+ this.size++;
+ this.store.set(key, value);
+ }
+
+ return value;
+ }
+
+ purge() {
+ this.store.clear();
+ this.size = 0;
+ this.hits = 0;
+ this.misses = 0;
+ }
+}
| true |
Other
|
emberjs
|
ember.js
|
37d0294d68fd83cca0819087f2ba8216e4e0f4ac.json
|
Move Cache from ember-metal to ember-utils.
Also remove usage of `UNDEFINED` symbol (just use Map behaviors).
|
packages/ember-utils/tests/cache_test.js
|
@@ -44,28 +44,6 @@ moduleFor(
assert.equal(count, 2);
}
- ['@test caches computation correctly with custom cache keys'](assert) {
- let count = 0;
- let cache = new Cache(
- 100,
- obj => {
- count++;
- return obj.value.toUpperCase();
- },
- obj => obj.key
- );
-
- assert.equal(count, 0);
- cache.get({ key: 'foo', value: 'foo' });
- assert.equal(count, 1);
- cache.get({ key: 'bar', value: 'bar' });
- assert.equal(count, 2);
- cache.get({ key: 'bar', value: 'bar' });
- assert.equal(count, 2);
- cache.get({ key: 'foo', value: 'foo' });
- assert.equal(count, 2);
- }
-
['@test handles undefined value correctly'](assert) {
let count = 0;
let cache = new Cache(100, () => {
| true |
Other
|
emberjs
|
ember.js
|
37d0294d68fd83cca0819087f2ba8216e4e0f4ac.json
|
Move Cache from ember-metal to ember-utils.
Also remove usage of `UNDEFINED` symbol (just use Map behaviors).
|
packages/ember/index.js
|
@@ -189,6 +189,7 @@ Ember.tryInvoke = utils.tryInvoke;
Ember.wrap = utils.wrap;
Ember.uuid = utils.uuid;
Ember.NAME_KEY = utils.NAME_KEY;
+Ember._Cache = utils.Cache;
// ****container****
Ember.Container = Container;
@@ -264,7 +265,7 @@ Ember._getPath = metal._getPath;
Ember.set = metal.set;
Ember.trySet = metal.trySet;
Ember.FEATURES = assign({ isEnabled }, FEATURES);
-Ember._Cache = metal.Cache;
+Ember._Cache = utils.Cache;
Ember.on = metal.on;
Ember.addListener = metal.addListener;
Ember.removeListener = metal.removeListener;
| true |
Other
|
emberjs
|
ember.js
|
37d0294d68fd83cca0819087f2ba8216e4e0f4ac.json
|
Move Cache from ember-metal to ember-utils.
Also remove usage of `UNDEFINED` symbol (just use Map behaviors).
|
packages/ember/tests/reexports_test.js
|
@@ -101,7 +101,7 @@ let allExports = [
['_getPath', 'ember-metal'],
['getWithDefault', 'ember-metal'],
['trySet', 'ember-metal'],
- ['_Cache', 'ember-metal', 'Cache'],
+ ['_Cache', 'ember-utils', 'Cache'],
['on', 'ember-metal'],
['addListener', 'ember-metal'],
['removeListener', 'ember-metal'],
| true |
Other
|
emberjs
|
ember.js
|
3db7357a47731a448f7b51d23cfb16c75b9a3e59.json
|
remove unused isDescriptorTrap
|
packages/ember-metal/lib/meta.js
|
@@ -673,12 +673,6 @@ if (DEBUG) {
meta._counters = counters;
}
-// Using `symbol()` here causes some node test to fail, presumably
-// because we define the CP with one copy of Ember and boot the app
-// with a different copy, so the random key we generate do not line
-// up. Is that testing a legit scenario?
-export const DESCRIPTOR = '__DESCRIPTOR__';
-
/**
Returns the CP descriptor assocaited with `obj` and `keyName`, if any.
@@ -703,18 +697,6 @@ export function descriptorFor(obj, keyName, _meta) {
}
}
-export let isDescriptorTrap;
-
-if (DEBUG) {
- isDescriptorTrap = function isDescriptorTrap(possibleDesc) {
- return (
- possibleDesc !== null &&
- typeof possibleDesc === 'object' &&
- possibleDesc[DESCRIPTOR] !== undefined
- );
- };
-}
-
/**
Check whether a value is a CP descriptor.
| false |
Other
|
emberjs
|
ember.js
|
e64390d6f2044cb43466333e1a93b1074cc29498.json
|
remove EMBER_METAL_ES5_GETTER flag
|
broccoli/features.js
|
@@ -21,9 +21,6 @@ function getFeatures(isDebug) {
}
}
- features['descriptor-trap'] = isDebug;
- features['mandatory-getter'] = isDebug;
- features['mandatory-setter'] = isDebug;
features['ember-glimmer-detect-backtracking-rerender'] = isDebug;
return features;
| true |
Other
|
emberjs
|
ember.js
|
e64390d6f2044cb43466333e1a93b1074cc29498.json
|
remove EMBER_METAL_ES5_GETTER flag
|
features.json
|
@@ -4,7 +4,6 @@
"ember-libraries-isregistered": null,
"ember-improved-instrumentation": null,
"ember-glimmer-named-arguments": true,
- "ember-metal-es5-getters": true,
"ember-routing-router-service": true,
"ember-engines-mount-params": true,
"ember-module-unification": null,
| true |
Other
|
emberjs
|
ember.js
|
e64390d6f2044cb43466333e1a93b1074cc29498.json
|
remove EMBER_METAL_ES5_GETTER flag
|
packages/ember-glimmer/externs.d.ts
|
@@ -4,5 +4,4 @@ declare module 'ember/features' {
export const GLIMMER_CUSTOM_COMPONENT_MANAGER: boolean | null;
export const EMBER_ENGINES_MOUNT_PARAMS: boolean | null;
export const EMBER_GLIMMER_DETECT_BACKTRACKING_RERENDER: boolean | null;
- export const MANDATORY_SETTER: boolean | null;
}
| true |
Other
|
emberjs
|
ember.js
|
e64390d6f2044cb43466333e1a93b1074cc29498.json
|
remove EMBER_METAL_ES5_GETTER flag
|
packages/ember-glimmer/lib/utils/references.ts
|
@@ -22,7 +22,7 @@ import {
import { Option } from '@glimmer/util';
import { didRender, get, set, tagFor, tagForProperty, watchKey } from 'ember-metal';
import { isProxy, symbol } from 'ember-utils';
-import { EMBER_GLIMMER_DETECT_BACKTRACKING_RERENDER, MANDATORY_SETTER } from 'ember/features';
+import { EMBER_GLIMMER_DETECT_BACKTRACKING_RERENDER } from 'ember/features';
import { HelperFunction, HelperInstance, RECOMPUTE_TAG } from '../helper';
import emberToBool from './to-bool';
@@ -196,7 +196,7 @@ export class RootPropertyReference extends PropertyReference
this.tag = tagForProperty(parentValue, propertyKey);
}
- if (MANDATORY_SETTER) {
+ if (DEBUG) {
watchKey(parentValue, propertyKey);
}
}
@@ -254,7 +254,7 @@ export class NestedPropertyReference extends PropertyReference {
}
if ((parentValueType === 'object' && parentValue !== null) || parentValueType === 'function') {
- if (MANDATORY_SETTER) {
+ if (DEBUG) {
watchKey(parentValue, _propertyKey);
}
| true |
Other
|
emberjs
|
ember.js
|
e64390d6f2044cb43466333e1a93b1074cc29498.json
|
remove EMBER_METAL_ES5_GETTER flag
|
packages/ember-glimmer/tests/integration/components/curly-components-test.js
|
@@ -1,4 +1,5 @@
import { run } from '@ember/runloop';
+import { DEBUG } from '@glimmer/env';
/* globals EmberDev */
import { set, get, observer, on, computed } from 'ember-metal';
import { Object as EmberObject, A as emberA, inject, Service } from 'ember-runtime';
@@ -8,7 +9,6 @@ import { Component, compile, htmlSafe } from '../../utils/helpers';
import { strip } from '../../utils/abstract-test-case';
import { moduleFor, RenderingTest } from '../../utils/test-case';
import { classes, equalTokens, equalsElement, styles } from '../../utils/test-helpers';
-import { MANDATORY_SETTER } from 'ember/features';
moduleFor(
'Components test: curly components',
@@ -2638,7 +2638,7 @@ moduleFor(
this.assertText('initial value - initial value');
- if (MANDATORY_SETTER) {
+ if (DEBUG) {
expectAssertion(() => {
component.bar = 'foo-bar';
}, /You must use set\(\) to set the `bar` property \(of .+\) to `foo-bar`\./);
| true |
Other
|
emberjs
|
ember.js
|
e64390d6f2044cb43466333e1a93b1074cc29498.json
|
remove EMBER_METAL_ES5_GETTER flag
|
packages/ember-metal/lib/meta.js
|
@@ -2,7 +2,6 @@ import { lookupDescriptor, symbol, toString } from 'ember-utils';
import { protoMethods as listenerMethods } from './meta_listeners';
import { assert } from 'ember-debug';
import { DEBUG } from '@glimmer/env';
-import { DESCRIPTOR_TRAP, EMBER_METAL_ES5_GETTERS, MANDATORY_SETTER } from 'ember/features';
import { removeChainWatcher } from './chains';
import { ENV } from 'ember-environment';
@@ -36,20 +35,14 @@ export class Meta {
constructor(obj, parentMeta) {
if (DEBUG) {
counters.metaInstantiated++;
+ this._values = undefined;
}
-
- if (EMBER_METAL_ES5_GETTERS) {
- this._descriptors = undefined;
- }
-
+ this._descriptors = undefined;
this._watching = undefined;
this._mixins = undefined;
if (ENV._ENABLE_BINDING_SUPPORT) {
this._bindings = undefined;
}
- if (MANDATORY_SETTER) {
- this._values = undefined;
- }
this._deps = undefined;
this._chainWatchers = undefined;
this._chains = undefined;
@@ -456,13 +449,55 @@ export class Meta {
);
this._bindings = undefined;
}
+
+ writeDescriptors(subkey, value) {
+ assert(
+ this.isMetaDestroyed() &&
+ `Cannot update descriptors for \`${subkey}\` on \`${toString(
+ this.source
+ )}\` after it has been destroyed.`,
+ !this.isMetaDestroyed()
+ );
+ let map = this._getOrCreateOwnMap('_descriptors');
+ map[subkey] = value;
+ }
+
+ peekDescriptors(subkey) {
+ let possibleDesc = this._findInherited('_descriptors', subkey);
+ return possibleDesc === UNDEFINED ? undefined : possibleDesc;
+ }
+
+ removeDescriptors(subkey) {
+ this.writeDescriptors(subkey, UNDEFINED);
+ }
+
+ forEachDescriptors(fn) {
+ let pointer = this;
+ let seen;
+ while (pointer !== undefined) {
+ let map = pointer._descriptors;
+ if (map !== undefined) {
+ for (let key in map) {
+ seen = seen === undefined ? new Set() : seen;
+ if (!seen.has(key)) {
+ seen.add(key);
+ let value = map[key];
+ if (value !== UNDEFINED) {
+ fn(key, value);
+ }
+ }
+ }
+ }
+ pointer = pointer.parent;
+ }
+ }
}
for (let name in listenerMethods) {
Meta.prototype[name] = listenerMethods[name];
}
-if (MANDATORY_SETTER) {
+if (DEBUG) {
Meta.prototype.writeValues = function(subkey, value) {
assert(
this.isMetaDestroyed() &&
@@ -516,50 +551,6 @@ if (MANDATORY_SETTER) {
};
}
-if (EMBER_METAL_ES5_GETTERS) {
- Meta.prototype.writeDescriptors = function(subkey, value) {
- assert(
- this.isMetaDestroyed() &&
- `Cannot update descriptors for \`${subkey}\` on \`${toString(
- this.source
- )}\` after it has been destroyed.`,
- !this.isMetaDestroyed()
- );
- let map = this._getOrCreateOwnMap('_descriptors');
- map[subkey] = value;
- };
-
- Meta.prototype.peekDescriptors = function(subkey) {
- let possibleDesc = this._findInherited('_descriptors', subkey);
- return possibleDesc === UNDEFINED ? undefined : possibleDesc;
- };
-
- Meta.prototype.removeDescriptors = function(subkey) {
- this.writeDescriptors(subkey, UNDEFINED);
- };
-
- Meta.prototype.forEachDescriptors = function(fn) {
- let pointer = this;
- let seen;
- while (pointer !== undefined) {
- let map = pointer._descriptors;
- if (map !== undefined) {
- for (let key in map) {
- seen = seen === undefined ? new Set() : seen;
- if (!seen.has(key)) {
- seen.add(key);
- let value = map[key];
- if (value !== UNDEFINED) {
- fn(key, value);
- }
- }
- }
- }
- pointer = pointer.parent;
- }
- };
-}
-
const getPrototypeOf = Object.getPrototypeOf;
const metaStore = new WeakMap();
@@ -705,33 +696,23 @@ export function descriptorFor(obj, keyName, _meta) {
typeof obj === 'object' || typeof obj === 'function'
);
- if (EMBER_METAL_ES5_GETTERS) {
- let meta = _meta === undefined ? peekMeta(obj) : _meta;
-
- if (meta !== undefined) {
- return meta.peekDescriptors(keyName);
- }
- } else {
- let possibleDesc = obj[keyName];
+ let meta = _meta === undefined ? peekMeta(obj) : _meta;
- if (DESCRIPTOR_TRAP && isDescriptorTrap(possibleDesc)) {
- return possibleDesc[DESCRIPTOR];
- } else {
- return isDescriptor(possibleDesc) ? possibleDesc : undefined;
- }
+ if (meta !== undefined) {
+ return meta.peekDescriptors(keyName);
}
}
-export function isDescriptorTrap(possibleDesc) {
- if (DESCRIPTOR_TRAP) {
+export let isDescriptorTrap;
+
+if (DEBUG) {
+ isDescriptorTrap = function isDescriptorTrap(possibleDesc) {
return (
possibleDesc !== null &&
typeof possibleDesc === 'object' &&
possibleDesc[DESCRIPTOR] !== undefined
);
- } else {
- throw new Error('Cannot call `isDescriptorTrap` in production');
- }
+ };
}
/**
| true |
Other
|
emberjs
|
ember.js
|
e64390d6f2044cb43466333e1a93b1074cc29498.json
|
remove EMBER_METAL_ES5_GETTER flag
|
packages/ember-metal/lib/mixin.js
|
@@ -1,7 +1,6 @@
/**
@module @ember/object
*/
-import { EMBER_METAL_ES5_GETTERS } from 'ember/features';
import { assign } from '@ember/polyfills';
import { guidFor, ROOT, wrap, makeArray, NAME_KEY } from 'ember-utils';
import { assert } from 'ember-debug';
@@ -100,10 +99,7 @@ function giveMethodSuper(obj, key, method, values, descs) {
// If we didn't find the original value in a parent mixin, find it in
// the original object
- if (
- superMethod === undefined &&
- (!EMBER_METAL_ES5_GETTERS || descriptorFor(obj, key) === undefined)
- ) {
+ if (superMethod === undefined && descriptorFor(obj, key) === undefined) {
superMethod = obj[key];
}
@@ -324,7 +320,7 @@ function applyMixin(obj, mixins, partial) {
continue;
}
- if (EMBER_METAL_ES5_GETTERS && descriptorFor(obj, key) !== undefined) {
+ if (descriptorFor(obj, key) !== undefined) {
replaceObserversAndListeners(obj, key, null, value);
} else {
replaceObserversAndListeners(obj, key, obj[key], value);
| true |
Other
|
emberjs
|
ember.js
|
e64390d6f2044cb43466333e1a93b1074cc29498.json
|
remove EMBER_METAL_ES5_GETTER flag
|
packages/ember-metal/lib/properties.js
|
@@ -3,10 +3,10 @@
*/
import { assert } from 'ember-debug';
-import { HAS_NATIVE_PROXY, HAS_NATIVE_SYMBOL } from 'ember-utils';
-import { descriptorFor, meta as metaFor, peekMeta, DESCRIPTOR, UNDEFINED } from './meta';
+import { DEBUG } from '@glimmer/env';
+import { descriptorFor, meta as metaFor, peekMeta, UNDEFINED } from './meta';
import { overrideChains } from './property_events';
-import { DESCRIPTOR_TRAP, EMBER_METAL_ES5_GETTERS, MANDATORY_SETTER } from 'ember/features';
+
// ..........................................................
// DESCRIPTOR
//
@@ -75,113 +75,9 @@ export function INHERITING_GETTER_FUNCTION(name) {
return IGETTER_FUNCTION;
}
-let DESCRIPTOR_GETTER_FUNCTION;
-
-if (EMBER_METAL_ES5_GETTERS) {
- DESCRIPTOR_GETTER_FUNCTION = function(name, descriptor) {
- return function CPGETTER_FUNCTION() {
- return descriptor.get(this, name);
- };
- };
-} else if (DESCRIPTOR_TRAP) {
- // Future traveler, although this code looks scary. It merely exists in
- // development to aid in development asertions. Production builds of
- // ember strip this entire branch out.
- let messageFor = function(obj, keyName, property, value) {
- return (
- `You attempted to access \`${keyName}.${String(property)}\` ` +
- `(on \`${obj}\`), but \`${keyName}\` is a computed property.\n\n` +
- `Due to certain internal implementation details of Ember, the ` +
- `\`${keyName}\` property previously contained a private "descriptor" ` +
- `object, therefore \`${keyName}.${String(property)}\` would have been ` +
- `\`${String(value).replace(/\n/g, ' ')}\`.\n\n` +
- `This implementation detail has now changed and the "descriptor" ` +
- `object is no longer present at this location. Soon, accessing ` +
- `\`${keyName}\` on this object will return the computed property's ` +
- `current value (see RFC #281 for more details).\n\n` +
- `If you are seeing this error, you are likely using an addon that ` +
- `relies on this now-defunct private implementation detail. If you ` +
- `can, identify the addon from the stack trace below and report this ` +
- `bug to the addon authors. If you feel stuck, the Ember Community ` +
- `Slack (https://ember-community-slackin.herokuapp.com/) may be able ` +
- `to offer some help.\n\n` +
- `If you are an addon author and need help transitioning your code, ` +
- `please get in touch in the #dev-ember channel in the Ember Community ` +
- `Slack.`
- );
- };
-
- let trapFor;
-
- if (HAS_NATIVE_PROXY) {
- /* globals Proxy */
- trapFor = function(obj, keyName, descriptor) {
- return new Proxy(descriptor, {
- get(descriptor, property) {
- if (property === DESCRIPTOR) {
- return descriptor;
- } else if (
- property === 'prototype' ||
- property === 'constructor' ||
- property === 'nodeType' ||
- property === 'window'
- ) {
- return undefined;
- } else if (
- property === 'toString' ||
- property === 'valueOf' ||
- property === 'inspect' ||
- property === 'toJSON' ||
- (HAS_NATIVE_SYMBOL && property === Symbol.toPrimitive) ||
- (HAS_NATIVE_SYMBOL && property === Symbol.toStringTag)
- ) {
- return () => '[COMPUTED PROPERTY]';
- }
-
- assert(messageFor(obj, keyName, property, descriptor[property]));
- },
- });
- };
- } else {
- trapFor = function(obj, keyName, descriptor) {
- let trap = Object.create(null);
-
- Object.defineProperty(trap, DESCRIPTOR, {
- configurable: false,
- enumerable: false,
- writable: false,
- value: descriptor,
- });
-
- trap.toString = trap.toJSON = trap.valueOf = () => '[COMPUTED PROPERTY]';
-
- // Without a proxy, we can only trap the "likely" properties
- ['isDescriptor', 'setup', 'teardown', 'get', '_getter', 'set', '_setter', 'meta'].forEach(
- property => {
- Object.defineProperty(trap, property, {
- configurable: false,
- enumerable: false,
- get() {
- assert(messageFor(obj, keyName, property, descriptor[property]));
- },
- });
- }
- );
-
- return trap;
- };
- }
-
- DESCRIPTOR_GETTER_FUNCTION = function(name, descriptor) {
- let trap;
- return function CPGETTER_FUNCTION() {
- if (trap) {
- return trap;
- }
-
- trap = trapFor(this, name, descriptor);
- return trap;
- };
+function DESCRIPTOR_GETTER_FUNCTION(name, descriptor) {
+ return function CPGETTER_FUNCTION() {
+ return descriptor.get(this, name);
};
}
@@ -245,9 +141,7 @@ export function defineProperty(obj, keyName, desc, data, meta) {
if (wasDescriptor) {
previousDesc.teardown(obj, keyName, meta);
- if (EMBER_METAL_ES5_GETTERS) {
- meta.removeDescriptors(keyName);
- }
+ meta.removeDescriptors(keyName);
}
// used to track if the the property being defined be enumerable
@@ -266,41 +160,21 @@ export function defineProperty(obj, keyName, desc, data, meta) {
if (desc instanceof Descriptor) {
value = desc;
- if (EMBER_METAL_ES5_GETTERS || DESCRIPTOR_TRAP) {
- Object.defineProperty(obj, keyName, {
- configurable: true,
- enumerable,
- get: DESCRIPTOR_GETTER_FUNCTION(keyName, value),
- });
- } else if (MANDATORY_SETTER && watching) {
- Object.defineProperty(obj, keyName, {
- configurable: true,
- enumerable,
- writable: true,
- value,
- });
- } else if (enumerable === false) {
- Object.defineProperty(obj, keyName, {
- configurable: true,
- writable: true,
- enumerable,
- value,
- });
- } else {
- obj[keyName] = value;
- }
+ Object.defineProperty(obj, keyName, {
+ configurable: true,
+ enumerable,
+ get: DESCRIPTOR_GETTER_FUNCTION(keyName, value),
+ });
- if (EMBER_METAL_ES5_GETTERS) {
- meta.writeDescriptors(keyName, value);
- }
+ meta.writeDescriptors(keyName, value);
if (typeof desc.setup === 'function') {
desc.setup(obj, keyName);
}
} else if (desc === undefined || desc === null) {
value = data;
- if (MANDATORY_SETTER && watching) {
+ if (DEBUG && watching) {
meta.writeValues(keyName, data);
let defaultDescriptor = {
@@ -311,7 +185,7 @@ export function defineProperty(obj, keyName, desc, data, meta) {
};
Object.defineProperty(obj, keyName, defaultDescriptor);
- } else if ((EMBER_METAL_ES5_GETTERS || DESCRIPTOR_TRAP) && wasDescriptor) {
+ } else if (wasDescriptor) {
Object.defineProperty(obj, keyName, {
configurable: true,
enumerable,
| true |
Other
|
emberjs
|
ember.js
|
e64390d6f2044cb43466333e1a93b1074cc29498.json
|
remove EMBER_METAL_ES5_GETTER flag
|
packages/ember-metal/lib/property_get.js
|
@@ -1,15 +1,10 @@
/**
@module @ember/object
*/
-
+import { DEBUG } from '@glimmer/env';
import { assert, deprecate } from 'ember-debug';
import { HAS_NATIVE_PROXY, symbol } from 'ember-utils';
-import {
- DESCRIPTOR_TRAP,
- EMBER_METAL_ES5_GETTERS,
- EMBER_METAL_TRACKED_PROPERTIES,
- MANDATORY_GETTER,
-} from 'ember/features';
+import { EMBER_METAL_TRACKED_PROPERTIES } from 'ember/features';
import { isPath } from './path_cache';
import { isDescriptor, isDescriptorTrap, DESCRIPTOR, descriptorFor } from './meta';
import { getCurrentTracker } from './tracked';
@@ -24,7 +19,7 @@ const ALLOWABLE_TYPES = {
export const PROXY_CONTENT = symbol('PROXY_CONTENT');
export function getPossibleMandatoryProxyValue(obj, keyName) {
- if (MANDATORY_GETTER && EMBER_METAL_ES5_GETTERS && HAS_NATIVE_PROXY) {
+ if (DEBUG && HAS_NATIVE_PROXY) {
let content = obj[PROXY_CONTENT];
if (content === undefined) {
return obj[keyName];
@@ -109,21 +104,19 @@ export function get(obj, keyName) {
if (tracker) tracker.add(tagForProperty(obj, keyName));
}
- if (EMBER_METAL_ES5_GETTERS) {
- descriptor = descriptorFor(obj, keyName);
- }
+ descriptor = descriptorFor(obj, keyName);
- if (!EMBER_METAL_ES5_GETTERS || descriptor === undefined) {
+ if (descriptor === undefined) {
value = getPossibleMandatoryProxyValue(obj, keyName);
- if (DESCRIPTOR_TRAP && isDescriptorTrap(value)) {
+ if (DEBUG && isDescriptorTrap(value)) {
descriptor = value[DESCRIPTOR];
} else if (isDescriptor(value)) {
deprecate(
`[DEPRECATED] computed property '${keyName}' was not set on object '${obj &&
obj.toString &&
obj.toString()}' via 'defineProperty'`,
- !EMBER_METAL_ES5_GETTERS,
+ false,
{
id: 'ember-meta.descriptor-on-object',
until: '3.5.0',
| true |
Other
|
emberjs
|
ember.js
|
e64390d6f2044cb43466333e1a93b1074cc29498.json
|
remove EMBER_METAL_ES5_GETTER flag
|
packages/ember-metal/lib/property_set.js
|
@@ -1,12 +1,13 @@
import { toString } from 'ember-utils';
import EmberError from '@ember/error';
+import { DEBUG } from '@glimmer/env';
import { assert } from 'ember-debug';
import { getPossibleMandatoryProxyValue, _getPath as getPath } from './property_get';
import { notifyPropertyChange } from './property_events';
import { isPath } from './path_cache';
import { isDescriptor, isDescriptorTrap, peekMeta, DESCRIPTOR, descriptorFor } from './meta';
-import { DESCRIPTOR_TRAP, EMBER_METAL_ES5_GETTERS, MANDATORY_SETTER } from 'ember/features';
+
/**
@module @ember/object
*/
@@ -60,19 +61,17 @@ export function set(obj, keyName, value, tolerant) {
return setPath(obj, keyName, value, tolerant);
}
- if (EMBER_METAL_ES5_GETTERS) {
- let possibleDesc = descriptorFor(obj, keyName);
+ let possibleDesc = descriptorFor(obj, keyName);
- if (possibleDesc !== undefined) {
- /* computed property */
- possibleDesc.set(obj, keyName, value);
- return value;
- }
+ if (possibleDesc !== undefined) {
+ /* computed property */
+ possibleDesc.set(obj, keyName, value);
+ return value;
}
let currentValue = getPossibleMandatoryProxyValue(obj, keyName);
- if (DESCRIPTOR_TRAP && isDescriptorTrap(currentValue)) {
+ if (DEBUG && isDescriptorTrap(currentValue)) {
currentValue = currentValue[DESCRIPTOR];
}
@@ -90,7 +89,7 @@ export function set(obj, keyName, value, tolerant) {
} else {
let meta = peekMeta(obj);
- if (MANDATORY_SETTER) {
+ if (DEBUG) {
setWithMandatorySetter(meta, obj, keyName, value);
} else {
obj[keyName] = value;
@@ -104,7 +103,7 @@ export function set(obj, keyName, value, tolerant) {
return value;
}
-if (MANDATORY_SETTER) {
+if (DEBUG) {
var setWithMandatorySetter = (meta, obj, keyName, value) => {
if (meta !== undefined && meta.peekWatching(keyName) > 0) {
makeEnumerable(obj, keyName);
| true |
Other
|
emberjs
|
ember.js
|
e64390d6f2044cb43466333e1a93b1074cc29498.json
|
remove EMBER_METAL_ES5_GETTER flag
|
packages/ember-metal/lib/watch_key.js
|
@@ -1,5 +1,5 @@
import { lookupDescriptor } from 'ember-utils';
-import { MANDATORY_SETTER } from 'ember/features';
+import { DEBUG } from '@glimmer/env';
import { descriptorFor, isDescriptor, meta as metaFor, peekMeta, UNDEFINED } from './meta';
import {
MANDATORY_SETTER_FUNCTION,
@@ -26,14 +26,14 @@ export function watchKey(obj, keyName, _meta) {
obj.willWatchProperty(keyName);
}
- if (MANDATORY_SETTER) {
+ if (DEBUG) {
// NOTE: this is dropped for prod + minified builds
handleMandatorySetter(meta, obj, keyName);
}
}
}
-if (MANDATORY_SETTER) {
+if (DEBUG) {
let hasOwnProperty = (obj, key) => Object.prototype.hasOwnProperty.call(obj, key);
let propertyIsEnumerable = (obj, key) => Object.prototype.propertyIsEnumerable.call(obj, key);
@@ -95,7 +95,7 @@ export function unwatchKey(obj, keyName, _meta) {
obj.didUnwatchProperty(keyName);
}
- if (MANDATORY_SETTER) {
+ if (DEBUG) {
// It is true, the following code looks quite WAT. But have no fear, It
// exists purely to improve development ergonomics and is removed from
// ember.min.js and ember.prod.js builds.
| true |
Other
|
emberjs
|
ember.js
|
e64390d6f2044cb43466333e1a93b1074cc29498.json
|
remove EMBER_METAL_ES5_GETTER flag
|
packages/ember-metal/tests/accessors/mandatory_setters_test.js
|
@@ -1,4 +1,4 @@
-import { MANDATORY_SETTER } from 'ember/features';
+import { DEBUG } from '@glimmer/env';
import { get, set, watch, unwatch, meta as metaFor } from '../..';
import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
@@ -14,7 +14,7 @@ function hasMetaValue(object, property) {
return metaFor(object).peekValues(property) !== undefined;
}
-if (MANDATORY_SETTER) {
+if (DEBUG) {
moduleFor(
'mandory-setters',
class extends AbstractTestCase {
| true |
Other
|
emberjs
|
ember.js
|
e64390d6f2044cb43466333e1a93b1074cc29498.json
|
remove EMBER_METAL_ES5_GETTER flag
|
packages/ember-metal/tests/computed_test.js
|
@@ -1,4 +1,4 @@
-import { DESCRIPTOR_TRAP, EMBER_METAL_ES5_GETTERS } from 'ember/features';
+import { DEBUG } from '@glimmer/env';
import { Object as EmberObject } from 'ember-runtime';
import {
ComputedProperty,
@@ -46,29 +46,26 @@ moduleFor(
}
['@test computed property can be accessed without `get`'](assert) {
- if (EMBER_METAL_ES5_GETTERS) {
- let obj = {};
- let count = 0;
- defineProperty(
- obj,
- 'foo',
- computed(function(key) {
- count++;
- return 'computed ' + key;
- })
- );
+ let obj = {};
+ let count = 0;
+ defineProperty(
+ obj,
+ 'foo',
+ computed(function(key) {
+ count++;
+ return 'computed ' + key;
+ })
+ );
- assert.equal(obj.foo, 'computed foo', 'should return value');
- assert.equal(count, 1, 'should have invoked computed property');
- } else {
- assert.expect(0);
- }
+ assert.equal(obj.foo, 'computed foo', 'should return value');
+ assert.equal(count, 1, 'should have invoked computed property');
}
['@test accessing computed property descriptor through the object triggers an assertion'](
assert
) {
- if (!EMBER_METAL_ES5_GETTERS && DESCRIPTOR_TRAP) {
+ // this is !EMBER_METAL_ES5_GETTERS
+ if (DEBUG) {
let obj = {
toString() {
return 'obj';
| true |
Other
|
emberjs
|
ember.js
|
e64390d6f2044cb43466333e1a93b1074cc29498.json
|
remove EMBER_METAL_ES5_GETTER flag
|
packages/ember-runtime/lib/system/core_object.js
|
@@ -35,7 +35,6 @@ import { validatePropertyInjections } from '../inject';
import { assert } from 'ember-debug';
import { DEBUG } from '@glimmer/env';
import { ENV } from 'ember-environment';
-import { MANDATORY_GETTER, MANDATORY_SETTER, EMBER_METAL_ES5_GETTERS } from 'ember/features';
const applyMixin = Mixin._apply;
const reopen = Mixin.prototype.reopen;
@@ -80,13 +79,7 @@ function makeCtor(base) {
beforeInitCalled = true;
}
- if (
- DEBUG &&
- MANDATORY_GETTER &&
- EMBER_METAL_ES5_GETTERS &&
- HAS_NATIVE_PROXY &&
- typeof self.unknownProperty === 'function'
- ) {
+ if (DEBUG && HAS_NATIVE_PROXY && typeof self.unknownProperty === 'function') {
let messageFor = (obj, property) => {
return (
`You attempted to access the \`${String(property)}\` property (of ${obj}).\n` +
@@ -206,7 +199,7 @@ function makeCtor(base) {
} else if (typeof self.setUnknownProperty === 'function' && !(keyName in self)) {
self.setUnknownProperty(keyName, value);
} else {
- if (MANDATORY_SETTER) {
+ if (DEBUG) {
defineProperty(self, keyName, null, value); // setup mandatory setter
} else {
self[keyName] = value;
| true |
Other
|
emberjs
|
ember.js
|
e64390d6f2044cb43466333e1a93b1074cc29498.json
|
remove EMBER_METAL_ES5_GETTER flag
|
packages/ember-runtime/tests/system/object/create_test.js
|
@@ -1,6 +1,6 @@
import { getOwner, setOwner } from 'ember-owner';
import { computed, Mixin, observer } from 'ember-metal';
-import { MANDATORY_SETTER } from 'ember/features';
+import { DEBUG } from '@glimmer/env';
import EmberObject from '../../../lib/system/object';
import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
@@ -29,7 +29,7 @@ moduleFor(
}
['@test sets up mandatory setters for watched simple properties'](assert) {
- if (MANDATORY_SETTER) {
+ if (DEBUG) {
let MyClass = EmberObject.extend({
foo: null,
bar: null,
| true |
Other
|
emberjs
|
ember.js
|
e64390d6f2044cb43466333e1a93b1074cc29498.json
|
remove EMBER_METAL_ES5_GETTER flag
|
packages/ember-runtime/tests/system/object/destroy_test.js
|
@@ -8,7 +8,7 @@ import {
peekMeta,
} from 'ember-metal';
import EmberObject from '../../../lib/system/object';
-import { MANDATORY_SETTER } from 'ember/features';
+import { DEBUG } from '@glimmer/env';
import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
moduleFor(
@@ -36,7 +36,7 @@ moduleFor(
['@test should raise an exception when modifying watched properties on a destroyed object'](
assert
) {
- if (MANDATORY_SETTER) {
+ if (DEBUG) {
let obj = EmberObject.extend({
fooDidChange: observer('foo', function() {}),
}).create({
| true |
Other
|
emberjs
|
ember.js
|
e64390d6f2044cb43466333e1a93b1074cc29498.json
|
remove EMBER_METAL_ES5_GETTER flag
|
packages/ember-runtime/tests/system/object_proxy_test.js
|
@@ -1,6 +1,6 @@
+import { DEBUG } from '@glimmer/env';
import { addObserver, computed, get, set, isWatching, removeObserver } from 'ember-metal';
import { HAS_NATIVE_PROXY } from 'ember-utils';
-import { MANDATORY_GETTER, EMBER_METAL_ES5_GETTERS } from 'ember/features';
import ObjectProxy from '../../lib/system/object_proxy';
import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
@@ -128,7 +128,7 @@ moduleFor(
}
['@test getting proxied properties with [] should be an error'](assert) {
- if (MANDATORY_GETTER && EMBER_METAL_ES5_GETTERS && HAS_NATIVE_PROXY) {
+ if (DEBUG && HAS_NATIVE_PROXY) {
let proxy = ObjectProxy.create({
content: {
foo: 'FOO',
| true |
Other
|
emberjs
|
ember.js
|
e64390d6f2044cb43466333e1a93b1074cc29498.json
|
remove EMBER_METAL_ES5_GETTER flag
|
packages/ember/tests/service_injection_test.js
|
@@ -3,7 +3,7 @@ import Controller from '@ember/controller';
import { inject, Service, _ProxyMixin } from 'ember-runtime';
import { moduleFor, ApplicationTestCase } from 'internal-test-helpers';
import { computed } from 'ember-metal';
-import { EMBER_METAL_ES5_GETTERS, EMBER_MODULE_UNIFICATION } from 'ember/features';
+import { EMBER_MODULE_UNIFICATION } from 'ember/features';
moduleFor(
'Service Injection',
@@ -53,38 +53,32 @@ moduleFor(
}
);
-if (EMBER_METAL_ES5_GETTERS) {
- moduleFor(
- 'Service Injection with ES5 Getters',
- class extends ApplicationTestCase {
- ['@test Service can be injected and is resolved without calling `get`'](assert) {
- this.add(
- 'controller:application',
- Controller.extend({
- myService: inject.service('my-service'),
- })
- );
- let MyService = Service.extend({
- name: computed(function() {
- return 'The service name';
- }),
- });
- this.add('service:my-service', MyService);
- this.addTemplate('application', '');
+moduleFor(
+ 'Service Injection with ES5 Getters',
+ class extends ApplicationTestCase {
+ ['@test Service can be injected and is resolved without calling `get`'](assert) {
+ this.add(
+ 'controller:application',
+ Controller.extend({
+ myService: inject.service('my-service'),
+ })
+ );
+ let MyService = Service.extend({
+ name: computed(function() {
+ return 'The service name';
+ }),
+ });
+ this.add('service:my-service', MyService);
+ this.addTemplate('application', '');
- this.visit('/').then(() => {
- let controller = this.applicationInstance.lookup('controller:application');
- assert.ok(controller.myService instanceof MyService);
- assert.equal(
- controller.myService.name,
- 'The service name',
- 'service property accessible'
- );
- });
- }
+ this.visit('/').then(() => {
+ let controller = this.applicationInstance.lookup('controller:application');
+ assert.ok(controller.myService instanceof MyService);
+ assert.equal(controller.myService.name, 'The service name', 'service property accessible');
+ });
}
- );
-}
+ }
+);
if (EMBER_MODULE_UNIFICATION) {
moduleFor(
| true |
Other
|
emberjs
|
ember.js
|
8cb2c6b27e68c30f1528a55970a943eee1a6a9f2.json
|
fix template compiler
|
ember-cli-build.js
|
@@ -96,6 +96,8 @@ module.exports = function() {
'container/lib/**',
'ember-environment/index.js',
'ember-environment/lib/**',
+ 'ember-browser-environment/index.js',
+ 'ember-browser-environment/lib/**',
'ember-glimmer/index.js',
'ember-glimmer/lib/**',
'ember-metal/index.js',
@@ -106,6 +108,7 @@ module.exports = function() {
}),
rollupPackage(packagesES, 'container'),
rollupPackage(packagesES, 'ember-environment'),
+ rollupPackage(packagesES, 'ember-browser-environment'),
rollupPackage(packagesES, 'ember-glimmer'),
rollupPackage(packagesES, 'ember-metal'),
rollupPackage(packagesES, 'ember-utils'),
@@ -182,6 +185,7 @@ module.exports = function() {
'ember/version.js',
'ember-debug/**',
'ember-environment.js',
+ 'ember-browser-environment.js',
'ember-template-compiler/**',
'ember-utils.js',
],
| false |
Other
|
emberjs
|
ember.js
|
c77ddd2edbaf5595c4ddbea114a7eda50c55a727.json
|
Add v3.2.0-beta.2 to CHANGELOG
[ci skip]
(cherry picked from commit b66cd523fae329800f4b5f2580d4c925ccfb874f)
|
CHANGELOG.md
|
@@ -1,5 +1,15 @@
# Ember Changelog
+### v3.2.0-beta.2 (April 16, 2018)
+
+- [#16493](https://github.com/emberjs/ember.js/pull/16493) [BUGFIX] Ensure proxies have access to `getOwner(this)`.
+- [#16494](https://github.com/emberjs/ember.js/pull/16494) [BUGFIX] Adjust assertion to allow for either undefined or null
+- [#16499](https://github.com/emberjs/ember.js/pull/16499) [BUGFIX] Object to string serialization
+- [#16514](https://github.com/emberjs/ember.js/pull/16514) [BUGFIX] Bring back (with deprecation) Ember.EXTEND_PROTOTYPES.
+- [#16520](https://github.com/emberjs/ember.js/pull/16520) [BUGFIX] Adds options checking ability to debug/deprecation test helpers
+- [#16526](https://github.com/emberjs/ember.js/pull/16526) [BUGFIX] Ensure setting a `NAME_KEY` does not error.
+- [#16527](https://github.com/emberjs/ember.js/pull/16527) [BUGFIX] Update glimmer-vm to 0.33.5.
+
### v3.2.0-beta.1 (April 10, 2018)
- [#16250](https://github.com/emberjs/ember.js/pull/16250) [DEPRECATION] Deprecation of `Ember.Logger`
| false |
Other
|
emberjs
|
ember.js
|
9e17a486e599f9f1b0e6d8d0b9910b1936ef73aa.json
|
Convert ember-environment to typescript.
|
packages/ember-environment/index.d.ts
|
@@ -1,16 +0,0 @@
-export const environment: {
- hasDOM: boolean;
- isChrome: boolean;
- isFirefox: boolean;
- location: Location | null;
- history: History | null;
- userAgent: string;
- window: Window | null;
-};
-
-export const ENV: {
- _ENABLE_DID_INIT_ATTRS_SUPPORT: boolean;
- _APPLICATION_TEMPLATE_WRAPPER: boolean;
- _ENABLE_RENDER_SUPPORT: boolean;
- _TEMPLATE_ONLY_GLIMMER_COMPONENTS: boolean;
-};
| true |
Other
|
emberjs
|
ember.js
|
9e17a486e599f9f1b0e6d8d0b9910b1936ef73aa.json
|
Convert ember-environment to typescript.
|
packages/ember-environment/index.ts
|
@@ -0,0 +1,3 @@
+export * from './lib/context';
+export * from './lib/env';
+export * from './lib/has-dom';
| true |
Other
|
emberjs
|
ember.js
|
9e17a486e599f9f1b0e6d8d0b9910b1936ef73aa.json
|
Convert ember-environment to typescript.
|
packages/ember-environment/lib/context.ts
|
@@ -0,0 +1,32 @@
+import global from './global';
+
+export interface GlobalContext {
+ imports: object;
+ exports: object;
+ lookup: object;
+}
+
+// legacy imports/exports/lookup stuff (should we keep this??)
+export const context = (function(
+ global: object,
+ Ember: Partial<GlobalContext> | undefined
+): GlobalContext {
+ return Ember === undefined
+ ? { imports: global, exports: global, lookup: global }
+ : {
+ // import jQuery
+ imports: Ember.imports || global,
+ // export Ember
+ exports: Ember.exports || global,
+ // search for Namespaces
+ lookup: Ember.lookup || global,
+ };
+})(global, global.Ember);
+
+export function getLookup(): object {
+ return context.lookup;
+}
+
+export function setLookup(value: object): void {
+ context.lookup = value;
+}
| true |
Other
|
emberjs
|
ember.js
|
9e17a486e599f9f1b0e6d8d0b9910b1936ef73aa.json
|
Convert ember-environment to typescript.
|
packages/ember-environment/lib/env.ts
|
@@ -1,5 +1,22 @@
-import global from './lib/global';
-import { defaultFalse, defaultTrue, normalizeExtendPrototypes } from './lib/utils';
+import global from './global';
+import { defaultFalse, defaultTrue, normalizeExtendPrototypes } from './utils';
+
+export interface Environment {
+ ENABLE_ALL_FEATURES: boolean;
+ ENABLE_OPTIONAL_FEATURES: boolean;
+ EXTEND_PROTOTYPES: {
+ Array: boolean;
+ Function: boolean;
+ String: boolean;
+ };
+ LOG_STACKTRACE_ON_DEPRECATION: boolean;
+ LOG_VERSION: boolean;
+ RAISE_ON_DEPRECATION: boolean;
+ _APPLICATION_TEMPLATE_WRAPPER: boolean;
+ _TEMPLATE_ONLY_GLIMMER_COMPONENTS: boolean;
+ _ENABLE_WARN_OPTIONS_SUPPORT: boolean;
+}
+
/**
The hash of environment variables used to control various configuration
settings. To specify your own or override default settings, add the
@@ -11,7 +28,7 @@ import { defaultFalse, defaultTrue, normalizeExtendPrototypes } from './lib/util
@type Object
@public
*/
-export const ENV =
+export const ENV: Environment =
(typeof global.EmberENV === 'object' && global.EmberENV) ||
(typeof global.ENV === 'object' && global.ENV) ||
{};
@@ -101,52 +118,3 @@ ENV._APPLICATION_TEMPLATE_WRAPPER = defaultTrue(ENV._APPLICATION_TEMPLATE_WRAPPE
@private
*/
ENV._TEMPLATE_ONLY_GLIMMER_COMPONENTS = defaultFalse(ENV._TEMPLATE_ONLY_GLIMMER_COMPONENTS);
-
-// check if window exists and actually is the global
-const hasDOM =
- typeof window !== 'undefined' &&
- window === global &&
- window.document &&
- window.document.createElement &&
- !ENV.disableBrowserEnvironment; // is this a public thing?
-
-// legacy imports/exports/lookup stuff (should we keep this??)
-const originalContext = global.Ember || {};
-
-export const context = {
- // import jQuery
- imports: originalContext.imports || global,
- // export Ember
- exports: originalContext.exports || global,
- // search for Namespaces
- lookup: originalContext.lookup || global,
-};
-
-export function getLookup() {
- return context.lookup;
-}
-
-export function setLookup(value) {
- context.lookup = value;
-}
-
-// TODO: cleanup single source of truth issues with this stuff
-export const environment = hasDOM
- ? {
- hasDOM: true,
- isChrome: !!window.chrome && !window.opera,
- isFirefox: typeof InstallTrigger !== 'undefined',
- location: window.location,
- history: window.history,
- userAgent: window.navigator.userAgent,
- window,
- }
- : {
- hasDOM: false,
- isChrome: false,
- isFirefox: false,
- location: null,
- history: null,
- userAgent: 'Lynx (textmode)',
- window: null,
- };
| true |
Other
|
emberjs
|
ember.js
|
9e17a486e599f9f1b0e6d8d0b9910b1936ef73aa.json
|
Convert ember-environment to typescript.
|
packages/ember-environment/lib/global.ts
|
@@ -1,18 +1,19 @@
/* globals global, window, self, mainContext */
+declare const mainContext: object | undefined;
// from lodash to catch fake globals
-function checkGlobal(value) {
+function checkGlobal(value: any | null | undefined): value is object {
return value && value.Object === Object ? value : undefined;
}
// element ids can ruin global miss checks
-function checkElementIdShadowing(value) {
+function checkElementIdShadowing(value: any | null | undefined) {
return value && value.nodeType === undefined ? value : undefined;
}
// export real global
export default checkGlobal(checkElementIdShadowing(typeof global === 'object' && global)) ||
checkGlobal(typeof self === 'object' && self) ||
checkGlobal(typeof window === 'object' && window) ||
-mainContext || // set before strict mode in Ember loader/wrapper
+(typeof mainContext !== 'undefined' && mainContext) || // set before strict mode in Ember loader/wrapper
new Function('return this')(); // eval outside of strict mode
| true |
Other
|
emberjs
|
ember.js
|
9e17a486e599f9f1b0e6d8d0b9910b1936ef73aa.json
|
Convert ember-environment to typescript.
|
packages/ember-environment/lib/has-dom.ts
|
@@ -0,0 +1,33 @@
+import { ENV } from './env';
+import global from './global';
+
+// check if window exists and actually is the global
+const hasDOM =
+ typeof window !== 'undefined' &&
+ window === global &&
+ window.document &&
+ window.document.createElement &&
+ !(ENV as any).disableBrowserEnvironment; // is this a public thing?
+
+declare const InstallTrigger: any | undefined;
+
+// TODO: cleanup single source of truth issues with this stuff
+export const environment = hasDOM
+ ? {
+ hasDOM: true,
+ isChrome: !!(window as any).chrome && !(window as any).opera,
+ isFirefox: typeof InstallTrigger !== 'undefined',
+ location: window.location,
+ history: window.history,
+ userAgent: window.navigator.userAgent,
+ window,
+ }
+ : {
+ hasDOM: false,
+ isChrome: false,
+ isFirefox: false,
+ location: null,
+ history: null,
+ userAgent: 'Lynx (textmode)',
+ window: null,
+ };
| true |
Other
|
emberjs
|
ember.js
|
9e17a486e599f9f1b0e6d8d0b9910b1936ef73aa.json
|
Convert ember-environment to typescript.
|
packages/ember-environment/lib/utils.js
|
@@ -1,21 +0,0 @@
-export function defaultTrue(v) {
- return v === false ? false : true;
-}
-
-export function defaultFalse(v) {
- return v === true ? true : false;
-}
-
-export function normalizeExtendPrototypes(obj) {
- if (obj === false) {
- return { String: false, Array: false, Function: false };
- } else if (!obj || obj === true) {
- return { String: true, Array: true, Function: true };
- } else {
- return {
- String: defaultTrue(obj.String),
- Array: defaultTrue(obj.Array),
- Function: defaultTrue(obj.Function),
- };
- }
-}
| true |
Other
|
emberjs
|
ember.js
|
9e17a486e599f9f1b0e6d8d0b9910b1936ef73aa.json
|
Convert ember-environment to typescript.
|
packages/ember-environment/lib/utils.ts
|
@@ -0,0 +1,21 @@
+export function defaultTrue(v: any | undefined | null) {
+ return v === false ? false : true;
+}
+
+export function defaultFalse(v: any | undefined | null) {
+ return v === true ? true : false;
+}
+
+export function normalizeExtendPrototypes(obj: any | undefined | null) {
+ if (obj === false) {
+ return { String: false, Array: false, Function: false };
+ }
+ if (obj === undefined || obj === null || obj === true) {
+ return { String: true, Array: true, Function: true };
+ }
+ return {
+ String: defaultTrue(obj.String),
+ Array: defaultTrue(obj.Array),
+ Function: defaultTrue(obj.Function),
+ };
+}
| true |
Other
|
emberjs
|
ember.js
|
e5d33f60b33d48eecc19e04c2d84b39701604add.json
|
Move Ember.Engine to @ember/engine.
|
packages/@ember/application/lib/application.js
|
@@ -21,7 +21,7 @@ import {
BucketCache,
} from 'ember-routing';
import ApplicationInstance from '@ember/application/instance';
-import { Engine } from 'ember-application';
+import Engine from '@ember/engine';
import { privatize as P } from 'container';
import { setupApplicationRegistry } from 'ember-glimmer';
import { RouterService } from 'ember-routing';
| true |
Other
|
emberjs
|
ember.js
|
e5d33f60b33d48eecc19e04c2d84b39701604add.json
|
Move Ember.Engine to @ember/engine.
|
packages/@ember/application/tests/application_instance_test.js
|
@@ -1,4 +1,4 @@
-import { Engine } from 'ember-application';
+import Engine from '@ember/engine';
import Application from '@ember/application';
import ApplicationInstance from '@ember/application/instance';
import { run } from '@ember/runloop';
| true |
Other
|
emberjs
|
ember.js
|
e5d33f60b33d48eecc19e04c2d84b39701604add.json
|
Move Ember.Engine to @ember/engine.
|
packages/@ember/application/tests/visit_test.js
|
@@ -3,7 +3,7 @@ import { Object as EmberObject, inject, RSVP, onerrorDefault } from 'ember-runti
import { later } from '@ember/runloop';
import Application from '@ember/application';
import ApplicationInstance from '@ember/application/instance';
-import { Engine } from 'ember-application';
+import Engine from '@ember/engine';
import { Route } from 'ember-routing';
import { Component, helper, isSerializationFirstNode } from 'ember-glimmer';
import { compile } from 'ember-template-compiler';
| true |
Other
|
emberjs
|
ember.js
|
e5d33f60b33d48eecc19e04c2d84b39701604add.json
|
Move Ember.Engine to @ember/engine.
|
packages/@ember/engine/index.js
|
@@ -8,7 +8,7 @@ import DAG from 'dag-map';
import { assert } from 'ember-debug';
import { get, set } from 'ember-metal';
import DefaultResolver from '@ember/application/globals-resolver';
-import EngineInstance from './engine-instance';
+import { EngineInstance } from 'ember-application';
import { RoutingService } from 'ember-routing';
import { ContainerDebugAdapter } from 'ember-extension-support';
import { ComponentLookup } from 'ember-views';
| true |
Other
|
emberjs
|
ember.js
|
e5d33f60b33d48eecc19e04c2d84b39701604add.json
|
Move Ember.Engine to @ember/engine.
|
packages/@ember/engine/tests/engine_initializers_test.js
|
@@ -1,5 +1,5 @@
import { run } from '@ember/runloop';
-import Engine from '../../lib/system/engine';
+import Engine from '@ember/engine';
import { moduleFor, AbstractTestCase as TestCase } from 'internal-test-helpers';
let MyEngine, myEngine, myEngineInstance;
| true |
Other
|
emberjs
|
ember.js
|
e5d33f60b33d48eecc19e04c2d84b39701604add.json
|
Move Ember.Engine to @ember/engine.
|
packages/@ember/engine/tests/engine_test.js
|
@@ -1,9 +1,12 @@
import { context } from 'ember-environment';
import { run } from '@ember/runloop';
-import Engine from '../../lib/system/engine';
+import Engine from '@ember/engine';
import { Object as EmberObject } from 'ember-runtime';
import { privatize as P } from 'container';
-import { verifyInjection, verifyRegistration } from '../test-helpers/registry-check';
+import {
+ verifyInjection,
+ verifyRegistration,
+} from 'ember-application/tests/test-helpers/registry-check';
import { moduleFor, AbstractTestCase as TestCase } from 'internal-test-helpers';
let engine;
| true |
Other
|
emberjs
|
ember.js
|
e5d33f60b33d48eecc19e04c2d84b39701604add.json
|
Move Ember.Engine to @ember/engine.
|
packages/ember-application/index.js
|
@@ -1,3 +1,2 @@
-export { default as Engine } from './lib/system/engine';
export { default as EngineInstance } from './lib/system/engine-instance';
export { getEngineParent, setEngineParent } from './lib/system/engine-parent';
| true |
Other
|
emberjs
|
ember.js
|
e5d33f60b33d48eecc19e04c2d84b39701604add.json
|
Move Ember.Engine to @ember/engine.
|
packages/ember-application/tests/system/engine_instance_initializers_test.js
|
@@ -1,5 +1,5 @@
import { run } from '@ember/runloop';
-import Engine from '../../lib/system/engine';
+import Engine from '@ember/engine';
import EngineInstance from '../../lib/system/engine-instance';
import { setEngineParent } from '../../lib/system/engine-parent';
import { moduleFor, AbstractTestCase as TestCase } from 'internal-test-helpers';
| true |
Other
|
emberjs
|
ember.js
|
e5d33f60b33d48eecc19e04c2d84b39701604add.json
|
Move Ember.Engine to @ember/engine.
|
packages/ember-application/tests/system/engine_instance_test.js
|
@@ -1,4 +1,4 @@
-import Engine from '../../lib/system/engine';
+import Engine from '@ember/engine';
import EngineInstance from '../../lib/system/engine-instance';
import { getEngineParent, setEngineParent } from '../../lib/system/engine-parent';
import { run } from '@ember/runloop';
| true |
Other
|
emberjs
|
ember.js
|
e5d33f60b33d48eecc19e04c2d84b39701604add.json
|
Move Ember.Engine to @ember/engine.
|
packages/ember-glimmer/tests/integration/application/engine-test.js
|
@@ -3,7 +3,7 @@ import { strip } from '../../utils/abstract-test-case';
import { compile } from '../../utils/helpers';
import { Controller, RSVP } from 'ember-runtime';
import { Component } from 'ember-glimmer';
-import { Engine } from 'ember-application';
+import Engine from '@ember/engine';
import { Route } from 'ember-routing';
import { next } from '@ember/runloop';
| true |
Other
|
emberjs
|
ember.js
|
e5d33f60b33d48eecc19e04c2d84b39701604add.json
|
Move Ember.Engine to @ember/engine.
|
packages/ember-glimmer/tests/integration/mount-test.js
|
@@ -3,7 +3,8 @@ import { moduleFor, ApplicationTest, RenderingTest } from '../utils/test-case';
import { compile, Component } from '../utils/helpers';
import { Controller } from 'ember-runtime';
import { set } from 'ember-metal';
-import { Engine, getEngineParent } from 'ember-application';
+import Engine from '@ember/engine';
+import { getEngineParent } from 'ember-application';
import { EMBER_ENGINES_MOUNT_PARAMS } from 'ember/features';
if (EMBER_ENGINES_MOUNT_PARAMS) {
| true |
Other
|
emberjs
|
ember.js
|
e5d33f60b33d48eecc19e04c2d84b39701604add.json
|
Move Ember.Engine to @ember/engine.
|
packages/ember/index.js
|
@@ -109,6 +109,7 @@ import { getOwner, setOwner } from 'ember-owner';
import Application, { onLoad, runLoadHooks } from '@ember/application';
import Resolver from '@ember/application/globals-resolver';
import ApplicationInstance from '@ember/application/instance';
+import Engine from '@ember/engine';
// ****ember-environment****
@@ -137,6 +138,9 @@ Ember.Application = Application;
Ember.DefaultResolver = Ember.Resolver = Resolver;
Ember.ApplicationInstance = ApplicationInstance;
+// ****@ember/engine****
+Ember.Engine = Engine;
+
// ****ember-utils****
Ember.generateGuid = utils.generateGuid;
Ember.GUID_KEY = utils.GUID_KEY;
@@ -506,7 +510,6 @@ Ember.Router = routing.Router;
Ember.Route = routing.Route;
// ****ember-application****
-Ember.Engine = application.Engine;
Ember.EngineInstance = application.EngineInstance;
runLoadHooks('Ember.Application', Application);
| true |
Other
|
emberjs
|
ember.js
|
e5d33f60b33d48eecc19e04c2d84b39701604add.json
|
Move Ember.Engine to @ember/engine.
|
packages/ember/tests/reexports_test.js
|
@@ -265,7 +265,7 @@ let allExports = [
// ember-application
['Application', '@ember/application', 'default'],
['ApplicationInstance', '@ember/application/instance', 'default'],
- ['Engine', 'ember-application'],
+ ['Engine', '@ember/engine', 'default'],
['EngineInstance', 'ember-application'],
['Resolver', '@ember/application/globals-resolver', 'default'],
['DefaultResolver', '@ember/application/globals-resolver', 'default'],
| true |
Other
|
emberjs
|
ember.js
|
e5d33f60b33d48eecc19e04c2d84b39701604add.json
|
Move Ember.Engine to @ember/engine.
|
packages/ember/tests/routing/decoupled_basic_test.js
|
@@ -10,7 +10,7 @@ import { run } from '@ember/runloop';
import { Mixin, computed, set, addObserver, observer } from 'ember-metal';
import { getTextOf } from 'internal-test-helpers';
import { Component } from 'ember-glimmer';
-import { Engine } from 'ember-application';
+import Engine from '@ember/engine';
import { Transition } from 'router';
let originalRenderSupport;
| true |
Other
|
emberjs
|
ember.js
|
db08764fd0affda46dd068347e886597aef93cb1.json
|
Use function for externals in rolled up packages.
Instead of a hard coded list we swap to using a function with a "simple"
detection: if it starts with a `.` or `/` its internal otherwise its
external.
This prevents some pretty annoying issues when new externals are used
that aren't in the predefined list...
|
ember-cli-build.js
|
@@ -312,32 +312,6 @@ function glimmerDependenciesES() {
}
function rollupPackage(packagesES, name) {
- let externs = [
- '@glimmer/reference',
- '@glimmer/runtime',
- '@glimmer/node',
- '@glimmer/opcode-compiler',
- '@glimmer/program',
- '@glimmer/wire-format',
- '@glimmer/util',
- 'ember-console',
- 'ember-debug',
- 'ember-env-flags',
- 'ember/features',
- 'ember/version',
- 'ember-environment',
- 'ember-utils',
- 'ember-metal',
- 'ember-runtime',
- 'ember-views',
- 'ember-routing',
- 'node-module',
- 'require',
- 'rsvp',
- 'container',
- 'backburner',
- ];
-
// this prevents broccoli-rollup from "seeing" changes in
// its input that are unrelated to what we are building
// and therefore noop on rebuilds...
@@ -350,7 +324,20 @@ function rollupPackage(packagesES, name) {
annotation: `rollup ${name}`,
rollup: {
input: `${name}/index.js`,
- external: externs,
+ external(importee, importer) {
+ // importer of null/undefined means entry module
+ if (!importer) {
+ return false;
+ }
+
+ // import is relative initially, then expanded to absolute
+ // when resolveId is called. this checks for either...
+ if (importee[0] === '.' || importee[0] === '/') {
+ return false;
+ }
+
+ return true;
+ },
output: {
file: `${name}.js`,
format: 'es',
| false |
Other
|
emberjs
|
ember.js
|
67532742036d74e16e53e02da0559d56457da379.json
|
Reduce rollup rebuilds by restricting inputs...
|
ember-cli-build.js
|
@@ -338,7 +338,15 @@ function rollupPackage(packagesES, name) {
'backburner',
];
- return new Rollup(packagesES, {
+ // this prevents broccoli-rollup from "seeing" changes in
+ // its input that are unrelated to what we are building
+ // and therefore noop on rebuilds...
+ let rollupRestrictedInput = new Funnel(packagesES, {
+ srcDir: name,
+ destDir: name,
+ });
+
+ return new Rollup(rollupRestrictedInput, {
annotation: `rollup ${name}`,
rollup: {
input: `${name}/index.js`,
| false |
Other
|
emberjs
|
ember.js
|
8a7318e9c0f3e58f1e9cc7a6ce591d6c83fcb351.json
|
Remove legacy packages structure.
|
bin/run-tests.js
|
@@ -6,15 +6,14 @@ var execa = require('execa');
var RSVP = require('rsvp');
var execFile = require('child_process').execFile;
var chalk = require('chalk');
-var FEATURES = require('../broccoli/features');
-var getPackages = require('../lib/packages');
var runInSequence = require('../lib/run-in-sequence');
var path = require('path');
var finalhandler = require('finalhandler');
var http = require('http');
var serveStatic = require('serve-static');
var puppeteer = require('puppeteer');
+const fs = require('fs');
// Serve up public/ftp folder.
var serve = serveStatic('./dist/', { index: ['index.html', 'index.htm'] });
@@ -198,28 +197,31 @@ function runInBrowser(url, retries, resolve, reject) {
var testFunctions = [];
function generateEachPackageTests() {
- var features = FEATURES;
- var packages = getPackages(features);
+ let entries = fs.readdirSync('packages');
+ entries.forEach(entry => {
+ let relativePath = path.join('packages', entry);
- Object.keys(packages).forEach(function(packageName) {
- if (packages[packageName].skipTests) {
+ if (!fs.existsSync(path.join(relativePath, 'tests'))) {
return;
}
testFunctions.push(function() {
- return run('package=' + packageName);
+ return run('package=' + entry);
});
testFunctions.push(function() {
- return run('package=' + packageName + '&dist=es');
+ return run('package=' + entry + '&dist=es');
});
- if (packages[packageName].requiresJQuery === false) {
+ testFunctions.push(function() {
+ return run('package=' + entry + '&enableoptionalfeatures=true');
+ });
+
+ // TODO: this should ultimately be deleted (when all packages can run with and
+ // without jQuery)
+ if (entry !== 'ember') {
testFunctions.push(function() {
- return run('package=' + packageName + '&jquery=none');
+ return run('package=' + entry + '&jquery=none');
});
}
- testFunctions.push(function() {
- return run('package=' + packageName + '&enableoptionalfeatures=true');
- });
});
}
| true |
Other
|
emberjs
|
ember.js
|
8a7318e9c0f3e58f1e9cc7a6ce591d6c83fcb351.json
|
Remove legacy packages structure.
|
lib/packages.js
|
@@ -1,101 +0,0 @@
-module.exports = function() {
- var packages = {
- container: {
- trees: null,
- requirements: ['ember-utils'],
- isTypeScript: true,
- vendorRequirements: ['@glimmer/di'],
- requiresJQuery: false,
- },
- 'ember-environment': {
- trees: null,
- requirements: [],
- skipTests: true,
- requiresJQuery: false,
- },
- 'ember-utils': { trees: null, requirements: [], requiresJQuery: false },
- 'ember-console': {
- trees: null,
- requirements: [],
- skipTests: true,
- requiresJQuery: false,
- },
- 'ember-metal': {
- trees: null,
- requirements: ['ember-environment', 'ember-utils'],
- vendorRequirements: ['backburner'],
- requiresJQuery: false,
- },
- 'ember-debug': { trees: null, requirements: [], requiresJQuery: false },
- 'ember-runtime': {
- trees: null,
- vendorRequirements: ['rsvp'],
- requirements: ['container', 'ember-environment', 'ember-console', 'ember-metal'],
- requiresJQuery: false,
- },
- 'ember-views': {
- trees: null,
- requirements: ['ember-runtime'],
- skipTests: true,
- },
- 'ember-extension-support': {
- trees: null,
- requirements: ['ember-application'],
- requiresJQuery: false,
- },
- 'ember-testing': {
- trees: null,
- requiresJQuery: false,
- requirements: ['ember-application', 'ember-routing'],
- testing: true,
- },
- 'ember-template-compiler': {
- trees: null,
- templateCompilerOnly: true,
- requiresJQuery: false,
- requirements: ['container', 'ember-metal', 'ember-environment', 'ember-console'],
- templateCompilerVendor: [
- 'simple-html-tokenizer',
- 'backburner',
- '@glimmer/wire-format',
- '@glimmer/syntax',
- '@glimmer/util',
- '@glimmer/compiler',
- '@glimmer/reference',
- '@glimmer/runtime',
- 'handlebars',
- ],
- },
- 'ember-routing': {
- trees: null,
- vendorRequirements: ['router', 'route-recognizer'],
- requirements: ['ember-runtime', 'ember-views'],
- requiresJQuery: false,
- },
- 'ember-application': {
- trees: null,
- vendorRequirements: ['dag-map'],
- requirements: ['ember-routing'],
- requiresJQuery: false,
- },
- ember: { trees: null, requirements: ['ember-application'] },
- 'internal-test-helpers': { trees: null, requiresJQuery: false },
-
- 'ember-glimmer': {
- trees: null,
- requiresJQuery: false,
- requirements: ['container', 'ember-metal', 'ember-routing'],
- hasTemplates: true,
- vendorRequirements: [
- '@glimmer/runtime',
- '@glimmer/reference',
- '@glimmer/util',
- '@glimmer/wire-format',
- '@glimmer/node',
- ],
- testingVendorRequirements: [],
- },
- };
-
- return packages;
-};
| true |
Other
|
emberjs
|
ember.js
|
31477ddc14b7e8fcc3ebeb7c69788aacdd0408d3.json
|
Simplify bundle building for non-production assets.
ember.debug.js, ember-template-compiler.js, and ember-testing.js
|
broccoli/packages.js
|
@@ -63,7 +63,7 @@ module.exports.qunit = function _qunit() {
module.exports.getPackagesES = function getPackagesES() {
let input = new Funnel(`packages`, {
- exclude: ['packages/node-module/**', 'packages/loader/**', 'packages/external-helpers/**'],
+ exclude: ['node-module/**', 'loader/**', 'external-helpers/**'],
destDir: `packages`,
});
| true |
Other
|
emberjs
|
ember.js
|
31477ddc14b7e8fcc3ebeb7c69788aacdd0408d3.json
|
Simplify bundle building for non-production assets.
ember.debug.js, ember-template-compiler.js, and ember-testing.js
|
ember-cli-build.js
|
@@ -24,56 +24,63 @@ const {
backburnerES,
dagES,
routeRecognizerES,
- emberPkgES,
glimmerTrees,
nodeModuleUtils,
emberVersionES,
emberLicense,
emberFeaturesES,
nodeTests,
- rollupEmberMetal,
buildEmberEnvFlagsES,
getPackagesES,
} = require('./broccoli/packages');
-const SHOULD_ROLLUP = true;
const ENV = process.env.EMBER_ENV || 'development';
module.exports = function() {
let loader = internalLoader();
- let license = emberLicense();
let nodeModule = nodeModuleUtils();
// generate "loose" ES<latest> modules...
- let combinedES = new MergeTrees([
- // dependencies
+ let dependenciesES = new MergeTrees([
backburnerES(),
handlebarsES(),
- simpleHTMLTokenizerES(),
rsvpES(),
dagES(),
routerES(),
routeRecognizerES(),
- ...glimmerDependenciesES({ includeGlimmerCompiler: true }),
+ ...glimmerDependenciesES(),
+ ]);
+
+ let templateCompilerDependenciesES = new MergeTrees([
+ simpleHTMLTokenizerES(),
+ handlebarsES(),
+ ...glimmerTrees(['@glimmer/compiler']),
+ ]);
+
+ let packagesES = new MergeTrees([
// dynamically generated packages
emberVersionES(),
emberFeaturesES(),
emberLicense(),
+ // packages/** (after typescript compilation)
getPackagesES(),
]);
- let es = new Funnel(combinedES, {
- destDir: 'es',
- });
+ let es = new Funnel(
+ new MergeTrees([packagesES, dependenciesES, templateCompilerDependenciesES], {
+ overwrite: true,
+ }),
+ { destDir: 'es' }
+ );
let esMin = minify(
- new Funnel(combinedES, {
+ new Funnel(packagesES, {
destDir: 'es-min',
})
);
- let pkgAndTestESInAMD = toNamedAMD(combinedES);
+ let pkgAndTestESInAMD = toNamedAMD(packagesES);
let emberEnvFlagsDebug = toNamedAMD(buildEmberEnvFlagsES({ DEBUG: true }));
let pkgAndTestESBundleDebug = concat(
@@ -85,33 +92,17 @@ module.exports = function() {
}
);
- let version = toES5(emberVersionES());
- let emberDebug = emberPkgES('ember-debug');
let babelDebugHelpersES5 = toES5(babelHelpers('debug'), {
annotation: 'babel helpers debug',
});
- let inlineParser = toES5(handlebarsES(), { annotation: 'handlebars' });
- let tokenizer = toES5(simpleHTMLTokenizerES(), { annotation: 'tokenizer' });
- let rsvp = toES5(rsvpES(), { annotation: 'rsvp' });
- let emberMetal = new Funnel('packages/ember-metal', {
- destDir: '/',
- include: ['**/*.js'],
- exclude: ['tests'],
- });
- let emberMetalES5 = rollupEmberMetal(emberMetal);
- let emberConsole = emberPkgES('ember-console', SHOULD_ROLLUP, ['ember-environment']);
- let emberConsoleES5 = toES5(emberConsole, { annotation: 'ember-console' });
- let emberEnvironment = emberPkgES('ember-environment');
- let emberEnvironmentES5 = toES5(emberEnvironment, {
- annotation: 'ember-environment',
- });
// ES5
- let combinedES5 = toES5(combinedES);
+ let packagesES5 = toES5(packagesES);
+ let dependenciesES5 = toES5(dependenciesES);
// Bundling
let emberTestsBundle = new MergeTrees([
- new Funnel(combinedES5, {
+ new Funnel(packagesES5, {
include: ['internal-test-helpers/**', '*/tests/**', 'license.js'],
}),
loader,
@@ -125,9 +116,10 @@ module.exports = function() {
});
let emberDebugBundle = new MergeTrees([
- new Funnel(combinedES5, {
+ new Funnel(packagesES5, {
exclude: ['*/tests/**'],
}),
+ dependenciesES5,
loader,
nodeModule,
bootstrapModule('ember'),
@@ -139,7 +131,7 @@ module.exports = function() {
});
let emberTestingBundle = new MergeTrees([
- new Funnel(combinedES5, {
+ new Funnel(packagesES5, {
include: ['ember-debug/**', 'ember-testing/**', 'license.js'],
}),
loader,
@@ -159,22 +151,20 @@ module.exports = function() {
`,
});
- function templateCompiler(babelHelpers) {
+ function templateCompiler() {
return new MergeTrees([
- new Funnel(combinedES5, {
+ new Funnel(packagesES5, {
include: [
'license.js',
'ember/features.js',
+ 'ember/version.js',
'ember-debug/**',
'ember-environment/**',
'ember-template-compiler/**',
'ember-utils/**',
],
}),
- ...glimmerTrees(['@glimmer/compiler']).map(toES5),
- tokenizer,
- inlineParser,
- babelHelpers,
+ toES5(templateCompilerDependenciesES),
bootstrapModule('ember-template-compiler', 'umd'),
]);
}
@@ -292,9 +282,9 @@ module.exports = function() {
}
} else {
let emberTemplateCompilerBundle = new MergeTrees([
- templateCompiler(babelDebugHelpersES5),
- version,
+ templateCompiler(),
loader,
+ babelDebugHelpersES5,
nodeModule,
]);
@@ -321,13 +311,9 @@ module.exports = function() {
]);
};
-function glimmerDependenciesES(options = {}) {
+function glimmerDependenciesES() {
let glimmerEntries = ['@glimmer/node', '@glimmer/opcode-compiler', '@glimmer/runtime'];
- if (options.includeGlimmerCompiler) {
- glimmerEntries.push('@glimmer/compiler');
- }
-
if (ENV === 'development') {
let hasGlimmerDebug = true;
try {
| true |
Other
|
emberjs
|
ember.js
|
3cd99c8b24572978c625ffad7365d5c857407690.json
|
Add v3.2.0-beta.1 to CHANGELOG
[ci skip]
(cherry picked from commit e11e9d820c5fb17538fd10e4859aab7d3336bc03)
|
CHANGELOG.md
|
@@ -1,5 +1,16 @@
# Ember Changelog
+### v3.2.0-beta.1 (April 10, 2018)
+
+- [#16250](https://github.com/emberjs/ember.js/pull/16250) [DEPRECATION] Deprecation of `Ember.Logger`
+- [#16436](https://github.com/emberjs/ember.js/pull/16436) [BUGFIX] Refactor `CoreObject` to leverage native JS semantics.
+- [#16382](https://github.com/emberjs/ember.js/pull/16382) Upgrade `backburner.js` to 2.2.2.
+- [#16387](https://github.com/emberjs/ember.js/pull/16387) [BUGFIX] Add an assertion that actions cannot be sent from a destroyed/destroying object
+- [#16386](https://github.com/emberjs/ember.js/pull/16386) [BUGFIX] Add an assertion if you attempt a `transitionTo` when the app is destroyed
+- [#16433](https://github.com/emberjs/ember.js/pull/16433) [CLEANUP] Remove `content` alias
+- [#16462](https://github.com/emberjs/ember.js/pull/16462) [CLEANUP] Remove deprecated `MODEL_FACTORY_INJECTIONS`
+- [emberjs/rfcs#286](https://github.com/emberjs/rfcs/blob/master/text/0286-block-let-template-helper.md) [FEATURE] Enabled block `let` handlebars helper by default.
+
### v3.1.0 (April 10, 2018)
- [#16293](https://github.com/emberjs/ember.js/pull/16293) [BUGFIX] Ignore --pod for -addon blueprints: helper, initializer, and instance-initializer
- [#16312](https://github.com/emberjs/ember.js/pull/16312) [DEPRECATION] Deprecate `Route.prototype.router` in favor of `Route.prototype._router`
| false |
Other
|
emberjs
|
ember.js
|
b33720734607970789f936e7a4cd1426c440214a.json
|
Add v3.1.0 to CHANGELOG
[ci skip]
(cherry picked from commit 2a19b7be81029c21ace8411644be371c4a5aaf34)
|
CHANGELOG.md
|
@@ -1,42 +1,20 @@
# Ember Changelog
-### v3.1.0-beta.5 (March 12, 2018)
-- [#15601](https://github.com/emberjs/ember.js/pull/15601) [BUGFIX] Ensure Mixin.prototype.toString does not return constructor code
+### v3.1.0 (April 10, 2018)
+- [#16293](https://github.com/emberjs/ember.js/pull/16293) [BUGFIX] Ignore --pod for -addon blueprints: helper, initializer, and instance-initializer
+- [#16312](https://github.com/emberjs/ember.js/pull/16312) [DEPRECATION] Deprecate `Route.prototype.router` in favor of `Route.prototype._router`
- [#16326](https://github.com/emberjs/ember.js/pull/16326) [BUGFIX] Expanded syntax error for if handlebars helper to include source of error
-- [#16347](https://github.com/emberjs/ember.js/pull/16347) [BUGFIX] Adds toJSON to list of descriptorTrap assertion exception
-- [#16350](https://github.com/emberjs/ember.js/pull/16350) [BUGFIX] Fix initialiters tests blueprints
-- [#16351](https://github.com/emberjs/ember.js/pull/16351) [BUGFIX] Bring RSVP.cast back from the dead
-- [#16365](https://github.com/emberjs/ember.js/pull/16365) [BUGFIX] Fold all trap methods together
-
-### v3.1.0-beta.4 (March 5, 2018)
+- [#16350](https://github.com/emberjs/ember.js/pull/16350) [BUGFIX] Fix initializers tests blueprints
- [#16294](https://github.com/emberjs/ember.js/pull/16294) [BUGFIX] Fix input macro params handling
-- [#16297](https://github.com/emberjs/ember.js/pull/16297) [BUGFIX] Revert "Update to [email protected]."
-- [#16299](https://github.com/emberjs/ember.js/pull/16299) [BUGFIX] Revert "[CLEANUP] Remove ':change' suffix on change events"
- [#16307](https://github.com/emberjs/ember.js/pull/16307) [BUGFIX] Ensure proper .toString() of default components.
-
-### v3.1.0-beta.3 (February 26, 2018)
-- [#16271](https://github.com/emberjs/ember.js/pull/16271) [BUGFIX] Fix ChainNode unchaining
-- [#16274](https://github.com/emberjs/ember.js/pull/16274) [BUGFIX] Ensure accessing a "proxy" itself does not error.
-- [#16282](https://github.com/emberjs/ember.js/pull/16282) [BUGFIX] Fix nested ObserverSet flushes
-- [#16285](https://github.com/emberjs/ember.js/pull/16285) [BUGFIX] Fix version with many special chars.
-- [#16286](https://github.com/emberjs/ember.js/pull/16286) [BUGFIX] Update to [email protected].
- [#16287](https://github.com/emberjs/ember.js/pull/16287) [BUGFIX] Update to [email protected].
-- [#16288](https://github.com/emberjs/ember.js/pull/16288) [BUGFIX] Ensure all "internal symbols" avoid the proxy assertion
-
-### v3.1.0-beta.2 (February 19, 2018)
-
-- [#13355](https://github.com/emberjs/ember.js/pull/13355) [BUGFIX] Fix issue with `Ember.trySet` on destroyed objects.
- [#16245](https://github.com/emberjs/ember.js/pull/16245) [BUGFIX] Ensure errors in deferred component hooks can be recovered.
- [#16246](https://github.com/emberjs/ember.js/pull/16246) [BUGFIX] computed.sort should not sort if sortProperties is empty
-
-### v3.1.0-beta.1 (February 14, 2018)
-
- [emberjs/rfcs#276](https://github.com/emberjs/rfcs/blob/master/text/0276-named-args.md) [FEATURE named-args] enabled by default.
- [emberjs/rfcs#278](https://github.com/emberjs/rfcs/blob/master/text/0278-template-only-components.md) [FEATURE template-only-glimmer-components] Enable-able via `@ember/optional-features` addon.
- [emberjs/rfcs#280](https://github.com/emberjs/rfcs/blob/master/text/0280-remove-application-wrapper.md) [FEATURE application-template-wrapper] Enable-able via `@ember/optional-features` addon.
- [emberjs/rfcs#281](https://github.com/emberjs/rfcs/blob/master/text/0281-es5-getters.md) [FEATURE native-es5-getters] Enabled by default.
- [#15828](https://github.com/emberjs/ember.js/pull/15828) Upgrade glimmer-vm to latest version.
-- [#16212](https://github.com/emberjs/ember.js/pull/16212) Update to [email protected].
### v3.0.0 (February 13, 2018)
| false |
Other
|
emberjs
|
ember.js
|
ff00bb2f7da6389ad043c6ba08f48d9e22d5bb64.json
|
Ensure publishing scripts are invoked properly.
|
bin/publish_builds
|
@@ -8,9 +8,9 @@ echo -e "PULL_REQUEST: ${TRAVIS_PULL_REQUEST}\n"
if [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$PUBLISH" == "true" ]; then
- ./bin/build-for-publishing.js
+ node ./bin/build-for-publishing.js
- ./bin/publish_to_s3.js
+ node ./bin/publish_to_s3.js
#### NPM PUBLISHING
if [[ "$TRAVIS_TAG" =~ ^v[0-9.]+ ]]; then
| false |
Other
|
emberjs
|
ember.js
|
b876d72bed76178bffc993d13f95f5060dbe40db.json
|
Fix lazy local import of bootstrapping module.
This was lazy required when the boostrapping was being done in
ember-glimmer, but now lives "together" so can use a normal import...
|
packages/ember-template-compiler/lib/system/initializer.js
|
@@ -1,4 +1,5 @@
import require, { has } from 'require';
+import bootstrap from './bootstrap';
// Globals mode template compiler
if (has('ember-application') && has('ember-environment') && has('ember-glimmer')) {
@@ -9,15 +10,11 @@ if (has('ember-application') && has('ember-environment') && has('ember-glimmer')
let { hasTemplate, setTemplate } = emberGlimmer;
let { environment } = emberEnv;
- let bootstrap = function() {};
-
Application.initializer({
name: 'domTemplates',
initialize() {
- let bootstrapModuleId = 'ember-template-compiler/system/bootstrap';
let context;
- if (environment.hasDOM && has(bootstrapModuleId)) {
- bootstrap = require(bootstrapModuleId).default;
+ if (environment.hasDOM) {
context = document;
}
| false |
Other
|
emberjs
|
ember.js
|
f96f8bb74d776c5fc0349a5745b7ee4ec9a3c615.json
|
Fix deep imports from external packages.
|
packages/ember-glimmer/tests/integration/components/contextual-components-test.js
|
@@ -3,7 +3,7 @@ import { Component } from '../../utils/helpers';
import { applyMixins, strip } from '../../utils/abstract-test-case';
import { moduleFor, RenderingTest } from '../../utils/test-case';
import { isEmpty } from 'ember-metal';
-import { A as emberA } from 'ember-runtime/mixins/array';
+import { A as emberA } from 'ember-runtime';
moduleFor(
'Components test: contextual components',
| true |
Other
|
emberjs
|
ember.js
|
f96f8bb74d776c5fc0349a5745b7ee4ec9a3c615.json
|
Fix deep imports from external packages.
|
packages/ember-glimmer/tests/integration/components/curly-components-test.js
|
@@ -1,7 +1,7 @@
/* globals EmberDev */
import { set, get, observer, on, computed, run } from 'ember-metal';
import { Object as EmberObject, A as emberA, inject, Service } from 'ember-runtime';
-import { jQueryDisabled } from 'ember-views/system/jquery';
+import { jQueryDisabled } from 'ember-views';
import { ENV } from 'ember-environment';
import { Component, compile, htmlSafe } from '../../utils/helpers';
import { strip } from '../../utils/abstract-test-case';
| true |
Other
|
emberjs
|
ember.js
|
f96f8bb74d776c5fc0349a5745b7ee4ec9a3c615.json
|
Fix deep imports from external packages.
|
packages/ember-glimmer/tests/integration/components/dynamic-components-test.js
|
@@ -1,5 +1,5 @@
import { set, computed } from 'ember-metal';
-import { jQueryDisabled } from 'ember-views/system/jquery';
+import { jQueryDisabled } from 'ember-views';
import { Component } from '../../utils/helpers';
import { strip } from '../../utils/abstract-test-case';
import { moduleFor, RenderingTest } from '../../utils/test-case';
| true |
Other
|
emberjs
|
ember.js
|
65f35c8a6e37785988c753f4328e9c27d5c6974b.json
|
Fix paths for ember-source addon.
The refactor to move `index.js` -> `lib/index.js` left this in a broken
state (the paths are incorrect and therefore the funnel threw an error
at build time).
|
lib/index.js
|
@@ -66,6 +66,7 @@ module.exports = {
files: ['jquery.js'],
});
+ let emberSourceDistPath = path.join(__dirname, '..', 'dist');
var emberFiles = [
'ember-runtime.js',
'ember-template-compiler.js',
@@ -81,12 +82,12 @@ module.exports = {
return flat.concat(jsAndMap);
}, [])
.filter(function(file) {
- var fullPath = path.join(__dirname, '..', 'dist', file);
+ var fullPath = path.join(emberSourceDistPath, file);
return fs.existsSync(fullPath);
});
- var ember = new Funnel(__dirname + '../dist', {
+ var ember = new Funnel(emberSourceDistPath, {
destDir: 'ember',
files: emberFiles,
});
| false |
Other
|
emberjs
|
ember.js
|
dfaa8676b0fa854e672692891afb26596da95ce1.json
|
clarify documentation for makeArray
Resolve #14741.
|
packages/ember-utils/lib/make-array.js
|
@@ -5,7 +5,7 @@ const { isArray } = Array;
/**
Forces the passed object to be part of an array. If the object is already
an array, it will return the object. Otherwise, it will add the object to
- an array. If obj is `null` or `undefined`, it will return an empty array.
+ an array. If object is `null` or `undefined`, it will return an empty array.
```javascript
import { makeArray } from '@ember/array';
@@ -17,9 +17,9 @@ const { isArray } = Array;
makeArray('lindsay'); // ['lindsay']
makeArray([1, 2, 42]); // [1, 2, 42]
- let controller = ArrayProxy.create({ content: [] });
+ let proxy = ArrayProxy.create({ content: [] });
- makeArray(controller) === controller; // true
+ makeArray(proxy) === proxy; // false
```
@method makeArray
| false |
Other
|
emberjs
|
ember.js
|
a6ab4c692fd385b338fe837587c2cd1452010482.json
|
Remove unused code.
|
packages/ember-runtime/lib/system/application.js
|
@@ -1,3 +0,0 @@
-import Namespace from './namespace';
-
-export default Namespace.extend();
| true |
Other
|
emberjs
|
ember.js
|
a6ab4c692fd385b338fe837587c2cd1452010482.json
|
Remove unused code.
|
packages/ember-runtime/tests/system/application/base_test.js
|
@@ -1,12 +0,0 @@
-import Namespace from '../../../system/namespace';
-import Application from '../../../system/application';
-import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
-
-moduleFor(
- 'Ember.Application',
- class extends AbstractTestCase {
- ['@test Ember.Application should be a subclass of Ember.Namespace'](assert) {
- assert.ok(Namespace.detect(Application), 'Ember.Application subclass of Ember.Namespace');
- }
- }
-);
| true |
Other
|
emberjs
|
ember.js
|
505dbe681943bc25d55b654f298f6723e3dcb1be.json
|
Update controllerName documentation
Update outdated route naming in `controllerName` documentation.
|
packages/ember-routing/lib/system/route.js
|
@@ -563,7 +563,7 @@ let Route = EmberObject.extend(ActionHandler, Evented, {
The name of the controller to associate with this route.
By default, Ember will lookup a route's controller that matches the name
- of the route (i.e. `App.PostController` for `App.PostRoute`). However,
+ of the route (i.e. `posts.new`). However,
if you would like to define a specific controller to use, you can do so
using this property.
| false |
Other
|
emberjs
|
ember.js
|
27e61169b35fc8481de971290a630476f6c2c9b4.json
|
Apply prettier configuration changes to *.ts files.
|
packages/ember-glimmer/index.ts
|
@@ -268,12 +268,7 @@ export { default as LinkComponent } from './lib/components/link-to';
export { default as Component, ROOT_REF } from './lib/component';
export { default as Helper, helper } from './lib/helper';
export { default as Environment } from './lib/environment';
-export {
- SafeString,
- escapeExpression,
- htmlSafe,
- isHTMLSafe
-} from './lib/utils/string';
+export { SafeString, escapeExpression, htmlSafe, isHTMLSafe } from './lib/utils/string';
export {
Renderer,
InertRenderer,
@@ -290,7 +285,10 @@ export {
} from './lib/template_registry';
export { setupEngineRegistry, setupApplicationRegistry } from './lib/setup-registry';
export { DOMChanges, NodeDOMTreeConstruction, DOMTreeConstruction } from './lib/dom';
-export { registerMacros as _registerMacros, experimentalMacros as _experimentalMacros } from './lib/syntax';
+export {
+ registerMacros as _registerMacros,
+ experimentalMacros as _experimentalMacros,
+} from './lib/syntax';
export { default as AbstractComponentManager } from './lib/component-managers/abstract';
// needed for test
| true |
Other
|
emberjs
|
ember.js
|
27e61169b35fc8481de971290a630476f6c2c9b4.json
|
Apply prettier configuration changes to *.ts files.
|
packages/ember-glimmer/lib/compile-time-lookup.ts
|
@@ -1,10 +1,17 @@
-import { CompilableTemplate, CompileTimeLookup as ICompileTimeLookup, ComponentCapabilities, Option, ProgramSymbolTable } from '@glimmer/interfaces';
+import {
+ CompilableTemplate,
+ CompileTimeLookup as ICompileTimeLookup,
+ ComponentCapabilities,
+ Option,
+ ProgramSymbolTable,
+} from '@glimmer/interfaces';
import { ComponentDefinition, ComponentManager, WithStaticLayout } from '@glimmer/runtime';
import { OwnedTemplateMeta } from 'ember-views';
import RuntimeResolver from './resolver';
-interface StaticComponentManager<DefinitionState> extends WithStaticLayout<any, DefinitionState, OwnedTemplateMeta, RuntimeResolver>, ComponentManager<any, DefinitionState> {
-}
+interface StaticComponentManager<DefinitionState>
+ extends WithStaticLayout<any, DefinitionState, OwnedTemplateMeta, RuntimeResolver>,
+ ComponentManager<any, DefinitionState> {}
export default class CompileTimeLookup implements ICompileTimeLookup<OwnedTemplateMeta> {
constructor(private resolver: RuntimeResolver) {}
@@ -16,7 +23,9 @@ export default class CompileTimeLookup implements ICompileTimeLookup<OwnedTempla
}
getLayout<DefinitionState>(handle: number): Option<CompilableTemplate<ProgramSymbolTable>> {
- const { manager, state } = this.resolver.resolve<ComponentDefinition<DefinitionState, StaticComponentManager<DefinitionState>>>(handle);
+ const { manager, state } = this.resolver.resolve<
+ ComponentDefinition<DefinitionState, StaticComponentManager<DefinitionState>>
+ >(handle);
const capabilities = manager.getCapabilities(state);
if (capabilities.dynamicLayout) {
@@ -26,8 +35,10 @@ export default class CompileTimeLookup implements ICompileTimeLookup<OwnedTempla
const invocation = manager.getLayout(state, this.resolver);
return {
// TODO: this seems weird, it already is compiled
- compile() { return invocation.handle; },
- symbolTable: invocation.symbolTable
+ compile() {
+ return invocation.handle;
+ },
+ symbolTable: invocation.symbolTable,
};
}
| true |
Other
|
emberjs
|
ember.js
|
27e61169b35fc8481de971290a630476f6c2c9b4.json
|
Apply prettier configuration changes to *.ts files.
|
packages/ember-glimmer/lib/component-managers/abstract.ts
|
@@ -7,7 +7,7 @@ import {
DynamicScope,
ElementOperations,
Environment,
- PreparedArguments
+ PreparedArguments,
} from '@glimmer/runtime';
import { Destroyable, Opaque, Option } from '@glimmer/util';
import { DEBUG } from 'ember-env-flags';
@@ -17,8 +17,7 @@ import DebugStack from '../utils/debug-stack';
// tslint:disable-next-line:max-line-length
// https://github.com/glimmerjs/glimmer-vm/blob/v0.24.0-beta.4/packages/%40glimmer/runtime/lib/component/interfaces.ts#L21
-export default abstract class AbstractManager<T, U>
- implements ComponentManager<T, U> {
+export default abstract class AbstractManager<T, U> implements ComponentManager<T, U> {
public debugStack: typeof DebugStack;
public _pushToDebugStack!: (name: string, environment: any) => void;
public _pushEngineToDebugStack!: (name: string, environment: any) => void;
@@ -47,11 +46,7 @@ export default abstract class AbstractManager<T, U>
abstract getSelf(component: T): VersionedPathReference<Opaque>;
abstract getCapabilities(state: U): ComponentCapabilities;
- didCreateElement(
- _component: T,
- _element: Simple.Element,
- _operations: ElementOperations
- ): void {
+ didCreateElement(_component: T, _element: Simple.Element, _operations: ElementOperations): void {
// noop
}
@@ -90,18 +85,12 @@ export default abstract class AbstractManager<T, U>
}
if (DEBUG) {
- AbstractManager.prototype._pushToDebugStack = function(
- name: string,
- environment
- ) {
+ AbstractManager.prototype._pushToDebugStack = function(name: string, environment) {
this.debugStack = environment.debugStack;
this.debugStack.push(name);
};
- AbstractManager.prototype._pushEngineToDebugStack = function(
- name: string,
- environment
- ) {
+ AbstractManager.prototype._pushEngineToDebugStack = function(name: string, environment) {
this.debugStack = environment.debugStack;
this.debugStack.pushEngine(name);
};
| true |
Other
|
emberjs
|
ember.js
|
27e61169b35fc8481de971290a630476f6c2c9b4.json
|
Apply prettier configuration changes to *.ts files.
|
packages/ember-glimmer/lib/component-managers/curly.ts
|
@@ -3,13 +3,9 @@ import {
Option,
ProgramSymbolTable,
Simple,
- VMHandle
+ VMHandle,
} from '@glimmer/interfaces';
-import {
- combine,
- Tag,
- VersionedPathReference,
-} from '@glimmer/reference';
+import { combine, Tag, VersionedPathReference } from '@glimmer/reference';
import {
Arguments,
Bounds,
@@ -25,42 +21,24 @@ import {
} from '@glimmer/runtime';
import { Destroyable, EMPTY_ARRAY } from '@glimmer/util';
import { privatize as P } from 'container';
-import {
- assert,
- deprecate,
-} from 'ember-debug';
+import { assert, deprecate } from 'ember-debug';
import { DEBUG } from 'ember-env-flags';
import { ENV } from 'ember-environment';
-import {
- _instrumentStart, get,
-} from 'ember-metal';
+import { _instrumentStart, get } from 'ember-metal';
import { String as StringUtils } from 'ember-runtime';
-import {
- assign,
- getOwner,
- guidFor,
-} from 'ember-utils';
+import { assign, getOwner, guidFor } from 'ember-utils';
import { addChildView, OwnedTemplateMeta, setViewElement } from 'ember-views';
-import {
- BOUNDS,
- DIRTY_TAG,
- HAS_BLOCK,
- IS_DISPATCHING_ATTRS,
- ROOT_REF
-} from '../component';
+import { BOUNDS, DIRTY_TAG, HAS_BLOCK, IS_DISPATCHING_ATTRS, ROOT_REF } from '../component';
import Environment from '../environment';
import { DynamicScope } from '../renderer';
import RuntimeResolver from '../resolver';
-import {
- Factory as TemplateFactory,
- OwnedTemplate
-} from '../template';
+import { Factory as TemplateFactory, OwnedTemplate } from '../template';
import {
AttributeBinding,
ClassNameBinding,
ColonClassNameBindingReference,
IsVisibleBinding,
- referenceForKey
+ referenceForKey,
} from '../utils/bindings';
import ComponentStateBucket, { Component } from '../utils/curly-component-state-bucket';
import { processComponentArgs } from '../utils/process-args';
@@ -71,7 +49,10 @@ import DefinitionState from './definition-state';
function aliasIdToElementId(args: Arguments, props: any) {
if (args.named.has('id')) {
// tslint:disable-next-line:max-line-length
- assert(`You cannot invoke a component with both 'id' and 'elementId' at the same time.`, !args.named.has('elementId'));
+ assert(
+ `You cannot invoke a component with both 'id' and 'elementId' at the same time.`,
+ !args.named.has('elementId')
+ );
props.elementId = props.id;
}
}
@@ -83,7 +64,12 @@ function isTemplateFactory(template: OwnedTemplate | TemplateFactory): template
// We must traverse the attributeBindings in reverse keeping track of
// what has already been applied. This is essentially refining the concatenated
// properties applying right to left.
-function applyAttributeBindings(element: Simple.Element, attributeBindings: Array<string>, component: Component, operations: ElementOperations) {
+function applyAttributeBindings(
+ element: Simple.Element,
+ attributeBindings: Array<string>,
+ component: Component,
+ operations: ElementOperations
+) {
let seen: string[] = [];
let i = attributeBindings.length - 1;
@@ -111,16 +97,17 @@ function applyAttributeBindings(element: Simple.Element, attributeBindings: Arra
const DEFAULT_LAYOUT = P`template:components/-default`;
-export default class CurlyComponentManager extends AbstractManager<ComponentStateBucket, DefinitionState>
- implements WithStaticLayout<ComponentStateBucket, DefinitionState, OwnedTemplateMeta, RuntimeResolver>,
- WithDynamicTagName<ComponentStateBucket>,
- WithDynamicLayout<ComponentStateBucket, OwnedTemplateMeta, RuntimeResolver> {
-
+export default class CurlyComponentManager
+ extends AbstractManager<ComponentStateBucket, DefinitionState>
+ implements
+ WithStaticLayout<ComponentStateBucket, DefinitionState, OwnedTemplateMeta, RuntimeResolver>,
+ WithDynamicTagName<ComponentStateBucket>,
+ WithDynamicLayout<ComponentStateBucket, OwnedTemplateMeta, RuntimeResolver> {
getLayout(state: DefinitionState, _resolver: RuntimeResolver): Invocation {
return {
// TODO fix
- handle: state.handle as any as number,
- symbolTable: state.symbolTable!
+ handle: (state.handle as any) as number,
+ symbolTable: state.symbolTable!,
};
}
@@ -171,26 +158,37 @@ export default class CurlyComponentManager extends AbstractManager<ComponentStat
const { positionalParams } = state.ComponentClass.class;
// early exits
- if (positionalParams === undefined || positionalParams === null || args.positional.length === 0) {
+ if (
+ positionalParams === undefined ||
+ positionalParams === null ||
+ args.positional.length === 0
+ ) {
return null;
}
let named: PreparedArguments['named'];
if (typeof positionalParams === 'string') {
- assert(`You cannot specify positional parameters and the hash argument \`${positionalParams}\`.`, !args.named.has(positionalParams));
+ assert(
+ `You cannot specify positional parameters and the hash argument \`${positionalParams}\`.`,
+ !args.named.has(positionalParams)
+ );
named = { [positionalParams]: args.positional.capture() };
assign(named, args.named.capture().map);
} else if (Array.isArray(positionalParams) && positionalParams.length > 0) {
const count = Math.min(positionalParams.length, args.positional.length);
named = {};
assign(named, args.named.capture().map);
- for (let i=0; i<count; i++) {
+ for (let i = 0; i < count; i++) {
const name = positionalParams[i];
- deprecate(`You cannot specify both a positional param (at position ${i}) and the hash argument \`${name}\`.`, !args.named.has(name), {
- id: 'ember-glimmer.positional-param-conflict',
- until: '3.5.0',
- });
+ deprecate(
+ `You cannot specify both a positional param (at position ${i}) and the hash argument \`${name}\`.`,
+ !args.named.has(name),
+ {
+ id: 'ember-glimmer.positional-param-conflict',
+ until: '3.5.0',
+ }
+ );
named[name] = args.positional.at(i);
}
} else {
@@ -206,7 +204,14 @@ export default class CurlyComponentManager extends AbstractManager<ComponentStat
* features like exposed by view mixins like ChildViewSupport, ActionSupport,
* etc.
*/
- create(environment: Environment, state: DefinitionState, args: Arguments, dynamicScope: DynamicScope, callerSelfRef: VersionedPathReference, hasBlock: boolean): ComponentStateBucket {
+ create(
+ environment: Environment,
+ state: DefinitionState,
+ args: Arguments,
+ dynamicScope: DynamicScope,
+ callerSelfRef: VersionedPathReference,
+ hasBlock: boolean
+ ): ComponentStateBucket {
if (DEBUG) {
this._pushToDebugStack(`component:${state.name}`, environment);
}
@@ -302,7 +307,11 @@ export default class CurlyComponentManager extends AbstractManager<ComponentStat
return component[ROOT_REF];
}
- didCreateElement({ component, classRef, environment }: ComponentStateBucket, element: HTMLElement, operations: ElementOperations): void {
+ didCreateElement(
+ { component, classRef, environment }: ComponentStateBucket,
+ element: HTMLElement,
+ operations: ElementOperations
+ ): void {
setViewElement(component, element);
let { attributeBindings, classNames, classNameBindings } = component;
@@ -319,9 +328,14 @@ export default class CurlyComponentManager extends AbstractManager<ComponentStat
}
if (classRef && classRef.value()) {
- const ref = classRef.value() === true ?
- new ColonClassNameBindingReference(classRef, StringUtils.dasherize(classRef['_propertyKey']), null) :
- classRef;
+ const ref =
+ classRef.value() === true
+ ? new ColonClassNameBindingReference(
+ classRef,
+ StringUtils.dasherize(classRef['_propertyKey']),
+ null
+ )
+ : classRef;
operations.setAttribute('class', ref, false, null);
}
@@ -360,8 +374,7 @@ export default class CurlyComponentManager extends AbstractManager<ComponentStat
}
getTag({ args, component }: ComponentStateBucket): Tag {
- return args ? combine([args.tag, component[DIRTY_TAG]]) :
- component[DIRTY_TAG];
+ return args ? combine([args.tag, component[DIRTY_TAG]]) : component[DIRTY_TAG];
}
didCreate({ component, environment }: ComponentStateBucket): void {
@@ -376,7 +389,7 @@ export default class CurlyComponentManager extends AbstractManager<ComponentStat
let { component, args, argsRevision, environment } = bucket;
if (DEBUG) {
- this._pushToDebugStack(component._debugContainerKey, environment);
+ this._pushToDebugStack(component._debugContainerKey, environment);
}
bucket.finalizer = _instrumentStart('render.component', rerenderInstrumentDetails, component);
@@ -420,7 +433,11 @@ export default class CurlyComponentManager extends AbstractManager<ComponentStat
}
}
-export function validatePositionalParameters(named: { has(name: string): boolean }, positional: { length: number }, positionalParamsDefinition: any) {
+export function validatePositionalParameters(
+ named: { has(name: string): boolean },
+ positional: { length: number },
+ positionalParamsDefinition: any
+) {
if (DEBUG) {
if (!named || !positional || !positional.length) {
return;
@@ -430,7 +447,10 @@ export function validatePositionalParameters(named: { has(name: string): boolean
if (paramType === 'string') {
// tslint:disable-next-line:max-line-length
- assert(`You cannot specify positional parameters and the hash argument \`${positionalParamsDefinition}\`.`, !named.has(positionalParamsDefinition));
+ assert(
+ `You cannot specify positional parameters and the hash argument \`${positionalParamsDefinition}\`.`,
+ !named.has(positionalParamsDefinition)
+ );
} else {
if (positional.length < positionalParamsDefinition.length) {
positionalParamsDefinition = positionalParamsDefinition.slice(0, positional.length);
@@ -441,46 +461,63 @@ export function validatePositionalParameters(named: { has(name: string): boolean
assert(
`You cannot specify both a positional param (at position ${i}) and the hash argument \`${name}\`.`,
- !named.has(name),
+ !named.has(name)
);
}
}
}
}
export function processComponentInitializationAssertions(component: Component, props: any) {
- assert(`classNameBindings must be non-empty strings: ${component}`, (() => {
- let { classNameBindings } = component;
- for (let i = 0; i < classNameBindings.length; i++) {
- let binding = classNameBindings[i];
-
- if (typeof binding !== 'string' || binding.length === 0) {
- return false;
+ assert(
+ `classNameBindings must be non-empty strings: ${component}`,
+ (() => {
+ let { classNameBindings } = component;
+ for (let i = 0; i < classNameBindings.length; i++) {
+ let binding = classNameBindings[i];
+
+ if (typeof binding !== 'string' || binding.length === 0) {
+ return false;
+ }
}
- }
- return true;
- })());
-
- assert(`classNameBindings must not have spaces in them: ${component}`, (() => {
- let { classNameBindings } = component;
- for (let i = 0; i < classNameBindings.length; i++) {
- let binding = classNameBindings[i];
- if (binding.split(' ').length > 1) {
- return false;
+ return true;
+ })()
+ );
+
+ assert(
+ `classNameBindings must not have spaces in them: ${component}`,
+ (() => {
+ let { classNameBindings } = component;
+ for (let i = 0; i < classNameBindings.length; i++) {
+ let binding = classNameBindings[i];
+ if (binding.split(' ').length > 1) {
+ return false;
+ }
}
- }
- return true;
- })());
-
- assert(`You cannot use \`classNameBindings\` on a tag-less component: ${component}`,
- component.tagName !== '' || !component.classNameBindings || component.classNameBindings.length === 0);
-
- assert(`You cannot use \`elementId\` on a tag-less component: ${component}`,
- component.tagName !== '' || props.id === component.elementId ||
- (!component.elementId && component.elementId !== ''));
-
- assert(`You cannot use \`attributeBindings\` on a tag-less component: ${component}`,
- component.tagName !== '' || !component.attributeBindings || component.attributeBindings.length === 0);
+ return true;
+ })()
+ );
+
+ assert(
+ `You cannot use \`classNameBindings\` on a tag-less component: ${component}`,
+ component.tagName !== '' ||
+ !component.classNameBindings ||
+ component.classNameBindings.length === 0
+ );
+
+ assert(
+ `You cannot use \`elementId\` on a tag-less component: ${component}`,
+ component.tagName !== '' ||
+ props.id === component.elementId ||
+ (!component.elementId && component.elementId !== '')
+ );
+
+ assert(
+ `You cannot use \`attributeBindings\` on a tag-less component: ${component}`,
+ component.tagName !== '' ||
+ !component.attributeBindings ||
+ component.attributeBindings.length === 0
+ );
}
export function initialRenderInstrumentDetails(component: any): any {
@@ -509,7 +546,7 @@ export const CURLY_CAPABILITIES: ComponentCapabilities = {
createCaller: true,
dynamicScope: true,
updateHook: true,
- createInstance: true
+ createInstance: true,
};
const CURLY_COMPONENT_MANAGER = new CurlyComponentManager();
@@ -520,7 +557,16 @@ export class CurlyComponentDefinition implements ComponentDefinition {
public symbolTable: ProgramSymbolTable | undefined;
// tslint:disable-next-line:no-shadowed-variable
- constructor(public name: string, public manager: ComponentManager<ComponentStateBucket, DefinitionState> | CustomComponentManager<CustomComponentState<any>> = CURLY_COMPONENT_MANAGER, public ComponentClass: any, public handle: Option<VMHandle>, template: OwnedTemplate, args?: CurriedArgs) {
+ constructor(
+ public name: string,
+ public manager:
+ | ComponentManager<ComponentStateBucket, DefinitionState>
+ | CustomComponentManager<CustomComponentState<any>> = CURLY_COMPONENT_MANAGER,
+ public ComponentClass: any,
+ public handle: Option<VMHandle>,
+ template: OwnedTemplate,
+ args?: CurriedArgs
+ ) {
const layout = template && template.asLayout();
const symbolTable = layout ? layout.symbolTable : undefined;
this.symbolTable = symbolTable;
@@ -532,7 +578,7 @@ export class CurlyComponentDefinition implements ComponentDefinition {
handle,
template,
capabilities: CURLY_CAPABILITIES,
- symbolTable
+ symbolTable,
};
}
}
| true |
Other
|
emberjs
|
ember.js
|
27e61169b35fc8481de971290a630476f6c2c9b4.json
|
Apply prettier configuration changes to *.ts files.
|
packages/ember-glimmer/lib/component-managers/custom.ts
|
@@ -13,7 +13,7 @@ import DefinitionState from './definition-state';
export interface CustomComponentManagerDelegate<T> {
version: 'string';
- create(options: { ComponentClass: T, args: {} }): T;
+ create(options: { ComponentClass: T; args: {} }): T;
getContext(instance: T): Opaque;
update(instance: T, args: {}): void;
destroy?(instance: T): void;
@@ -52,18 +52,26 @@ export interface ComponentArguments<T = {}> {
* `update()` - invoked when the arguments passed to a component change
* `getContext()` - returns the object that should be
*/
-export default class CustomComponentManager<T> extends AbstractComponentManager<CustomComponentState<T> | null, DefinitionState> {
+export default class CustomComponentManager<T> extends AbstractComponentManager<
+ CustomComponentState<T> | null,
+ DefinitionState
+> {
constructor(private delegate: CustomComponentManagerDelegate<T>) {
super();
}
- create(_env: Environment, definition: DefinitionState, args: Arguments, dynamicScope: DynamicScope): CustomComponentState<T> {
+ create(
+ _env: Environment,
+ definition: DefinitionState,
+ args: Arguments,
+ dynamicScope: DynamicScope
+ ): CustomComponentState<T> {
const { delegate } = this;
const capturedArgs = args.named.capture();
const component = delegate.create({
args: capturedArgs.value(),
- ComponentClass: definition.ComponentClass as any as T
+ ComponentClass: (definition.ComponentClass as any) as T,
});
const { view: parentView } = dynamicScope;
@@ -94,11 +102,13 @@ export default class CustomComponentManager<T> extends AbstractComponentManager<
getLayout(state: DefinitionState) {
return {
handle: state.template.asLayout().compile(),
- symbolTable: state.symbolTable
+ symbolTable: state.symbolTable,
};
}
- getSelf({ component }: CustomComponentState<T>): PrimitiveReference<null> | PathReference<Opaque> {
+ getSelf({
+ component,
+ }: CustomComponentState<T>): PrimitiveReference<null> | PathReference<Opaque> {
const context = this.delegate.getContext(component);
return new RootReference(context);
}
@@ -118,7 +128,7 @@ export default class CustomComponentManager<T> extends AbstractComponentManager<
createCaller: false,
dynamicScope: true,
updateHook: true,
- createInstance: true
+ createInstance: true,
};
}
@@ -151,12 +161,16 @@ export class CustomComponentState<T> {
let renderer = getRenderer(component);
renderer.unregister(component);
- if (delegate.destroy) { delegate.destroy(component); }
+ if (delegate.destroy) {
+ delegate.destroy(component);
+ }
}
}
function getRenderer(component: {}): Renderer {
let renderer = component['renderer'];
- if (!renderer) { throw new Error(`missing renderer for component ${component}`); }
+ if (!renderer) {
+ throw new Error(`missing renderer for component ${component}`);
+ }
return renderer as Renderer;
-}
\ No newline at end of file
+}
| true |
Other
|
emberjs
|
ember.js
|
27e61169b35fc8481de971290a630476f6c2c9b4.json
|
Apply prettier configuration changes to *.ts files.
|
packages/ember-glimmer/lib/component-managers/definition-state.ts
|
@@ -1,19 +1,16 @@
-import {
- ComponentCapabilities,
- ProgramSymbolTable,
- VMHandle
-} from '@glimmer/interfaces';
-import {
- Option
-} from '@glimmer/util';
+import { ComponentCapabilities, ProgramSymbolTable, VMHandle } from '@glimmer/interfaces';
+import { Option } from '@glimmer/util';
import { Factory } from 'ember-utils';
import { Component } from '../utils/curly-component-state-bucket';
export default interface DefinitionState {
capabilities: ComponentCapabilities;
name: string;
- ComponentClass: Factory<Component, { create(props?: any): Component; positionalParams: string | string[] | undefined | null; }>;
+ ComponentClass: Factory<
+ Component,
+ { create(props?: any): Component; positionalParams: string | string[] | undefined | null }
+ >;
handle: Option<VMHandle>;
symbolTable?: ProgramSymbolTable;
template?: any;
-}
+};
| true |
Other
|
emberjs
|
ember.js
|
27e61169b35fc8481de971290a630476f6c2c9b4.json
|
Apply prettier configuration changes to *.ts files.
|
packages/ember-glimmer/lib/component-managers/mount.ts
|
@@ -1,21 +1,7 @@
-import {
- ComponentCapabilities,
-} from '@glimmer/interfaces';
-import {
- CONSTANT_TAG,
- Tag,
- VersionedPathReference,
-} from '@glimmer/reference';
-import {
- ComponentDefinition,
- Invocation,
- WithDynamicLayout,
-} from '@glimmer/runtime';
-import {
- Destroyable,
- Opaque,
- Option
-} from '@glimmer/util';
+import { ComponentCapabilities } from '@glimmer/interfaces';
+import { CONSTANT_TAG, Tag, VersionedPathReference } from '@glimmer/reference';
+import { ComponentDefinition, Invocation, WithDynamicLayout } from '@glimmer/runtime';
+import { Destroyable, Opaque, Option } from '@glimmer/util';
import { DEBUG } from 'ember-env-flags';
import { generateControllerFactory } from 'ember-routing';
@@ -52,7 +38,7 @@ interface EngineDefinitionState {
modelRef: VersionedPathReference<Opaque> | undefined;
}
-const CAPABILITIES = {
+const CAPABILITIES = {
dynamicLayout: true,
dynamicTag: false,
prepareArgs: false,
@@ -62,18 +48,19 @@ const CAPABILITIES = {
createCaller: true,
dynamicScope: true,
updateHook: true,
- createInstance: true
+ createInstance: true,
};
-class MountManager extends AbstractManager<EngineState | EngineWithModelState, EngineDefinitionState>
- implements WithDynamicLayout<EngineState | EngineWithModelState, OwnedTemplateMeta, RuntimeResolver> {
-
+class MountManager
+ extends AbstractManager<EngineState | EngineWithModelState, EngineDefinitionState>
+ implements
+ WithDynamicLayout<EngineState | EngineWithModelState, OwnedTemplateMeta, RuntimeResolver> {
getDynamicLayout(state: EngineState, _: RuntimeResolver): Invocation {
let template = state.engine.lookup('template:application') as OwnedTemplate;
let layout = template.asLayout();
return {
handle: layout.compile(),
- symbolTable: layout.symbolTable
+ symbolTable: layout.symbolTable,
};
}
| true |
Other
|
emberjs
|
ember.js
|
27e61169b35fc8481de971290a630476f6c2c9b4.json
|
Apply prettier configuration changes to *.ts files.
|
packages/ember-glimmer/lib/component-managers/outlet.ts
|
@@ -1,7 +1,5 @@
import { ComponentCapabilities, Option, Unique } from '@glimmer/interfaces';
-import {
- CONSTANT_TAG, Tag, VersionedPathReference
-} from '@glimmer/reference';
+import { CONSTANT_TAG, Tag, VersionedPathReference } from '@glimmer/reference';
import {
Arguments,
ComponentDefinition,
@@ -10,7 +8,7 @@ import {
Invocation,
UNDEFINED_REFERENCE,
WithDynamicTagName,
- WithStaticLayout
+ WithStaticLayout,
} from '@glimmer/runtime';
import { Destroyable } from '@glimmer/util';
import { DEBUG } from 'ember-env-flags';
@@ -20,9 +18,7 @@ import { assign, guidFor } from 'ember-utils';
import { OwnedTemplateMeta } from 'ember-views';
import { DynamicScope } from '../renderer';
import RuntimeResolver from '../resolver';
-import {
- OwnedTemplate,
-} from '../template';
+import { OwnedTemplate } from '../template';
import { OutletState } from '../utils/outlet';
import { RootReference } from '../utils/references';
import OutletView from '../views/outlet';
@@ -55,15 +51,23 @@ const CAPABILITIES: ComponentCapabilities = {
createCaller: true,
dynamicScope: true,
updateHook: true,
- createInstance: true
+ createInstance: true,
};
class OutletComponentManager extends AbstractManager<OutletInstanceState, OutletDefinitionState>
- implements WithStaticLayout<OutletInstanceState, OutletDefinitionState, OwnedTemplateMeta, RuntimeResolver> {
- create(environment: Environment,
- definition: OutletDefinitionState,
- _args: Arguments,
- dynamicScope: DynamicScope) {
+ implements
+ WithStaticLayout<
+ OutletInstanceState,
+ OutletDefinitionState,
+ OwnedTemplateMeta,
+ RuntimeResolver
+ > {
+ create(
+ environment: Environment,
+ definition: OutletDefinitionState,
+ _args: Arguments,
+ dynamicScope: DynamicScope
+ ) {
if (DEBUG) {
this._pushToDebugStack(`template:${definition.template.referrer.moduleName}`, environment);
}
@@ -82,7 +86,11 @@ class OutletComponentManager extends AbstractManager<OutletInstanceState, Outlet
};
}
- layoutFor(_state: OutletDefinitionState, _component: OutletInstanceState, _env: Environment): Unique<'Handle'> {
+ layoutFor(
+ _state: OutletDefinitionState,
+ _component: OutletInstanceState,
+ _env: Environment
+ ): Unique<'Handle'> {
throw new Error('Method not implemented.');
}
@@ -91,7 +99,7 @@ class OutletComponentManager extends AbstractManager<OutletInstanceState, Outlet
const layout = template.asLayout();
return {
handle: layout.compile(),
- symbolTable: layout.symbolTable
+ symbolTable: layout.symbolTable,
};
}
@@ -123,9 +131,12 @@ class OutletComponentManager extends AbstractManager<OutletInstanceState, Outlet
const OUTLET_MANAGER = new OutletComponentManager();
-export class OutletComponentDefinition implements ComponentDefinition<OutletDefinitionState, OutletComponentManager> {
- constructor(public state: OutletDefinitionState, public manager: OutletComponentManager = OUTLET_MANAGER) {
- }
+export class OutletComponentDefinition
+ implements ComponentDefinition<OutletDefinitionState, OutletComponentManager> {
+ constructor(
+ public state: OutletDefinitionState,
+ public manager: OutletComponentManager = OUTLET_MANAGER
+ ) {}
}
export function createRootOutlet(outletView: OutletView): OutletComponentDefinition {
@@ -136,8 +147,7 @@ export function createRootOutlet(outletView: OutletView): OutletComponentDefinit
});
const WrappedOutletComponentManager = class extends OutletComponentManager
- implements WithDynamicTagName<OutletInstanceState> {
-
+ implements WithDynamicTagName<OutletInstanceState> {
getTagName(_component: OutletInstanceState) {
return 'div';
}
@@ -148,15 +158,19 @@ export function createRootOutlet(outletView: OutletView): OutletComponentDefinit
const layout = template.asWrappedLayout();
return {
handle: layout.compile(),
- symbolTable: layout.symbolTable
+ symbolTable: layout.symbolTable,
};
}
getCapabilities(): ComponentCapabilities {
return WRAPPED_CAPABILITIES;
}
- didCreateElement(component: OutletInstanceState, element: Element, _operations: ElementOperations): void {
+ didCreateElement(
+ component: OutletInstanceState,
+ element: Element,
+ _operations: ElementOperations
+ ): void {
// to add GUID id and class
element.setAttribute('class', 'ember-view');
element.setAttribute('id', guidFor(component));
| true |
Other
|
emberjs
|
ember.js
|
27e61169b35fc8481de971290a630476f6c2c9b4.json
|
Apply prettier configuration changes to *.ts files.
|
packages/ember-glimmer/lib/component-managers/render.ts
|
@@ -1,15 +1,6 @@
-import {
- ComponentCapabilities,
-} from '@glimmer/interfaces';
-import {
- CONSTANT_TAG, Tag, VersionedPathReference
-} from '@glimmer/reference';
-import {
- Arguments,
- ComponentDefinition,
- Invocation,
- WithStaticLayout
-} from '@glimmer/runtime';
+import { ComponentCapabilities } from '@glimmer/interfaces';
+import { CONSTANT_TAG, Tag, VersionedPathReference } from '@glimmer/reference';
+import { Arguments, ComponentDefinition, Invocation, WithStaticLayout } from '@glimmer/runtime';
import { DEBUG } from 'ember-env-flags';
import { generateController, generateControllerFactory } from 'ember-routing';
@@ -27,13 +18,15 @@ export interface RenderDefinitionState {
template: OwnedTemplate;
}
-export abstract class AbstractRenderManager<T extends RenderState> extends AbstractManager<T, RenderDefinitionState>
+export abstract class AbstractRenderManager<T extends RenderState>
+ extends AbstractManager<T, RenderDefinitionState>
implements WithStaticLayout<T, RenderDefinitionState, OwnedTemplateMeta, any> {
-
- create(env: Environment,
- definition: RenderDefinitionState,
- args: Arguments,
- dynamicScope: DynamicScope): T {
+ create(
+ env: Environment,
+ definition: RenderDefinitionState,
+ args: Arguments,
+ dynamicScope: DynamicScope
+ ): T {
let { name } = definition;
if (DEBUG) {
@@ -53,7 +46,7 @@ export abstract class AbstractRenderManager<T extends RenderState> extends Abstr
const layout = template!.asLayout();
return {
handle: layout.compile(),
- symbolTable: layout.symbolTable
+ symbolTable: layout.symbolTable,
};
}
@@ -86,7 +79,7 @@ const CAPABILITIES = {
createCaller: true,
dynamicScope: true,
updateHook: true,
- createInstance: true
+ createInstance: true,
};
class SingletonRenderManager extends AbstractRenderManager<RenderState> {
@@ -121,13 +114,15 @@ const NONSINGLETON_CAPABILITIES: ComponentCapabilities = {
dynamicScope: true,
createCaller: false,
updateHook: true,
- createInstance: true
+ createInstance: true,
};
class NonSingletonRenderManager extends AbstractRenderManager<RenderStateWithModel> {
createRenderState(args: Arguments, owner: Owner, name: string) {
let model = args.positional.at(1);
- let factory = owner.factoryFor(`controller:${name}`) || generateControllerFactory(owner, `controller:${name}`);
+ let factory =
+ owner.factoryFor(`controller:${name}`) ||
+ generateControllerFactory(owner, `controller:${name}`);
let controller = factory.create({ model: model.value() });
return { controller, model };
}
@@ -152,10 +147,13 @@ class NonSingletonRenderManager extends AbstractRenderManager<RenderStateWithMod
export const NON_SINGLETON_RENDER_MANAGER = new NonSingletonRenderManager();
export class RenderDefinition implements ComponentDefinition {
-
public state: RenderDefinitionState;
- constructor(name: string, template: OwnedTemplate, public manager: SingletonRenderManager | NonSingletonRenderManager) {
+ constructor(
+ name: string,
+ template: OwnedTemplate,
+ public manager: SingletonRenderManager | NonSingletonRenderManager
+ ) {
this.state = {
name,
template,
| true |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.