diff --git a/packages/@pollyjs/adapter-fetch/package.json b/packages/@pollyjs/adapter-fetch/package.json index 10fe9a94..b6123a32 100644 --- a/packages/@pollyjs/adapter-fetch/package.json +++ b/packages/@pollyjs/adapter-fetch/package.json @@ -42,7 +42,7 @@ "dependencies": { "@pollyjs/adapter": "^5.1.1", "@pollyjs/utils": "^5.1.1", - "detect-node": "^2.0.4", + "detect-node": "^2.1.0", "to-arraybuffer": "^1.0.1" }, "devDependencies": { diff --git a/packages/@pollyjs/adapter-node-http/package.json b/packages/@pollyjs/adapter-node-http/package.json index 5eea82a8..d8aabe2f 100644 --- a/packages/@pollyjs/adapter-node-http/package.json +++ b/packages/@pollyjs/adapter-node-http/package.json @@ -45,15 +45,15 @@ "dependencies": { "@pollyjs/adapter": "^5.1.1", "@pollyjs/utils": "^5.1.1", - "lodash-es": "^4.17.11", + "lodash-es": "^4.17.21", "nock": "^12.0.3" }, "devDependencies": { "@pollyjs/core": "^5.1.1", "@pollyjs/persister-fs": "^5.1.1", - "form-data": "^2.5.1", - "get-stream": "^5.1.0", - "node-fetch": "^2.6.0", + "form-data": "^4.0.0", + "get-stream": "^6.0.1", + "node-fetch": "^2.6.6", "rollup": "^1.14.6" } } diff --git a/packages/@pollyjs/adapter-puppeteer/package.json b/packages/@pollyjs/adapter-puppeteer/package.json index 492e86a2..2ca7857a 100644 --- a/packages/@pollyjs/adapter-puppeteer/package.json +++ b/packages/@pollyjs/adapter-puppeteer/package.json @@ -45,7 +45,7 @@ "devDependencies": { "@pollyjs/core": "^5.1.1", "@pollyjs/persister-fs": "^5.1.1", - "node-fetch": "^2.6.0", + "node-fetch": "^2.6.6", "puppeteer": "1.10.0", "rollup": "^1.14.6" } diff --git a/packages/@pollyjs/cli/bin/cli.js b/packages/@pollyjs/cli/bin/cli.js index c260bba2..a9ce7434 100755 --- a/packages/@pollyjs/cli/bin/cli.js +++ b/packages/@pollyjs/cli/bin/cli.js @@ -4,13 +4,13 @@ process.title = 'polly'; const Polly = require('@pollyjs/node-server'); -const cli = require('commander'); +const { program } = require('commander'); const version = require('../package.json').version; -cli.name('polly').version(version, '-v, --version'); +program.name('polly').version(version, '-v, --version'); -cli +program .command('listen') .alias('l') .description('start the server and listen for requests') @@ -31,14 +31,14 @@ cli 'recording size limit', Polly.Defaults.recordingSizeLimit ) - .option('-q, --quiet', 'disable the logging') + .option('-q, --quiet', 'disable logging') .action(function (options) { new Polly.Server(options).listen(); }); -cli.parse(process.argv); +program.parse(process.argv); // if cli was called with no arguments, show help. -if (cli.args.length === 0) { - cli.help(); +if (program.args.length === 0) { + program.help(); } diff --git a/packages/@pollyjs/cli/package.json b/packages/@pollyjs/cli/package.json index 9ea94838..26bf06f5 100644 --- a/packages/@pollyjs/cli/package.json +++ b/packages/@pollyjs/cli/package.json @@ -29,7 +29,7 @@ "license": "Apache-2.0", "dependencies": { "@pollyjs/node-server": "^5.1.1", - "commander": "^2.20.0" + "commander": "^8.3.0" }, "devDependencies": { "npm-run-all": "^4.1.5", diff --git a/packages/@pollyjs/core/package.json b/packages/@pollyjs/core/package.json index 6468a6f5..fbf66a16 100644 --- a/packages/@pollyjs/core/package.json +++ b/packages/@pollyjs/core/package.json @@ -43,13 +43,13 @@ "license": "Apache-2.0", "dependencies": { "@pollyjs/utils": "^5.1.1", - "@sindresorhus/fnv1a": "^1.2.0", - "blueimp-md5": "^2.10.0", - "fast-json-stable-stringify": "^2.0.0", - "is-absolute-url": "^3.0.0", - "lodash-es": "^4.17.11", + "@sindresorhus/fnv1a": "^2.0.1", + "blueimp-md5": "^2.19.0", + "fast-json-stable-stringify": "^2.1.0", + "is-absolute-url": "^3.0.3", + "lodash-es": "^4.17.21", "route-recognizer": "^0.3.4", - "slugify": "^1.3.4" + "slugify": "^1.6.3" }, "devDependencies": { "@pollyjs/adapter": "^5.1.1", diff --git a/packages/@pollyjs/core/tests/unit/utils/guid-for-recording-test.js b/packages/@pollyjs/core/tests/unit/utils/guid-for-recording-test.js index b72e9511..c21ab079 100644 --- a/packages/@pollyjs/core/tests/unit/utils/guid-for-recording-test.js +++ b/packages/@pollyjs/core/tests/unit/utils/guid-for-recording-test.js @@ -6,13 +6,13 @@ describe('Unit | Utils | guidForRecording', function () { }); it('should remove illegal file system characters', function () { - expect(guidForRecording(`'?<>\\:*|"`)).to.equal('-_3218500777'); + expect(guidForRecording(`'?<>\\:*|"`)).to.equal('_3218500777'); }); it('should create a guid for each segment of the name', function () { const name = guidForRecording(`foo!/bar%/baz..`); - expect(name).to.equal('foo-_2152783170/bar-_567945773/baz-_1682401886'); + expect(name).to.equal('foo_2152783170/bar_567945773/baz_1682401886'); }); it('should trim name to 100 characters', function () { diff --git a/packages/@pollyjs/persister-fs/package.json b/packages/@pollyjs/persister-fs/package.json index 96fc58b7..e081bea8 100644 --- a/packages/@pollyjs/persister-fs/package.json +++ b/packages/@pollyjs/persister-fs/package.json @@ -43,7 +43,7 @@ "@pollyjs/persister": "^5.1.1" }, "devDependencies": { - "fixturify": "^1.2.0", + "fixturify": "^2.1.1", "rimraf": "^3.0.2", "rollup": "^1.14.6" } diff --git a/packages/@pollyjs/persister/package.json b/packages/@pollyjs/persister/package.json index 640b12a3..ddeaef90 100644 --- a/packages/@pollyjs/persister/package.json +++ b/packages/@pollyjs/persister/package.json @@ -39,13 +39,13 @@ "dependencies": { "@pollyjs/utils": "^5.1.1", "bowser": "^2.4.0", - "fast-json-stable-stringify": "^2.0.0", - "lodash-es": "^4.17.11", - "set-cookie-parser": "^2.3.5", + "fast-json-stable-stringify": "^2.1.0", + "lodash-es": "^4.17.21", + "set-cookie-parser": "^2.4.8", "utf8-byte-length": "^1.0.4" }, "devDependencies": { - "har-validator": "^5.1.3", + "har-validator": "^5.1.5", "rollup": "^1.14.6" } } diff --git a/packages/@pollyjs/utils/package.json b/packages/@pollyjs/utils/package.json index 02ac0c2e..3acb088c 100644 --- a/packages/@pollyjs/utils/package.json +++ b/packages/@pollyjs/utils/package.json @@ -37,7 +37,7 @@ ], "license": "Apache-2.0", "dependencies": { - "qs": "^6.7.0", + "qs": "^6.10.1", "url-parse": "^1.4.7" }, "devDependencies": { diff --git a/yarn.lock b/yarn.lock index a68c2b65..a4435c67 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2757,10 +2757,10 @@ resolved "https://registry.yarnpkg.com/@simple-dom/interface/-/interface-1.4.0.tgz#e8feea579232017f89b0138e2726facda6fbb71f" integrity sha512-l5qumKFWU0S+4ZzMaLXFU8tQZsicHEMEyAxI5kDFGhJsRqDwe0a7/iPA/GdxlGyDKseQQAgIz5kzU7eXTrlSpA== -"@sindresorhus/fnv1a@^1.2.0": - version "1.2.0" - resolved "https://registry.yarnpkg.com/@sindresorhus/fnv1a/-/fnv1a-1.2.0.tgz#d554da64c406f3b62ad06dfce9efd537a4a55de4" - integrity sha512-5ezb/dBSTWtKQ4sLQwMgOJyREXJcZZkTMbendMwKrXTghUhWjZhstzkkmt4/WkFy/GSTSGzfJOKU7dEXv3C/XQ== +"@sindresorhus/fnv1a@^2.0.1": + version "2.0.1" + resolved "https://registry.yarnpkg.com/@sindresorhus/fnv1a/-/fnv1a-2.0.1.tgz#2aefdfa7eb5b7f29a7936978218e986c70c603fc" + integrity sha512-suq9tRQ6bkpMukTG5K5z0sPWB7t0zExMzZCdmYm6xTSSIm/yCKNm7VCL36wVeyTsFr597/UhU1OAYdHGMDiHrw== "@sindresorhus/is@^0.14.0": version "0.14.0" @@ -4791,9 +4791,10 @@ bluebird@^3.5.5: resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f" integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg== -blueimp-md5@^2.10.0: - version "2.10.0" - resolved "https://registry.yarnpkg.com/blueimp-md5/-/blueimp-md5-2.10.0.tgz#02f0843921f90dca14f5b8920a38593201d6964d" +blueimp-md5@^2.19.0: + version "2.19.0" + resolved "https://registry.yarnpkg.com/blueimp-md5/-/blueimp-md5-2.19.0.tgz#b53feea5498dcb53dc6ec4b823adb84b729c4af0" + integrity sha512-DRQrD6gJyy8FbiE4s+bDoXS9hiW3Vbx5uCdwvcCf3zLHL+Iv7LtGHLpr+GZV8rHG8tK766FGYBwRbu8pELTt+w== bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.1.1, bn.js@^4.4.0: version "4.11.8" @@ -6972,10 +6973,10 @@ detect-newline@3.1.0, detect-newline@^3.0.0: resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-3.1.0.tgz#576f5dfc63ae1a192ff192d8ad3af6308991b651" integrity sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA== -detect-node@^2.0.4: - version "2.0.4" - resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.0.4.tgz#014ee8f8f669c5c58023da64b8179c083a28c46c" - integrity sha512-ZIzRpLJrOj7jjP2miAtgqIfmzbxa4ZOr5jJc601zklsfEx9oTzmmj2nVpIPRpNlRTIh8lc1kyViIY7BWSGNmKw== +detect-node@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.1.0.tgz#c9c70775a49c3d03bc2c06d9a73be550f978f8b1" + integrity sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g== dezalgo@^1.0.0: version "1.0.3" @@ -8614,6 +8615,11 @@ fast-json-stable-stringify@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2" +fast-json-stable-stringify@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633" + integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw== + fast-levenshtein@^2.0.6, fast-levenshtein@~2.0.4: version "2.0.6" resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917" @@ -8936,7 +8942,7 @@ fixturify@^1.2.0: fs-extra "^7.0.1" matcher-collection "^2.0.0" -fixturify@^2.1.0: +fixturify@^2.1.0, fixturify@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/fixturify/-/fixturify-2.1.1.tgz#e962d72f062600cb81a9651086f60d822c72d998" integrity sha512-SRgwIMXlxkb6AUgaVjIX+jCEqdhyXu9hah7mcK+lWynjKtX73Ux1TDv71B7XyaQ+LJxkYRHl5yCL8IycAvQRUw== @@ -8997,15 +9003,6 @@ forever-agent@~0.6.1: version "0.6.1" resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91" -form-data@^2.5.1: - version "2.5.1" - resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.5.1.tgz#f2cbec57b5e59e23716e128fe44d4e5dd23895f4" - integrity sha512-m21N3WOmEEURgk6B9GLOE4RuWOFf28Lhh9qGYeNlGq4VDXUlJy2th2slBNU8Gp8EzloYZOibZJ7t5ecIrFSjVA== - dependencies: - asynckit "^0.4.0" - combined-stream "^1.0.6" - mime-types "^2.1.12" - form-data@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/form-data/-/form-data-3.0.1.tgz#ebd53791b78356a99af9a300d4282c4d5eb9755f" @@ -9015,6 +9012,15 @@ form-data@^3.0.0: combined-stream "^1.0.8" mime-types "^2.1.12" +form-data@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.0.tgz#93919daeaf361ee529584b9b31664dc12c9fa452" + integrity sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww== + dependencies: + asynckit "^0.4.0" + combined-stream "^1.0.8" + mime-types "^2.1.12" + form-data@~2.3.2: version "2.3.3" resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6" @@ -9337,7 +9343,7 @@ get-stream@^5.1.0: dependencies: pump "^3.0.0" -get-stream@^6.0.0: +get-stream@^6.0.0, get-stream@^6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.1.tgz#a262d8eef67aced57c2852ad6167526a43cbf7b7" integrity sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg== @@ -9795,7 +9801,7 @@ har-validator@^5.1.3: ajv "^6.5.5" har-schema "^2.0.0" -har-validator@~5.1.3: +har-validator@^5.1.5, har-validator@~5.1.3: version "5.1.5" resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.5.tgz#1f0803b9f8cb20c0fa13822df1ecddb36bde1efd" integrity sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w== @@ -10415,10 +10421,10 @@ ipaddr.js@1.9.0: resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.0.tgz#37df74e430a0e47550fe54a2defe30d8acd95f65" integrity sha512-M4Sjn6N/+O6/IXSJseKqHoFc+5FdGJ22sXqnjTpdZweHK64MzEPAyQZyEU3R/KRv2GLoa7nNtg/C2Ev6m7z+eA== -is-absolute-url@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/is-absolute-url/-/is-absolute-url-3.0.0.tgz#eb21d69df2ed8ef72a3e6f243e216563036a0913" - integrity sha512-3OkP8XrM2Xq4/IxsJnClfMp3OaM3TAatLPLKPeWcxLBTrpe6hihwtX+XZfJTcXg/FTRi4qjy0y/C5qiyNxY24g== +is-absolute-url@^3.0.3: + version "3.0.3" + resolved "https://registry.yarnpkg.com/is-absolute-url/-/is-absolute-url-3.0.3.tgz#96c6a22b6a23929b11ea0afb1836c36ad4a5d698" + integrity sha512-opmNIX7uFnS96NtPmhWQgQx6/NYFgsUXYMllcfzwWKUMwfo8kku1TvE6hkNcH+Q1ts5cMVrsY7j0bxXQDciu9Q== is-accessor-descriptor@^0.1.6: version "0.1.6" @@ -12026,10 +12032,10 @@ locate-path@^6.0.0: dependencies: p-locate "^5.0.0" -lodash-es@^4.17.11: - version "4.17.11" - resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.11.tgz#145ab4a7ac5c5e52a3531fb4f310255a152b4be0" - integrity sha512-DHb1ub+rMjjrxqlB3H56/6MXtm1lSksDp2rA2cNWjG8mlDUYFhUj3Di2Zn5IwSU87xLv8tNIQ7sSwE/YOX/D/Q== +lodash-es@^4.17.21: + version "4.17.21" + resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.21.tgz#43e626c46e6591b7750beb2b50117390c609e3ee" + integrity sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw== lodash._baseassign@^3.0.0: version "3.2.0" @@ -13291,7 +13297,7 @@ node-fetch@^2.6.0: resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.0.tgz#e633456386d4aa55863f676a7ab0daa8fdecb0fd" integrity sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA== -node-fetch@^2.6.1: +node-fetch@^2.6.1, node-fetch@^2.6.6: version "2.6.6" resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.6.tgz#1751a7c01834e8e1697758732e9efb6eeadfaf89" integrity sha512-Z8/6vRlTUChSdIgMa51jxQ4lrw/Jy5SOW10ObaA47/RElsAN2c5Pn8bTgFGWn/ibwzXTE8qwr1Yzx28vsecXEA== @@ -14697,11 +14703,18 @@ q@^1.5.1: version "1.5.1" resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7" -qs@6.7.0, qs@^6.4.0, qs@^6.7.0: +qs@6.7.0, qs@^6.4.0: version "6.7.0" resolved "https://registry.yarnpkg.com/qs/-/qs-6.7.0.tgz#41dc1a015e3d581f1621776be31afb2876a9b1bc" integrity sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ== +qs@^6.10.1: + version "6.10.1" + resolved "https://registry.yarnpkg.com/qs/-/qs-6.10.1.tgz#4931482fa8d647a5aab799c5271d2133b981fb6a" + integrity sha512-M528Hph6wsSVOBiYUnGf+K/7w0hNshs/duGsNXPUCLH5XAqjEtiPGwNONLV0tBH8NoGb0mvD5JubnUTrujKDTg== + dependencies: + side-channel "^1.0.4" + qs@~6.5.2: version "6.5.2" resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36" @@ -15854,10 +15867,10 @@ set-blocking@^2.0.0, set-blocking@~2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7" -set-cookie-parser@^2.3.5: - version "2.3.5" - resolved "https://registry.yarnpkg.com/set-cookie-parser/-/set-cookie-parser-2.3.5.tgz#e2c16c93f063dee2486c5d48e26621ad75fd3bab" - integrity sha512-cN4GIBOE11PDqW1tXs4y9hQX68eOczUAQSrmB1ByNG3zH4hSOeBVtBe3lmEyjt8iy2F7JR17JLRwYLb1XncfuA== +set-cookie-parser@^2.4.8: + version "2.4.8" + resolved "https://registry.yarnpkg.com/set-cookie-parser/-/set-cookie-parser-2.4.8.tgz#d0da0ed388bc8f24e706a391f9c9e252a13c58b2" + integrity sha512-edRH8mBKEWNVIVMKejNnuJxleqYE/ZSdcT8/Nem9/mmosx12pctd80s2Oy00KNZzrogMZS5mauK2/ymL1bvlvg== set-value@^0.4.3: version "0.4.3" @@ -16020,10 +16033,10 @@ slide@^1.1.6: resolved "https://registry.yarnpkg.com/slide/-/slide-1.1.6.tgz#56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707" integrity sha1-VusCfWW00tzmyy4tMsTUr8nh1wc= -slugify@^1.3.4: - version "1.3.4" - resolved "https://registry.yarnpkg.com/slugify/-/slugify-1.3.4.tgz#78d2792d7222b55cd9fc81fa018df99af779efeb" - integrity sha512-KP0ZYk5hJNBS8/eIjGkFDCzGQIoZ1mnfQRYS5WM3273z+fxGWXeN0fkwf2ebEweydv9tioZIHGZKoF21U07/nw== +slugify@^1.6.3: + version "1.6.3" + resolved "https://registry.yarnpkg.com/slugify/-/slugify-1.6.3.tgz#325aec50871acfb17976f2d3cb09ee1e7ab563be" + integrity sha512-1MPyqnIhgiq+/0iDJyqSJHENdnH5MMIlgJIBxmkRMzTNKlS/QsN5dXsB+MdDq4E6w0g9jFA4XOTRkVDjDae/2w== smart-buffer@^4.1.0: version "4.2.0"