Merge pull request #145 from josemarluedke/chore/htmlsafe

Import htmlSafe from @ember/template
josemarluedke · Feb 13, 2021 · d096ce5 · d096ce5
2 parents 393fdfd + d4d5e0c
commit d096ce5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/packages/core/addon/utils/safe-styles.ts b/packages/core/addon/utils/safe-styles.ts
@@ -1,9 +1,8 @@
-import { htmlSafe } from '@ember/string';
-import type { SafeString } from 'handlebars';
+import { htmlSafe } from '@ember/template';
 
 export default function safeStyles(
   style: Record<string, string | number> | undefined
-): SafeString {
+): ReturnType<typeof htmlSafe> {
   if (!style) {
     return htmlSafe('');
   }

diff --git a/packages/notifications/addon/components/notification-card.ts b/packages/notifications/addon/components/notification-card.ts
@@ -2,7 +2,7 @@ import Component from '@glimmer/component';
 import { tracked } from '@glimmer/tracking';
 import { action } from '@ember/object';
 import { inject as service } from '@ember/service';
-import { htmlSafe } from '@ember/string';
+import { htmlSafe } from '@ember/template';
 import { NotificationsService, Notification, CustomAction } from '../.';
 import { later } from '@ember/runloop';
 import { NotificationsContainerArgs } from './notifications-container';