[DEPRECATION] Deprecate the globals resolver

emberjs · Nov 18, 2019 · f8c9a26 · f8c9a26
1 parent 7f1a081
commit f8c9a26
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 2 deletions.
diff --git a/packages/@ember/application/globals-resolver.js b/packages/@ember/application/globals-resolver.js
@@ -4,7 +4,7 @@
 
 import { dictionary } from '@ember/-internals/utils';
 import { get, findNamespace } from '@ember/-internals/metal';
-import { assert, info } from '@ember/debug';
+import { assert, info, deprecate } from '@ember/debug';
 import { capitalize, classify, dasherize, decamelize } from '@ember/string';
 import { Object as EmberObject } from '@ember/-internals/runtime';
 import { getTemplate } from '@ember/-internals/glimmer';
@@ -77,6 +77,7 @@ import { DEBUG } from '@glimmer/env';
   @class GlobalsResolver
   @extends EmberObject
   @public
+  @deprecated
 */
 
 class DefaultResolver extends EmberObject {
@@ -93,9 +94,20 @@ class DefaultResolver extends EmberObject {
 
     @property namespace
     @public
+    @deprecated
   */
 
   init() {
+    deprecate(
+      'Using the globals resolver is deprecated. Use the ember-resolver package instead. See https://deprecations.emberjs.com/v3.x#toc_ember-deprecate-globals-resolver',
+      false,
+      {
+        until: '4.0.0',
+        id: 'globals-resolver',
+        url: 'https://deprecations.emberjs.com/v3.x#toc_ember-deprecate-globals-resolver',
+      }
+    );
+
     this._parseNameCache = dictionary(null);
   }
 

diff --git a/packages/ember/index.js b/packages/ember/index.js
@@ -133,6 +133,7 @@ import EngineInstance from '@ember/engine/instance';
 import { assign, merge } from '@ember/polyfills';
 import { LOGGER, EMBER_EXTEND_PROTOTYPES, JQUERY_INTEGRATION } from '@ember/deprecated-features';
 import templateOnlyComponent from '@ember/component/template-only';
+
 // ****@ember/-internals/environment****
 
 const Ember = (typeof context.imports.Ember === 'object' && context.imports.Ember) || {};
@@ -175,9 +176,30 @@ if (EMBER_EXTEND_PROTOTYPES) {
 Ember.getOwner = getOwner;
 Ember.setOwner = setOwner;
 Ember.Application = Application;
-Ember.DefaultResolver = Ember.Resolver = Resolver;
 Ember.ApplicationInstance = ApplicationInstance;
 
+Object.defineProperty(Ember, 'Resolver', {
+  get() {
+    deprecate(
+      'Using the globals resolver is deprecated. Use the ember-resolver package instead. See https://deprecations.emberjs.com/v3.x#toc_ember-deprecate-globals-resolver',
+      false,
+      {
+        id: 'ember.globals-resolver',
+        until: '4.0.0',
+        url: 'https://deprecations.emberjs.com/v3.x#toc_ember-deprecate-globals-resolver',
+      }
+    );
+
+    return Resolver;
+  },
+});
+
+Object.defineProperty(Ember, 'DefaultResolver', {
+  get() {
+    return Ember.Resolver;
+  },
+});
+
 // ****@ember/engine****
 Ember.Engine = Engine;
 Ember.EngineInstance = EngineInstance;