Re-enable deprecations of htmlSafe and isHTMLSafe from

`@ember/string`. They have moved to `@ember/template`.
emberjs · Jan 2, 2023 · 6f0b80f · 6f0b80f
1 parent 78b3590
commit 6f0b80f
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 38 deletions.
diff --git a/packages/@ember/string/index.ts b/packages/@ember/string/index.ts
@@ -240,16 +240,14 @@ function deprecateImportFromString(
   name: string,
   message = `Importing ${name} from '@ember/string' is deprecated. Please import ${name} from '@ember/template' instead.`
 ) {
-  // Disabling this deprecation due to unintended errors in 3.25
-  // See https://github.com/emberjs/ember.js/issues/19393 fo more information.
-  deprecate(message, true, {
+  deprecate(message, false, {
     id: 'ember-string.htmlsafe-ishtmlsafe',
     for: 'ember-source',
     since: {
-      available: '3.25',
-      enabled: '3.25',
+      available: '4.10',
+      enabled: '4.10',
     },
-    until: '4.0.0',
+    until: '5.0.0',
     url: 'https://deprecations.emberjs.com/v3.x/#toc_ember-string-htmlsafe-ishtmlsafe',
   });
 }

diff --git a/packages/ember/index.ts b/packages/ember/index.ts
@@ -637,16 +637,14 @@ const deprecateImportFromString = function (
   name: string,
   message = `Importing ${name} from '@ember/string' is deprecated. Please import ${name} from '@ember/template' instead.`
 ) {
-  // Disabling this deprecation due to unintended errors in 3.25
-  // See https://github.com/emberjs/ember.js/issues/19393 fo more information.
-  deprecate(message, true, {
+  deprecate(message, false, {
     id: 'ember-string.htmlsafe-ishtmlsafe',
     for: 'ember-source',
     since: {
-      available: '3.25',
-      enabled: '3.25',
+      available: '4.10',
+      enabled: '4.10',
     },
-    until: '4.0.0',
+    until: '5.0.0',
     url: 'https://deprecations.emberjs.com/v3.x/#toc_ember-string-htmlsafe-ishtmlsafe',
   });
 };

diff --git a/packages/ember/tests/reexports_test.js b/packages/ember/tests/reexports_test.js
@@ -20,30 +20,6 @@ moduleFor(
       });
     }
 
-    ['@skip Ember.String.htmlSafe exports correctly (but deprecated)'](assert) {
-      let glimmer = require('@ember/-internals/glimmer');
-      expectDeprecation(() => {
-        assert.equal(
-          Ember.String.htmlSafe,
-          glimmer.htmlSafe,
-          'Ember.String.htmlSafe is exported correctly'
-        );
-      }, /Importing htmlSafe from '@ember\/string' is deprecated/);
-      assert.notEqual(glimmer.htmlSafe, undefined, 'Ember.String.htmlSafe is not `undefined`');
-    }
-
-    ['@skip Ember.String.isHTMLSafe exports correctly (but deprecated)'](assert) {
-      let glimmer = require('@ember/-internals/glimmer');
-      expectDeprecation(() => {
-        assert.equal(
-          Ember.String.isHTMLSafe,
-          glimmer.isHTMLSafe,
-          'Ember.String.isHTMLSafe is exported correctly'
-        );
-      }, /Importing isHTMLSafe from '@ember\/string' is deprecated/);
-      assert.notEqual(glimmer.isHTMLSafe, undefined, 'Ember.String.isHTMLSafe is not `undefined`');
-    }
-
     '@test Ember.FEATURES is exported'(assert) {
       for (let feature in FEATURES) {
         assert.equal(
@@ -260,8 +236,8 @@ let allExports = [
   ['String.classify', '@ember/string', 'classify'],
   ['String.dasherize', '@ember/string', 'dasherize'],
   ['String.decamelize', '@ember/string', 'decamelize'],
-  ['String.htmlSafe', '@ember/-internals/glimmer', 'htmlSafe'],
-  ['String.isHTMLSafe', '@ember/-internals/glimmer', 'isHTMLSafe'],
+  ['String.htmlSafe', '@ember/string', 'htmlSafe'],
+  ['String.isHTMLSafe', '@ember/string', 'isHTMLSafe'],
   ['String.underscore', '@ember/string', 'underscore'],
   ['String.w', '@ember/string', 'w'],
   ['STRINGS', '@ember/string', { get: '_getStrings', set: '_setStrings' }],