From 0c1f6910373f657345eb221c25a959cdb598e49a Mon Sep 17 00:00:00 2001 From: Kiko Beats Date: Mon, 27 Feb 2023 10:06:41 +0100 Subject: [PATCH] refactor: pass uri to cheerio --- .../test/snapshots/index.js.snap | Bin 752 -> 711 bytes packages/metascraper/src/index.js | 6 +++--- packages/metascraper/src/load-html.js | 5 ----- 3 files changed, 3 insertions(+), 8 deletions(-) delete mode 100644 packages/metascraper/src/load-html.js diff --git a/packages/metascraper-manifest/test/snapshots/index.js.snap b/packages/metascraper-manifest/test/snapshots/index.js.snap index acb93c1b011619b4cbe60f850a7424c2f22fabdc..fb10027c730731920db0aea629e4478b22bec7f4 100644 GIT binary patch literal 711 zcmV;&0yzCaRzVS57A_m zAgM}E{U3`600000000BsmcMV*Fcin*UVi{pMJxCNJivCja7TO4ih&J=N+48FJ0T}| zN!)Yn$bPwN2L?7)HrDc2u(I%nFfcGOGw_n;+N!-?D>0lP(vuTE$IAEPub*?2gvvw% z_u(_3LlC*jqD+Jeq|>5snL+pdD2@e+-7hU~ z$*V4QgDq@P`;;Q2ct`Px;tpF}V~a1seTa~;liStRRgbNBY~EwHY0TVR*7DfG8e5LR zMOGFljjsDzE9XYcE1}cNQYJN%Q#Xq;RMKT&oBS9+|2zO08SQu?LB(9)DUXIlVZnjM zizL4OnZjdJvmQor-$x5Ng3b_Z1gay7BB<6opmEm7*smV^?q=_RqEqPfx-PnZ-bG`4m2GmN z5@U0S|G(|C-++uvKEWvWrm6cqOQVEiqX_2!UFTFrAajvIP!`IFI2d*}9zE=>_j`{Y z1hg$Q28kHfjyZng#5hq#n+E)iZtsBNYU@zX;+uMkhUCCOnp0t!h;sMGG?L$DNwPgA zdFK27b~_CYO^Ia)m)L4~8jSC=gzB9dQilR%R0C-Qk-5?!w8vHH#7a&3_S> zn!RVr9hz}W3`Y_X>?OqdXNb-BseMB6i(-XcNvm}gt%bF@kKQvt9@2lppsIfwMy|~Z zqa^94yQ=6`ig{i-8MXPySUOx`NOqyDD~v_QU1aEJZF7RdF$1myR>y9tOej=6C3k47 tq&h2HHR6z$Ix#en&xKN)0AyT&b9L?QTz>^8z}-2f`3Ks)BvLL3006Y9RH6U? literal 752 zcmV7dMkQ;&i+1UfACS! zqYy4w>>rB=00000000BsmcMV*Fcinnz5W2Iik?7X^#EIQ>HX+kuL8jaLnRO@h)&3H zUK015II^9)c3@y*Wn(RW1uOpwBLf37121WEt=isQw-ZEqa^h!O`hNWNb4~+KDn2xy zzJe82!m;BkFf>s%5=lr!Kx3AO0F0$?Uhh*;q^JhQBj!mECSj?Glr&Nn`wYXw_<->R;~rUUkkyyo5pYY$8ia%Yy(p9@opAFm>7Q?uu~L(Kxo9GvFk zwmM;Jpt>FxM~>ByaA=M|bC6Azrf$C9E{@Ym_)h-ev37=QUVC@j z#bc3JH(;Z}F=sO-#^Dhj8gO=6?PHAj*1?|Dx5W}A$)SNT#=y z02gnWaDu8hR2RrR9X)|Q?+ms9c(>geuwHk&)9d@3bvu23&;_RZ^gSe9Oypu9(J| z5qyh|mB#BBM(8ihnpA0PsNo7P<1LDCsEvS1X7h_Wl*(hWSdtp6w7|;DOg`d-W=WuM iA%`+4DFTS71Y?S7-Msk@UIX{wjOJe*gXbt<2><{(FJ&D7 diff --git a/packages/metascraper/src/index.js b/packages/metascraper/src/index.js index ebd96d267..9dba4260a 100644 --- a/packages/metascraper/src/index.js +++ b/packages/metascraper/src/index.js @@ -1,10 +1,10 @@ 'use strict' const { isUrl } = require('@metascraper/helpers') +const { load } = require('cheerio') const whoops = require('whoops') const { loadRules, mergeRules } = require('./rules') -const loadHTML = require('./load-html') const getData = require('./get-data') const MetascraperError = whoops('MetascraperError') @@ -13,7 +13,7 @@ module.exports = rules => { const loadedRules = loadRules(rules) return async ({ url, - html, + html = '', rules: inlineRules, validateUrl = true, ...props @@ -27,7 +27,7 @@ module.exports = rules => { return getData({ url, - htmlDom: loadHTML(html), + htmlDom: load(html, { baseURI: url }), rules: mergeRules(inlineRules, loadedRules), ...props }) diff --git a/packages/metascraper/src/load-html.js b/packages/metascraper/src/load-html.js deleted file mode 100644 index ec0b73f36..000000000 --- a/packages/metascraper/src/load-html.js +++ /dev/null @@ -1,5 +0,0 @@ -'use strict' - -const cheerio = require('cheerio') - -module.exports = (html = '') => cheerio.load(html)