url-regex - npm Package Compare versions

Comparing version 2.1.3 to 3.0.0

index.js

 'use strict';
-var ip = require('ip-regex').v4().source;
-var tlds = require('./tlds.json').join('|');
+var ipRegex = require('ip-regex');
 
@@ -8,13 +7,13 @@ module.exports = function (opts) {
 
+	var protocol = '(?:(?:[a-z]+:)?//)';
 	var auth = '(?:\\S+(?::\\S*)?@)?';
-	var domain = '(?:\\.(?:xn--[a-z0-9\\-]{1,59}|(?:[a-z\\u00a1-\\uffff0-9]+-?){0,62}[a-z\\u00a1-\\uffff0-9]{1,63}))*';
-	var host = '(?:xn--[a-z0-9\\-]{1,59}|(?:(?:[a-z\\u00a1-\\uffff0-9]+-?){0,62}[a-z\\u00a1-\\uffff0-9]{1,63}))';
-	var path = '(?:\/[^\\s]*)?';
+	var ip = ipRegex.v4().source;
+	var host = '(?:(?:[a-z\\u00a1-\\uffff0-9]-*)*[a-z\\u00a1-\\uffff0-9]+)';
+	var domain = '(?:\\.(?:[a-z\\u00a1-\\uffff0-9]-*)*[a-z\\u00a1-\\uffff0-9]+)*';
+	var tld = '(?:\\.(?:[a-z\\u00a1-\\uffff]{2,}))';
 	var port = '(?::\\d{2,5})?';
-	var protocol = '(?:(?:(?:\\w)+:)?\/\/)?';
-	var tld = '(?:\\.(?:xn--[a-z0-9\\-]{1,59}|' + tlds + '+))';
-
+	var path = '(?:/\\S*)?';
 	var regex = [
-		protocol + auth + '(?:' + ip + '|',
-		'(?:localhost)|' + host + domain + tld + ')' + port + path
+		protocol, auth, '(?:localhost|' + ip + '|' + host + domain + tld + ')',
+		port, path
 	].join('');
@@ -21,0 +20,0 @@

package.json

 {
   "name": "url-regex",
-  "version": "2.1.3",
+  "version": "3.0.0",
   "description": "Regular expression for matching URLs",
@@ -16,9 +16,6 @@ "license": "MIT",
   "scripts": {
-    "prepublish": "node lib/index.js",
-    "pretest": "node lib/index.js",
     "test": "node test.js"
   },
   "files": [
-    "index.js",
-    "tlds.json"
+    "index.js"
   ],
@@ -34,5 +31,4 @@ "keywords": [
   "devDependencies": {
-    "ava": "^0.0.4",
-    "tlds": "^1.14.0"
+    "ava": "^0.0.4"
   }
 }

readme.md

@@ -20,13 +20,13 @@ # url-regex [![Build Status](http://img.shields.io/travis/kevva/url-regex.svg?style=flat)](https://travis-ci.org/kevva/url-regex)
 
-urlRegex().test('github.com foo bar');
+urlRegex().test('http://github.com foo bar');
 //=> true
 
-urlRegex({exact: true}).test('github.com foo bar');
+urlRegex({exact: true}).test('http://github.com foo bar');
 //=> false
 
-urlRegex({exact: true}).test('github.com');
+urlRegex({exact: true}).test('http://github.com');
 //=> true
 
-'foo github.com bar google.com'.match(urlRegex());
-//=> ['github.com', 'google.com']
+'foo http://github.com bar //google.com'.match(urlRegex());
+//=> ['http://github.com', '//google.com']
 ```
@@ -33,0 +33,0 @@

tlds.json

-["vermögensberatung","vermögensberater","cancerresearch","spreadbetting","international","construction","versicherung","scholarships","barclaycard","engineering","enterprises","சிங்கப்பூர்","williamhill","blackfriday","productions","accountants","photography","investments","motorcycles","contractors","accountant","associates","bnpparibas","vlaanderen","apartments","restaurant","republican","properties","immobilien","university","healthcare","technology","eurovision","cuisinella","creditcard","management","foundation","industries","consulting","goldpoint","community","melbourne","christmas","solutions","institute","bloomberg","vacations","aquarelle","marketing","directory","furniture","amsterdam","education","allfinanz","yodobashi","equipment","financial","pictures","cleaning","mortgage","memorial","clothing","software","marriott","boutique","brussels","budapest","computer","builders","business","services","lighting","barclays","saarland","bargains","capetown","training","infiniti","airforce","redstone","holdings","delivery","democrat","property","diamonds","graphics","catering","supplies","discount","yokohama","plumbing","download","football","flsmidth","ventures","engineer","exchange","pharmacy","partners","firmdale","السعودية","attorney","feedback","everbank","limited","college","cologne","samsung","systems","company","surgery","abogado","reviews","support","capital","cooking","academy","caravan","country","courses","leclerc","الجزائر","cricket","latrobe","cruises","இந்தியா","lacaixa","komatsu","kitchen","rentals","careers","cartier","whoswho","recipes","realtor","hosting","holiday","wedding","spiegel","android","zuerich","dentist","hangout","hamburg","guitars","auction","singles","digital","shriram","channel","bauhaus","gallery","website","frogans","domains","panerai","trading","forsale","organic","okinawa","flowers","neustar","florist","flights","fitness","network","shiksha","toshiba","fishing","tickets","temasek","science","finance","schwarz","youtube","fashion","markets","schmidt","express","exposed","expert","abbott","active","yandex","yachts","فلسطين","events","இலங்கை","مليسيا","estate","agency","المغرب","الاردن","امارات","alsace","energy","emerck","онлайн","москва","webcam","voyage","voting","vision","villas","durban","doosan","viajes","travel","bayern","tienda","futbol","berlin","tennis","garden","tattoo","taipei","sydney","suzuki","supply","social","schule","school","camera","global","ryukyu","review","report","repair","career","direct","reisen","casino","racing","google","quebec","center","pictet","gratis","piaget","physio","photos","otsuka","chrome","oracle","design","online","church","dental","nissan","nagoya","hermes","hiphop","museum","degree","claims","moscow","mormon","monash","clinic","coffee","market","maison","madrid","luxury","condos","datsun","dating","london","credit","lawyer","kaufen","insure","juegos","joburg","party","tires","jetzt","dance","actor","dabur","koeln","kyoto","cymru","adult","lease","legal","loans","lotte","lotto","سورية","mango","house","codes","coach","media","miami","بھارت","money","horse","click","homes","deals","بازار","movie","epson","ایران","citic","संगठन","nexus","ninja","భారత్","archi","email","world","works","osaka","guide","chloe","paris","cheap","parts","faith","photo","gripe","green","pizza","place","poker","praxi","press","audio","watch","wales","rehab","reise","vodka","autos","cards","gmail","canon","forex","rocks","rodeo","globo","irish","video","vegas","trust","glass","gives","trade","build","shoes","gifts","boats","solar","tours","space","black","study","style","sucks","tools","tokyo","bingo","today","tatar","tirol","camp","info","haus","сайт","kiwi","موقع","desi","ভারত","guru","jobs","love","تونس","ltda","work","page","luxe","immo","cyou","maif","组织机构","chat","شبكة","army","guge","fans","film","pics","diet","fail","pink","kred","java","wiki","plus","pohl","cern","porn","post","land","meet","wien","prod","arpa","prof","asia","club","meme","qpon","wang","goog","dclk","cash","voto","casa","menu","farm","golf","reit","vote","gold","erni","mini","care","rest","date","mobi","moda","rich","dvag","fish","host","aero","rsvp","ruhr","ਭਾਰਤ","kddi","sale","グーグル","band","sarl","saxo","yoga","bank","lgbt","cafe","lidl","life","doha","fund","scot","buzz","mtpc","sexy","coop","here","toys","bond","site","town","name","navy","sohu","عمان","city","beer","cool","blue","limo","news","link","भारत","ભારત","gift","nico","surf","loan","ggee","gent","bike","help","ලංකා","gbiz","zone","tech","дети","tips","best","docs","我爱你","gal","tel","bid","tax","gdn","bio","biz","top","soy","bmw","sky","boo","sew","bbc","bzh","cab","cal","tui","bar","uno","uol","scb","sca","sap","axa","vet","frl","gle","rip","rio","gmo","gmx","ren","foo","red","fly","goo","gop","pub","eat","cat","wed","cbn","gov","pro","ceo","cfd","win","wme","ovh","dev","org","wtc","wtf","xin","ooo","onl","dnp","edu","қаз","ong","one","срб","бел","淡马锡","орг","nyc","ntt","мкд","中文网","nrw","nra","nhk","ngo","new","укр","飞利浦","мон","fit","net","hiv","mtn","mov","moe","mma","mil","esq","how","com","ibm","ไทย","ifm","рус","day","みんな","ing","lds","afl","ink","مصر","قطر","eus","crs","新加坡","lat","xxx","xyz","krd","fan","ads","kim","int","jcb","zip","iwc","dad","lc","gg","bi","gh","gi","an","li","ag","ao","gl","dz","aw","ro","ec","lk","rs","ax","ru","gm","rw","bj","sa","ee","eg","gn","lr","ls","zw","sb","sc","az","lu","ba","aq","lv","ly","ma","bm","ai","sd","se","bn","ar","gp","sg","sh","gq","gr","er","si","cr","mc","sj","sk","md","sl","sm","sn","so","me","es","bo","gs","gt","gu","ae","mg","mh","sr","st","et","eu","su","cc","mk","ml","mm","gw","mn","mo","sv","sx","sy","gy","cd","sz","al","cu","ad","cv","tc","td","cw","cx","cy","as","hk","tf","tg","th","mp","mq","mr","ms","mt","tj","tk","tl","tm","tn","to","hm","hn","mu","cf","mv","mw","mx","my","tr","mz","na","cz","br","cg","tt","nc","tv","tw","tz","ua","ug","uk","ne","ch","fi","us","uy","uz","va","af","vc","ve","bs","hr","ht","nf","vg","vi","ng","hu","bt","ni","id","vn","ie","bb","nl","no","np","vu","nr","il","im","am","nu","de","nz","wf","in","om","bd","be","fj","fk","ci","at","bv","ws","ck","cl","fm","佛山","慈善","集团","在线","한국","io","八卦","pa","公益","公司","移动","iq","ir","fo","is","it","bw","pe","时尚","pf","pg","삼성","ph","商标","商店","商城","by","bz","je","中信","中国","中國","谷歌","ac","jm","jo","ca","网店","fr","网络","jp","香港","au","台湾","台灣","手机","cm","pk","pl","cn","ke","kg","pm","pn","kh","ki","dj","政府","dk","გე","机构","pr","健康","ga","km","kn","рф","dm","co","kp","世界","kr","网址","游戏","do","ps","企业","信息","pt","gb","广东","pw","py","qa","kw","政务","ky","bf","re","kz","ye","la","gd","bg","ge","yt","za","bh","zm","gf","lb","lt"]

No alert changes

Improved metrics

Dev dependency count

1

-50%

Worsened metrics

Total package byte prevSize

3412

-68.16%

Number of package files

4

-20%

No dependency changes