Deprecate accessing @ember/string methods off of the Ember module

(cherry picked from commit 0175865)

Author: kategengler

packages/ember/index.ts

@@ -633,39 +633,40 @@ Object.defineProperty(Ember, 'TEMPLATES', {
   enumerable: false,
 });
 
-const deprecateImportFromString = function (
-  name: string,
-  message = `Importing ${name} from '@ember/string' is deprecated. Please import ${name} from '@ember/template' instead.`
-) {
-  deprecate(message, false, {
-    id: 'ember-string.htmlsafe-ishtmlsafe',
-    for: 'ember-source',
-    since: {
-      available: '4.10',
-      enabled: '4.10',
-    },
-    until: '5.0.0',
-    url: 'https://deprecations.emberjs.com/v3.x/#toc_ember-string-htmlsafe-ishtmlsafe',
-  });
-};
-// NOTE: these are expressly *not* in the public API, because they were
-// deprecated and removed. TODO: remove them after we land the TS conversion,
-// and after confirming doing so is safe -- the state of the `@ember/string`
-// conversion remains confused.
-Object.defineProperty(Ember.String, 'htmlSafe', {
-  enumerable: true,
-  configurable: true,
-  get() {
-    deprecateImportFromString('htmlSafe');
-    return htmlSafe;
-  },
-});
-Object.defineProperty(Ember.String, 'isHTMLSafe', {
+function deprecateStringUseOnEmberModule() {
+  deprecate(
+    'Using `Ember.String` is deprecated. Please import methods directly from `@ember/string`.',
+    false,
+    {
+      id: 'ember-string.from-ember-module',
+      for: 'ember-source',
+      since: {
+        available: '4.10',
+        enabled: '4.10.',
+      },
+      until: '5.0.0',
+      url: 'https://deprecations.emberjs.com/v4.x/#toc_ember-string-from-ember-module',
+    }
+  );
+}
+
+Object.defineProperty(Ember, 'String', {
   enumerable: true,
   configurable: true,
   get() {
-    deprecateImportFromString('isHTMLSafe');
-    return isHTMLSafe;
+    deprecateStringUseOnEmberModule();
+
+    return {
+      camelize,
+      capitalize,
+      classify,
+      dasherize,
+      decamelize,
+      underscore,
+      w,
+      htmlSafe,
+      isHTMLSafe,
+    };
   },
 });
 

packages/ember/tests/reexports_test.js

@@ -28,7 +28,7 @@ moduleFor(
           glimmer.htmlSafe,
           'Ember.String.htmlSafe is exported correctly'
         );
-      }, /Importing htmlSafe from '@ember\/string' is deprecated/);
+      }, 'Using `Ember.String` is deprecated. Please import methods directly from `@ember/string`.');
       assert.notEqual(glimmer.htmlSafe, undefined, 'Ember.String.htmlSafe is not `undefined`');
     }
 
@@ -40,10 +40,33 @@ moduleFor(
           glimmer.isHTMLSafe,
           'Ember.String.isHTMLSafe is exported correctly'
         );
-      }, /Importing isHTMLSafe from '@ember\/string' is deprecated/);
+      }, 'Using `Ember.String` is deprecated. Please import methods directly from `@ember/string`.');
       assert.notEqual(glimmer.isHTMLSafe, undefined, 'Ember.String.isHTMLSafe is not `undefined`');
     }
 
+    ['@test Ember.String methods export correctly (but deprecated)'](assert) {
+      let string = require('@ember/string');
+      let methods = [
+        'camelize',
+        'capitalize',
+        'classify',
+        'dasherize',
+        'decamelize',
+        'underscore',
+        'w',
+      ];
+      methods.forEach((method) => {
+        expectDeprecation(() => {
+          assert.equal(
+            Ember.String[method],
+            string[method],
+            `Ember.String.${method} is exported correctly`
+          );
+        }, 'Using `Ember.String` is deprecated. Please import methods directly from `@ember/string`.');
+        assert.notEqual(string[method], undefined, `Ember.String.${method} is not \`undefined\``);
+      });
+    }
+
     '@test Ember.FEATURES is exported'(assert) {
       for (let feature in FEATURES) {
         assert.equal(
@@ -255,13 +278,6 @@ let allExports = [
   ['inject.service', '@ember/service', 'service'],
 
   // @ember/string
-  ['String.camelize', '@ember/string', 'camelize'],
-  ['String.capitalize', '@ember/string', 'capitalize'],
-  ['String.classify', '@ember/string', 'classify'],
-  ['String.dasherize', '@ember/string', 'dasherize'],
-  ['String.decamelize', '@ember/string', 'decamelize'],
-  ['String.underscore', '@ember/string', 'underscore'],
-  ['String.w', '@ember/string', 'w'],
   ['STRINGS', '@ember/string', { get: '_getStrings', set: '_setStrings' }],
 
   // @ember/template