diff --git a/packages/remark-iframes/dist/index.js b/packages/remark-iframes/dist/index.js index 41c9fb02a..e74d2cf1e 100644 --- a/packages/remark-iframes/dist/index.js +++ b/packages/remark-iframes/dist/index.js @@ -8,7 +8,7 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o = function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; } -function _iterableToArrayLimit(arr, i) { if (typeof Symbol === "undefined" || !(Symbol.iterator in Object(arr))) return; var _arr = []; var _n = true; var _d = false; var _e = undefined; try { for (var _i = arr[Symbol.iterator](), _s; !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; } +function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; } function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; } @@ -213,7 +213,7 @@ module.exports = function plugin(opts) { _context2.t0 = _context2["catch"](8); message = _context2.t0.message; - if (_context2.t0.name === 'AbortError') { + if (_context2.t0.name === 'FetchError') { message = "oEmbed URL timeout: ".concat(oembed.url); } diff --git a/packages/remark-iframes/src/index.js b/packages/remark-iframes/src/index.js index 1f50554d3..689f6f8ec 100644 --- a/packages/remark-iframes/src/index.js +++ b/packages/remark-iframes/src/index.js @@ -121,10 +121,12 @@ module.exports = function plugin (opts) { nextVisitOrBail() return } + const data = node.data const oembed = data.oembed const provider = data.oembed.provider const fallback = data.oembed.fallback + try { const { url, @@ -134,6 +136,7 @@ module.exports = function plugin (opts) { } = await fetchEmbed(oembed.url) node.thumbnail = thumbnail + Object.assign(data.hProperties, { src: url, width: provider.width || width, @@ -141,16 +144,18 @@ module.exports = function plugin (opts) { allowfullscreen: true, frameborder: '0', }) - } catch (err) { let message = err.message - if (err.name === 'AbortError') { + + if (err.name === 'FetchError') { message = `oEmbed URL timeout: ${oembed.url}` } + vfile.message(message, node.position, oembed.url) node.data = {} Object.assign(node, fallback) } + delete data.oembed toVisit-- nextVisitOrBail()