Merge pull request #15901 from thoov/safe-string

[CLEANUP] Remove Ember.Handlebars.SafeString
emberjs · Dec 1, 2017 · 514b7fb · 514b7fb
2 parents 9e1e171 + 997c113
commit 514b7fb
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 23 deletions.
diff --git a/packages/ember-glimmer/lib/index.ts b/packages/ember-glimmer/lib/index.ts
@@ -273,8 +273,7 @@ export {
   SafeString,
   escapeExpression,
   htmlSafe,
-  isHTMLSafe,
-  getSafeString as _getSafeString,
+  isHTMLSafe
 } from './utils/string';
 export {
   Renderer,

diff --git a/packages/ember-glimmer/lib/utils/string.ts b/packages/ember-glimmer/lib/utils/string.ts
@@ -20,20 +20,6 @@ export class SafeString {
   }
 }
 
-export function getSafeString() {
-  deprecate(
-    'Ember.Handlebars.SafeString is deprecated in favor of Ember.String.htmlSafe',
-    false,
-    {
-      id: 'ember-htmlbars.ember-handlebars-safestring',
-      until: '3.0.0',
-      url: 'https://emberjs.com/deprecations/v2.x#toc_use-ember-string-htmlsafe-over-ember-handlebars-safestring',
-    },
-  );
-
-  return SafeString;
-}
-
 const escape = {
   '&': '&amp;',
   '<': '&lt;',

diff --git a/packages/ember/lib/index.js b/packages/ember/lib/index.js
@@ -433,8 +433,7 @@ import {
   escapeExpression,
   isHTMLSafe,
   getTemplates,
-  setTemplates,
-  _getSafeString
+  setTemplates
 } from 'ember-glimmer';
 
 Ember.Component = Component;
@@ -455,10 +454,6 @@ let EmberHandlebars = Ember.Handlebars = Ember.Handlebars || {};
 let EmberHTMLBars = Ember.HTMLBars = Ember.HTMLBars || {};
 let EmberHandleBarsUtils = EmberHandlebars.Utils = EmberHandlebars.Utils || {};
 
-Object.defineProperty(EmberHandlebars, 'SafeString', {
-  get: _getSafeString
-});
-
 EmberHTMLBars.template = EmberHandlebars.template = template;
 EmberHandleBarsUtils.escapeExpression = escapeExpression;
 EmberString.htmlSafe = htmlSafe;

diff --git a/packages/ember/tests/reexports_test.js b/packages/ember/tests/reexports_test.js
@@ -142,7 +142,6 @@ QUnit.module('ember reexports');
   ['TextField',     'ember-glimmer', 'TextField'],
   ['TEMPLATES',     'ember-glimmer', { get: 'getTemplates', set: 'setTemplates' }],
   ['Handlebars.template', 'ember-glimmer', 'template'],
-  ['Handlebars.SafeString', 'ember-glimmer', { get: '_getSafeString' }],
   ['Handlebars.Utils.escapeExpression', 'ember-glimmer', 'escapeExpression'],
   ['String.htmlSafe', 'ember-glimmer', 'htmlSafe'],