diff --git a/package.json b/package.json index 8be20308e..fa57f974d 100644 --- a/package.json +++ b/package.json @@ -53,7 +53,6 @@ "minimist": "1.2.0", "n-readlines": "1.0.0", "normalize-path": "3.0.0", - "parse-srcset": "ikatyang/parse-srcset#54eb9c1cb21db5c62b4d0e275d7249516df6f0ee", "postcss-less": "2.0.0", "postcss-media-query-parser": "0.2.3", "postcss-scss": "2.0.0", @@ -64,6 +63,7 @@ "remark-parse": "5.0.0", "resolve": "1.14.2", "semver": "7.1.1", + "srcset": "2.0.1", "string-width": "4.2.0", "typescript": "3.7.4", "unicode-regex": "3.0.0", diff --git a/src/language-html/syntax-attribute.js b/src/language-html/syntax-attribute.js index a0cc307f0..c637377e7 100644 --- a/src/language-html/syntax-attribute.js +++ b/src/language-html/syntax-attribute.js @@ -3,26 +3,20 @@ const { builders: { concat, ifBreak, join, line } } = require("../document"); -const parseSrcset = require("parse-srcset"); +const parseSrcset = require("srcset").parse; function printImgSrcset(value) { - const srcset = parseSrcset(value, { - logger: { - error(message) { - throw new Error(message); - } - } - }); + const srcset = parseSrcset(value); - const hasW = srcset.some(src => src.w); - const hasH = srcset.some(src => src.h); - const hasX = srcset.some(src => src.d); + const hasW = srcset.some(src => src.width); + const hasH = srcset.some(src => src.height); + const hasX = srcset.some(src => src.density); if (hasW + hasH + hasX !== 1) { throw new Error("Mixed descriptor in srcset is not supported"); } - const key = hasW ? "w" : hasH ? "h" : "d"; + const key = hasW ? "width" : hasH ? "height" : "density"; const unit = hasW ? "w" : hasH ? "h" : "x"; const getMax = values => Math.max(...values); diff --git a/yarn.lock b/yarn.lock index ce322e0c6..af0e1aca7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5676,10 +5676,6 @@ parse-json@^5.0.0: json-parse-better-errors "^1.0.1" lines-and-columns "^1.1.6" -parse-srcset@ikatyang/parse-srcset#54eb9c1cb21db5c62b4d0e275d7249516df6f0ee: - version "1.0.2" - resolved "https://codeload.github.com/ikatyang/parse-srcset/tar.gz/54eb9c1cb21db5c62b4d0e275d7249516df6f0ee" - parse5@4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/parse5/-/parse5-4.0.0.tgz#6d78656e3da8d78b4ec0b906f7c08ef1dfe3f608" @@ -6822,6 +6818,11 @@ sprintf-js@~1.0.2: resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c" integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw= +srcset@2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/srcset/-/srcset-2.0.1.tgz#8f842d357487eb797f413d9c309de7a5149df5ac" + integrity sha512-00kZI87TdRKwt+P8jj8UZxbfp7mK2ufxcIMWvhAOZNJTRROimpHeruWrGvCZneiuVDLqdyHefVp748ECTnyUBQ== + sshpk@^1.7.0: version "1.16.1" resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.16.1.tgz#fb661c0bef29b39db40769ee39fa70093d6f6877"