Update dependencies (#132)

microlinkhq · Nov 16, 2018 · a256f0c · a256f0c
1 parent cf8cd92
commit a256f0c
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 11 deletions.
diff --git a/packages/metascraper-clearbit-logo/package.json b/packages/metascraper-clearbit-logo/package.json
@@ -21,7 +21,7 @@
     "metascraper"
   ],
   "dependencies": {
-    "got": "~9.2.0"
+    "got": "~9.3.2"
   },
   "devDependencies": {
     "mocha": "latest",

diff --git a/packages/metascraper-helpers/index.js b/packages/metascraper-helpers/index.js
@@ -29,6 +29,7 @@ const isIso = require('isostring')
 const toTitle = require('title')
 
 const { URL } = require('url')
+const urlLib = require('url')
 
 const MIMES_EXTENSIONS = {
   audio: audioExtensions,
@@ -105,7 +106,12 @@ const isAudioExtension = createExtensionValidator(audioExtensions)
 
 const isImageExtension = createExtensionValidator(imageExtensions)
 
-const extension = url => fileExtension(url).split('?')[0]
+const extension = (str = '') => {
+  const urlObj = urlLib.parse(str)
+  urlObj.hash = ''
+  urlObj.search = ''
+  return fileExtension(urlLib.format(urlObj))
+}
 
 const description = value => isString(value) && getDescription(value)
 

diff --git a/packages/metascraper-helpers/package.json b/packages/metascraper-helpers/package.json
@@ -22,7 +22,7 @@
     "isostring": "0.0.1",
     "lodash": "~4.17.11",
     "mime-types": "~2.1.21",
-    "normalize-url": "~3.3.0",
+    "normalize-url": "~4.0.0",
     "smartquotes": "~2.3.1",
     "title": "~3.4.0",
     "url-regex": "~4.1.1",

diff --git a/packages/metascraper-helpers/test/index.js b/packages/metascraper-helpers/test/index.js
@@ -2,10 +2,10 @@
 
 const should = require('should')
 
-const { absoluteUrl } = require('../')
+const { extension, absoluteUrl } = require('../')
 
 describe('metascraper-helpers', () => {
-  it('absoluteUrl', () => {
+  it('.absoluteUrl', () => {
     should(absoluteUrl('https://kikobeats.com/', 'blog')).be.equal(
       'https://kikobeats.com/blog'
     )
@@ -19,4 +19,11 @@ describe('metascraper-helpers', () => {
       'http://kikobeats.com/blog'
     )
   })
+
+  it('.extension', () => {
+    should(extension('.mp4')).be.equal('mp4')
+    should(extension('.mp4#t=0')).be.equal('mp4')
+    should(extension('.mp4?foo=bar')).be.equal('mp4')
+    should(extension('.mp4?foo=bar#t=0')).be.equal('mp4')
+  })
 })
diff --git a/packages/metascraper-logo/package.json b/packages/metascraper-logo/package.json
@@ -13,6 +13,7 @@
   },
   "dependencies": {
     "@metascraper/helpers": "^4.5.5",
+    "got": "~9.3.2",
     "lodash": "~4.17.10"
   },
   "devDependencies": {

diff --git a/packages/metascraper-media-provider/package.json b/packages/metascraper-media-provider/package.json
@@ -13,15 +13,15 @@
   },
   "dependencies": {
     "@metascraper/helpers": "^4.5.5",
-    "got": "~9.2.0",
+    "got": "~9.3.2",
     "lodash": "~4.17.10",
-    "memoize-one": "~4.0.2",
+    "memoize-one": "~4.0.3",
     "memoize-token": "~1.1.0",
     "tunnel": "0.0.6",
     "youtube-dl": "~1.12.2"
   },
   "devDependencies": {
-    "browserless": "~4.1.3",
+    "browserless": "~4.2.1",
     "mocha": "latest",
     "nyc": "latest",
     "puppeteer": "latest",

diff --git a/packages/metascraper-video/__snapshots__/index.js.snap-shot b/packages/metascraper-video/__snapshots__/index.js.snap-shot
@@ -15,7 +15,7 @@ exports['single src 1'] = {
 
 exports['clips.twitch.tv 1'] = {
   "image": "https://clips-media-assets.twitch.tv/27434665136-offset-2366-preview.jpg",
-  "video": "https://clips-media-assets.twitch.tv/AT-27434665136-offset-2366-1280x720.mp4"
+  "video": "https://clips-media-assets.twitch.tv/AT-27434665136-offset-2366-1280x720.mp4#t=0"
 }
 
 exports['play.tv 1'] = {

diff --git a/packages/metascraper-video/index.js b/packages/metascraper-video/index.js
@@ -29,13 +29,12 @@ const wrapVideo = createWrapper((domNodes, url) => {
     .orderBy(videoUrl => extension(videoUrl) === 'mp4', ['desc'])
     .first()
     .value()
-
   const urlValue = urlFn(videoUrl, { url })
   return isVideoUrl(urlValue) && urlValue
 })
 
 const withContentType = (url, contentType) =>
-  (isMime(contentType, 'video') ? url : false)
+  isMime(contentType, 'video') ? url : false
 
 /**
  * Rules.