emberjs · Serabe · Apr 6, 2018
diff --git a/packages/ember-application/lib/system/resolver.js b/packages/ember-application/lib/system/resolver.js
@@ -5,7 +5,7 @@
 import { dictionary } from 'ember-utils';
 import { get, findNamespace } from 'ember-metal';
 import { assert, info } from 'ember-debug';
-import { String as StringUtils, Object as EmberObject } from 'ember-runtime';
+import { StringUtils, Object as EmberObject } from 'ember-runtime';
 import validateType from '../utils/validate-type';
 import { getTemplate } from 'ember-glimmer';
 import { DEBUG } from 'ember-env-flags';

diff --git a/packages/ember-extension-support/lib/container_debug_adapter.js b/packages/ember-extension-support/lib/container_debug_adapter.js
@@ -1,10 +1,4 @@
-import {
-  A as emberA,
-  typeOf,
-  String as StringUtils,
-  Namespace,
-  Object as EmberObject,
-} from 'ember-runtime';
+import { A as emberA, typeOf, StringUtils, Namespace, Object as EmberObject } from 'ember-runtime';
 
 /**
 @module @ember/debug

diff --git a/packages/ember-glimmer/index.ts b/packages/ember-glimmer/index.ts
@@ -268,7 +268,14 @@ 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,
+  deprecatedHTMLSafe,
+  deprecatedIsHTMLSafe,
+  escapeExpression,
+  htmlSafe,
+  isHTMLSafe,
+} from './lib/utils/string';
 export {
   Renderer,
   InertRenderer,

diff --git a/packages/ember-glimmer/lib/component-managers/curly.ts b/packages/ember-glimmer/lib/component-managers/curly.ts
@@ -25,7 +25,7 @@ import { assert, deprecate } from 'ember-debug';
 import { DEBUG } from 'ember-env-flags';
 import { ENV } from 'ember-environment';
 import { _instrumentStart, get } from 'ember-metal';
-import { String as StringUtils } from 'ember-runtime';
+import { StringUtils } from 'ember-runtime';
 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';

diff --git a/packages/ember-glimmer/lib/helpers/-class.ts b/packages/ember-glimmer/lib/helpers/-class.ts
@@ -1,5 +1,5 @@
 import { Arguments, VM } from '@glimmer/runtime';
-import { String as StringUtils } from 'ember-runtime';
+import { StringUtils } from 'ember-runtime';
 import { InternalHelperReference } from '../utils/references';
 
 function classHelper({ positional }: any) {

diff --git a/packages/ember-glimmer/lib/helpers/-normalize-class.ts b/packages/ember-glimmer/lib/helpers/-normalize-class.ts
@@ -1,5 +1,5 @@
 import { Arguments, VM } from '@glimmer/runtime';
-import { String as StringUtils } from 'ember-runtime';
+import { StringUtils } from 'ember-runtime';
 import { InternalHelperReference } from '../utils/references';
 
 function normalizeClass({ positional }: any) {

diff --git a/packages/ember-glimmer/lib/helpers/loc.ts b/packages/ember-glimmer/lib/helpers/loc.ts
@@ -2,7 +2,7 @@
 @module ember
 */
 
-import { String as StringUtils } from 'ember-runtime';
+import { StringUtils } from 'ember-runtime';
 import { helper } from '../helper';
 
 /**

diff --git a/packages/ember-glimmer/lib/utils/bindings.ts b/packages/ember-glimmer/lib/utils/bindings.ts
@@ -4,7 +4,7 @@ import { ElementOperations, PrimitiveReference } from '@glimmer/runtime';
 import { Core, Ops } from '@glimmer/wire-format';
 import { assert } from 'ember-debug';
 import { get } from 'ember-metal';
-import { String as StringUtils } from 'ember-runtime';
+import { StringUtils } from 'ember-runtime';
 import { ROOT_REF } from '../component';
 import { Component } from './curly-component-state-bucket';
 import { referenceFromParts } from './references';

diff --git a/packages/ember-glimmer/lib/utils/string.ts b/packages/ember-glimmer/lib/utils/string.ts
@@ -2,6 +2,8 @@
 @module @ember/string
 */
 
