diff --git a/package-lock.json b/package-lock.json index 0478e7e..23d3d06 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12,6 +12,7 @@ "@types/node": "^17.0.39", "find-cache-dir": "^3.3.2", "json5": "^2.2.1", + "loader-utils": "^3.2.0", "make-dir": "^3.1.0", "schema-utils": "^4.0.0" }, @@ -86,21 +87,21 @@ } }, "node_modules/@babel/core": { - "version": "7.18.9", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.18.9.tgz", - "integrity": "sha512-1LIb1eL8APMy91/IMW+31ckrfBM4yCoLaVzoDhZUKSM4cu1L1nIidyxkCgzPAgrC5WEz36IPEr/eSeSF9pIn+g==", + "version": "7.18.10", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.18.10.tgz", + "integrity": "sha512-JQM6k6ENcBFKVtWvLavlvi/mPcpYZ3+R+2EySDEMSMbp7Mn4FexlbbJVrx2R7Ijhr01T8gyqrOaABWIOgxeUyw==", "dev": true, "dependencies": { "@ampproject/remapping": "^2.1.0", "@babel/code-frame": "^7.18.6", - "@babel/generator": "^7.18.9", + "@babel/generator": "^7.18.10", "@babel/helper-compilation-targets": "^7.18.9", "@babel/helper-module-transforms": "^7.18.9", "@babel/helpers": "^7.18.9", - "@babel/parser": "^7.18.9", - "@babel/template": "^7.18.6", - "@babel/traverse": "^7.18.9", - "@babel/types": "^7.18.9", + "@babel/parser": "^7.18.10", + "@babel/template": "^7.18.10", + "@babel/traverse": "^7.18.10", + "@babel/types": "^7.18.10", "convert-source-map": "^1.7.0", "debug": "^4.1.0", "gensync": "^1.0.0-beta.2", @@ -116,12 +117,12 @@ } }, "node_modules/@babel/generator": { - "version": "7.18.9", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.18.9.tgz", - "integrity": "sha512-wt5Naw6lJrL1/SGkipMiFxJjtyczUWTP38deiP1PO60HsBjDeKk08CGC3S8iVuvf0FmTdgKwU1KIXzSKL1G0Ug==", + "version": "7.18.12", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.18.12.tgz", + "integrity": "sha512-dfQ8ebCN98SvyL7IxNMCUtZQSq5R7kxgN+r8qYTGDmmSion1hX2C0zq2yo1bsCDhXixokv1SAWTZUMYbO/V5zg==", "dev": true, "dependencies": { - "@babel/types": "^7.18.9", + "@babel/types": "^7.18.10", "@jridgewell/gen-mapping": "^0.3.2", "jsesc": "^2.5.1" }, @@ -420,6 +421,15 @@ "node": ">=6.9.0" } }, + "node_modules/@babel/helper-string-parser": { + "version": "7.18.10", + "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.18.10.tgz", + "integrity": "sha512-XtIfWmeNY3i4t7t4D2t02q50HvqHybPqW2ki1kosnvWCwuCMeo81Jf0gwr85jy/neUdg5XDdeFE/80DXiO+njw==", + "dev": true, + "engines": { + "node": ">=6.9.0" + } + }, "node_modules/@babel/helper-validator-identifier": { "version": "7.18.6", "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.18.6.tgz", @@ -439,15 +449,15 @@ } }, "node_modules/@babel/helper-wrap-function": { - "version": "7.18.9", - "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.18.9.tgz", - "integrity": "sha512-cG2ru3TRAL6a60tfQflpEfs4ldiPwF6YW3zfJiRgmoFVIaC1vGnBBgatfec+ZUziPHkHSaXAuEck3Cdkf3eRpQ==", + "version": "7.18.11", + "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.18.11.tgz", + "integrity": "sha512-oBUlbv+rjZLh2Ks9SKi4aL7eKaAXBWleHzU89mP0G6BMUlRxSckk9tSIkgDGydhgFxHuGSlBQZfnaD47oBEB7w==", "dev": true, "dependencies": { "@babel/helper-function-name": "^7.18.9", - "@babel/template": "^7.18.6", - "@babel/traverse": "^7.18.9", - "@babel/types": "^7.18.9" + "@babel/template": "^7.18.10", + "@babel/traverse": "^7.18.11", + "@babel/types": "^7.18.10" }, "engines": { "node": ">=6.9.0" @@ -482,9 +492,9 @@ } }, "node_modules/@babel/parser": { - "version": "7.18.9", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.18.9.tgz", - "integrity": "sha512-9uJveS9eY9DJ0t64YbIBZICtJy8a5QrDEVdiLCG97fVLpDTpGX7t8mMSb6OWw6Lrnjqj4O8zwjELX3dhoMgiBg==", + "version": "7.18.11", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.18.11.tgz", + "integrity": "sha512-9JKn5vN+hDt0Hdqn1PiJ2guflwP+B6Ga8qbDuoF0PzzVhrzsKIJo8yGqVk6CmMHiMei9w1C1Bp9IMJSIK+HPIQ==", "dev": true, "bin": { "parser": "bin/babel-parser.js" @@ -526,14 +536,14 @@ } }, "node_modules/@babel/plugin-proposal-async-generator-functions": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.18.6.tgz", - "integrity": "sha512-WAz4R9bvozx4qwf74M+sfqPMKfSqwM0phxPTR6iJIi8robgzXwkEgmeJG1gEKhm6sDqT/U9aV3lfcqybIpev8w==", + "version": "7.18.10", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.18.10.tgz", + "integrity": "sha512-1mFuY2TOsR1hxbjCo4QL+qlIjV07p4H4EUYw2J/WCqsvFV6V9X9z9YhXbWndc/4fw+hYGlDT7egYxliMp5O6Ew==", "dev": true, "dependencies": { - "@babel/helper-environment-visitor": "^7.18.6", - "@babel/helper-plugin-utils": "^7.18.6", - "@babel/helper-remap-async-to-generator": "^7.18.6", + "@babel/helper-environment-visitor": "^7.18.9", + "@babel/helper-plugin-utils": "^7.18.9", + "@babel/helper-remap-async-to-generator": "^7.18.9", "@babel/plugin-syntax-async-generators": "^7.8.4" }, "engines": { @@ -1483,12 +1493,12 @@ } }, "node_modules/@babel/plugin-transform-unicode-escapes": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.18.6.tgz", - "integrity": "sha512-XNRwQUXYMP7VLuy54cr/KS/WeL3AZeORhrmeZ7iewgu+X2eBqmpaLI/hzqr9ZxCeUoq0ASK4GUzSM0BDhZkLFw==", + "version": "7.18.10", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.18.10.tgz", + "integrity": "sha512-kKAdAI+YzPgGY/ftStBFXTI1LZFju38rYThnfMykS+IXy8BVx+res7s2fxf1l8I35DV2T97ezo6+SGrXz6B3iQ==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.18.6" + "@babel/helper-plugin-utils": "^7.18.9" }, "engines": { "node": ">=6.9.0" @@ -1514,9 +1524,9 @@ } }, "node_modules/@babel/preset-env": { - "version": "7.18.9", - "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.18.9.tgz", - "integrity": "sha512-75pt/q95cMIHWssYtyfjVlvI+QEZQThQbKvR9xH+F/Agtw/s4Wfc2V9Bwd/P39VtixB7oWxGdH4GteTTwYJWMg==", + "version": "7.18.10", + "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.18.10.tgz", + "integrity": "sha512-wVxs1yjFdW3Z/XkNfXKoblxoHgbtUF7/l3PvvP4m02Qz9TZ6uZGxRVYjSQeR87oQmHco9zWitW5J82DJ7sCjvA==", "dev": true, "dependencies": { "@babel/compat-data": "^7.18.8", @@ -1525,7 +1535,7 @@ "@babel/helper-validator-option": "^7.18.6", "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.18.6", "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.18.9", - "@babel/plugin-proposal-async-generator-functions": "^7.18.6", + "@babel/plugin-proposal-async-generator-functions": "^7.18.10", "@babel/plugin-proposal-class-properties": "^7.18.6", "@babel/plugin-proposal-class-static-block": "^7.18.6", "@babel/plugin-proposal-dynamic-import": "^7.18.6", @@ -1585,13 +1595,13 @@ "@babel/plugin-transform-sticky-regex": "^7.18.6", "@babel/plugin-transform-template-literals": "^7.18.9", "@babel/plugin-transform-typeof-symbol": "^7.18.9", - "@babel/plugin-transform-unicode-escapes": "^7.18.6", + "@babel/plugin-transform-unicode-escapes": "^7.18.10", "@babel/plugin-transform-unicode-regex": "^7.18.6", "@babel/preset-modules": "^0.1.5", - "@babel/types": "^7.18.9", - "babel-plugin-polyfill-corejs2": "^0.3.1", - "babel-plugin-polyfill-corejs3": "^0.5.2", - "babel-plugin-polyfill-regenerator": "^0.3.1", + "@babel/types": "^7.18.10", + "babel-plugin-polyfill-corejs2": "^0.3.2", + "babel-plugin-polyfill-corejs3": "^0.5.3", + "babel-plugin-polyfill-regenerator": "^0.4.0", "core-js-compat": "^3.22.1", "semver": "^6.3.0" }, @@ -1631,33 +1641,33 @@ } }, "node_modules/@babel/template": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.18.6.tgz", - "integrity": "sha512-JoDWzPe+wgBsTTgdnIma3iHNFC7YVJoPssVBDjiHfNlyt4YcunDtcDOUmfVDfCK5MfdsaIoX9PkijPhjH3nYUw==", + "version": "7.18.10", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.18.10.tgz", + "integrity": "sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==", "dev": true, "dependencies": { "@babel/code-frame": "^7.18.6", - "@babel/parser": "^7.18.6", - "@babel/types": "^7.18.6" + "@babel/parser": "^7.18.10", + "@babel/types": "^7.18.10" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/traverse": { - "version": "7.18.9", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.18.9.tgz", - "integrity": "sha512-LcPAnujXGwBgv3/WHv01pHtb2tihcyW1XuL9wd7jqh1Z8AQkTd+QVjMrMijrln0T7ED3UXLIy36P9Ao7W75rYg==", + "version": "7.18.11", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.18.11.tgz", + "integrity": "sha512-TG9PiM2R/cWCAy6BPJKeHzNbu4lPzOSZpeMfeNErskGpTJx6trEvFaVCbDvpcxwy49BKWmEPwiW8mrysNiDvIQ==", "dev": true, "dependencies": { "@babel/code-frame": "^7.18.6", - "@babel/generator": "^7.18.9", + "@babel/generator": "^7.18.10", "@babel/helper-environment-visitor": "^7.18.9", "@babel/helper-function-name": "^7.18.9", "@babel/helper-hoist-variables": "^7.18.6", "@babel/helper-split-export-declaration": "^7.18.6", - "@babel/parser": "^7.18.9", - "@babel/types": "^7.18.9", + "@babel/parser": "^7.18.11", + "@babel/types": "^7.18.10", "debug": "^4.1.0", "globals": "^11.1.0" }, @@ -1666,11 +1676,12 @@ } }, "node_modules/@babel/types": { - "version": "7.18.9", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.18.9.tgz", - "integrity": "sha512-WwMLAg2MvJmt/rKEVQBBhIVffMmnilX4oe0sRe7iPOHIGsqpruFHHdrfj4O1CMMtgMtCU4oPafZjDPCRgO57Wg==", + "version": "7.18.10", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.18.10.tgz", + "integrity": "sha512-MJvnbEiiNkpjo+LknnmRrqbY1GPUUggjv+wQVjetM/AONoupqRALB7I6jGqNUAZsKcRIEu2J6FRFvsczljjsaQ==", "dev": true, "dependencies": { + "@babel/helper-string-parser": "^7.18.10", "@babel/helper-validator-identifier": "^7.18.6", "to-fast-properties": "^2.0.0" }, @@ -1759,9 +1770,9 @@ } }, "node_modules/@humanwhocodes/config-array": { - "version": "0.9.5", - "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.9.5.tgz", - "integrity": "sha512-ObyMyWxZiCu/yTisA7uzx81s40xR2fD5Cg/2Kq7G02ajkNubJf6BopgDTmDyc3U7sXpNKM8cYOw7s7Tyr+DnCw==", + "version": "0.10.4", + "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.10.4.tgz", + "integrity": "sha512-mXAIHxZT3Vcpg83opl1wGlVZ9xydbfZO3r5YfRSH6Gpp2J/PfdBP0wbDa2sO6/qRbcalpoevVyW6A/fI6LfeMw==", "dev": true, "dependencies": { "@humanwhocodes/object-schema": "^1.2.1", @@ -1772,6 +1783,16 @@ "node": ">=10.10.0" } }, + "node_modules/@humanwhocodes/gitignore-to-minimatch": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/@humanwhocodes/gitignore-to-minimatch/-/gitignore-to-minimatch-1.0.2.tgz", + "integrity": "sha512-rSqmMJDdLFUsyxR6FMtD00nfQKKLFb1kv+qBbOVKqErvloEIJLo5bDTJTQNTYgeyp78JsA7u/NPi5jT1GR/MuA==", + "dev": true, + "funding": { + "type": "github", + "url": "/~https://github.com/sponsors/nzakas" + } + }, "node_modules/@humanwhocodes/object-schema": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz", @@ -2991,9 +3012,9 @@ } }, "node_modules/@sinclair/typebox": { - "version": "0.24.22", - "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.24.22.tgz", - "integrity": "sha512-JsBe3cOFpNZ6yjBYnXKhcENWy5qZE3PQZwExQ5ksA/h8qp4bwwxFmy07A6bC2R6qv6+RF3SfrbQTskTwYNTXUQ==", + "version": "0.24.27", + "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.24.27.tgz", + "integrity": "sha512-K7C7IlQ3zLePEZleUN21ceBA2aLcMnLHTLph8QWk1JK37L90obdpY+QGY8bXMKxf1ht1Z0MNewvXxWv0oGDYFg==", "dev": true }, "node_modules/@sinonjs/commons": { @@ -3047,9 +3068,9 @@ } }, "node_modules/@types/babel__traverse": { - "version": "7.17.1", - "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.17.1.tgz", - "integrity": "sha512-kVzjari1s2YVi77D3w1yuvohV2idweYXMCDzqBiVNN63TcDWrIlTVOYpqVrvbbyOE/IyzBoTKF0fdnLPEORFxA==", + "version": "7.18.0", + "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.18.0.tgz", + "integrity": "sha512-v4Vwdko+pgymgS+A2UIaJru93zQd85vIGWObM5ekZNdXCKtDYqATlEYnWgfo86Q6I1Lh0oXnksDnMU1cwmlPDw==", "dev": true, "dependencies": { "@babel/types": "^7.3.0" @@ -3141,9 +3162,9 @@ "integrity": "sha512-w+tIMs3rq2afQdsPJlODhoUEKzFP1ayaoyl1CcnwtIlsVe7K7bA1NGm4s3PraqTLlXnbIN84zuBlxBWo1u9BLw==" }, "node_modules/@types/prettier": { - "version": "2.6.4", - "resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.6.4.tgz", - "integrity": "sha512-fOwvpvQYStpb/zHMx0Cauwywu9yLDmzWiiQBC7gJyq5tYLUXFZvDG7VK1B7WBxxjBJNKFOZ0zLoOQn8vmATbhw==", + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.7.0.tgz", + "integrity": "sha512-RI1L7N4JnW5gQw2spvL7Sllfuf1SaHdrZpCHiBlCXjIlufi1SMNnbu2teze3/QE67Fg2tBlH7W+mi4hVNk4p0A==", "dev": true }, "node_modules/@types/sharp": { @@ -3173,9 +3194,9 @@ } }, "node_modules/@types/yargs": { - "version": "17.0.10", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.10.tgz", - "integrity": "sha512-gmEaFwpj/7f/ROdtIlci1R1VYU1J4j95m8T+Tj3iBgiBFKg1foE/PSl93bBd5T9LDXNPo8UlNN6W0qwD8O5OaA==", + "version": "17.0.11", + "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.11.tgz", + "integrity": "sha512-aB4y9UDUXTSMxmM4MH+YnuR0g5Cph3FLQBoWoMB21DSvFVAxRVEHEMx3TLh+zUZYMCQtKiqazz0Q4Rre31f/OA==", "dev": true, "dependencies": { "@types/yargs-parser": "*" @@ -3188,14 +3209,14 @@ "dev": true }, "node_modules/@typescript-eslint/eslint-plugin": { - "version": "5.31.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.31.0.tgz", - "integrity": "sha512-VKW4JPHzG5yhYQrQ1AzXgVgX8ZAJEvCz0QI6mLRX4tf7rnFfh5D8SKm0Pq6w5PyNfAWJk6sv313+nEt3ohWMBQ==", + "version": "5.32.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.32.0.tgz", + "integrity": "sha512-CHLuz5Uz7bHP2WgVlvoZGhf0BvFakBJKAD/43Ty0emn4wXWv5k01ND0C0fHcl/Im8Td2y/7h44E9pca9qAu2ew==", "dev": true, "dependencies": { - "@typescript-eslint/scope-manager": "5.31.0", - "@typescript-eslint/type-utils": "5.31.0", - "@typescript-eslint/utils": "5.31.0", + "@typescript-eslint/scope-manager": "5.32.0", + "@typescript-eslint/type-utils": "5.32.0", + "@typescript-eslint/utils": "5.32.0", "debug": "^4.3.4", "functional-red-black-tree": "^1.0.1", "ignore": "^5.2.0", @@ -3236,14 +3257,14 @@ } }, "node_modules/@typescript-eslint/parser": { - "version": "5.31.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.31.0.tgz", - "integrity": "sha512-UStjQiZ9OFTFReTrN+iGrC6O/ko9LVDhreEK5S3edmXgR396JGq7CoX2TWIptqt/ESzU2iRKXAHfSF2WJFcWHw==", + "version": "5.32.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.32.0.tgz", + "integrity": "sha512-IxRtsehdGV9GFQ35IGm5oKKR2OGcazUoiNBxhRV160iF9FoyuXxjY+rIqs1gfnd+4eL98OjeGnMpE7RF/NBb3A==", "dev": true, "dependencies": { - "@typescript-eslint/scope-manager": "5.31.0", - "@typescript-eslint/types": "5.31.0", - "@typescript-eslint/typescript-estree": "5.31.0", + "@typescript-eslint/scope-manager": "5.32.0", + "@typescript-eslint/types": "5.32.0", + "@typescript-eslint/typescript-estree": "5.32.0", "debug": "^4.3.4" }, "engines": { @@ -3263,13 +3284,13 @@ } }, "node_modules/@typescript-eslint/scope-manager": { - "version": "5.31.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.31.0.tgz", - "integrity": "sha512-8jfEzBYDBG88rcXFxajdVavGxb5/XKXyvWgvD8Qix3EEJLCFIdVloJw+r9ww0wbyNLOTYyBsR+4ALNGdlalLLg==", + "version": "5.32.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.32.0.tgz", + "integrity": "sha512-KyAE+tUON0D7tNz92p1uetRqVJiiAkeluvwvZOqBmW9z2XApmk5WSMV9FrzOroAcVxJZB3GfUwVKr98Dr/OjOg==", "dev": true, "dependencies": { - "@typescript-eslint/types": "5.31.0", - "@typescript-eslint/visitor-keys": "5.31.0" + "@typescript-eslint/types": "5.32.0", + "@typescript-eslint/visitor-keys": "5.32.0" }, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" @@ -3280,12 +3301,12 @@ } }, "node_modules/@typescript-eslint/type-utils": { - "version": "5.31.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.31.0.tgz", - "integrity": "sha512-7ZYqFbvEvYXFn9ax02GsPcEOmuWNg+14HIf4q+oUuLnMbpJ6eHAivCg7tZMVwzrIuzX3QCeAOqKoyMZCv5xe+w==", + "version": "5.32.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.32.0.tgz", + "integrity": "sha512-0gSsIhFDduBz3QcHJIp3qRCvVYbqzHg8D6bHFsDMrm0rURYDj+skBK2zmYebdCp+4nrd9VWd13egvhYFJj/wZg==", "dev": true, "dependencies": { - "@typescript-eslint/utils": "5.31.0", + "@typescript-eslint/utils": "5.32.0", "debug": "^4.3.4", "tsutils": "^3.21.0" }, @@ -3306,9 +3327,9 @@ } }, "node_modules/@typescript-eslint/types": { - "version": "5.31.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.31.0.tgz", - "integrity": "sha512-/f/rMaEseux+I4wmR6mfpM2wvtNZb1p9hAV77hWfuKc3pmaANp5dLAZSiE3/8oXTYTt3uV9KW5yZKJsMievp6g==", + "version": "5.32.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.32.0.tgz", + "integrity": "sha512-EBUKs68DOcT/EjGfzywp+f8wG9Zw6gj6BjWu7KV/IYllqKJFPlZlLSYw/PTvVyiRw50t6wVbgv4p9uE2h6sZrQ==", "dev": true, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" @@ -3319,13 +3340,13 @@ } }, "node_modules/@typescript-eslint/typescript-estree": { - "version": "5.31.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.31.0.tgz", - "integrity": "sha512-3S625TMcARX71wBc2qubHaoUwMEn+l9TCsaIzYI/ET31Xm2c9YQ+zhGgpydjorwQO9pLfR/6peTzS/0G3J/hDw==", + "version": "5.32.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.32.0.tgz", + "integrity": "sha512-ZVAUkvPk3ITGtCLU5J4atCw9RTxK+SRc6hXqLtllC2sGSeMFWN+YwbiJR9CFrSFJ3w4SJfcWtDwNb/DmUIHdhg==", "dev": true, "dependencies": { - "@typescript-eslint/types": "5.31.0", - "@typescript-eslint/visitor-keys": "5.31.0", + "@typescript-eslint/types": "5.32.0", + "@typescript-eslint/visitor-keys": "5.32.0", "debug": "^4.3.4", "globby": "^11.1.0", "is-glob": "^4.0.3", @@ -3361,15 +3382,15 @@ } }, "node_modules/@typescript-eslint/utils": { - "version": "5.31.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.31.0.tgz", - "integrity": "sha512-kcVPdQS6VIpVTQ7QnGNKMFtdJdvnStkqS5LeALr4rcwx11G6OWb2HB17NMPnlRHvaZP38hL9iK8DdE9Fne7NYg==", + "version": "5.32.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.32.0.tgz", + "integrity": "sha512-W7lYIAI5Zlc5K082dGR27Fczjb3Q57ECcXefKU/f0ajM5ToM0P+N9NmJWip8GmGu/g6QISNT+K6KYB+iSHjXCQ==", "dev": true, "dependencies": { "@types/json-schema": "^7.0.9", - "@typescript-eslint/scope-manager": "5.31.0", - "@typescript-eslint/types": "5.31.0", - "@typescript-eslint/typescript-estree": "5.31.0", + "@typescript-eslint/scope-manager": "5.32.0", + "@typescript-eslint/types": "5.32.0", + "@typescript-eslint/typescript-estree": "5.32.0", "eslint-scope": "^5.1.1", "eslint-utils": "^3.0.0" }, @@ -3385,12 +3406,12 @@ } }, "node_modules/@typescript-eslint/visitor-keys": { - "version": "5.31.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.31.0.tgz", - "integrity": "sha512-ZK0jVxSjS4gnPirpVjXHz7mgdOsZUHzNYSfTw2yPa3agfbt9YfqaBiBZFSSxeBWnpWkzCxTfUpnzA3Vily/CSg==", + "version": "5.32.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.32.0.tgz", + "integrity": "sha512-S54xOHZgfThiZ38/ZGTgB2rqx51CMJ5MCfVT2IplK4Q7hgzGfe0nLzLCcenDnc/cSjP568hdeKfeDcBgqNHD/g==", "dev": true, "dependencies": { - "@typescript-eslint/types": "5.31.0", + "@typescript-eslint/types": "5.32.0", "eslint-visitor-keys": "^3.3.0" }, "engines": { @@ -3918,12 +3939,12 @@ } }, "node_modules/babel-plugin-polyfill-regenerator": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.3.1.tgz", - "integrity": "sha512-Y2B06tvgHYt1x0yz17jGkGeeMr5FeKUu+ASJ+N6nB5lQ8Dapfg42i0OVrf8PNGJ3zKL4A23snMi1IRwrqqND7A==", + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.4.0.tgz", + "integrity": "sha512-RW1cnryiADFeHmfLS+WW/G431p1PsW5qdRdz0SDRi7TKcUgc7Oh/uXkT7MZ/+tGsT1BkczEAmD5XjUyJ5SWDTw==", "dev": true, "dependencies": { - "@babel/helper-define-polyfill-provider": "^0.3.1" + "@babel/helper-define-polyfill-provider": "^0.3.2" }, "peerDependencies": { "@babel/core": "^7.0.0-0" @@ -4141,9 +4162,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001373", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001373.tgz", - "integrity": "sha512-pJYArGHrPp3TUqQzFYRmP/lwJlj8RCbVe3Gd3eJQkAV8SAC6b19XS9BjMvRdvaS8RMkaTN8ZhoHP6S1y8zzwEQ==", + "version": "1.0.30001374", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001374.tgz", + "integrity": "sha512-mWvzatRx3w+j5wx/mpFN5v5twlPrabG8NqX2c6e45LCpymdoGqNvRkRutFUqpRTXKFQFNQJasvK0YT7suW6/Hw==", "dev": true, "funding": [ { @@ -4523,9 +4544,9 @@ "dev": true }, "node_modules/electron-to-chromium": { - "version": "1.4.206", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.206.tgz", - "integrity": "sha512-h+Fadt1gIaQ06JaIiyqPsBjJ08fV5Q7md+V8bUvQW/9OvXfL2LRICTz2EcnnCP7QzrFTS6/27MRV6Bl9Yn97zA==", + "version": "1.4.211", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.211.tgz", + "integrity": "sha512-BZSbMpyFQU0KBJ1JG26XGeFI3i4op+qOYGxftmZXFZoHkhLgsSv4DHDJfl8ogII3hIuzGt51PaZ195OVu0yJ9A==", "dev": true }, "node_modules/emittery": { @@ -4614,13 +4635,14 @@ } }, "node_modules/eslint": { - "version": "8.20.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.20.0.tgz", - "integrity": "sha512-d4ixhz5SKCa1D6SCPrivP7yYVi7nyD6A4vs6HIAul9ujBzcEmZVM3/0NN/yu5nKhmO1wjp5xQ46iRfmDGlOviA==", + "version": "8.21.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.21.0.tgz", + "integrity": "sha512-/XJ1+Qurf1T9G2M5IHrsjp+xrGT73RZf23xA1z5wB1ZzzEAWSZKvRwhWxTFp1rvkvCfwcvAUNAP31bhKTTGfDA==", "dev": true, "dependencies": { "@eslint/eslintrc": "^1.3.0", - "@humanwhocodes/config-array": "^0.9.2", + "@humanwhocodes/config-array": "^0.10.4", + "@humanwhocodes/gitignore-to-minimatch": "^1.0.2", "ajv": "^6.10.0", "chalk": "^4.0.0", "cross-spawn": "^7.0.2", @@ -4630,14 +4652,17 @@ "eslint-scope": "^7.1.1", "eslint-utils": "^3.0.0", "eslint-visitor-keys": "^3.3.0", - "espree": "^9.3.2", + "espree": "^9.3.3", "esquery": "^1.4.0", "esutils": "^2.0.2", "fast-deep-equal": "^3.1.3", "file-entry-cache": "^6.0.1", + "find-up": "^5.0.0", "functional-red-black-tree": "^1.0.1", "glob-parent": "^6.0.1", "globals": "^13.15.0", + "globby": "^11.1.0", + "grapheme-splitter": "^1.0.4", "ignore": "^5.2.0", "import-fresh": "^3.0.0", "imurmurhash": "^0.1.4", @@ -4803,6 +4828,22 @@ "node": ">=4.0" } }, + "node_modules/eslint/node_modules/find-up": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", + "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==", + "dev": true, + "dependencies": { + "locate-path": "^6.0.0", + "path-exists": "^4.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "/~https://github.com/sponsors/sindresorhus" + } + }, "node_modules/eslint/node_modules/globals": { "version": "13.17.0", "resolved": "https://registry.npmjs.org/globals/-/globals-13.17.0.tgz", @@ -4839,6 +4880,36 @@ "js-yaml": "bin/js-yaml.js" } }, + "node_modules/eslint/node_modules/locate-path": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", + "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==", + "dev": true, + "dependencies": { + "p-locate": "^5.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "/~https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/eslint/node_modules/p-locate": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", + "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==", + "dev": true, + "dependencies": { + "p-limit": "^3.0.2" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "/~https://github.com/sponsors/sindresorhus" + } + }, "node_modules/eslint/node_modules/supports-color": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", @@ -4864,17 +4935,20 @@ } }, "node_modules/espree": { - "version": "9.3.2", - "resolved": "https://registry.npmjs.org/espree/-/espree-9.3.2.tgz", - "integrity": "sha512-D211tC7ZwouTIuY5x9XnS0E9sWNChB7IYKX/Xp5eQj3nFXhqmiUDB9q27y76oFl8jTg3pXcQx/bpxMfs3CIZbA==", + "version": "9.3.3", + "resolved": "https://registry.npmjs.org/espree/-/espree-9.3.3.tgz", + "integrity": "sha512-ORs1Rt/uQTqUKjDdGCyrtYxbazf5umATSf/K4qxjmZHORR6HJk+2s/2Pqe+Kk49HHINC/xNIrGfgh8sZcll0ng==", "dev": true, "dependencies": { - "acorn": "^8.7.1", + "acorn": "^8.8.0", "acorn-jsx": "^5.3.2", "eslint-visitor-keys": "^3.3.0" }, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" } }, "node_modules/esprima": { @@ -5068,9 +5142,9 @@ "dev": true }, "node_modules/fastest-levenshtein": { - "version": "1.0.14", - "resolved": "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.14.tgz", - "integrity": "sha512-tFfWHjnuUfKE186Tfgr+jtaFc0mZTApEgKDOeyN+FwOqRkO/zK/3h1AiRd8u8CY53owL3CUmGr/oI9p/RdyLTA==", + "version": "1.0.16", + "resolved": "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.16.tgz", + "integrity": "sha512-eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg==", "dev": true, "engines": { "node": ">= 4.9.1" @@ -5364,6 +5438,12 @@ "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==", "dev": true }, + "node_modules/grapheme-splitter": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz", + "integrity": "sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==", + "dev": true + }, "node_modules/has": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", @@ -5589,9 +5669,9 @@ "dev": true }, "node_modules/is-core-module": { - "version": "2.9.0", - "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.9.0.tgz", - "integrity": "sha512-+5FPy5PnwmO3lvfMb0AsoPaBG+5KHUI0wYFXOtYPnVVVspTFUuMZNfNaNVRt3FZadstu2c8x23vykRW/NBoU6A==", + "version": "2.10.0", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.10.0.tgz", + "integrity": "sha512-Erxj2n/LDAZ7H8WNJXd9tw38GYM3dv8rk8Zcs+jJuxYTW7sozH+SS8NtrSjVL1/vpLvWi1hxy96IzjJ3EHTJJg==", "dev": true, "dependencies": { "has": "^1.0.3" @@ -7489,6 +7569,14 @@ "node": ">=6.11.5" } }, + "node_modules/loader-utils": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-3.2.0.tgz", + "integrity": "sha512-HVl9ZqccQihZ7JM85dco1MvO9G+ONvxoGa9rkhzFsneGLKSUg1gJf9bWzhRhcvm2qChhWpebQhP44qxjKIUCaQ==", + "engines": { + "node": ">= 12.13.0" + } + }, "node_modules/locate-path": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", @@ -7783,9 +7871,9 @@ "dev": true }, "node_modules/node-abi": { - "version": "3.22.0", - "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.22.0.tgz", - "integrity": "sha512-u4uAs/4Zzmp/jjsD9cyFYDXeISfUWaAVWshPmDZOFOv4Xl4SbzTXm53I04C2uRueYJ+0t5PEtLH/owbn2Npf/w==", + "version": "3.24.0", + "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.24.0.tgz", + "integrity": "sha512-YPG3Co0luSu6GwOBsmIdGW6Wx0NyNDLg/hriIyDllVsNwnI6UeqaWShxC3lbH4LtEQUgoLP3XR1ndXiDAWvmRw==", "dev": true, "dependencies": { "semver": "^7.3.5" @@ -7858,14 +7946,14 @@ } }, "node_modules/object.assign": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz", - "integrity": "sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==", + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.3.tgz", + "integrity": "sha512-ZFJnX3zltyjcYJL0RoCJuzb+11zWGyaDbjgxZbdV7rFEcHQuYxrZqhow67aA7xpes6LhojyFDaBKAFfogQrikA==", "dev": true, "dependencies": { - "call-bind": "^1.0.0", - "define-properties": "^1.1.3", - "has-symbols": "^1.0.1", + "call-bind": "^1.0.2", + "define-properties": "^1.1.4", + "has-symbols": "^1.0.3", "object-keys": "^1.1.1" }, "engines": { @@ -9860,9 +9948,9 @@ } }, "node_modules/yargs-parser": { - "version": "21.0.1", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.0.1.tgz", - "integrity": "sha512-9BK1jFpLzJROCI5TzwZL/TU4gqjK5xiHV/RfWLOahrjAko/e4DJkRDZQXfvqAsiZzzYhgAzbgz6lg48jcm4GLg==", + "version": "21.1.1", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz", + "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==", "dev": true, "engines": { "node": ">=12" @@ -9908,21 +9996,21 @@ "dev": true }, "@babel/core": { - "version": "7.18.9", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.18.9.tgz", - "integrity": "sha512-1LIb1eL8APMy91/IMW+31ckrfBM4yCoLaVzoDhZUKSM4cu1L1nIidyxkCgzPAgrC5WEz36IPEr/eSeSF9pIn+g==", + "version": "7.18.10", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.18.10.tgz", + "integrity": "sha512-JQM6k6ENcBFKVtWvLavlvi/mPcpYZ3+R+2EySDEMSMbp7Mn4FexlbbJVrx2R7Ijhr01T8gyqrOaABWIOgxeUyw==", "dev": true, "requires": { "@ampproject/remapping": "^2.1.0", "@babel/code-frame": "^7.18.6", - "@babel/generator": "^7.18.9", + "@babel/generator": "^7.18.10", "@babel/helper-compilation-targets": "^7.18.9", "@babel/helper-module-transforms": "^7.18.9", "@babel/helpers": "^7.18.9", - "@babel/parser": "^7.18.9", - "@babel/template": "^7.18.6", - "@babel/traverse": "^7.18.9", - "@babel/types": "^7.18.9", + "@babel/parser": "^7.18.10", + "@babel/template": "^7.18.10", + "@babel/traverse": "^7.18.10", + "@babel/types": "^7.18.10", "convert-source-map": "^1.7.0", "debug": "^4.1.0", "gensync": "^1.0.0-beta.2", @@ -9931,12 +10019,12 @@ } }, "@babel/generator": { - "version": "7.18.9", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.18.9.tgz", - "integrity": "sha512-wt5Naw6lJrL1/SGkipMiFxJjtyczUWTP38deiP1PO60HsBjDeKk08CGC3S8iVuvf0FmTdgKwU1KIXzSKL1G0Ug==", + "version": "7.18.12", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.18.12.tgz", + "integrity": "sha512-dfQ8ebCN98SvyL7IxNMCUtZQSq5R7kxgN+r8qYTGDmmSion1hX2C0zq2yo1bsCDhXixokv1SAWTZUMYbO/V5zg==", "dev": true, "requires": { - "@babel/types": "^7.18.9", + "@babel/types": "^7.18.10", "@jridgewell/gen-mapping": "^0.3.2", "jsesc": "^2.5.1" }, @@ -10159,6 +10247,12 @@ "@babel/types": "^7.18.6" } }, + "@babel/helper-string-parser": { + "version": "7.18.10", + "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.18.10.tgz", + "integrity": "sha512-XtIfWmeNY3i4t7t4D2t02q50HvqHybPqW2ki1kosnvWCwuCMeo81Jf0gwr85jy/neUdg5XDdeFE/80DXiO+njw==", + "dev": true + }, "@babel/helper-validator-identifier": { "version": "7.18.6", "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.18.6.tgz", @@ -10172,15 +10266,15 @@ "dev": true }, "@babel/helper-wrap-function": { - "version": "7.18.9", - "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.18.9.tgz", - "integrity": "sha512-cG2ru3TRAL6a60tfQflpEfs4ldiPwF6YW3zfJiRgmoFVIaC1vGnBBgatfec+ZUziPHkHSaXAuEck3Cdkf3eRpQ==", + "version": "7.18.11", + "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.18.11.tgz", + "integrity": "sha512-oBUlbv+rjZLh2Ks9SKi4aL7eKaAXBWleHzU89mP0G6BMUlRxSckk9tSIkgDGydhgFxHuGSlBQZfnaD47oBEB7w==", "dev": true, "requires": { "@babel/helper-function-name": "^7.18.9", - "@babel/template": "^7.18.6", - "@babel/traverse": "^7.18.9", - "@babel/types": "^7.18.9" + "@babel/template": "^7.18.10", + "@babel/traverse": "^7.18.11", + "@babel/types": "^7.18.10" } }, "@babel/helpers": { @@ -10206,9 +10300,9 @@ } }, "@babel/parser": { - "version": "7.18.9", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.18.9.tgz", - "integrity": "sha512-9uJveS9eY9DJ0t64YbIBZICtJy8a5QrDEVdiLCG97fVLpDTpGX7t8mMSb6OWw6Lrnjqj4O8zwjELX3dhoMgiBg==", + "version": "7.18.11", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.18.11.tgz", + "integrity": "sha512-9JKn5vN+hDt0Hdqn1PiJ2guflwP+B6Ga8qbDuoF0PzzVhrzsKIJo8yGqVk6CmMHiMei9w1C1Bp9IMJSIK+HPIQ==", "dev": true }, "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": { @@ -10232,14 +10326,14 @@ } }, "@babel/plugin-proposal-async-generator-functions": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.18.6.tgz", - "integrity": "sha512-WAz4R9bvozx4qwf74M+sfqPMKfSqwM0phxPTR6iJIi8robgzXwkEgmeJG1gEKhm6sDqT/U9aV3lfcqybIpev8w==", + "version": "7.18.10", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.18.10.tgz", + "integrity": "sha512-1mFuY2TOsR1hxbjCo4QL+qlIjV07p4H4EUYw2J/WCqsvFV6V9X9z9YhXbWndc/4fw+hYGlDT7egYxliMp5O6Ew==", "dev": true, "requires": { - "@babel/helper-environment-visitor": "^7.18.6", - "@babel/helper-plugin-utils": "^7.18.6", - "@babel/helper-remap-async-to-generator": "^7.18.6", + "@babel/helper-environment-visitor": "^7.18.9", + "@babel/helper-plugin-utils": "^7.18.9", + "@babel/helper-remap-async-to-generator": "^7.18.9", "@babel/plugin-syntax-async-generators": "^7.8.4" } }, @@ -10850,12 +10944,12 @@ } }, "@babel/plugin-transform-unicode-escapes": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.18.6.tgz", - "integrity": "sha512-XNRwQUXYMP7VLuy54cr/KS/WeL3AZeORhrmeZ7iewgu+X2eBqmpaLI/hzqr9ZxCeUoq0ASK4GUzSM0BDhZkLFw==", + "version": "7.18.10", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.18.10.tgz", + "integrity": "sha512-kKAdAI+YzPgGY/ftStBFXTI1LZFju38rYThnfMykS+IXy8BVx+res7s2fxf1l8I35DV2T97ezo6+SGrXz6B3iQ==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.18.6" + "@babel/helper-plugin-utils": "^7.18.9" } }, "@babel/plugin-transform-unicode-regex": { @@ -10869,9 +10963,9 @@ } }, "@babel/preset-env": { - "version": "7.18.9", - "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.18.9.tgz", - "integrity": "sha512-75pt/q95cMIHWssYtyfjVlvI+QEZQThQbKvR9xH+F/Agtw/s4Wfc2V9Bwd/P39VtixB7oWxGdH4GteTTwYJWMg==", + "version": "7.18.10", + "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.18.10.tgz", + "integrity": "sha512-wVxs1yjFdW3Z/XkNfXKoblxoHgbtUF7/l3PvvP4m02Qz9TZ6uZGxRVYjSQeR87oQmHco9zWitW5J82DJ7sCjvA==", "dev": true, "requires": { "@babel/compat-data": "^7.18.8", @@ -10880,7 +10974,7 @@ "@babel/helper-validator-option": "^7.18.6", "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.18.6", "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.18.9", - "@babel/plugin-proposal-async-generator-functions": "^7.18.6", + "@babel/plugin-proposal-async-generator-functions": "^7.18.10", "@babel/plugin-proposal-class-properties": "^7.18.6", "@babel/plugin-proposal-class-static-block": "^7.18.6", "@babel/plugin-proposal-dynamic-import": "^7.18.6", @@ -10940,13 +11034,13 @@ "@babel/plugin-transform-sticky-regex": "^7.18.6", "@babel/plugin-transform-template-literals": "^7.18.9", "@babel/plugin-transform-typeof-symbol": "^7.18.9", - "@babel/plugin-transform-unicode-escapes": "^7.18.6", + "@babel/plugin-transform-unicode-escapes": "^7.18.10", "@babel/plugin-transform-unicode-regex": "^7.18.6", "@babel/preset-modules": "^0.1.5", - "@babel/types": "^7.18.9", - "babel-plugin-polyfill-corejs2": "^0.3.1", - "babel-plugin-polyfill-corejs3": "^0.5.2", - "babel-plugin-polyfill-regenerator": "^0.3.1", + "@babel/types": "^7.18.10", + "babel-plugin-polyfill-corejs2": "^0.3.2", + "babel-plugin-polyfill-corejs3": "^0.5.3", + "babel-plugin-polyfill-regenerator": "^0.4.0", "core-js-compat": "^3.22.1", "semver": "^6.3.0" } @@ -10974,40 +11068,41 @@ } }, "@babel/template": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.18.6.tgz", - "integrity": "sha512-JoDWzPe+wgBsTTgdnIma3iHNFC7YVJoPssVBDjiHfNlyt4YcunDtcDOUmfVDfCK5MfdsaIoX9PkijPhjH3nYUw==", + "version": "7.18.10", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.18.10.tgz", + "integrity": "sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==", "dev": true, "requires": { "@babel/code-frame": "^7.18.6", - "@babel/parser": "^7.18.6", - "@babel/types": "^7.18.6" + "@babel/parser": "^7.18.10", + "@babel/types": "^7.18.10" } }, "@babel/traverse": { - "version": "7.18.9", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.18.9.tgz", - "integrity": "sha512-LcPAnujXGwBgv3/WHv01pHtb2tihcyW1XuL9wd7jqh1Z8AQkTd+QVjMrMijrln0T7ED3UXLIy36P9Ao7W75rYg==", + "version": "7.18.11", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.18.11.tgz", + "integrity": "sha512-TG9PiM2R/cWCAy6BPJKeHzNbu4lPzOSZpeMfeNErskGpTJx6trEvFaVCbDvpcxwy49BKWmEPwiW8mrysNiDvIQ==", "dev": true, "requires": { "@babel/code-frame": "^7.18.6", - "@babel/generator": "^7.18.9", + "@babel/generator": "^7.18.10", "@babel/helper-environment-visitor": "^7.18.9", "@babel/helper-function-name": "^7.18.9", "@babel/helper-hoist-variables": "^7.18.6", "@babel/helper-split-export-declaration": "^7.18.6", - "@babel/parser": "^7.18.9", - "@babel/types": "^7.18.9", + "@babel/parser": "^7.18.11", + "@babel/types": "^7.18.10", "debug": "^4.1.0", "globals": "^11.1.0" } }, "@babel/types": { - "version": "7.18.9", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.18.9.tgz", - "integrity": "sha512-WwMLAg2MvJmt/rKEVQBBhIVffMmnilX4oe0sRe7iPOHIGsqpruFHHdrfj4O1CMMtgMtCU4oPafZjDPCRgO57Wg==", + "version": "7.18.10", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.18.10.tgz", + "integrity": "sha512-MJvnbEiiNkpjo+LknnmRrqbY1GPUUggjv+wQVjetM/AONoupqRALB7I6jGqNUAZsKcRIEu2J6FRFvsczljjsaQ==", "dev": true, "requires": { + "@babel/helper-string-parser": "^7.18.10", "@babel/helper-validator-identifier": "^7.18.6", "to-fast-properties": "^2.0.0" } @@ -11074,9 +11169,9 @@ } }, "@humanwhocodes/config-array": { - "version": "0.9.5", - "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.9.5.tgz", - "integrity": "sha512-ObyMyWxZiCu/yTisA7uzx81s40xR2fD5Cg/2Kq7G02ajkNubJf6BopgDTmDyc3U7sXpNKM8cYOw7s7Tyr+DnCw==", + "version": "0.10.4", + "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.10.4.tgz", + "integrity": "sha512-mXAIHxZT3Vcpg83opl1wGlVZ9xydbfZO3r5YfRSH6Gpp2J/PfdBP0wbDa2sO6/qRbcalpoevVyW6A/fI6LfeMw==", "dev": true, "requires": { "@humanwhocodes/object-schema": "^1.2.1", @@ -11084,6 +11179,12 @@ "minimatch": "^3.0.4" } }, + "@humanwhocodes/gitignore-to-minimatch": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/@humanwhocodes/gitignore-to-minimatch/-/gitignore-to-minimatch-1.0.2.tgz", + "integrity": "sha512-rSqmMJDdLFUsyxR6FMtD00nfQKKLFb1kv+qBbOVKqErvloEIJLo5bDTJTQNTYgeyp78JsA7u/NPi5jT1GR/MuA==", + "dev": true + }, "@humanwhocodes/object-schema": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz", @@ -12025,9 +12126,9 @@ } }, "@sinclair/typebox": { - "version": "0.24.22", - "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.24.22.tgz", - "integrity": "sha512-JsBe3cOFpNZ6yjBYnXKhcENWy5qZE3PQZwExQ5ksA/h8qp4bwwxFmy07A6bC2R6qv6+RF3SfrbQTskTwYNTXUQ==", + "version": "0.24.27", + "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.24.27.tgz", + "integrity": "sha512-K7C7IlQ3zLePEZleUN21ceBA2aLcMnLHTLph8QWk1JK37L90obdpY+QGY8bXMKxf1ht1Z0MNewvXxWv0oGDYFg==", "dev": true }, "@sinonjs/commons": { @@ -12081,9 +12182,9 @@ } }, "@types/babel__traverse": { - "version": "7.17.1", - "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.17.1.tgz", - "integrity": "sha512-kVzjari1s2YVi77D3w1yuvohV2idweYXMCDzqBiVNN63TcDWrIlTVOYpqVrvbbyOE/IyzBoTKF0fdnLPEORFxA==", + "version": "7.18.0", + "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.18.0.tgz", + "integrity": "sha512-v4Vwdko+pgymgS+A2UIaJru93zQd85vIGWObM5ekZNdXCKtDYqATlEYnWgfo86Q6I1Lh0oXnksDnMU1cwmlPDw==", "dev": true, "requires": { "@babel/types": "^7.3.0" @@ -12175,9 +12276,9 @@ "integrity": "sha512-w+tIMs3rq2afQdsPJlODhoUEKzFP1ayaoyl1CcnwtIlsVe7K7bA1NGm4s3PraqTLlXnbIN84zuBlxBWo1u9BLw==" }, "@types/prettier": { - "version": "2.6.4", - "resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.6.4.tgz", - "integrity": "sha512-fOwvpvQYStpb/zHMx0Cauwywu9yLDmzWiiQBC7gJyq5tYLUXFZvDG7VK1B7WBxxjBJNKFOZ0zLoOQn8vmATbhw==", + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.7.0.tgz", + "integrity": "sha512-RI1L7N4JnW5gQw2spvL7Sllfuf1SaHdrZpCHiBlCXjIlufi1SMNnbu2teze3/QE67Fg2tBlH7W+mi4hVNk4p0A==", "dev": true }, "@types/sharp": { @@ -12207,9 +12308,9 @@ } }, "@types/yargs": { - "version": "17.0.10", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.10.tgz", - "integrity": "sha512-gmEaFwpj/7f/ROdtIlci1R1VYU1J4j95m8T+Tj3iBgiBFKg1foE/PSl93bBd5T9LDXNPo8UlNN6W0qwD8O5OaA==", + "version": "17.0.11", + "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.11.tgz", + "integrity": "sha512-aB4y9UDUXTSMxmM4MH+YnuR0g5Cph3FLQBoWoMB21DSvFVAxRVEHEMx3TLh+zUZYMCQtKiqazz0Q4Rre31f/OA==", "dev": true, "requires": { "@types/yargs-parser": "*" @@ -12222,14 +12323,14 @@ "dev": true }, "@typescript-eslint/eslint-plugin": { - "version": "5.31.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.31.0.tgz", - "integrity": "sha512-VKW4JPHzG5yhYQrQ1AzXgVgX8ZAJEvCz0QI6mLRX4tf7rnFfh5D8SKm0Pq6w5PyNfAWJk6sv313+nEt3ohWMBQ==", + "version": "5.32.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.32.0.tgz", + "integrity": "sha512-CHLuz5Uz7bHP2WgVlvoZGhf0BvFakBJKAD/43Ty0emn4wXWv5k01ND0C0fHcl/Im8Td2y/7h44E9pca9qAu2ew==", "dev": true, "requires": { - "@typescript-eslint/scope-manager": "5.31.0", - "@typescript-eslint/type-utils": "5.31.0", - "@typescript-eslint/utils": "5.31.0", + "@typescript-eslint/scope-manager": "5.32.0", + "@typescript-eslint/type-utils": "5.32.0", + "@typescript-eslint/utils": "5.32.0", "debug": "^4.3.4", "functional-red-black-tree": "^1.0.1", "ignore": "^5.2.0", @@ -12250,52 +12351,52 @@ } }, "@typescript-eslint/parser": { - "version": "5.31.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.31.0.tgz", - "integrity": "sha512-UStjQiZ9OFTFReTrN+iGrC6O/ko9LVDhreEK5S3edmXgR396JGq7CoX2TWIptqt/ESzU2iRKXAHfSF2WJFcWHw==", + "version": "5.32.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.32.0.tgz", + "integrity": "sha512-IxRtsehdGV9GFQ35IGm5oKKR2OGcazUoiNBxhRV160iF9FoyuXxjY+rIqs1gfnd+4eL98OjeGnMpE7RF/NBb3A==", "dev": true, "requires": { - "@typescript-eslint/scope-manager": "5.31.0", - "@typescript-eslint/types": "5.31.0", - "@typescript-eslint/typescript-estree": "5.31.0", + "@typescript-eslint/scope-manager": "5.32.0", + "@typescript-eslint/types": "5.32.0", + "@typescript-eslint/typescript-estree": "5.32.0", "debug": "^4.3.4" } }, "@typescript-eslint/scope-manager": { - "version": "5.31.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.31.0.tgz", - "integrity": "sha512-8jfEzBYDBG88rcXFxajdVavGxb5/XKXyvWgvD8Qix3EEJLCFIdVloJw+r9ww0wbyNLOTYyBsR+4ALNGdlalLLg==", + "version": "5.32.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.32.0.tgz", + "integrity": "sha512-KyAE+tUON0D7tNz92p1uetRqVJiiAkeluvwvZOqBmW9z2XApmk5WSMV9FrzOroAcVxJZB3GfUwVKr98Dr/OjOg==", "dev": true, "requires": { - "@typescript-eslint/types": "5.31.0", - "@typescript-eslint/visitor-keys": "5.31.0" + "@typescript-eslint/types": "5.32.0", + "@typescript-eslint/visitor-keys": "5.32.0" } }, "@typescript-eslint/type-utils": { - "version": "5.31.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.31.0.tgz", - "integrity": "sha512-7ZYqFbvEvYXFn9ax02GsPcEOmuWNg+14HIf4q+oUuLnMbpJ6eHAivCg7tZMVwzrIuzX3QCeAOqKoyMZCv5xe+w==", + "version": "5.32.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.32.0.tgz", + "integrity": "sha512-0gSsIhFDduBz3QcHJIp3qRCvVYbqzHg8D6bHFsDMrm0rURYDj+skBK2zmYebdCp+4nrd9VWd13egvhYFJj/wZg==", "dev": true, "requires": { - "@typescript-eslint/utils": "5.31.0", + "@typescript-eslint/utils": "5.32.0", "debug": "^4.3.4", "tsutils": "^3.21.0" } }, "@typescript-eslint/types": { - "version": "5.31.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.31.0.tgz", - "integrity": "sha512-/f/rMaEseux+I4wmR6mfpM2wvtNZb1p9hAV77hWfuKc3pmaANp5dLAZSiE3/8oXTYTt3uV9KW5yZKJsMievp6g==", + "version": "5.32.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.32.0.tgz", + "integrity": "sha512-EBUKs68DOcT/EjGfzywp+f8wG9Zw6gj6BjWu7KV/IYllqKJFPlZlLSYw/PTvVyiRw50t6wVbgv4p9uE2h6sZrQ==", "dev": true }, "@typescript-eslint/typescript-estree": { - "version": "5.31.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.31.0.tgz", - "integrity": "sha512-3S625TMcARX71wBc2qubHaoUwMEn+l9TCsaIzYI/ET31Xm2c9YQ+zhGgpydjorwQO9pLfR/6peTzS/0G3J/hDw==", + "version": "5.32.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.32.0.tgz", + "integrity": "sha512-ZVAUkvPk3ITGtCLU5J4atCw9RTxK+SRc6hXqLtllC2sGSeMFWN+YwbiJR9CFrSFJ3w4SJfcWtDwNb/DmUIHdhg==", "dev": true, "requires": { - "@typescript-eslint/types": "5.31.0", - "@typescript-eslint/visitor-keys": "5.31.0", + "@typescript-eslint/types": "5.32.0", + "@typescript-eslint/visitor-keys": "5.32.0", "debug": "^4.3.4", "globby": "^11.1.0", "is-glob": "^4.0.3", @@ -12315,26 +12416,26 @@ } }, "@typescript-eslint/utils": { - "version": "5.31.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.31.0.tgz", - "integrity": "sha512-kcVPdQS6VIpVTQ7QnGNKMFtdJdvnStkqS5LeALr4rcwx11G6OWb2HB17NMPnlRHvaZP38hL9iK8DdE9Fne7NYg==", + "version": "5.32.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.32.0.tgz", + "integrity": "sha512-W7lYIAI5Zlc5K082dGR27Fczjb3Q57ECcXefKU/f0ajM5ToM0P+N9NmJWip8GmGu/g6QISNT+K6KYB+iSHjXCQ==", "dev": true, "requires": { "@types/json-schema": "^7.0.9", - "@typescript-eslint/scope-manager": "5.31.0", - "@typescript-eslint/types": "5.31.0", - "@typescript-eslint/typescript-estree": "5.31.0", + "@typescript-eslint/scope-manager": "5.32.0", + "@typescript-eslint/types": "5.32.0", + "@typescript-eslint/typescript-estree": "5.32.0", "eslint-scope": "^5.1.1", "eslint-utils": "^3.0.0" } }, "@typescript-eslint/visitor-keys": { - "version": "5.31.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.31.0.tgz", - "integrity": "sha512-ZK0jVxSjS4gnPirpVjXHz7mgdOsZUHzNYSfTw2yPa3agfbt9YfqaBiBZFSSxeBWnpWkzCxTfUpnzA3Vily/CSg==", + "version": "5.32.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.32.0.tgz", + "integrity": "sha512-S54xOHZgfThiZ38/ZGTgB2rqx51CMJ5MCfVT2IplK4Q7hgzGfe0nLzLCcenDnc/cSjP568hdeKfeDcBgqNHD/g==", "dev": true, "requires": { - "@typescript-eslint/types": "5.31.0", + "@typescript-eslint/types": "5.32.0", "eslint-visitor-keys": "^3.3.0" } }, @@ -12761,12 +12862,12 @@ } }, "babel-plugin-polyfill-regenerator": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.3.1.tgz", - "integrity": "sha512-Y2B06tvgHYt1x0yz17jGkGeeMr5FeKUu+ASJ+N6nB5lQ8Dapfg42i0OVrf8PNGJ3zKL4A23snMi1IRwrqqND7A==", + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.4.0.tgz", + "integrity": "sha512-RW1cnryiADFeHmfLS+WW/G431p1PsW5qdRdz0SDRi7TKcUgc7Oh/uXkT7MZ/+tGsT1BkczEAmD5XjUyJ5SWDTw==", "dev": true, "requires": { - "@babel/helper-define-polyfill-provider": "^0.3.1" + "@babel/helper-define-polyfill-provider": "^0.3.2" } }, "babel-preset-current-node-syntax": { @@ -12913,9 +13014,9 @@ "dev": true }, "caniuse-lite": { - "version": "1.0.30001373", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001373.tgz", - "integrity": "sha512-pJYArGHrPp3TUqQzFYRmP/lwJlj8RCbVe3Gd3eJQkAV8SAC6b19XS9BjMvRdvaS8RMkaTN8ZhoHP6S1y8zzwEQ==", + "version": "1.0.30001374", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001374.tgz", + "integrity": "sha512-mWvzatRx3w+j5wx/mpFN5v5twlPrabG8NqX2c6e45LCpymdoGqNvRkRutFUqpRTXKFQFNQJasvK0YT7suW6/Hw==", "dev": true }, "chalk": { @@ -13213,9 +13314,9 @@ "dev": true }, "electron-to-chromium": { - "version": "1.4.206", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.206.tgz", - "integrity": "sha512-h+Fadt1gIaQ06JaIiyqPsBjJ08fV5Q7md+V8bUvQW/9OvXfL2LRICTz2EcnnCP7QzrFTS6/27MRV6Bl9Yn97zA==", + "version": "1.4.211", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.211.tgz", + "integrity": "sha512-BZSbMpyFQU0KBJ1JG26XGeFI3i4op+qOYGxftmZXFZoHkhLgsSv4DHDJfl8ogII3hIuzGt51PaZ195OVu0yJ9A==", "dev": true }, "emittery": { @@ -13283,13 +13384,14 @@ "dev": true }, "eslint": { - "version": "8.20.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.20.0.tgz", - "integrity": "sha512-d4ixhz5SKCa1D6SCPrivP7yYVi7nyD6A4vs6HIAul9ujBzcEmZVM3/0NN/yu5nKhmO1wjp5xQ46iRfmDGlOviA==", + "version": "8.21.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.21.0.tgz", + "integrity": "sha512-/XJ1+Qurf1T9G2M5IHrsjp+xrGT73RZf23xA1z5wB1ZzzEAWSZKvRwhWxTFp1rvkvCfwcvAUNAP31bhKTTGfDA==", "dev": true, "requires": { "@eslint/eslintrc": "^1.3.0", - "@humanwhocodes/config-array": "^0.9.2", + "@humanwhocodes/config-array": "^0.10.4", + "@humanwhocodes/gitignore-to-minimatch": "^1.0.2", "ajv": "^6.10.0", "chalk": "^4.0.0", "cross-spawn": "^7.0.2", @@ -13299,14 +13401,17 @@ "eslint-scope": "^7.1.1", "eslint-utils": "^3.0.0", "eslint-visitor-keys": "^3.3.0", - "espree": "^9.3.2", + "espree": "^9.3.3", "esquery": "^1.4.0", "esutils": "^2.0.2", "fast-deep-equal": "^3.1.3", "file-entry-cache": "^6.0.1", + "find-up": "^5.0.0", "functional-red-black-tree": "^1.0.1", "glob-parent": "^6.0.1", "globals": "^13.15.0", + "globby": "^11.1.0", + "grapheme-splitter": "^1.0.4", "ignore": "^5.2.0", "import-fresh": "^3.0.0", "imurmurhash": "^0.1.4", @@ -13387,6 +13492,16 @@ "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", "dev": true }, + "find-up": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", + "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==", + "dev": true, + "requires": { + "locate-path": "^6.0.0", + "path-exists": "^4.0.0" + } + }, "globals": { "version": "13.17.0", "resolved": "https://registry.npmjs.org/globals/-/globals-13.17.0.tgz", @@ -13411,6 +13526,24 @@ "argparse": "^2.0.1" } }, + "locate-path": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", + "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==", + "dev": true, + "requires": { + "p-locate": "^5.0.0" + } + }, + "p-locate": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", + "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==", + "dev": true, + "requires": { + "p-limit": "^3.0.2" + } + }, "supports-color": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", @@ -13462,12 +13595,12 @@ "dev": true }, "espree": { - "version": "9.3.2", - "resolved": "https://registry.npmjs.org/espree/-/espree-9.3.2.tgz", - "integrity": "sha512-D211tC7ZwouTIuY5x9XnS0E9sWNChB7IYKX/Xp5eQj3nFXhqmiUDB9q27y76oFl8jTg3pXcQx/bpxMfs3CIZbA==", + "version": "9.3.3", + "resolved": "https://registry.npmjs.org/espree/-/espree-9.3.3.tgz", + "integrity": "sha512-ORs1Rt/uQTqUKjDdGCyrtYxbazf5umATSf/K4qxjmZHORR6HJk+2s/2Pqe+Kk49HHINC/xNIrGfgh8sZcll0ng==", "dev": true, "requires": { - "acorn": "^8.7.1", + "acorn": "^8.8.0", "acorn-jsx": "^5.3.2", "eslint-visitor-keys": "^3.3.0" } @@ -13620,9 +13753,9 @@ "dev": true }, "fastest-levenshtein": { - "version": "1.0.14", - "resolved": "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.14.tgz", - "integrity": "sha512-tFfWHjnuUfKE186Tfgr+jtaFc0mZTApEgKDOeyN+FwOqRkO/zK/3h1AiRd8u8CY53owL3CUmGr/oI9p/RdyLTA==", + "version": "1.0.16", + "resolved": "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.16.tgz", + "integrity": "sha512-eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg==", "dev": true }, "fastq": { @@ -13849,6 +13982,12 @@ "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==", "dev": true }, + "grapheme-splitter": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz", + "integrity": "sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==", + "dev": true + }, "has": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", @@ -14012,9 +14151,9 @@ "dev": true }, "is-core-module": { - "version": "2.9.0", - "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.9.0.tgz", - "integrity": "sha512-+5FPy5PnwmO3lvfMb0AsoPaBG+5KHUI0wYFXOtYPnVVVspTFUuMZNfNaNVRt3FZadstu2c8x23vykRW/NBoU6A==", + "version": "2.10.0", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.10.0.tgz", + "integrity": "sha512-Erxj2n/LDAZ7H8WNJXd9tw38GYM3dv8rk8Zcs+jJuxYTW7sozH+SS8NtrSjVL1/vpLvWi1hxy96IzjJ3EHTJJg==", "dev": true, "requires": { "has": "^1.0.3" @@ -15427,6 +15566,11 @@ "integrity": "sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==", "dev": true }, + "loader-utils": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-3.2.0.tgz", + "integrity": "sha512-HVl9ZqccQihZ7JM85dco1MvO9G+ONvxoGa9rkhzFsneGLKSUg1gJf9bWzhRhcvm2qChhWpebQhP44qxjKIUCaQ==" + }, "locate-path": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", @@ -15656,9 +15800,9 @@ "dev": true }, "node-abi": { - "version": "3.22.0", - "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.22.0.tgz", - "integrity": "sha512-u4uAs/4Zzmp/jjsD9cyFYDXeISfUWaAVWshPmDZOFOv4Xl4SbzTXm53I04C2uRueYJ+0t5PEtLH/owbn2Npf/w==", + "version": "3.24.0", + "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.24.0.tgz", + "integrity": "sha512-YPG3Co0luSu6GwOBsmIdGW6Wx0NyNDLg/hriIyDllVsNwnI6UeqaWShxC3lbH4LtEQUgoLP3XR1ndXiDAWvmRw==", "dev": true, "requires": { "semver": "^7.3.5" @@ -15715,14 +15859,14 @@ "dev": true }, "object.assign": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz", - "integrity": "sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==", + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.3.tgz", + "integrity": "sha512-ZFJnX3zltyjcYJL0RoCJuzb+11zWGyaDbjgxZbdV7rFEcHQuYxrZqhow67aA7xpes6LhojyFDaBKAFfogQrikA==", "dev": true, "requires": { - "call-bind": "^1.0.0", - "define-properties": "^1.1.3", - "has-symbols": "^1.0.1", + "call-bind": "^1.0.2", + "define-properties": "^1.1.4", + "has-symbols": "^1.0.3", "object-keys": "^1.1.1" } }, @@ -17163,9 +17307,9 @@ } }, "yargs-parser": { - "version": "21.0.1", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.0.1.tgz", - "integrity": "sha512-9BK1jFpLzJROCI5TzwZL/TU4gqjK5xiHV/RfWLOahrjAko/e4DJkRDZQXfvqAsiZzzYhgAzbgz6lg48jcm4GLg==", + "version": "21.1.1", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz", + "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==", "dev": true }, "yocto-queue": { diff --git a/package.json b/package.json index 936b13c..a2a5025 100644 --- a/package.json +++ b/package.json @@ -55,8 +55,9 @@ "@types/node": "^17.0.39", "find-cache-dir": "^3.3.2", "json5": "^2.2.1", - "schema-utils": "^4.0.0", - "make-dir": "^3.1.0" + "loader-utils": "^3.2.0", + "make-dir": "^3.1.0", + "schema-utils": "^4.0.0" }, "devDependencies": { "@babel/core": "^7.18.2", diff --git a/src/index.ts b/src/index.ts index d0832d5..c204509 100644 --- a/src/index.ts +++ b/src/index.ts @@ -6,7 +6,7 @@ import { parseOptions, getOutputAndPublicPath, createPlaceholder } from './utils import { cache } from './cache' import type { LoaderContext } from 'webpack' -import interpolateName from './interpolateName' +import { interpolateName } from 'loader-utils' import { parseQuery } from './parseQuery' import type { @@ -70,7 +70,7 @@ export default function loader(this: LoaderContext, content: string): v } const createFile = ({ data, width, height }: AdapterResizeResponse) => { - const fileName = interpolateName(this.resourcePath, this.resourceQuery, name, { + const fileName = interpolateName(this, name, { context: outputContext, content: data.toString(), }) diff --git a/src/interpolateName.ts b/src/interpolateName.ts deleted file mode 100644 index d248b62..0000000 --- a/src/interpolateName.ts +++ /dev/null @@ -1,86 +0,0 @@ -import { util } from 'webpack' -import * as path from 'path' - -type Options = { - context: string - content: string -} - -export default function interpolateName( - loaderResourcePath: string, - loaderResourceQuery: string, - name: string, - options: Options -): string { - const filename = name || '[hash].[ext]' - - const context = options.context - const content = options.content - - let ext = 'bin' - let basename = 'file' - let directory = '' - let folder = '' - let query = '' - - if (loaderResourcePath) { - const parsed = path.parse(loaderResourcePath) - let resourcePath = loaderResourcePath - - if (parsed.ext) { - ext = parsed.ext.slice(1) - } - - if (parsed.dir) { - basename = parsed.name - resourcePath = parsed.dir + path.sep - } - - if (typeof context !== 'undefined') { - directory = path - .relative(context, resourcePath + '_') - .replace(/\\/g, '/') - .replace(/\.\.(\/)?/g, '_$1') - directory = directory.slice(0, directory.length - 1) - } else { - directory = resourcePath.replace(/\\/g, '/').replace(/\.\.(\/)?/g, '_$1') - } - - if (directory.length === 1) { - directory = '' - } else if (directory.length > 1) { - folder = path.basename(directory) - } - } - - if (loaderResourceQuery && loaderResourceQuery.length > 1) { - query = loaderResourceQuery - - const hashIdx = query.indexOf('#') - - if (hashIdx >= 0) { - query = query.slice(0, hashIdx) - } - } - - let url = filename - - if (content) { - const hash = util.createHash('md4') - hash.update(content) - // Match hash template - url = url - // `hash` and `contenthash` are same in `loader-utils` context - // let's keep `hash` for backward compatibility - .replace(/\[(?:([^:\]]+):)?(?:hash|contenthash)(?::([a-z]+\d*))?(?::(\d+))?\]/gi, `${hash.digest('hex')}`) - } - - url = url - .replace(/\[ext\]/gi, () => ext) - .replace(/\[name\]/gi, () => basename) - .replace(/\[path\]/gi, () => directory) - .replace(/\[folder\]/gi, () => folder) - .replace(/\[query\]/gi, () => query) - - return url -} diff --git a/src/loader-utils.d.ts b/src/loader-utils.d.ts new file mode 100644 index 0000000..8c2eaf8 --- /dev/null +++ b/src/loader-utils.d.ts @@ -0,0 +1,3 @@ +declare module 'loader-utils' { + export function interpolateName(LoaderContext: any, name: string, options: any): any +} diff --git a/test/jimp/build/__snapshots__/test.js.snap b/test/jimp/build/__snapshots__/test.js.snap index 1f43c37..6488a24 100644 --- a/test/jimp/build/__snapshots__/test.js.snap +++ b/test/jimp/build/__snapshots__/test.js.snap @@ -6,12 +6,12 @@ Object { "images": Array [ Object { "height": 100, - "path": "foobar/8467bdd6e6ee43692327aa8efb258fd4-100.jpg", + "path": "foobar/82e6d197b5ce433a-100.jpg", "width": 100, }, ], - "src": "foobar/8467bdd6e6ee43692327aa8efb258fd4-100.jpg", - "srcSet": "foobar/8467bdd6e6ee43692327aa8efb258fd4-100.jpg", + "src": "foobar/82e6d197b5ce433a-100.jpg", + "srcSet": "foobar/82e6d197b5ce433a-100.jpg", "toString": [Function], }, } @@ -24,12 +24,12 @@ Object { "images": Array [ Object { "height": 225, - "path": "foobar/8869f9dd68c1b99a89c642f1b8ade3ad-250.jpg", + "path": "foobar/445db0be601e84d6-250.jpg", "width": 250, }, ], - "src": "foobar/8869f9dd68c1b99a89c642f1b8ade3ad-250.jpg", - "srcSet": "foobar/8869f9dd68c1b99a89c642f1b8ade3ad-250.jpg 250w", + "src": "foobar/445db0be601e84d6-250.jpg", + "srcSet": "foobar/445db0be601e84d6-250.jpg 250w", "toString": [Function], "width": 250, }, @@ -43,17 +43,17 @@ Object { "images": Array [ Object { "height": 450, - "path": "foobar/2756dba88775137f3a131197fee4ba11-500.jpg", + "path": "foobar/c869fe04ebafd01d-500.jpg", "width": 500, }, Object { "height": 900, - "path": "foobar/ce1f7cab922695ef86906a04192b055d-1000.jpg", + "path": "foobar/076d6ca8665b1d94-1000.jpg", "width": 1000, }, ], - "src": "foobar/ce1f7cab922695ef86906a04192b055d-1000.jpg", - "srcSet": "foobar/2756dba88775137f3a131197fee4ba11-500.jpg 500w,foobar/ce1f7cab922695ef86906a04192b055d-1000.jpg 1000w", + "src": "foobar/076d6ca8665b1d94-1000.jpg", + "srcSet": "foobar/c869fe04ebafd01d-500.jpg 500w,foobar/076d6ca8665b1d94-1000.jpg 1000w", "toString": [Function], "width": 1000, }, @@ -67,12 +67,12 @@ Object { "images": Array [ Object { "height": 450, - "path": "foobar/2756dba88775137f3a131197fee4ba11-500.jpg", + "path": "foobar/c869fe04ebafd01d-500.jpg", "width": 500, }, ], - "src": "foobar/2756dba88775137f3a131197fee4ba11-500.jpg", - "srcSet": "foobar/2756dba88775137f3a131197fee4ba11-500.jpg 500w", + "src": "foobar/c869fe04ebafd01d-500.jpg", + "srcSet": "foobar/c869fe04ebafd01d-500.jpg 500w", "toString": [Function], "width": 500, }, @@ -86,22 +86,22 @@ Object { "images": Array [ Object { "height": 450, - "path": "foobar/img/2756dba88775137f3a131197fee4ba11-500.jpg", + "path": "foobar/img/c869fe04ebafd01d-500.jpg", "width": 500, }, Object { "height": 675, - "path": "foobar/img/5b62cc7550ffe13de26a9abe0965803b-750.jpg", + "path": "foobar/img/76a7b8dd076af418-750.jpg", "width": 750, }, Object { "height": 900, - "path": "foobar/img/ce1f7cab922695ef86906a04192b055d-1000.jpg", + "path": "foobar/img/076d6ca8665b1d94-1000.jpg", "width": 1000, }, ], - "src": "foobar/img/ce1f7cab922695ef86906a04192b055d-1000.jpg", - "srcSet": "foobar/img/2756dba88775137f3a131197fee4ba11-500.jpg 500w,foobar/img/5b62cc7550ffe13de26a9abe0965803b-750.jpg 750w,foobar/img/ce1f7cab922695ef86906a04192b055d-1000.jpg 1000w", + "src": "foobar/img/076d6ca8665b1d94-1000.jpg", + "srcSet": "foobar/img/c869fe04ebafd01d-500.jpg 500w,foobar/img/76a7b8dd076af418-750.jpg 750w,foobar/img/076d6ca8665b1d94-1000.jpg 1000w", "toString": [Function], "width": 1000, }, @@ -115,22 +115,22 @@ Object { "images": Array [ Object { "height": 450, - "path": "foobar/test/2756dba88775137f3a131197fee4ba11-500x450.jpg", + "path": "foobar/test/c869fe04ebafd01d-500x450.jpg", "width": 500, }, Object { "height": 675, - "path": "foobar/test/5b62cc7550ffe13de26a9abe0965803b-750x675.jpg", + "path": "foobar/test/76a7b8dd076af418-750x675.jpg", "width": 750, }, Object { "height": 900, - "path": "foobar/test/ce1f7cab922695ef86906a04192b055d-1000x900.jpg", + "path": "foobar/test/076d6ca8665b1d94-1000x900.jpg", "width": 1000, }, ], - "src": "foobar/test/ce1f7cab922695ef86906a04192b055d-1000x900.jpg", - "srcSet": "foobar/test/2756dba88775137f3a131197fee4ba11-500x450.jpg 500w,foobar/test/5b62cc7550ffe13de26a9abe0965803b-750x675.jpg 750w,foobar/test/ce1f7cab922695ef86906a04192b055d-1000x900.jpg 1000w", + "src": "foobar/test/076d6ca8665b1d94-1000x900.jpg", + "srcSet": "foobar/test/c869fe04ebafd01d-500x450.jpg 500w,foobar/test/76a7b8dd076af418-750x675.jpg 750w,foobar/test/076d6ca8665b1d94-1000x900.jpg 1000w", "toString": [Function], "width": 1000, }, @@ -144,12 +144,12 @@ Object { "images": Array [ Object { "height": 90, - "path": "foobar/32708317aa6a3e07c17ed98fc519f791-100.jpg", + "path": "foobar/f7443232972a8934-100.jpg", "width": 100, }, ], - "src": "foobar/32708317aa6a3e07c17ed98fc519f791-100.jpg", - "srcSet": "foobar/32708317aa6a3e07c17ed98fc519f791-100.jpg 100w", + "src": "foobar/f7443232972a8934-100.jpg", + "srcSet": "foobar/f7443232972a8934-100.jpg 100w", "toString": [Function], "width": 100, }, @@ -163,17 +163,17 @@ Object { "images": Array [ Object { "height": 90, - "path": "foobar/32708317aa6a3e07c17ed98fc519f791-100.jpg", + "path": "foobar/f7443232972a8934-100.jpg", "width": 100, }, Object { "height": 180, - "path": "foobar/d1632154d15da263ba52fe0a6de45cdd-200.jpg", + "path": "foobar/974831fb3cc31ef7-200.jpg", "width": 200, }, ], - "src": "foobar/d1632154d15da263ba52fe0a6de45cdd-200.jpg", - "srcSet": "foobar/32708317aa6a3e07c17ed98fc519f791-100.jpg 100w,foobar/d1632154d15da263ba52fe0a6de45cdd-200.jpg 200w", + "src": "foobar/974831fb3cc31ef7-200.jpg", + "srcSet": "foobar/f7443232972a8934-100.jpg 100w,foobar/974831fb3cc31ef7-200.jpg 200w", "toString": [Function], "width": 200, }, @@ -187,22 +187,22 @@ Object { "images": Array [ Object { "height": 45, - "path": "foobar/8df7f84b5cc05ee5c20f57f31376f4fb-50.jpg", + "path": "foobar/843b57924a32e9ff-50.jpg", "width": 50, }, Object { "height": 90, - "path": "foobar/32708317aa6a3e07c17ed98fc519f791-100.jpg", + "path": "foobar/f7443232972a8934-100.jpg", "width": 100, }, Object { "height": 180, - "path": "foobar/d1632154d15da263ba52fe0a6de45cdd-200.jpg", + "path": "foobar/974831fb3cc31ef7-200.jpg", "width": 200, }, ], - "src": "foobar/d1632154d15da263ba52fe0a6de45cdd-200.jpg", - "srcSet": "foobar/8df7f84b5cc05ee5c20f57f31376f4fb-50.jpg 50w,foobar/32708317aa6a3e07c17ed98fc519f791-100.jpg 100w,foobar/d1632154d15da263ba52fe0a6de45cdd-200.jpg 200w", + "src": "foobar/974831fb3cc31ef7-200.jpg", + "srcSet": "foobar/843b57924a32e9ff-50.jpg 50w,foobar/f7443232972a8934-100.jpg 100w,foobar/974831fb3cc31ef7-200.jpg 200w", "toString": [Function], "width": 200, }, @@ -216,17 +216,17 @@ Object { "images": Array [ Object { "height": 580, - "path": "foobar/9825db9bc09d7607bb1bfe486e6875c3-500.png", + "path": "foobar/f64253666cd2fe13-500.png", "width": 500, }, Object { "height": 595, - "path": "foobar/0edee379a82c61e9f6aec7c4b5d39ee4-513.png", + "path": "foobar/a44dff6b028c41f7-513.png", "width": 513, }, ], - "src": "foobar/0edee379a82c61e9f6aec7c4b5d39ee4-513.png", - "srcSet": "foobar/9825db9bc09d7607bb1bfe486e6875c3-500.png 500w,foobar/0edee379a82c61e9f6aec7c4b5d39ee4-513.png 513w", + "src": "foobar/a44dff6b028c41f7-513.png", + "srcSet": "foobar/f64253666cd2fe13-500.png 500w,foobar/a44dff6b028c41f7-513.png 513w", "toString": [Function], "width": 513, }, @@ -240,17 +240,17 @@ Object { "images": Array [ Object { "height": 580, - "path": "foobar/87e8336f9a8705a1fb758b60e777d1cf-500.jpg", + "path": "foobar/940321b5b2ba9532-500.jpg", "width": 500, }, Object { "height": 595, - "path": "foobar/5da49147b5c21c6aa29076ac9d532673-513.jpg", + "path": "foobar/07deb4eb4e131586-513.jpg", "width": 513, }, ], - "src": "foobar/5da49147b5c21c6aa29076ac9d532673-513.jpg", - "srcSet": "foobar/87e8336f9a8705a1fb758b60e777d1cf-500.jpg 500w,foobar/5da49147b5c21c6aa29076ac9d532673-513.jpg 513w", + "src": "foobar/07deb4eb4e131586-513.jpg", + "srcSet": "foobar/940321b5b2ba9532-500.jpg 500w,foobar/07deb4eb4e131586-513.jpg 513w", "toString": [Function], "width": 513, }, @@ -264,17 +264,17 @@ Object { "images": Array [ Object { "height": 580, - "path": "foobar/87e8336f9a8705a1fb758b60e777d1cf-500.jpg", + "path": "foobar/940321b5b2ba9532-500.jpg", "width": 500, }, Object { "height": 595, - "path": "foobar/5da49147b5c21c6aa29076ac9d532673-513.jpg", + "path": "foobar/07deb4eb4e131586-513.jpg", "width": 513, }, ], - "src": "foobar/5da49147b5c21c6aa29076ac9d532673-513.jpg", - "srcSet": "foobar/87e8336f9a8705a1fb758b60e777d1cf-500.jpg 500w,foobar/5da49147b5c21c6aa29076ac9d532673-513.jpg 513w", + "src": "foobar/07deb4eb4e131586-513.jpg", + "srcSet": "foobar/940321b5b2ba9532-500.jpg 500w,foobar/07deb4eb4e131586-513.jpg 513w", "toString": [Function], "width": 513, }, @@ -288,22 +288,22 @@ Object { "images": Array [ Object { "height": 450, - "path": "public/2756dba88775137f3a131197fee4ba11-500.jpg", + "path": "public/c869fe04ebafd01d-500.jpg", "width": 500, }, Object { "height": 675, - "path": "public/5b62cc7550ffe13de26a9abe0965803b-750.jpg", + "path": "public/76a7b8dd076af418-750.jpg", "width": 750, }, Object { "height": 900, - "path": "public/ce1f7cab922695ef86906a04192b055d-1000.jpg", + "path": "public/076d6ca8665b1d94-1000.jpg", "width": 1000, }, ], - "src": "public/ce1f7cab922695ef86906a04192b055d-1000.jpg", - "srcSet": "public/2756dba88775137f3a131197fee4ba11-500.jpg 500w,public/5b62cc7550ffe13de26a9abe0965803b-750.jpg 750w,public/ce1f7cab922695ef86906a04192b055d-1000.jpg 1000w", + "src": "public/076d6ca8665b1d94-1000.jpg", + "srcSet": "public/c869fe04ebafd01d-500.jpg 500w,public/76a7b8dd076af418-750.jpg 750w,public/076d6ca8665b1d94-1000.jpg 1000w", "toString": [Function], "width": 1000, }, @@ -317,12 +317,12 @@ Object { "images": Array [ Object { "height": 450, - "path": "foobar/2756dba88775137f3a131197fee4ba11-500.jpg", + "path": "foobar/c869fe04ebafd01d-500.jpg", "width": 500, }, ], - "src": "foobar/2756dba88775137f3a131197fee4ba11-500.jpg", - "srcSet": "foobar/2756dba88775137f3a131197fee4ba11-500.jpg 500w", + "src": "foobar/c869fe04ebafd01d-500.jpg", + "srcSet": "foobar/c869fe04ebafd01d-500.jpg 500w", "toString": [Function], "width": 500, }, @@ -336,22 +336,22 @@ Object { "images": Array [ Object { "height": 450, - "path": "foobar/2756dba88775137f3a131197fee4ba11-500.jpg", + "path": "foobar/c869fe04ebafd01d-500.jpg", "width": 500, }, Object { "height": 675, - "path": "foobar/5b62cc7550ffe13de26a9abe0965803b-750.jpg", + "path": "foobar/76a7b8dd076af418-750.jpg", "width": 750, }, Object { "height": 900, - "path": "foobar/ce1f7cab922695ef86906a04192b055d-1000.jpg", + "path": "foobar/076d6ca8665b1d94-1000.jpg", "width": 1000, }, ], - "src": "foobar/ce1f7cab922695ef86906a04192b055d-1000.jpg", - "srcSet": "foobar/2756dba88775137f3a131197fee4ba11-500.jpg 500w,foobar/5b62cc7550ffe13de26a9abe0965803b-750.jpg 750w,foobar/ce1f7cab922695ef86906a04192b055d-1000.jpg 1000w", + "src": "foobar/076d6ca8665b1d94-1000.jpg", + "srcSet": "foobar/c869fe04ebafd01d-500.jpg 500w,foobar/76a7b8dd076af418-750.jpg 750w,foobar/076d6ca8665b1d94-1000.jpg 1000w", "toString": [Function], "width": 1000, }, @@ -365,27 +365,27 @@ Object { "images": Array [ Object { "height": 90, - "path": "foobar/32708317aa6a3e07c17ed98fc519f791-100.jpg", + "path": "foobar/f7443232972a8934-100.jpg", "width": 100, }, Object { "height": 150, - "path": "foobar/734736ef066c39120760fd69e8d2eaa7-167.jpg", + "path": "foobar/fb90951ca5da54c2-167.jpg", "width": 167, }, Object { "height": 211, - "path": "foobar/192a0bafe1555e25e65afd6390e58a84-234.jpg", + "path": "foobar/fe6debad717249e9-234.jpg", "width": 234, }, Object { "height": 270, - "path": "foobar/9ce71322d2da0a01ef90cfc44e592171-300.jpg", + "path": "foobar/a990e2f8f763852a-300.jpg", "width": 300, }, ], - "src": "foobar/9ce71322d2da0a01ef90cfc44e592171-300.jpg", - "srcSet": "foobar/32708317aa6a3e07c17ed98fc519f791-100.jpg 100w,foobar/734736ef066c39120760fd69e8d2eaa7-167.jpg 167w,foobar/192a0bafe1555e25e65afd6390e58a84-234.jpg 234w,foobar/9ce71322d2da0a01ef90cfc44e592171-300.jpg 300w", + "src": "foobar/a990e2f8f763852a-300.jpg", + "srcSet": "foobar/f7443232972a8934-100.jpg 100w,foobar/fb90951ca5da54c2-167.jpg 167w,foobar/fe6debad717249e9-234.jpg 234w,foobar/a990e2f8f763852a-300.jpg 300w", "toString": [Function], "width": 300, }, @@ -399,22 +399,22 @@ Object { "images": Array [ Object { "height": 450, - "path": "foobar/2756dba88775137f3a131197fee4ba11-500.jpg", + "path": "foobar/c869fe04ebafd01d-500.jpg", "width": 500, }, Object { "height": 675, - "path": "foobar/5b62cc7550ffe13de26a9abe0965803b-750.jpg", + "path": "foobar/76a7b8dd076af418-750.jpg", "width": 750, }, Object { "height": 900, - "path": "foobar/ce1f7cab922695ef86906a04192b055d-1000.jpg", + "path": "foobar/076d6ca8665b1d94-1000.jpg", "width": 1000, }, ], - "src": "foobar/ce1f7cab922695ef86906a04192b055d-1000.jpg", - "srcSet": "foobar/2756dba88775137f3a131197fee4ba11-500.jpg 500w,foobar/5b62cc7550ffe13de26a9abe0965803b-750.jpg 750w,foobar/ce1f7cab922695ef86906a04192b055d-1000.jpg 1000w", + "src": "foobar/076d6ca8665b1d94-1000.jpg", + "srcSet": "foobar/c869fe04ebafd01d-500.jpg 500w,foobar/76a7b8dd076af418-750.jpg 750w,foobar/076d6ca8665b1d94-1000.jpg 1000w", "toString": [Function], "width": 1000, }, @@ -428,23 +428,23 @@ Object { "images": Array [ Object { "height": 450, - "path": "foobar/2756dba88775137f3a131197fee4ba11-500.jpg", + "path": "foobar/c869fe04ebafd01d-500.jpg", "width": 500, }, Object { "height": 675, - "path": "foobar/5b62cc7550ffe13de26a9abe0965803b-750.jpg", + "path": "foobar/76a7b8dd076af418-750.jpg", "width": 750, }, Object { "height": 900, - "path": "foobar/ce1f7cab922695ef86906a04192b055d-1000.jpg", + "path": "foobar/076d6ca8665b1d94-1000.jpg", "width": 1000, }, ], "placeholder": "data:image/jpeg;base64,/9j/4AAQSkZJRgABAQAAAQABAAD/2wCEAAUDBAQEAwUEBAQFBQUGBwwIBwcHBw8LCwkMEQ8SEhEPERETFhwXExQaFRERGCEYGh0dHx8fExciJCIeJBweHx4BBQUFBwYHDggIDh4UERQeHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHv/AABEIACQAKAMBEQACEQEDEQH/xAGiAAABBQEBAQEBAQAAAAAAAAAAAQIDBAUGBwgJCgsQAAIBAwMCBAMFBQQEAAABfQECAwAEEQUSITFBBhNRYQcicRQygZGhCCNCscEVUtHwJDNicoIJChYXGBkaJSYnKCkqNDU2Nzg5OkNERUZHSElKU1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6g4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2drh4uPk5ebn6Onq8fLz9PX29/j5+gEAAwEBAQEBAQEBAQAAAAAAAAECAwQFBgcICQoLEQACAQIEBAMEBwUEBAABAncAAQIDEQQFITEGEkFRB2FxEyIygQgUQpGhscEJIzNS8BVictEKFiQ04SXxFxgZGiYnKCkqNTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqCg4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2dri4+Tl5ufo6ery8/T19vf4+fr/2gAMAwEAAhEDEQA/AMnW/wBnaO4v4hpWo2tjZFv3reWxkRfRVzhvqSMe9bukuhnzO1mUm/ZomXVIZF8Uxy2YbMiyWZD47AYYg/pU+yGpF3XP2aNIuYi+na7cWlwe5hDRn/gORj86p0kHMzl7j9nPxZo9za32karY6lJGcyxMDCf+A5JB49cVlUoOUWjajW9nNS7HfeDPg9ObqK+8VyQsiHcLKE5DEf327j2HX1rCjgrO8zvxGZuS5aa+Z7dPNBa20tzcyRwwRKXkkfhVUDJJ9K9A8g8i8TftB+D9MuXg0u1utXZODKn7mIn2LfMf++cVm6iQ1FkvgT48eG/EWsRaXe2E+kTXB2xSPKJIi3oTgEZ9cYoVVdQcWeqQ3thcY+z3dtNuO0bJFbJ9OD1rS6ESFAeOfoaAPFPFvw98dalod43iv4hNNYW8DyPHH+7jbaCfnwACOOpzWMozfUtOK6HzWbIu/wC7IlQAH5PmyOnPpWG6L2Z33w1+Geta217cBlsJ9PmEWy5Uq27GfTjginKN0JSsz1v4S/DS78N+NINakuIfJSNmuQX3GSYhh8vA4AYHPrmqpwfMmwlJWPbAVfkZA7iuoyM+70+0u7SW2u4FninUpJDJ8yOD1BB4NTuB5/rHwltZ/F9j4h0pbKxNsQJIBbDy3VfukKMYYcfp6VDp63Q0+5sa5pOssrxxqmbniS4jjw+4Dgkg5HAxntUzTYIs/C7Tdfg8O+X4ilea4S5kEczABpI88EgdO/4VVNO2o5W6HXeQVyQcitCSVVGc5NMBr5DcE1LASJiwYtzzTQErcKBng0wAdM9z1oA//9k=", - "src": "foobar/ce1f7cab922695ef86906a04192b055d-1000.jpg", - "srcSet": "foobar/2756dba88775137f3a131197fee4ba11-500.jpg 500w,foobar/5b62cc7550ffe13de26a9abe0965803b-750.jpg 750w,foobar/ce1f7cab922695ef86906a04192b055d-1000.jpg 1000w", + "src": "foobar/076d6ca8665b1d94-1000.jpg", + "srcSet": "foobar/c869fe04ebafd01d-500.jpg 500w,foobar/76a7b8dd076af418-750.jpg 750w,foobar/076d6ca8665b1d94-1000.jpg 1000w", "toString": [Function], "width": 1000, }, @@ -458,22 +458,22 @@ Object { "images": Array [ Object { "height": 450, - "path": "foobar/2756dba88775137f3a131197fee4ba11-500.jpg", + "path": "foobar/c869fe04ebafd01d-500.jpg", "width": 500, }, Object { "height": 675, - "path": "foobar/5b62cc7550ffe13de26a9abe0965803b-750.jpg", + "path": "foobar/76a7b8dd076af418-750.jpg", "width": 750, }, Object { "height": 900, - "path": "foobar/ce1f7cab922695ef86906a04192b055d-1000.jpg", + "path": "foobar/076d6ca8665b1d94-1000.jpg", "width": 1000, }, ], - "src": "foobar/ce1f7cab922695ef86906a04192b055d-1000.jpg", - "srcSet": "foobar/2756dba88775137f3a131197fee4ba11-500.jpg 500w,foobar/5b62cc7550ffe13de26a9abe0965803b-750.jpg 750w,foobar/ce1f7cab922695ef86906a04192b055d-1000.jpg 1000w", + "src": "foobar/076d6ca8665b1d94-1000.jpg", + "srcSet": "foobar/c869fe04ebafd01d-500.jpg 500w,foobar/76a7b8dd076af418-750.jpg 750w,foobar/076d6ca8665b1d94-1000.jpg 1000w", "toString": [Function], "width": 1000, }, diff --git a/test/sharp/build/__snapshots__/test.js.snap b/test/sharp/build/__snapshots__/test.js.snap index e9d7c7c..06edb24 100644 --- a/test/sharp/build/__snapshots__/test.js.snap +++ b/test/sharp/build/__snapshots__/test.js.snap @@ -23,12 +23,12 @@ Object { "images": Array [ Object { "height": 395, - "path": "foobar/598555c7d2adcfb1ba1a985910a3d1e5-439.jpeg", + "path": "foobar/f93d9af4a72634bc-439.jpeg", "width": 439, }, ], - "src": "foobar/598555c7d2adcfb1ba1a985910a3d1e5-439.jpeg", - "srcSet": "foobar/598555c7d2adcfb1ba1a985910a3d1e5-439.jpeg 439w", + "src": "foobar/f93d9af4a72634bc-439.jpeg", + "srcSet": "foobar/f93d9af4a72634bc-439.jpeg 439w", "toString": [Function], "width": 439, } @@ -39,12 +39,12 @@ Object { "images": Array [ Object { "height": 100, - "path": "foobar/8467bdd6e6ee43692327aa8efb258fd4-100.jpg", + "path": "foobar/82e6d197b5ce433a-100.jpg", "width": 100, }, ], - "src": "foobar/8467bdd6e6ee43692327aa8efb258fd4-100.jpg", - "srcSet": "foobar/8467bdd6e6ee43692327aa8efb258fd4-100.jpg", + "src": "foobar/82e6d197b5ce433a-100.jpg", + "srcSet": "foobar/82e6d197b5ce433a-100.jpg", "toString": [Function], } `; @@ -55,39 +55,66 @@ Object { "images": Array [ Object { "height": 225, - "path": "foobar/96ace3b661e096e716b4a62bcc3934d2-250.jpg", + "path": "foobar/0a229ed85b2f5618-250.jpg", "width": 250, }, ], - "src": "foobar/96ace3b661e096e716b4a62bcc3934d2-250.jpg", - "srcSet": "foobar/96ace3b661e096e716b4a62bcc3934d2-250.jpg 250w", + "src": "foobar/0a229ed85b2f5618-250.jpg", + "srcSet": "foobar/0a229ed85b2f5618-250.jpg 250w", "toString": [Function], "width": 250, } `; +exports[`hash lenght output should be relative to context 1`] = ` +Object { + "height": 900, + "images": Array [ + Object { + "height": 450, + "path": "foobar/test/282d046d-500.jpg", + "width": 500, + }, + Object { + "height": 675, + "path": "foobar/test/b8e60128-750.jpg", + "width": 750, + }, + Object { + "height": 900, + "path": "foobar/test/3cf3c375-1000.jpg", + "width": 1000, + }, + ], + "src": "foobar/test/3cf3c375-1000.jpg", + "srcSet": "foobar/test/282d046d-500.jpg 500w,foobar/test/b8e60128-750.jpg 750w,foobar/test/3cf3c375-1000.jpg 1000w", + "toString": [Function], + "width": 1000, +} +`; + exports[`jpg to webp 1`] = ` Object { "height": 900, "images": Array [ Object { "height": 450, - "path": "foobar/7f504de41e9e641521569e46d7c339ff-500.webp", + "path": "foobar/8593c1f9da542c50-500.webp", "width": 500, }, Object { "height": 675, - "path": "foobar/89c1d47924fefa2b33b8b6f1d343dab0-750.webp", + "path": "foobar/72befca36bd004a7-750.webp", "width": 750, }, Object { "height": 900, - "path": "foobar/d002bffca8dea375467f089165593f94-1000.webp", + "path": "foobar/c66204d304cfe4fd-1000.webp", "width": 1000, }, ], - "src": "foobar/d002bffca8dea375467f089165593f94-1000.webp", - "srcSet": "foobar/7f504de41e9e641521569e46d7c339ff-500.webp 500w,foobar/89c1d47924fefa2b33b8b6f1d343dab0-750.webp 750w,foobar/d002bffca8dea375467f089165593f94-1000.webp 1000w", + "src": "foobar/c66204d304cfe4fd-1000.webp", + "srcSet": "foobar/8593c1f9da542c50-500.webp 500w,foobar/72befca36bd004a7-750.webp 750w,foobar/c66204d304cfe4fd-1000.webp 1000w", "toString": [Function], "width": 1000, } @@ -99,17 +126,17 @@ Object { "images": Array [ Object { "height": 450, - "path": "foobar/78a57c37d73de1a0df2e5e84a7c3a493-500.jpg", + "path": "foobar/282d046d550fa19c-500.jpg", "width": 500, }, Object { "height": 900, - "path": "foobar/03fe31cc7d34b5317390ef55eaf9bc12-1000.jpg", + "path": "foobar/3cf3c37514578847-1000.jpg", "width": 1000, }, ], - "src": "foobar/03fe31cc7d34b5317390ef55eaf9bc12-1000.jpg", - "srcSet": "foobar/78a57c37d73de1a0df2e5e84a7c3a493-500.jpg 500w,foobar/03fe31cc7d34b5317390ef55eaf9bc12-1000.jpg 1000w", + "src": "foobar/3cf3c37514578847-1000.jpg", + "srcSet": "foobar/282d046d550fa19c-500.jpg 500w,foobar/3cf3c37514578847-1000.jpg 1000w", "toString": [Function], "width": 1000, } @@ -121,12 +148,12 @@ Object { "images": Array [ Object { "height": 450, - "path": "foobar/78a57c37d73de1a0df2e5e84a7c3a493-500.jpg", + "path": "foobar/282d046d550fa19c-500.jpg", "width": 500, }, ], - "src": "foobar/78a57c37d73de1a0df2e5e84a7c3a493-500.jpg", - "srcSet": "foobar/78a57c37d73de1a0df2e5e84a7c3a493-500.jpg 500w", + "src": "foobar/282d046d550fa19c-500.jpg", + "srcSet": "foobar/282d046d550fa19c-500.jpg 500w", "toString": [Function], "width": 500, } @@ -138,22 +165,22 @@ Object { "images": Array [ Object { "height": 450, - "path": "foobar/img/78a57c37d73de1a0df2e5e84a7c3a493-500.jpg", + "path": "foobar/img/282d046d550fa19c-500.jpg", "width": 500, }, Object { "height": 675, - "path": "foobar/img/7d2980f5976397657aae4e66161cc660-750.jpg", + "path": "foobar/img/b8e6012830c98919-750.jpg", "width": 750, }, Object { "height": 900, - "path": "foobar/img/03fe31cc7d34b5317390ef55eaf9bc12-1000.jpg", + "path": "foobar/img/3cf3c37514578847-1000.jpg", "width": 1000, }, ], - "src": "foobar/img/03fe31cc7d34b5317390ef55eaf9bc12-1000.jpg", - "srcSet": "foobar/img/78a57c37d73de1a0df2e5e84a7c3a493-500.jpg 500w,foobar/img/7d2980f5976397657aae4e66161cc660-750.jpg 750w,foobar/img/03fe31cc7d34b5317390ef55eaf9bc12-1000.jpg 1000w", + "src": "foobar/img/3cf3c37514578847-1000.jpg", + "srcSet": "foobar/img/282d046d550fa19c-500.jpg 500w,foobar/img/b8e6012830c98919-750.jpg 750w,foobar/img/3cf3c37514578847-1000.jpg 1000w", "toString": [Function], "width": 1000, } @@ -165,22 +192,22 @@ Object { "images": Array [ Object { "height": 450, - "path": "foobar/test/78a57c37d73de1a0df2e5e84a7c3a493-500x450.jpg", + "path": "foobar/test/282d046d550fa19c-500x450.jpg", "width": 500, }, Object { "height": 675, - "path": "foobar/test/7d2980f5976397657aae4e66161cc660-750x675.jpg", + "path": "foobar/test/b8e6012830c98919-750x675.jpg", "width": 750, }, Object { "height": 900, - "path": "foobar/test/03fe31cc7d34b5317390ef55eaf9bc12-1000x900.jpg", + "path": "foobar/test/3cf3c37514578847-1000x900.jpg", "width": 1000, }, ], - "src": "foobar/test/03fe31cc7d34b5317390ef55eaf9bc12-1000x900.jpg", - "srcSet": "foobar/test/78a57c37d73de1a0df2e5e84a7c3a493-500x450.jpg 500w,foobar/test/7d2980f5976397657aae4e66161cc660-750x675.jpg 750w,foobar/test/03fe31cc7d34b5317390ef55eaf9bc12-1000x900.jpg 1000w", + "src": "foobar/test/3cf3c37514578847-1000x900.jpg", + "srcSet": "foobar/test/282d046d550fa19c-500x450.jpg 500w,foobar/test/b8e6012830c98919-750x675.jpg 750w,foobar/test/3cf3c37514578847-1000x900.jpg 1000w", "toString": [Function], "width": 1000, } @@ -192,12 +219,12 @@ Object { "images": Array [ Object { "height": 90, - "path": "foobar/0049f565d3e598f80b744f888ccaf30d-100.jpg", + "path": "foobar/661fbbbdbe7372a2-100.jpg", "width": 100, }, ], - "src": "foobar/0049f565d3e598f80b744f888ccaf30d-100.jpg", - "srcSet": "foobar/0049f565d3e598f80b744f888ccaf30d-100.jpg 100w", + "src": "foobar/661fbbbdbe7372a2-100.jpg", + "srcSet": "foobar/661fbbbdbe7372a2-100.jpg 100w", "toString": [Function], "width": 100, } @@ -209,17 +236,17 @@ Object { "images": Array [ Object { "height": 90, - "path": "foobar/0049f565d3e598f80b744f888ccaf30d-100.jpg", + "path": "foobar/661fbbbdbe7372a2-100.jpg", "width": 100, }, Object { "height": 180, - "path": "foobar/5f2f5155b26fa7fed6fcc32f01aca2fa-200.jpg", + "path": "foobar/daae2e5f7f65b269-200.jpg", "width": 200, }, ], - "src": "foobar/5f2f5155b26fa7fed6fcc32f01aca2fa-200.jpg", - "srcSet": "foobar/0049f565d3e598f80b744f888ccaf30d-100.jpg 100w,foobar/5f2f5155b26fa7fed6fcc32f01aca2fa-200.jpg 200w", + "src": "foobar/daae2e5f7f65b269-200.jpg", + "srcSet": "foobar/661fbbbdbe7372a2-100.jpg 100w,foobar/daae2e5f7f65b269-200.jpg 200w", "toString": [Function], "width": 200, } @@ -231,22 +258,22 @@ Object { "images": Array [ Object { "height": 45, - "path": "foobar/d29e4bda309a28b94d101aeeac15e622-50.webp", + "path": "foobar/b58d8935f3e689e3-50.webp", "width": 50, }, Object { "height": 90, - "path": "foobar/ab4bef82e752b1d075af5236c458073e-100.webp", + "path": "foobar/fffbb70a2c269cf1-100.webp", "width": 100, }, Object { "height": 180, - "path": "foobar/004bbcf97542aa5c1e2434233b53ac16-200.webp", + "path": "foobar/701bf549670b5294-200.webp", "width": 200, }, ], - "src": "foobar/004bbcf97542aa5c1e2434233b53ac16-200.webp", - "srcSet": "foobar/d29e4bda309a28b94d101aeeac15e622-50.webp 50w,foobar/ab4bef82e752b1d075af5236c458073e-100.webp 100w,foobar/004bbcf97542aa5c1e2434233b53ac16-200.webp 200w", + "src": "foobar/701bf549670b5294-200.webp", + "srcSet": "foobar/b58d8935f3e689e3-50.webp 50w,foobar/fffbb70a2c269cf1-100.webp 100w,foobar/701bf549670b5294-200.webp 200w", "toString": [Function], "width": 200, } @@ -258,17 +285,17 @@ Object { "images": Array [ Object { "height": 580, - "path": "foobar/3cc2498602702597270522eed2774f4a-500.png", + "path": "foobar/8168d0505a82f948-500.png", "width": 500, }, Object { "height": 595, - "path": "foobar/441052e71b6979cdaad82ca4441238f6-513.png", + "path": "foobar/ed7f6f89e4d82d00-513.png", "width": 513, }, ], - "src": "foobar/441052e71b6979cdaad82ca4441238f6-513.png", - "srcSet": "foobar/3cc2498602702597270522eed2774f4a-500.png 500w,foobar/441052e71b6979cdaad82ca4441238f6-513.png 513w", + "src": "foobar/ed7f6f89e4d82d00-513.png", + "srcSet": "foobar/8168d0505a82f948-500.png 500w,foobar/ed7f6f89e4d82d00-513.png 513w", "toString": [Function], "width": 513, } @@ -280,12 +307,12 @@ Object { "images": Array [ Object { "height": 595, - "path": "foobar/cddcdfc16d7f31fbe5b86d42bddf967c-513.avif", + "path": "foobar/6f6751159d27af0a-513.avif", "width": 513, }, ], - "src": "foobar/cddcdfc16d7f31fbe5b86d42bddf967c-513.avif", - "srcSet": "foobar/cddcdfc16d7f31fbe5b86d42bddf967c-513.avif 513w", + "src": "foobar/6f6751159d27af0a-513.avif", + "srcSet": "foobar/6f6751159d27af0a-513.avif 513w", "toString": [Function], "width": 513, } @@ -297,22 +324,22 @@ Object { "images": Array [ Object { "height": 450, - "path": "foobar/47e17ab6446aa0fa6d92c992ac655e3e-500.avif", + "path": "foobar/399c087b36a41dc7-500.avif", "width": 500, }, Object { "height": 675, - "path": "foobar/6c79d6fbb687c2f7c7a5c5654614b92b-750.avif", + "path": "foobar/2b2c71d7c209afa8-750.avif", "width": 750, }, Object { "height": 900, - "path": "foobar/08fd32f7bcfafc4b1a07092a2836b299-1000.avif", + "path": "foobar/41db421bee56e18f-1000.avif", "width": 1000, }, ], - "src": "foobar/08fd32f7bcfafc4b1a07092a2836b299-1000.avif", - "srcSet": "foobar/47e17ab6446aa0fa6d92c992ac655e3e-500.avif 500w,foobar/6c79d6fbb687c2f7c7a5c5654614b92b-750.avif 750w,foobar/08fd32f7bcfafc4b1a07092a2836b299-1000.avif 1000w", + "src": "foobar/41db421bee56e18f-1000.avif", + "srcSet": "foobar/399c087b36a41dc7-500.avif 500w,foobar/2b2c71d7c209afa8-750.avif 750w,foobar/41db421bee56e18f-1000.avif 1000w", "toString": [Function], "width": 1000, } @@ -324,17 +351,17 @@ Object { "images": Array [ Object { "height": 580, - "path": "foobar/8ef290c6aa9a99c26c88b600f62e8c73-500.jpg", + "path": "foobar/0be420cbedde023f-500.jpg", "width": 500, }, Object { "height": 595, - "path": "foobar/fda6d212d96bfa688c5895e30079bf26-513.jpg", + "path": "foobar/9e08ba9531804694-513.jpg", "width": 513, }, ], - "src": "foobar/fda6d212d96bfa688c5895e30079bf26-513.jpg", - "srcSet": "foobar/8ef290c6aa9a99c26c88b600f62e8c73-500.jpg 500w,foobar/fda6d212d96bfa688c5895e30079bf26-513.jpg 513w", + "src": "foobar/9e08ba9531804694-513.jpg", + "srcSet": "foobar/0be420cbedde023f-500.jpg 500w,foobar/9e08ba9531804694-513.jpg 513w", "toString": [Function], "width": 513, } @@ -346,17 +373,17 @@ Object { "images": Array [ Object { "height": 580, - "path": "foobar/efbbe56c2c29698c524ea3d6c104c453-500.webp", + "path": "foobar/c6cf8cc072ec32d0-500.webp", "width": 500, }, Object { "height": 595, - "path": "foobar/f359c3bb5fc56fcc3e75193058a4311c-513.webp", + "path": "foobar/924e13d10c98fb28-513.webp", "width": 513, }, ], - "src": "foobar/f359c3bb5fc56fcc3e75193058a4311c-513.webp", - "srcSet": "foobar/efbbe56c2c29698c524ea3d6c104c453-500.webp 500w,foobar/f359c3bb5fc56fcc3e75193058a4311c-513.webp 513w", + "src": "foobar/924e13d10c98fb28-513.webp", + "srcSet": "foobar/c6cf8cc072ec32d0-500.webp 500w,foobar/924e13d10c98fb28-513.webp 513w", "toString": [Function], "width": 513, } @@ -368,12 +395,12 @@ Object { "images": Array [ Object { "height": 554, - "path": "foobar/7acf753645105aca043bba1037734416-499.jpg", + "path": "foobar/eb9b881857272a9d-499.jpg", "width": 499, }, ], - "src": "foobar/7acf753645105aca043bba1037734416-499.jpg", - "srcSet": "foobar/7acf753645105aca043bba1037734416-499.jpg 499w", + "src": "foobar/eb9b881857272a9d-499.jpg", + "srcSet": "foobar/eb9b881857272a9d-499.jpg 499w", "toString": [Function], "width": 499, } @@ -385,17 +412,17 @@ Object { "images": Array [ Object { "height": 684, - "path": "foobar/a366eedb0a0ae21632438e6d488e8365-760.jpg", + "path": "foobar/e971e26ec2eea1f1-760.jpg", "width": 760, }, Object { "height": 864, - "path": "foobar/481f41d88cf3a0a41fd3f6a076222c68-960.jpg", + "path": "foobar/e5e8c73f5f931a48-960.jpg", "width": 960, }, ], - "src": "foobar/481f41d88cf3a0a41fd3f6a076222c68-960.jpg", - "srcSet": "foobar/a366eedb0a0ae21632438e6d488e8365-760.jpg 760w,foobar/481f41d88cf3a0a41fd3f6a076222c68-960.jpg 960w", + "src": "foobar/e5e8c73f5f931a48-960.jpg", + "srcSet": "foobar/e971e26ec2eea1f1-760.jpg 760w,foobar/e5e8c73f5f931a48-960.jpg 960w", "toString": [Function], "width": 960, } @@ -407,22 +434,22 @@ Object { "images": Array [ Object { "height": 450, - "path": "public/78a57c37d73de1a0df2e5e84a7c3a493-500.jpg", + "path": "public/282d046d550fa19c-500.jpg", "width": 500, }, Object { "height": 675, - "path": "public/7d2980f5976397657aae4e66161cc660-750.jpg", + "path": "public/b8e6012830c98919-750.jpg", "width": 750, }, Object { "height": 900, - "path": "public/03fe31cc7d34b5317390ef55eaf9bc12-1000.jpg", + "path": "public/3cf3c37514578847-1000.jpg", "width": 1000, }, ], - "src": "public/03fe31cc7d34b5317390ef55eaf9bc12-1000.jpg", - "srcSet": "public/78a57c37d73de1a0df2e5e84a7c3a493-500.jpg 500w,public/7d2980f5976397657aae4e66161cc660-750.jpg 750w,public/03fe31cc7d34b5317390ef55eaf9bc12-1000.jpg 1000w", + "src": "public/3cf3c37514578847-1000.jpg", + "srcSet": "public/282d046d550fa19c-500.jpg 500w,public/b8e6012830c98919-750.jpg 750w,public/3cf3c37514578847-1000.jpg 1000w", "toString": [Function], "width": 1000, } @@ -434,12 +461,12 @@ Object { "images": Array [ Object { "height": 666, - "path": "foobar/d12957441af3a63cafef04b5b5496ca5-599.jpg", + "path": "foobar/aa309fc022524f4b-599.jpg", "width": 599, }, ], - "src": "foobar/d12957441af3a63cafef04b5b5496ca5-599.jpg", - "srcSet": "foobar/d12957441af3a63cafef04b5b5496ca5-599.jpg 599w", + "src": "foobar/aa309fc022524f4b-599.jpg", + "srcSet": "foobar/aa309fc022524f4b-599.jpg 599w", "toString": [Function], "width": 599, } @@ -451,12 +478,12 @@ Object { "images": Array [ Object { "height": 450, - "path": "foobar/78a57c37d73de1a0df2e5e84a7c3a493-500.jpg", + "path": "foobar/282d046d550fa19c-500.jpg", "width": 500, }, ], - "src": "foobar/78a57c37d73de1a0df2e5e84a7c3a493-500.jpg", - "srcSet": "foobar/78a57c37d73de1a0df2e5e84a7c3a493-500.jpg 500w", + "src": "foobar/282d046d550fa19c-500.jpg", + "srcSet": "foobar/282d046d550fa19c-500.jpg 500w", "toString": [Function], "width": 500, } @@ -468,22 +495,22 @@ Object { "images": Array [ Object { "height": 450, - "path": "foobar/78a57c37d73de1a0df2e5e84a7c3a493-500.jpg", + "path": "foobar/282d046d550fa19c-500.jpg", "width": 500, }, Object { "height": 675, - "path": "foobar/7d2980f5976397657aae4e66161cc660-750.jpg", + "path": "foobar/b8e6012830c98919-750.jpg", "width": 750, }, Object { "height": 900, - "path": "foobar/03fe31cc7d34b5317390ef55eaf9bc12-1000.jpg", + "path": "foobar/3cf3c37514578847-1000.jpg", "width": 1000, }, ], - "src": "foobar/03fe31cc7d34b5317390ef55eaf9bc12-1000.jpg", - "srcSet": "foobar/78a57c37d73de1a0df2e5e84a7c3a493-500.jpg 500w,foobar/7d2980f5976397657aae4e66161cc660-750.jpg 750w,foobar/03fe31cc7d34b5317390ef55eaf9bc12-1000.jpg 1000w", + "src": "foobar/3cf3c37514578847-1000.jpg", + "srcSet": "foobar/282d046d550fa19c-500.jpg 500w,foobar/b8e6012830c98919-750.jpg 750w,foobar/3cf3c37514578847-1000.jpg 1000w", "toString": [Function], "width": 1000, } @@ -495,27 +522,27 @@ Object { "images": Array [ Object { "height": 90, - "path": "foobar/0049f565d3e598f80b744f888ccaf30d-100.jpg", + "path": "foobar/661fbbbdbe7372a2-100.jpg", "width": 100, }, Object { "height": 150, - "path": "foobar/aa3b8300ebda3fea987abdf9d9882114-167.jpg", + "path": "foobar/87ddc3296017abd7-167.jpg", "width": 167, }, Object { "height": 211, - "path": "foobar/3f3eeb68a9bed05267734028c5aecb8b-234.jpg", + "path": "foobar/c792e1e8f501c416-234.jpg", "width": 234, }, Object { "height": 270, - "path": "foobar/7c60c8715bec52ab753a83903b738d58-300.jpg", + "path": "foobar/5de63dd31e93ce82-300.jpg", "width": 300, }, ], - "src": "foobar/7c60c8715bec52ab753a83903b738d58-300.jpg", - "srcSet": "foobar/0049f565d3e598f80b744f888ccaf30d-100.jpg 100w,foobar/aa3b8300ebda3fea987abdf9d9882114-167.jpg 167w,foobar/3f3eeb68a9bed05267734028c5aecb8b-234.jpg 234w,foobar/7c60c8715bec52ab753a83903b738d58-300.jpg 300w", + "src": "foobar/5de63dd31e93ce82-300.jpg", + "srcSet": "foobar/661fbbbdbe7372a2-100.jpg 100w,foobar/87ddc3296017abd7-167.jpg 167w,foobar/c792e1e8f501c416-234.jpg 234w,foobar/5de63dd31e93ce82-300.jpg 300w", "toString": [Function], "width": 300, } @@ -527,22 +554,22 @@ Object { "images": Array [ Object { "height": 450, - "path": "foobar/78a57c37d73de1a0df2e5e84a7c3a493-500.jpg", + "path": "foobar/282d046d550fa19c-500.jpg", "width": 500, }, Object { "height": 675, - "path": "foobar/7d2980f5976397657aae4e66161cc660-750.jpg", + "path": "foobar/b8e6012830c98919-750.jpg", "width": 750, }, Object { "height": 900, - "path": "foobar/03fe31cc7d34b5317390ef55eaf9bc12-1000.jpg", + "path": "foobar/3cf3c37514578847-1000.jpg", "width": 1000, }, ], - "src": "foobar/03fe31cc7d34b5317390ef55eaf9bc12-1000.jpg", - "srcSet": "foobar/78a57c37d73de1a0df2e5e84a7c3a493-500.jpg 500w,foobar/7d2980f5976397657aae4e66161cc660-750.jpg 750w,foobar/03fe31cc7d34b5317390ef55eaf9bc12-1000.jpg 1000w", + "src": "foobar/3cf3c37514578847-1000.jpg", + "srcSet": "foobar/282d046d550fa19c-500.jpg 500w,foobar/b8e6012830c98919-750.jpg 750w,foobar/3cf3c37514578847-1000.jpg 1000w", "toString": [Function], "width": 1000, } @@ -554,23 +581,23 @@ Object { "images": Array [ Object { "height": 450, - "path": "foobar/78a57c37d73de1a0df2e5e84a7c3a493-500.jpg", + "path": "foobar/282d046d550fa19c-500.jpg", "width": 500, }, Object { "height": 675, - "path": "foobar/7d2980f5976397657aae4e66161cc660-750.jpg", + "path": "foobar/b8e6012830c98919-750.jpg", "width": 750, }, Object { "height": 900, - "path": "foobar/03fe31cc7d34b5317390ef55eaf9bc12-1000.jpg", + "path": "foobar/3cf3c37514578847-1000.jpg", "width": 1000, }, ], "placeholder": "data:image/jpeg;base64,/9j/2wBDAAUDBAQEAwUEBAQFBQUGBwwIBwcHBw8LCwkMEQ8SEhEPERETFhwXExQaFRERGCEYGh0dHx8fExciJCIeJBweHx7/2wBDAQUFBQcGBw4ICA4eFBEUHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh7/wAARCAAkACgDASIAAhEBAxEB/8QAHAAAAgEFAQAAAAAAAAAAAAAAAAcGAQIDBAgF/8QALBAAAQMDAwIGAgIDAAAAAAAAAQIDBAAFEQYSIQcxCBMiQVFhFDJxgSNSgv/EABgBAAMBAQAAAAAAAAAAAAAAAAABAwIE/8QAHBEAAwEBAAMBAAAAAAAAAAAAAAECEQMEEjEi/9oADAMBAAIRAxEAPwDx734dA/cGU2i4Q4EIq/yqKFlxCfhKckKP2SMVpK8M8tN1YWjVMd6EFEuhyGpLmPYABRB++RXSrzrEaO7JkONtMMpK3HFcJQkDJJPsBSk1N4g9FWuQti2MTL0pPHms4aaJ+lK5P8gVdzK+k02RK+eGW1yGiu2agfiyOf2jhTZ/oHI/o1F3/DprKzSok+0XK3XVxs5eaJLB/wCSrIPHzim1oTrvpfUl4ZtUuDKs8iSdrLjriXGlK9klQA25+SMU02pMN7HkyY7u47RscSrJ+OD3ocRSNTdS00JHRnR2S5KZm6tWx5SCFfgsK3biP919sfQ7/NFPEoBGO/0aKUcOcLEivXyevWtpiT1b0/6h3WxyxqzqGXbfHjrcW00A02vakn14CQRx3Oa5qMMuHc2pLiAAco9QI7c/Fd6zLdDmQnYsxhMhmQkodZc9SFg9wR2NL689JIz+sIOorSiBAMdSQ6x+MPKcSn9SEpwAocd+OB8Vmo34SVYIjpn01vd8XMlNlMF+3Ppa8uQClW7bnGPbgim30i6aTdNa1YvLjzCY6W1LlDzN298hQASMD0jcDn+am19tV6UFoQhvdL4clNN4XuA9JJByOBjJ7Vs9LLfqBnTezUbi3ZKZLnlvqSlKnW8+klI7e4rKj9D9nhLwUr5HA9xiiqeQU5IORRXRpMyoGVE5NWuZSeCaKKGBayoqCyrBrMrhIGe9FFCAByM+570UUUwP/9k=", - "src": "foobar/03fe31cc7d34b5317390ef55eaf9bc12-1000.jpg", - "srcSet": "foobar/78a57c37d73de1a0df2e5e84a7c3a493-500.jpg 500w,foobar/7d2980f5976397657aae4e66161cc660-750.jpg 750w,foobar/03fe31cc7d34b5317390ef55eaf9bc12-1000.jpg 1000w", + "src": "foobar/3cf3c37514578847-1000.jpg", + "srcSet": "foobar/282d046d550fa19c-500.jpg 500w,foobar/b8e6012830c98919-750.jpg 750w,foobar/3cf3c37514578847-1000.jpg 1000w", "toString": [Function], "width": 1000, } @@ -582,13 +609,13 @@ Object { "images": Array [ Object { "height": 360, - "path": "foobar/d6ffd74f8b036c86876b8341b9ac0c62-400.jpg", + "path": "foobar/c985fe28cb56f01d-400.jpg", "width": 400, }, ], "placeholder": "data:image/jpeg;base64,/9j/2wBDAAUDBAQEAwUEBAQFBQUGBwwIBwcHBw8LCwkMEQ8SEhEPERETFhwXExQaFRERGCEYGh0dHx8fExciJCIeJBweHx7/2wBDAQUFBQcGBw4ICA4eFBEUHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh7/wAARCAAkACgDASIAAhEBAxEB/8QAHAAAAgEFAQAAAAAAAAAAAAAAAAcGAQIDBAgF/8QALBAAAQMDAwIGAgIDAAAAAAAAAQIDBAAFEQYSIQcxCBMiQVFhFDJxgSNSgv/EABgBAAMBAQAAAAAAAAAAAAAAAAABAwIE/8QAHBEAAwEBAAMBAAAAAAAAAAAAAAECEQMEEjEi/9oADAMBAAIRAxEAPwDx734dA/cGU2i4Q4EIq/yqKFlxCfhKckKP2SMVpK8M8tN1YWjVMd6EFEuhyGpLmPYABRB++RXSrzrEaO7JkONtMMpK3HFcJQkDJJPsBSk1N4g9FWuQti2MTL0pPHms4aaJ+lK5P8gVdzK+k02RK+eGW1yGiu2agfiyOf2jhTZ/oHI/o1F3/DprKzSok+0XK3XVxs5eaJLB/wCSrIPHzim1oTrvpfUl4ZtUuDKs8iSdrLjriXGlK9klQA25+SMU02pMN7HkyY7u47RscSrJ+OD3ocRSNTdS00JHRnR2S5KZm6tWx5SCFfgsK3biP919sfQ7/NFPEoBGO/0aKUcOcLEivXyevWtpiT1b0/6h3WxyxqzqGXbfHjrcW00A02vakn14CQRx3Oa5qMMuHc2pLiAAco9QI7c/Fd6zLdDmQnYsxhMhmQkodZc9SFg9wR2NL689JIz+sIOorSiBAMdSQ6x+MPKcSn9SEpwAocd+OB8Vmo34SVYIjpn01vd8XMlNlMF+3Ppa8uQClW7bnGPbgim30i6aTdNa1YvLjzCY6W1LlDzN298hQASMD0jcDn+am19tV6UFoQhvdL4clNN4XuA9JJByOBjJ7Vs9LLfqBnTezUbi3ZKZLnlvqSlKnW8+klI7e4rKj9D9nhLwUr5HA9xiiqeQU5IORRXRpMyoGVE5NWuZSeCaKKGBayoqCyrBrMrhIGe9FFCAByM+570UUUwP/9k=", - "src": "foobar/d6ffd74f8b036c86876b8341b9ac0c62-400.jpg", - "srcSet": "foobar/d6ffd74f8b036c86876b8341b9ac0c62-400.jpg 400w", + "src": "foobar/c985fe28cb56f01d-400.jpg", + "srcSet": "foobar/c985fe28cb56f01d-400.jpg 400w", "toString": [Function], "width": 400, } @@ -600,22 +627,22 @@ Object { "images": Array [ Object { "height": 450, - "path": "foobar/78a57c37d73de1a0df2e5e84a7c3a493-500.jpg", + "path": "foobar/282d046d550fa19c-500.jpg", "width": 500, }, Object { "height": 675, - "path": "foobar/7d2980f5976397657aae4e66161cc660-750.jpg", + "path": "foobar/b8e6012830c98919-750.jpg", "width": 750, }, Object { "height": 900, - "path": "foobar/03fe31cc7d34b5317390ef55eaf9bc12-1000.jpg", + "path": "foobar/3cf3c37514578847-1000.jpg", "width": 1000, }, ], - "src": "foobar/03fe31cc7d34b5317390ef55eaf9bc12-1000.jpg", - "srcSet": "foobar/78a57c37d73de1a0df2e5e84a7c3a493-500.jpg 500w,foobar/7d2980f5976397657aae4e66161cc660-750.jpg 750w,foobar/03fe31cc7d34b5317390ef55eaf9bc12-1000.jpg 1000w", + "src": "foobar/3cf3c37514578847-1000.jpg", + "srcSet": "foobar/282d046d550fa19c-500.jpg 500w,foobar/b8e6012830c98919-750.jpg 750w,foobar/3cf3c37514578847-1000.jpg 1000w", "toString": [Function], "width": 1000, } diff --git a/test/sharp/index.js b/test/sharp/index.js index b8b9430..98aea0e 100644 --- a/test/sharp/index.js +++ b/test/sharp/index.js @@ -64,6 +64,11 @@ test('output should be relative to context', () => { expect(multi).toMatchSnapshot() }) +test('hash lenght output should be relative to context', () => { + const multi = require('../cat-1000.jpg?name=[path][contenthash:8]-[width].[ext]&context=./') + expect(multi).toMatchSnapshot() +}) + test('output should be in outputPath dir', () => { const multi = require('../cat-1000.jpg?outputPath=img/') expect(multi).toMatchSnapshot()