Merge pull request #16654 from emberjs/finish-meta-move

Finish ember-meta move
emberjs · May 18, 2018 · e52f85e · e52f85e
2 parents 3762e83 + 3042d33
commit e52f85e
Show file tree

Hide file tree

Showing 16 changed files with 25 additions and 40 deletions.
diff --git a/packages/ember-metal/tests/meta_test.js → packages/ember-meta/tests/meta_test.js b/packages/ember-metal/tests/meta_test.js → packages/ember-meta/tests/meta_test.js
@@ -1,5 +1,5 @@
+import { AbstractTestCase, moduleFor } from 'internal-test-helpers';
 import { meta } from '..';
-import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
 
 moduleFor(
   'Ember.meta',

diff --git a/packages/ember-metal/index.js b/packages/ember-metal/index.js
@@ -2,7 +2,6 @@ export { default as computed, ComputedProperty, _globalsComputed } from './lib/c
 export { getCacheFor, getCachedValueFor, peekCacheFor } from './lib/computed_cache';
 export { default as alias } from './lib/alias';
 export { deprecateProperty } from './lib/deprecate_property';
-export { descriptorFor, meta, peekMeta, deleteMeta } from 'ember-meta';
 export { PROXY_CONTENT, _getPath, get, getWithDefault } from './lib/property_get';
 export { set, trySet } from './lib/property_set';
 export {

diff --git a/packages/ember-metal/tests/accessors/mandatory_setters_test.js b/packages/ember-metal/tests/accessors/mandatory_setters_test.js
@@ -1,5 +1,6 @@
 import { DEBUG } from '@glimmer/env';
-import { get, set, watch, unwatch, meta as metaFor } from '../..';
+import { get, set, watch, unwatch } from '../..';
+import { meta as metaFor } from 'ember-meta';
 import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
 
 function hasMandatorySetter(object, property) {

diff --git a/packages/ember-metal/tests/alias_test.js b/packages/ember-metal/tests/alias_test.js
@@ -3,12 +3,12 @@ import {
   defineProperty,
   get,
   set,
-  meta,
   isWatching,
   addObserver,
   removeObserver,
   tagFor,
 } from '..';
+import { meta } from 'ember-meta';
 import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
 
 let obj, count;

diff --git a/packages/ember-metal/tests/chains_test.js b/packages/ember-metal/tests/chains_test.js
@@ -6,12 +6,11 @@ import {
   defineProperty,
   computed,
   notifyPropertyChange,
-  peekMeta,
-  meta,
   watch,
   unwatch,
   watcherCount,
 } from '..';
+import { meta, peekMeta } from 'ember-meta';
 import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
 
 moduleFor(

diff --git a/packages/ember-metal/tests/computed_test.js b/packages/ember-metal/tests/computed_test.js
@@ -9,8 +9,8 @@ import {
   set,
   isWatching,
   addObserver,
-  meta as metaFor,
 } from '..';
+import { meta as metaFor } from 'ember-meta';
 import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
 
 let obj, count;

diff --git a/packages/ember-metal/tests/watching/watch_test.js b/packages/ember-metal/tests/watching/watch_test.js
@@ -1,15 +1,6 @@
 import { context } from 'ember-environment';
-import {
-  meta,
-  set,
-  get,
-  computed,
-  defineProperty,
-  addListener,
-  watch,
-  unwatch,
-  deleteMeta,
-} from '../..';
+import { set, get, computed, defineProperty, addListener, watch, unwatch } from '../..';
+import { deleteMeta, meta } from 'ember-meta';
 import { moduleFor, AbstractTestCase } from 'internal-test-helpers';
 
 let didCount, didKeys, originalLookup;

diff --git a/packages/ember-runtime/lib/mixins/-proxy.js b/packages/ember-runtime/lib/mixins/-proxy.js
@@ -3,10 +3,10 @@
 */
 
 import { combine, CONSTANT_TAG, DirtyableTag, UpdatableTag } from '@glimmer/reference';
+import { meta } from 'ember-meta';
 import {
   get,
   set,
-  meta,
   addObserver,
   removeObserver,
   notifyPropertyChange,

diff --git a/packages/ember-runtime/lib/system/core_object.js b/packages/ember-runtime/lib/system/core_object.js
@@ -13,18 +13,15 @@ import {
   isInternalSymbol,
 } from 'ember-utils';
 import { schedule } from '@ember/runloop';
+import { descriptorFor, meta, peekMeta, deleteMeta } from 'ember-meta';
 import {
   PROXY_CONTENT,
-  descriptorFor,
-  meta,
-  peekMeta,
   finishChains,
   sendEvent,
   Mixin,
   defineProperty,
   ComputedProperty,
   InjectedProperty,
-  deleteMeta,
   descriptor,
   classToString,
 } from 'ember-metal';

diff --git a/packages/ember-runtime/tests/system/array_proxy/watching_and_listening_test.js b/packages/ember-runtime/tests/system/array_proxy/watching_and_listening_test.js
@@ -1,4 +1,5 @@
-import { get, addObserver, defineProperty, watcherCount, computed, peekMeta } from 'ember-metal';
+import { peekMeta } from 'ember-meta';
+import { get, addObserver, defineProperty, watcherCount, computed } from 'ember-metal';
 import ArrayProxy from '../../../lib/system/array_proxy';
 import { A } from '../../../lib/mixins/array';
 import { moduleFor, AbstractTestCase } from 'internal-test-helpers';

diff --git a/packages/ember-runtime/tests/system/object/destroy_test.js b/packages/ember-runtime/tests/system/object/destroy_test.js
@@ -1,12 +1,6 @@
 import { run } from '@ember/runloop';
-import {
-  observer,
-  get,
-  set,
-  beginPropertyChanges,
-  endPropertyChanges,
-  peekMeta,
-} from 'ember-metal';
+import { observer, get, set, beginPropertyChanges, endPropertyChanges } from 'ember-metal';
+import { peekMeta } from 'ember-meta';
 import EmberObject from '../../../lib/system/object';
 import { DEBUG } from '@glimmer/env';
 import { moduleFor, AbstractTestCase } from 'internal-test-helpers';

diff --git a/packages/ember-views/lib/mixins/class_names_support.js b/packages/ember-views/lib/mixins/class_names_support.js
@@ -1,8 +1,8 @@
 /**
 @module ember
 */
-
-import { Mixin, descriptorFor } from 'ember-metal';
+import { descriptorFor } from 'ember-meta';
+import { Mixin } from 'ember-metal';
 import { assert } from '@ember/debug';
 
 const EMPTY_ARRAY = Object.freeze([]);

diff --git a/packages/ember-views/lib/mixins/view_support.js b/packages/ember-views/lib/mixins/view_support.js
@@ -1,5 +1,6 @@
 import { guidFor } from 'ember-utils';
-import { descriptor, descriptorFor, Mixin } from 'ember-metal';
+import { descriptorFor } from 'ember-meta';
+import { descriptor, Mixin } from 'ember-metal';
 import { assert } from '@ember/debug';
 import { hasDOM } from 'ember-browser-environment';
 import { matches } from '../system/utils';

diff --git a/packages/ember/index.js b/packages/ember/index.js
@@ -5,6 +5,7 @@ import { IS_NODE, module } from 'node-module';
 import * as utils from 'ember-utils';
 import { Registry, Container } from 'container';
 import * as instrumentation from '@ember/instrumentation';
+import { deleteMeta, meta } from 'ember-meta';
 import * as metal from 'ember-metal';
 import { FEATURES, isEnabled } from '@ember/canary-features';
 import * as EmberDebug from '@ember/debug';
@@ -261,7 +262,7 @@ Ember.computed = computed;
 computed.alias = metal.alias;
 Ember.ComputedProperty = metal.ComputedProperty;
 Ember.cacheFor = metal.getCachedValueFor;
-Ember.meta = metal.meta;
+Ember.meta = meta;
 Ember.get = metal.get;
 Ember.getWithDefault = metal.getWithDefault;
 Ember._getPath = metal._getPath;
@@ -300,7 +301,7 @@ Ember.unwatchPath = metal.unwatchPath;
 Ember.watch = metal.watch;
 Ember.isWatching = metal.isWatching;
 Ember.unwatch = metal.unwatch;
-Ember.destroy = metal.deleteMeta;
+Ember.destroy = deleteMeta;
 Ember.libraries = metal.libraries;
 Ember.getProperties = metal.getProperties;
 Ember.setProperties = metal.setProperties;

diff --git a/packages/ember/tests/reexports_test.js b/packages/ember/tests/reexports_test.js
@@ -95,7 +95,7 @@ let allExports = [
   ['testing', '@ember/debug', { get: 'isTesting', set: 'setTesting' }],
   ['onerror', 'ember-error-handling', { get: 'getOnerror', set: 'setOnerror' }],
   ['FEATURES.isEnabled', '@ember/canary-features', 'isEnabled'],
-  ['meta', 'ember-metal'],
+  ['meta', 'ember-meta'],
   ['get', 'ember-metal'],
   ['set', 'ember-metal'],
   ['_getPath', 'ember-metal'],
@@ -149,7 +149,7 @@ let allExports = [
   ['watch', 'ember-metal'],
   ['isWatching', 'ember-metal'],
   ['unwatch', 'ember-metal'],
-  ['destroy', 'ember-metal', 'deleteMeta'],
+  ['destroy', 'ember-meta', 'deleteMeta'],
   ['libraries', 'ember-metal'],
   ['OrderedSet', '@ember/map/lib/ordered-set', 'default'],
   ['Map', '@ember/map', 'default'],

diff --git a/packages/ember/tests/routing/query_params_test.js b/packages/ember/tests/routing/query_params_test.js
@@ -2,7 +2,8 @@ import Controller from '@ember/controller';
 import { dasherize } from '@ember/string';
 import { RSVP, Object as EmberObject, A as emberA } from 'ember-runtime';
 import { run } from '@ember/runloop';
-import { get, computed, peekMeta } from 'ember-metal';
+import { peekMeta } from 'ember-meta';
+import { get, computed } from 'ember-metal';
 import { Route } from 'ember-routing';
 
 import { QueryParamTestCase, moduleFor, getTextOf } from 'internal-test-helpers';