+import { deprecate } from 'ember-debug';
+
 export class SafeString {
   public string: string;
 
@@ -74,6 +76,7 @@ export function escapeExpression(string: any): string {
   @static
   @return {Handlebars.SafeString} A string that will not be HTML escaped by Handlebars.
   @public
+  @deprecated
 */
 export function htmlSafe(str: string) {
   if (str === null || str === undefined) {
@@ -84,6 +87,19 @@ export function htmlSafe(str: string) {
   return new SafeString(str);
 }
 
+export function deprecatedHTMLSafe(str: string) {
+  deprecate(
+    'Ember.String namespace is deprecated. Please, import `htmlSafe` from `@ember/template`.',
+    false,
+    {
+      id: 'ember-glimmer.ember-string-html-safe',
+      until: '3.5.0',
+      url: '',
+    }
+  );
+  return htmlSafe(str);
+}
+
 /**
   Detects if a string was decorated using `htmlSafe`.
 
@@ -102,7 +118,21 @@ export function htmlSafe(str: string) {
   @static
   @return {Boolean} `true` if the string was decorated with `htmlSafe`, `false` otherwise.
   @public
+  @deprecated
 */
 export function isHTMLSafe(str: any | null | undefined): str is SafeString {
   return str !== null && typeof str === 'object' && typeof str.toHTML === 'function';
 }
+
+export function deprecatedIsHTMLSafe(str: any | null | undefined): str is SafeString {
+  deprecate(
+    'Ember.String namespace is deprecated. Please, import `isHTMLSafe` from `@ember/template`.',
+    false,
+    {
+      id: 'ember-glimmer.ember-string-is-html-safe',
+      until: '3.5.0',
+      url: '',
+    }
+  );
+  return isHTMLSafe(str);
+}
diff --git a/packages/ember-glimmer/tests/utils/helpers.js b/packages/ember-glimmer/tests/utils/helpers.js
@@ -9,7 +9,9 @@ export {
   InteractiveRender,
   InertRenderer,
   htmlSafe,
+  deprecatedHTMLSafe,
   SafeString,
   DOMChanges,
   isHTMLSafe,
+  deprecatedIsHTMLSafe,
 } from 'ember-glimmer';
diff --git a/packages/ember-glimmer/tests/utils/string-test.js b/packages/ember-glimmer/tests/utils/string-test.js
@@ -1,10 +1,23 @@
-import { SafeString, htmlSafe, isHTMLSafe } from './helpers';
+import {
+  SafeString,
+  htmlSafe,
+  deprecatedHTMLSafe,
+  isHTMLSafe,
+  deprecatedIsHTMLSafe,
+} from './helpers';
 import { TestCase } from './abstract-test-case';
 import { moduleFor } from './test-case';
 
 moduleFor(
   'SafeString',
   class extends TestCase {
+    ['@test deprecated version is deprecated']() {
+      expectDeprecation(/ember\/template/);
+      let safeString = deprecatedHTMLSafe('Hello');
+
+      this.assert.ok(safeString instanceof SafeString, 'should be a SafeString');
+    }
+
     ['@test htmlSafe should return an instance of SafeString']() {
       let safeString = htmlSafe('you need to be more <b>bold</b>');
 
@@ -30,6 +43,10 @@ moduleFor(
 moduleFor(
   'SafeString isHTMLSafe',
   class extends TestCase {
+    ['@test deprecated version is deprecated']() {
+      expectDeprecation(/ember\/template/);
+      deprecatedIsHTMLSafe('Hello');
+    }
     ['@test isHTMLSafe should detect SafeString']() {
       let safeString = htmlSafe('<em>Emphasize</em> the important things.');
 

diff --git a/packages/ember-routing/lib/system/route.js b/packages/ember-routing/lib/system/route.js
@@ -5,7 +5,7 @@ import { DEBUG } from 'ember-env-flags';
 import {
   typeOf,
   copy,
-  String as StringUtils,
+  StringUtils,
   Object as EmberObject,
   A as emberA,
   Evented,

diff --git a/packages/ember-runtime/index.d.ts b/packages/ember-runtime/index.d.ts
@@ -21,3 +21,15 @@ export const String: {
 export function isEmberArray(arr: any): boolean;
 
 export function _contentFor(proxy: any): any;
+
+export const StringUtils: {
+  fmt(s: string, ...args: any[]): string,
+  loc(s: string, ...args: any[]): string,
+  w(s: string): string[],
+  decamelize(s: string): string,
+  dasherize(s: string): string,
+  camelize(s: string): string,
+  classify(s: string): string,
+  underscore(s: string): string,
+  capitalize(s: string): string
+}
diff --git a/packages/ember-runtime/lib/ext/string.js b/packages/ember-runtime/lib/ext/string.js
@@ -3,6 +3,7 @@
 */
 
 import { ENV } from 'ember-environment';
+import { deprecate } from 'ember-debug';
 import {
   w,
   loc,
@@ -16,6 +17,23 @@ import {
 
 const StringPrototype = String.prototype;
 
+function deprecateEmberStringPrototypeExtension(name, fn, opts = {}) {
+  return function() {
+    deprecate(
+      opts.message ||
+        `String prototype extensions are deprecated. Please, us ${name} from '@ember/string' instead.`,
+      false,
+      opts.options || {
+        id: 'ember-string.prototype_extensions',
+        until: '3.5.0',
+        url: 'https://emberjs.com/deprecations/v2.x/#toc_ember-string-prototype-extensions',
+      }
+    );
+
+    return fn(this, ...arguments);
+  };
+}
+
 if (ENV.EXTEND_PROTOTYPES.String) {
   /**
     See [String.w](/api/ember/release/classes/String/methods/w?anchor=w).
@@ -29,9 +47,7 @@ if (ENV.EXTEND_PROTOTYPES.String) {
     configurable: true,
     enumerable: false,
     writeable: true,
-    value: function() {
-      return w(this);
-    },
+    value: deprecateEmberStringPrototypeExtension('w', w),
   });
 
   /**
@@ -46,9 +62,10 @@ if (ENV.EXTEND_PROTOTYPES.String) {
     configurable: true,
     enumerable: false,
     writeable: true,
-    value: function(...args) {
-      return loc(this, args);
-    },
+    value: deprecateEmberStringPrototypeExtension('loc', loc, {
+      message:
+        '`loc` is deprecated. Please, use an i18n addon instead. See https://emberobserver.com/categories/internationalization for a list of them.',
+    }),
   });
 
   /**
@@ -63,9 +80,7 @@ if (ENV.EXTEND_PROTOTYPES.String) {
     configurable: true,
     enumerable: false,
     writeable: true,
-    value: function() {
-      return camelize(this);
-    },
+    value: deprecateEmberStringPrototypeExtension('camelize', camelize),
   });
 
   /**
@@ -80,9 +95,7 @@ if (ENV.EXTEND_PROTOTYPES.String) {
     configurable: true,
     enumerable: false,
     writeable: true,
-    value: function() {
-      return decamelize(this);
-    },
+    value: deprecateEmberStringPrototypeExtension('decamelize', decamelize),
   });
 
   /**
@@ -97,9 +110,7 @@ if (ENV.EXTEND_PROTOTYPES.String) {
     configurable: true,
     enumerable: false,
     writeable: true,
-    value: function() {
-      return dasherize(this);
-    },
+    value: deprecateEmberStringPrototypeExtension('dasherize', dasherize),
   });
 
   /**
@@ -114,9 +125,7 @@ if (ENV.EXTEND_PROTOTYPES.String) {
     configurable: true,
     enumerable: false,
     writeable: true,
-    value: function() {
-      return underscore(this);
-    },
+    value: deprecateEmberStringPrototypeExtension('underscore', underscore),
   });
 
   /**
@@ -131,9 +140,7 @@ if (ENV.EXTEND_PROTOTYPES.String) {
     configurable: true,
     enumerable: false,
     writeable: true,
-    value: function() {
-      return classify(this);
-    },
+    value: deprecateEmberStringPrototypeExtension('classify', classify),
   });
 
   /**
@@ -148,8 +155,6 @@ if (ENV.EXTEND_PROTOTYPES.String) {
     configurable: true,
     enumerable: false,
     writeable: true,
-    value: function() {
-      return capitalize(this);
-    },
+    value: deprecateEmberStringPrototypeExtension('capitalize', capitalize),
   });
 }
diff --git a/packages/ember-runtime/lib/index.js b/packages/ember-runtime/lib/index.js
@@ -1,5 +1,5 @@
 export { default as Object, FrameworkObject } from './system/object';
-export { default as String } from './system/string';
+export { default as String, StringUtils } from './system/string';
 export { default as RegistryProxyMixin } from './mixins/registry_proxy';
 export { default as ContainerProxyMixin } from './mixins/container_proxy';
 export { default as copy } from './copy';