From 4ee3d4cc62294704dcf4c47443b3151d2b2e468c Mon Sep 17 00:00:00 2001
From: Ricardo Mendes <rokusu@gmail.com>
Date: Thu, 11 Feb 2021 02:20:35 +0000
Subject: [PATCH] disable deprecation for htmlSafe and isHTMLSafe

---
 packages/ember/index.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/ember/index.js b/packages/ember/index.js
index 74a8f145b3b..7831af19907 100644
--- a/packages/ember/index.js
+++ b/packages/ember/index.js
@@ -598,7 +598,7 @@ if (EMBER_MODERNIZED_BUILT_IN_COMPONENTS) {
           `Using Ember.${name} or importing from '${path}' has been deprecated, install the ` +
             `\`ember-legacy-built-in-components\` addon and use \`import { ${name} } from ` +
             `'ember-legacy-built-in-components';\` instead`,
-          false,
+          true,
           {
             id: 'ember.legacy-built-in-components',
             until: '4.0.0',
@@ -661,7 +661,9 @@ const deprecateImportFromString = function (
   name,
   message = `Importing ${name} from '@ember/string' is deprecated. Please import ${name} from '@ember/template' instead.`
 ) {
-  deprecate(message, false, {
+  // 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, {
     id: 'ember-string.htmlsafe-ishtmlsafe',
     for: 'ember-source',
     since: {