@atlaskit/link-picker 1.16.6 → 1.16.7

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @atlaskit/link-picker
 
+## 1.16.7
+
+### Patch Changes
+
+- [`10410539ac9`](https://bitbucket.org/atlassian/atlassian-frontend/commits/10410539ac9) - Url utils added (normalizeURL and isSafeUrl). Available to export
+- Updated dependencies
+
 ## 1.16.6
 
 ### Patch Changes

package/dist/cjs/common/analytics/context.js

@@ -22,7 +22,7 @@ var _analyticsNext = require("@atlaskit/analytics-next");
 
 var _constants = require("../constants");
 
-var _url = require("../utils/url");
+var _url = require("@atlaskit/linking-common/url");
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 

package/dist/cjs/services/use-search-query/index.js

@@ -7,7 +7,7 @@ exports.useSearchQuery = useSearchQuery;
 
 var _react = require("react");
 
-var _url = require("../../common/utils/url");
+var _url = require("@atlaskit/linking-common/url");
 
 function useSearchQuery(state) {
   var _queryState$current;

package/dist/cjs/ui/link-picker/form-footer/utils.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.checkSubmitDisabled = void 0;
 
-var _url = require("../../../common/utils/url");
+var _url = require("@atlaskit/linking-common/url");
 
 var checkSubmitDisabled = function checkSubmitDisabled(isLoading, error, state, items) {
   /*

package/dist/cjs/ui/link-picker/index.js

@@ -37,7 +37,7 @@ var _constants = require("../../common/constants");
 
 var _analytics2 = require("../../common/analytics");
 
-var _url2 = require("../../common/utils/url");
+var _url2 = require("@atlaskit/linking-common/url");
 
 var _usePlugins2 = require("../../services/use-plugins");
 

package/dist/cjs/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/link-picker",
-	"version": "1.16.6",
+	"version": "1.16.7",
 	"sideEffects": false
 }

package/dist/es2019/common/analytics/context.js

@@ -2,7 +2,7 @@ import _extends from "@babel/runtime/helpers/extends";
 import React, { useCallback, useContext, useMemo, useRef, useState } from 'react';
 import { AnalyticsListener } from '@atlaskit/analytics-next';
 import { ANALYTICS_CHANNEL } from '../constants';
-import { normalizeUrl } from '../utils/url';
+import { normalizeUrl } from '@atlaskit/linking-common/url';
 const DEFAULT_CONTEXT_ATTRIBUTES = {
   linkState: 'newLink',
   linkFieldContent: null,

package/dist/es2019/services/use-search-query/index.js

@@ -1,5 +1,5 @@
 import { useRef } from 'react';
-import { isSafeUrl } from '../../common/utils/url';
+import { isSafeUrl } from '@atlaskit/linking-common/url';
 export function useSearchQuery(state) {
   var _queryState$current;
 

package/dist/es2019/ui/link-picker/form-footer/utils.js

@@ -1,4 +1,4 @@
-import { normalizeUrl } from '../../../common/utils/url';
+import { normalizeUrl } from '@atlaskit/linking-common/url';
 export const checkSubmitDisabled = (isLoading, error, state, items) => {
   /*
    * Enable insert when search term is a valid url and it can be normalized

package/dist/es2019/ui/link-picker/index.js

@@ -11,7 +11,7 @@ import VisuallyHidden from '@atlaskit/visually-hidden';
 import createEventPayload from '../../analytics.codegen';
 import { ANALYTICS_CHANNEL } from '../../common/constants';
 import { useLinkPickerAnalytics, withInputFieldTracking, withLinkPickerAnalyticsContext } from '../../common/analytics';
-import { normalizeUrl, isSafeUrl } from '../../common/utils/url';
+import { normalizeUrl, isSafeUrl } from '@atlaskit/linking-common/url';
 import { usePlugins } from '../../services/use-plugins';
 import { useSearchQuery } from '../../services/use-search-query';
 import useFixHeight from '../../controllers/use-fix-height';

package/dist/es2019/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/link-picker",
-	"version": "1.16.6",
+	"version": "1.16.7",
 	"sideEffects": false
 }

package/dist/esm/common/analytics/context.js

@@ -9,7 +9,7 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 import React, { useCallback, useContext, useMemo, useRef, useState } from 'react';
 import { AnalyticsListener } from '@atlaskit/analytics-next';
 import { ANALYTICS_CHANNEL } from '../constants';
-import { normalizeUrl } from '../utils/url';
+import { normalizeUrl } from '@atlaskit/linking-common/url';
 var DEFAULT_CONTEXT_ATTRIBUTES = {
   linkState: 'newLink',
   linkFieldContent: null,

package/dist/esm/services/use-search-query/index.js

@@ -1,5 +1,5 @@
 import { useRef } from 'react';
-import { isSafeUrl } from '../../common/utils/url';
+import { isSafeUrl } from '@atlaskit/linking-common/url';
 export function useSearchQuery(state) {
   var _queryState$current;
 

package/dist/esm/ui/link-picker/form-footer/utils.js

@@ -1,4 +1,4 @@
-import { normalizeUrl } from '../../../common/utils/url';
+import { normalizeUrl } from '@atlaskit/linking-common/url';
 export var checkSubmitDisabled = function checkSubmitDisabled(isLoading, error, state, items) {
   /*
    * Enable insert when search term is a valid url and it can be normalized

package/dist/esm/ui/link-picker/index.js

@@ -19,7 +19,7 @@ import VisuallyHidden from '@atlaskit/visually-hidden';
 import createEventPayload from '../../analytics.codegen';
 import { ANALYTICS_CHANNEL } from '../../common/constants';
 import { useLinkPickerAnalytics, withInputFieldTracking, withLinkPickerAnalyticsContext } from '../../common/analytics';
-import { normalizeUrl, isSafeUrl } from '../../common/utils/url';
+import { normalizeUrl, isSafeUrl } from '@atlaskit/linking-common/url';
 import { usePlugins } from '../../services/use-plugins';
 import { useSearchQuery } from '../../services/use-search-query';
 import useFixHeight from '../../controllers/use-fix-height';

package/dist/esm/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/link-picker",
-	"version": "1.16.6",
+	"version": "1.16.7",
 	"sideEffects": false
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/link-picker",
-  "version": "1.16.6",
+  "version": "1.16.7",
   "description": "Standalone link picker",
   "author": "Atlassian Pty Ltd",
   "publishConfig": {
@@ -37,6 +37,7 @@
     "@atlaskit/form": "^8.8.0",
     "@atlaskit/frontend-utilities": "^2.1.0",
     "@atlaskit/icon": "^21.11.0",
+    "@atlaskit/linking-common": "^1.17.0",
     "@atlaskit/spinner": "^15.3.0",
     "@atlaskit/tabs": "^13.3.0",
     "@atlaskit/textfield": "^5.3.0",
@@ -49,7 +50,6 @@
     "@emotion/react": "^11.7.1",
     "@react-loosely-lazy/manifest": "^1.0.0",
     "date-fns": "^2.17.0",
-    "linkify-it": "^2.0.3",
     "react-loosely-lazy": "^1.0.0",
     "use-debounce": "^3.4.0",
     "uuid": "^3.1.0"

package/dist/cjs/common/utils/url.js

@@ -1,104 +0,0 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.isSafeUrl = void 0;
-exports.normalizeUrl = normalizeUrl;
-
-var _linkifyIt = _interopRequireDefault(require("linkify-it"));
-
-/**
- * This file has been duplicated in packages/editor/adf-schema/src/utils/url.ts
- * Any changes made here should be mirrored there.
- */
-var linkify = (0, _linkifyIt.default)();
-linkify.add('sourcetree:', 'http:');
-linkify.add('jamfselfservice:', 'http:');
-var tlds = 'biz|com|edu|gov|net|org|pro|web|xxx|aero|asia|coop|info|museum|name|shop|рф'.split('|');
-var tlds2Char = 'a[cdefgilmnoqrtuwxz]|b[abdefghijmnorstvwyz]|c[acdfghiklmnoruvwxyz]|d[ejkmoz]|e[cegrstu]|f[ijkmor]|g[abdefghilmnpqrstuwy]|h[kmnrtu]|i[delmnoqrst]|j[emop]|k[eghimnprwyz]|l[abcikrstuvy]|m[acdeghklmnopqrtuvwxyz]|n[acefgilopruz]|om|p[aefghkmnrtw]|qa|r[eosuw]|s[abcdegijklmnrtuvxyz]|t[cdfghjklmnortvwz]|u[agksyz]|v[aceginu]|w[fs]|y[et]|z[amw]';
-tlds.push(tlds2Char);
-linkify.tlds(tlds, false);
-var whitelistedURLPatterns = [/^https?:\/\/[^\s]*$/im, /^ftps?:\/\//im, /^jamfselfservice:\/\/[^\s]*$/im, /^\//im, /^mailto:/im, /^skype:/im, /^callto:[^\s]*$/im, /^facetime:[^\s]*$/im, /^git:/im, /^irc6?:/im, /^news:/im, /^nntp:/im, /^feed:/im, /^cvs:/im, /^svn:/im, /^mvn:/im, /^ssh:/im, /^scp:\/\//im, /^sftp:\/\//im, /^itms:/im, /^notes:/im, /^hipchat:\/\//im, /^sourcetree:/im, /^urn:/im, /^tel:/im, /^xmpp:/im, /^telnet:/im, /^vnc:/im, /^rdp:/im, /^whatsapp:/im, /^slack:/im, /^sips?:/im, /^magnet:/im, /^foo:/im, /^#/im];
-
-var normaliseLinkHref = function normaliseLinkHref(url) {
-  var match = getLinkMatch(url);
-  return match && match.url || null;
-};
-
-var getLinkMatch = function getLinkMatch(str) {
-  if (!str) {
-    return null;
-  }
-
-  var match = linkifyMatch(str);
-
-  if (!match.length) {
-    match = linkify.match(str);
-  }
-
-  return match && match.length > 0 && match[0].index === 0 && match[0].lastIndex === str.trim().length ? match[0] : null;
-};
-
-var LINK_REGEXP = /(https?|ftp|jamfselfservice):\/\/[^\s]+/;
-
-var linkifyMatch = function linkifyMatch(text) {
-  var matches = [];
-
-  if (!LINK_REGEXP.test(text)) {
-    return matches;
-  }
-
-  var startpos = 0;
-  var substr;
-
-  while (substr = text.substr(startpos)) {
-    var link = (substr.match(LINK_REGEXP) || [''])[0];
-
-    if (link) {
-      var index = substr.search(LINK_REGEXP);
-      var start = index >= 0 ? index + startpos : index;
-      var end = start + link.length;
-      matches.push({
-        index: start,
-        lastIndex: end,
-        raw: link,
-        url: link,
-        text: link,
-        schema: ''
-      });
-      startpos += end;
-    } else {
-      break;
-    }
-  }
-
-  return matches;
-};
-
-var isSafeUrl = function isSafeUrl(url) {
-  var urlTrimmed = url.trim();
-  return whitelistedURLPatterns.some(function (p) {
-    return p.test(urlTrimmed);
-  });
-};
-/**
- * Adds protocol to url if needed.
- */
-
-
-exports.isSafeUrl = isSafeUrl;
-
-function normalizeUrl(url) {
-  if (!url) {
-    return '';
-  }
-
-  if (isSafeUrl(url)) {
-    return url.trim();
-  }
-
-  return normaliseLinkHref(url);
-}

package/dist/es2019/common/utils/url.js

@@ -1,88 +0,0 @@
-/**
- * This file has been duplicated in packages/editor/adf-schema/src/utils/url.ts
- * Any changes made here should be mirrored there.
- */
-import LinkifyIt from 'linkify-it';
-const linkify = LinkifyIt();
-linkify.add('sourcetree:', 'http:');
-linkify.add('jamfselfservice:', 'http:');
-const tlds = 'biz|com|edu|gov|net|org|pro|web|xxx|aero|asia|coop|info|museum|name|shop|рф'.split('|');
-const tlds2Char = 'a[cdefgilmnoqrtuwxz]|b[abdefghijmnorstvwyz]|c[acdfghiklmnoruvwxyz]|d[ejkmoz]|e[cegrstu]|f[ijkmor]|g[abdefghilmnpqrstuwy]|h[kmnrtu]|i[delmnoqrst]|j[emop]|k[eghimnprwyz]|l[abcikrstuvy]|m[acdeghklmnopqrtuvwxyz]|n[acefgilopruz]|om|p[aefghkmnrtw]|qa|r[eosuw]|s[abcdegijklmnrtuvxyz]|t[cdfghjklmnortvwz]|u[agksyz]|v[aceginu]|w[fs]|y[et]|z[amw]';
-tlds.push(tlds2Char);
-linkify.tlds(tlds, false);
-const whitelistedURLPatterns = [/^https?:\/\/[^\s]*$/im, /^ftps?:\/\//im, /^jamfselfservice:\/\/[^\s]*$/im, /^\//im, /^mailto:/im, /^skype:/im, /^callto:[^\s]*$/im, /^facetime:[^\s]*$/im, /^git:/im, /^irc6?:/im, /^news:/im, /^nntp:/im, /^feed:/im, /^cvs:/im, /^svn:/im, /^mvn:/im, /^ssh:/im, /^scp:\/\//im, /^sftp:\/\//im, /^itms:/im, /^notes:/im, /^hipchat:\/\//im, /^sourcetree:/im, /^urn:/im, /^tel:/im, /^xmpp:/im, /^telnet:/im, /^vnc:/im, /^rdp:/im, /^whatsapp:/im, /^slack:/im, /^sips?:/im, /^magnet:/im, /^foo:/im, /^#/im];
-
-const normaliseLinkHref = url => {
-  const match = getLinkMatch(url);
-  return match && match.url || null;
-};
-
-const getLinkMatch = str => {
-  if (!str) {
-    return null;
-  }
-
-  let match = linkifyMatch(str);
-
-  if (!match.length) {
-    match = linkify.match(str);
-  }
-
-  return match && match.length > 0 && match[0].index === 0 && match[0].lastIndex === str.trim().length ? match[0] : null;
-};
-
-const LINK_REGEXP = /(https?|ftp|jamfselfservice):\/\/[^\s]+/;
-
-const linkifyMatch = text => {
-  const matches = [];
-
-  if (!LINK_REGEXP.test(text)) {
-    return matches;
-  }
-
-  let startpos = 0;
-  let substr;
-
-  while (substr = text.substr(startpos)) {
-    const link = (substr.match(LINK_REGEXP) || [''])[0];
-
-    if (link) {
-      const index = substr.search(LINK_REGEXP);
-      const start = index >= 0 ? index + startpos : index;
-      const end = start + link.length;
-      matches.push({
-        index: start,
-        lastIndex: end,
-        raw: link,
-        url: link,
-        text: link,
-        schema: ''
-      });
-      startpos += end;
-    } else {
-      break;
-    }
-  }
-
-  return matches;
-};
-
-export const isSafeUrl = url => {
-  const urlTrimmed = url.trim();
-  return whitelistedURLPatterns.some(p => p.test(urlTrimmed));
-};
-/**
- * Adds protocol to url if needed.
- */
-
-export function normalizeUrl(url) {
-  if (!url) {
-    return '';
-  }
-
-  if (isSafeUrl(url)) {
-    return url.trim();
-  }
-
-  return normaliseLinkHref(url);
-}

package/dist/esm/common/utils/url.js

@@ -1,90 +0,0 @@
-/**
- * This file has been duplicated in packages/editor/adf-schema/src/utils/url.ts
- * Any changes made here should be mirrored there.
- */
-import LinkifyIt from 'linkify-it';
-var linkify = LinkifyIt();
-linkify.add('sourcetree:', 'http:');
-linkify.add('jamfselfservice:', 'http:');
-var tlds = 'biz|com|edu|gov|net|org|pro|web|xxx|aero|asia|coop|info|museum|name|shop|рф'.split('|');
-var tlds2Char = 'a[cdefgilmnoqrtuwxz]|b[abdefghijmnorstvwyz]|c[acdfghiklmnoruvwxyz]|d[ejkmoz]|e[cegrstu]|f[ijkmor]|g[abdefghilmnpqrstuwy]|h[kmnrtu]|i[delmnoqrst]|j[emop]|k[eghimnprwyz]|l[abcikrstuvy]|m[acdeghklmnopqrtuvwxyz]|n[acefgilopruz]|om|p[aefghkmnrtw]|qa|r[eosuw]|s[abcdegijklmnrtuvxyz]|t[cdfghjklmnortvwz]|u[agksyz]|v[aceginu]|w[fs]|y[et]|z[amw]';
-tlds.push(tlds2Char);
-linkify.tlds(tlds, false);
-var whitelistedURLPatterns = [/^https?:\/\/[^\s]*$/im, /^ftps?:\/\//im, /^jamfselfservice:\/\/[^\s]*$/im, /^\//im, /^mailto:/im, /^skype:/im, /^callto:[^\s]*$/im, /^facetime:[^\s]*$/im, /^git:/im, /^irc6?:/im, /^news:/im, /^nntp:/im, /^feed:/im, /^cvs:/im, /^svn:/im, /^mvn:/im, /^ssh:/im, /^scp:\/\//im, /^sftp:\/\//im, /^itms:/im, /^notes:/im, /^hipchat:\/\//im, /^sourcetree:/im, /^urn:/im, /^tel:/im, /^xmpp:/im, /^telnet:/im, /^vnc:/im, /^rdp:/im, /^whatsapp:/im, /^slack:/im, /^sips?:/im, /^magnet:/im, /^foo:/im, /^#/im];
-
-var normaliseLinkHref = function normaliseLinkHref(url) {
-  var match = getLinkMatch(url);
-  return match && match.url || null;
-};
-
-var getLinkMatch = function getLinkMatch(str) {
-  if (!str) {
-    return null;
-  }
-
-  var match = linkifyMatch(str);
-
-  if (!match.length) {
-    match = linkify.match(str);
-  }
-
-  return match && match.length > 0 && match[0].index === 0 && match[0].lastIndex === str.trim().length ? match[0] : null;
-};
-
-var LINK_REGEXP = /(https?|ftp|jamfselfservice):\/\/[^\s]+/;
-
-var linkifyMatch = function linkifyMatch(text) {
-  var matches = [];
-
-  if (!LINK_REGEXP.test(text)) {
-    return matches;
-  }
-
-  var startpos = 0;
-  var substr;
-
-  while (substr = text.substr(startpos)) {
-    var link = (substr.match(LINK_REGEXP) || [''])[0];
-
-    if (link) {
-      var index = substr.search(LINK_REGEXP);
-      var start = index >= 0 ? index + startpos : index;
-      var end = start + link.length;
-      matches.push({
-        index: start,
-        lastIndex: end,
-        raw: link,
-        url: link,
-        text: link,
-        schema: ''
-      });
-      startpos += end;
-    } else {
-      break;
-    }
-  }
-
-  return matches;
-};
-
-export var isSafeUrl = function isSafeUrl(url) {
-  var urlTrimmed = url.trim();
-  return whitelistedURLPatterns.some(function (p) {
-    return p.test(urlTrimmed);
-  });
-};
-/**
- * Adds protocol to url if needed.
- */
-
-export function normalizeUrl(url) {
-  if (!url) {
-    return '';
-  }
-
-  if (isSafeUrl(url)) {
-    return url.trim();
-  }
-
-  return normaliseLinkHref(url);
-}

package/dist/types/common/utils/url.d.ts

@@ -1,5 +0,0 @@
-export declare const isSafeUrl: (url: string) => boolean;
-/**
- * Adds protocol to url if needed.
- */
-export declare function normalizeUrl(url?: string | null): string | null;