Merge pull request #3 from SeeClickFix/gaurav/update-htmlsafe-import

Update htmlSafe import

.github/workflows/ci.yml

@@ -58,6 +58,8 @@ jobs:
           - ember-lts-3.24
           - ember-lts-3.28
           - ember-lts-4.4
+          - ember-lts-4.8
+          - ember-lts-4.12
           - ember-release
           - ember-beta
           - ember-canary

addon/helpers/linkify.js

@@ -1,6 +1,6 @@
 import { typeOf } from '@ember/utils';
 import { helper } from '@ember/component/helper';
-import { htmlSafe } from '@ember/string';
+import { htmlSafe } from '@ember/template';
 import Ember from 'ember';
 import { urlRegex, shortenUrl } from 'ember-linkify/utils/url-regex';
 

config/ember-try.js

@@ -30,6 +30,22 @@ module.exports = async function () {
           },
         },
       },
+      {
+        name: 'ember-lts-4.8',
+        npm: {
+          devDependencies: {
+            'ember-source': '~4.8.0',
+          },
+        },
+      },
+      {
+        name: 'ember-lts-4.12',
+        npm: {
+          devDependencies: {
+            'ember-source': '~4.12.0',
+          },
+        },
+      },
       {
         name: 'ember-release',
         npm: {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ember-linkify",
-  "version": "5.0.0",
+  "version": "5.0.1",
   "description": "Linkify urls in strings, safely",
   "keywords": [
     "linkify",
@@ -34,6 +34,7 @@
   },
   "devDependencies": {
     "@ember/optional-features": "^2.0.0",
+    "@ember/string": "^3.1.1",
     "@ember/test-helpers": "^2.6.0",
     "@embroider/test-setup": "^0.48.1",
     "@glimmer/component": "^1.0.4",
@@ -70,6 +71,9 @@
     "qunit-dom": "^1.6.0",
     "webpack": "^5.73.0"
   },
+  "peerDependencies": {
+    "@ember/string": "^3.1.1"
+  },
   "engines": {
     "node": "12.* || 14.* || >= 16"
   },

tests/unit/helpers/linkify-test.js

@@ -168,3 +168,13 @@ test('it should properly handle fragments without leading slashes', function (as
     'My link: <a href="http://some.website.com#fragment">http://some.website.com#fragment</a>'
   );
 });
+
+test('it should properly handle newlines', function (assert) {
+  var result = linkify(['My link: http://some.website.com/\n\nNext line'])
+    .toString()
+    .trim();
+  assert.equal(
+    result,
+    'My link: <a href="http://some.website.com/">http://some.website.com/</a>\n\nNext line'
+  );
+});