From beec7771139b681cb15f82ed01ef7a1136170baf Mon Sep 17 00:00:00 2001 From: Jordan Eldredge Date: Thu, 12 Jan 2023 22:15:59 -0800 Subject: [PATCH] Try to be more explicit with port --- packages/webamp/jest-puppeteer.config.js | 10 +- packages/webamp/package.json | 2 +- yarn.lock | 200 +++++++++++++---------- 3 files changed, 125 insertions(+), 87 deletions(-) diff --git a/packages/webamp/jest-puppeteer.config.js b/packages/webamp/jest-puppeteer.config.js index 07cf8fb5eb..ad0b7ebcac 100644 --- a/packages/webamp/jest-puppeteer.config.js +++ b/packages/webamp/jest-puppeteer.config.js @@ -5,7 +5,13 @@ module.exports = { server: { // Note: We require the the build be run before these tests. // TODO: Figure out how to get this command to run the build. - command: "npm run serve", - port: 8080, // Jest Puppeteer will wait 5000ms for this port to come online. + command: "PORT=3000 yarn serve", + port: 3000, // Jest Puppeteer will wait 5000ms for this port to come online. + launchTimeout: 10000, // Jest Puppeteer will wait 10000ms for the server to start. + debug: true, + usedPortAction: "ask", // Note: "kill" will kill the process running on the port. + waitOnScheme: { + verbose: true, + }, }, }; diff --git a/packages/webamp/package.json b/packages/webamp/package.json index e20ff11273..7a03fa14af 100644 --- a/packages/webamp/package.json +++ b/packages/webamp/package.json @@ -106,7 +106,7 @@ "imagemin-optipng": "^6.0.0", "jest": "^27.5.1", "jest-image-snapshot": "^2.12.0", - "jest-puppeteer": "^4.4.0", + "jest-puppeteer": "^6.2.0", "parcel": "^2.8.2", "postcss": "^8.4.21", "puppeteer": "^1.15.0", diff --git a/yarn.lock b/yarn.lock index ba5c5ba8fb..0a3307049d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2680,32 +2680,17 @@ tslib "^2.4.0" value-or-promise "1.0.11" -"@hapi/address@2.x.x": - version "2.1.4" - resolved "https://registry.npmjs.org/@hapi/address/-/address-2.1.4.tgz" - -"@hapi/bourne@1.x.x": - version "1.3.2" - resolved "https://registry.npmjs.org/@hapi/bourne/-/bourne-1.3.2.tgz" - -"@hapi/hoek@8.x.x", "@hapi/hoek@^8.3.0": - version "8.5.1" - resolved "https://registry.npmjs.org/@hapi/hoek/-/hoek-8.5.1.tgz" +"@hapi/hoek@^9.0.0": + version "9.3.0" + resolved "https://registry.yarnpkg.com/@hapi/hoek/-/hoek-9.3.0.tgz#8368869dcb735be2e7f5cb7647de78e167a251fb" + integrity sha512-/c6rf4UJlmHlC9b5BaNvzAcFv7HZ2QHaV0D4/HNlBdvFnvQq8RI4kYdhyPCl7Xj+oWvTWQ8ujhqS53LIgAe6KQ== -"@hapi/joi@^15.0.3": - version "15.1.1" - resolved "https://registry.npmjs.org/@hapi/joi/-/joi-15.1.1.tgz" - dependencies: - "@hapi/address" "2.x.x" - "@hapi/bourne" "1.x.x" - "@hapi/hoek" "8.x.x" - "@hapi/topo" "3.x.x" - -"@hapi/topo@3.x.x": - version "3.1.6" - resolved "https://registry.npmjs.org/@hapi/topo/-/topo-3.1.6.tgz" +"@hapi/topo@^5.0.0": + version "5.1.0" + resolved "https://registry.yarnpkg.com/@hapi/topo/-/topo-5.1.0.tgz#dc448e332c6c6e37a4dc02fd84ba8d44b9afb012" + integrity sha512-foQZKJig7Ob0BMAYBfcJk8d77QtOe7Wo4ox7ff1lQYoNNAb6jwcY1ncdoy2e9wQZzvNy7ODZCYJkK8kzmcAnAg== dependencies: - "@hapi/hoek" "^8.3.0" + "@hapi/hoek" "^9.0.0" "@humanwhocodes/config-array@^0.11.6": version "0.11.7" @@ -5129,6 +5114,23 @@ fflate "^0.7.3" string.prototype.codepointat "^0.2.1" +"@sideway/address@^4.1.3": + version "4.1.4" + resolved "https://registry.yarnpkg.com/@sideway/address/-/address-4.1.4.tgz#03dccebc6ea47fdc226f7d3d1ad512955d4783f0" + integrity sha512-7vwq+rOHVWjyXxVlR76Agnvhy8I9rpzjosTESvmhNeXOXdZZB15Fl+TI9x1SiHZH5Jv2wTGduSxFDIaq0m3DUw== + dependencies: + "@hapi/hoek" "^9.0.0" + +"@sideway/formula@^3.0.0": + version "3.0.1" + resolved "https://registry.yarnpkg.com/@sideway/formula/-/formula-3.0.1.tgz#80fcbcbaf7ce031e0ef2dd29b1bfc7c3f583611f" + integrity sha512-/poHZJJVjx3L+zVD6g9KgHfYnb443oi7wLu/XKojDviHy6HOEOA6z1Trk5aR1dGcmPenJEgb2sK2I80LeS3MIg== + +"@sideway/pinpoint@^2.0.0": + version "2.0.0" + resolved "https://registry.yarnpkg.com/@sideway/pinpoint/-/pinpoint-2.0.0.tgz#cff8ffadc372ad29fd3f78277aeb29e632cc70df" + integrity sha512-RNiOoTPkptFtSVzQevY/yWtZwf/RxyVnPy/OcA9HBM3MlGDnBEYL5B41H0MTn0Uec8Hi+2qUtTfG2WWZBmMejQ== + "@sinclair/typebox@^0.24.1": version "0.24.42" resolved "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.24.42.tgz" @@ -7839,6 +7841,13 @@ axe-core@^4.4.3: resolved "https://registry.npmjs.org/axe-core/-/axe-core-4.4.3.tgz" integrity sha512-32+ub6kkdhhWick/UjvEwRchgoetXqTK14INLqbGm5U2TzBkBNF3nQtLYm8ovxSkQWArjEQvftCKryjZaATu3w== +axios@^0.25.0: + version "0.25.0" + resolved "https://registry.yarnpkg.com/axios/-/axios-0.25.0.tgz#349cfbb31331a9b4453190791760a8d35b093e0a" + integrity sha512-cD8FOb0tRH3uuEe6+evtAbgJtfxr7ly3fQjYcMcuPlgkwVS9xboaVIpcDV+cYQe+yGykgwZCs1pzjntcGa6l5g== + dependencies: + follow-redirects "^1.14.7" + axobject-query@^2.2.0: version "2.2.0" resolved "https://registry.npmjs.org/axobject-query/-/axobject-query-2.2.0.tgz" @@ -9488,7 +9497,7 @@ comma-separated-tokens@^1.0.0: resolved "https://registry.npmjs.org/comma-separated-tokens/-/comma-separated-tokens-1.0.8.tgz" integrity sha512-GHuDRO12Sypu2cV70d1dkA2EUmXHgntrzbpvOB+Qy+49ypNfGgFQIC2fhhXbnyrJRynDCAARsT7Ou0M6hirpfw== -commander@^2.11.0, commander@^2.19.0, commander@^2.20.0, commander@^2.20.3, commander@^2.3.0: +commander@^2.19.0, commander@^2.20.0, commander@^2.20.3, commander@^2.3.0: version "2.20.3" resolved "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz" @@ -9832,7 +9841,7 @@ core-js-pure@^3.25.1, core-js-pure@^3.8.1: resolved "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.25.2.tgz" integrity sha512-ItD7YpW1cUB4jaqFLZXe1AXkyqIxz6GqPnsDV4uF4hVcWh/WAGIqSqw5p0/WdsILM0Xht9s3Koyw05R3K6RtiA== -core-js@^2.4.0, core-js@^2.6.5: +core-js@^2.4.0: version "2.6.11" resolved "https://registry.npmjs.org/core-js/-/core-js-2.6.11.tgz" @@ -10353,7 +10362,7 @@ dateformat@^2.0.0: resolved "https://registry.npmjs.org/dateformat/-/dateformat-2.2.0.tgz" integrity sha512-GODcnWq3YGoTnygPfi02ygEiRxqUxpJwuRHjdhJYuxpcZmDq4rjBiXYmbCCzStxo176ixfLT6i4NPwQooRySnw== -debug@2.6.9, debug@^2.1.1, debug@^2.2.0, debug@^2.3.3, debug@^2.6.0, debug@^2.6.8, debug@^2.6.9: +debug@2.6.9, debug@^2.1.1, debug@^2.2.0, debug@^2.3.3, debug@^2.6.0, debug@^2.6.9: version "2.6.9" resolved "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz" dependencies: @@ -12576,9 +12585,10 @@ expand-tilde@^2.0.0, expand-tilde@^2.0.2: dependencies: homedir-polyfill "^1.0.1" -expect-puppeteer@^4.4.0: - version "4.4.0" - resolved "https://registry.npmjs.org/expect-puppeteer/-/expect-puppeteer-4.4.0.tgz" +expect-puppeteer@^6.1.1: + version "6.1.1" + resolved "https://registry.yarnpkg.com/expect-puppeteer/-/expect-puppeteer-6.1.1.tgz#f446cd2a6f9db895077e4fe591db432b5d7f34b5" + integrity sha512-cnQF96qdoEcOD63j5NQMc0RtW9WRMW/WHKXEKsuDQ2tszhVH3qC7zkXXS4D0LTt9qCB3DEExioqylsQXvqPrUw== expect@^27.5.1: version "27.5.1" @@ -13141,13 +13151,14 @@ find-pkg@^0.1.2: dependencies: find-file-up "^0.1.2" -find-process@^1.4.3: - version "1.4.3" - resolved "https://registry.npmjs.org/find-process/-/find-process-1.4.3.tgz" +find-process@^1.4.7: + version "1.4.7" + resolved "https://registry.yarnpkg.com/find-process/-/find-process-1.4.7.tgz#8c76962259216c381ef1099371465b5b439ea121" + integrity sha512-/U4CYp1214Xrp3u3Fqr9yNynUrr5Le4y0SsJh2lMDDSbpwYSz3M2SMWQC+wqcx79cN8PQtHQIL8KnuY9M66fdg== dependencies: - chalk "^2.0.1" - commander "^2.11.0" - debug "^2.6.8" + chalk "^4.0.0" + commander "^5.1.0" + debug "^4.1.1" find-up@^1.0.0: version "1.1.2" @@ -13276,6 +13287,11 @@ follow-redirects@^1.0.0: dependencies: debug "^3.0.0" +follow-redirects@^1.14.7: + version "1.15.2" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.2.tgz#b460864144ba63f2681096f274c4e57026da2c13" + integrity sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA== + for-each@^0.3.3: version "0.3.3" resolved "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz" @@ -15957,17 +15973,18 @@ jest-config@^27.5.1: slash "^3.0.0" strip-json-comments "^3.1.1" -jest-dev-server@^4.4.0: - version "4.4.0" - resolved "https://registry.npmjs.org/jest-dev-server/-/jest-dev-server-4.4.0.tgz" +jest-dev-server@^6.2.0: + version "6.2.0" + resolved "https://registry.yarnpkg.com/jest-dev-server/-/jest-dev-server-6.2.0.tgz#2c6d2b919217b376145b7a8303c760f25f4abbd8" + integrity sha512-ZWh8CuvxwjhYfvw4tGeftziqIvw/26R6AG3OTgNTQeXul8aZz48RQjDpnlDwnWX53jxJJl9fcigqIdSU5lYZuw== dependencies: - chalk "^3.0.0" + chalk "^4.1.2" cwd "^0.10.0" - find-process "^1.4.3" - prompts "^2.3.0" - spawnd "^4.4.0" + find-process "^1.4.7" + prompts "^2.4.2" + spawnd "^6.2.0" tree-kill "^1.2.2" - wait-on "^3.3.0" + wait-on "^6.0.1" jest-diff@^27.0.0: version "27.3.1" @@ -16032,14 +16049,16 @@ jest-environment-node@^27.5.1: jest-mock "^27.5.1" jest-util "^27.5.1" -jest-environment-puppeteer@^4.4.0: - version "4.4.0" - resolved "https://registry.npmjs.org/jest-environment-puppeteer/-/jest-environment-puppeteer-4.4.0.tgz" +jest-environment-puppeteer@^6.2.0: + version "6.2.0" + resolved "https://registry.yarnpkg.com/jest-environment-puppeteer/-/jest-environment-puppeteer-6.2.0.tgz#5f831d0e83fd8f58ec6237427040d5dc72ca7bf0" + integrity sha512-a/oSu6dO9D+XoDDe3ZY/0Sk79Jl2FcJl7Q0D+3x22l1eWNOYe4ikXnPGhtmNZ3mJIpuAVIX6LytA8EraOk/aqQ== dependencies: - chalk "^3.0.0" + chalk "^4.1.2" cwd "^0.10.0" - jest-dev-server "^4.4.0" - merge-deep "^3.0.2" + jest-dev-server "^6.2.0" + jest-environment-node "^27.5.1" + merge-deep "^3.0.3" jest-get-type@^24.9.0: version "24.9.0" @@ -16173,12 +16192,13 @@ jest-pnp-resolver@^1.2.2: resolved "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.2.tgz" integrity sha512-olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w== -jest-puppeteer@^4.4.0: - version "4.4.0" - resolved "https://registry.npmjs.org/jest-puppeteer/-/jest-puppeteer-4.4.0.tgz" +jest-puppeteer@^6.2.0: + version "6.2.0" + resolved "https://registry.yarnpkg.com/jest-puppeteer/-/jest-puppeteer-6.2.0.tgz#2fe67e9be19bd5190b9c2669f4ddc73825c6d2d8" + integrity sha512-4Ynkgcf9FkHlTNEpdsojGLb3KtsToWqjO6SCigxb9Qj3HzIqhzJzNbDJ/XhiciNDpqDe6KHW9sZ6fjHphNLr6g== dependencies: - expect-puppeteer "^4.4.0" - jest-environment-puppeteer "^4.4.0" + expect-puppeteer "^6.1.1" + jest-environment-puppeteer "^6.2.0" jest-regex-util@^27.5.1: version "27.5.1" @@ -16439,6 +16459,17 @@ jmespath@0.16.0: resolved "https://registry.npmjs.org/jmespath/-/jmespath-0.16.0.tgz" integrity sha512-9FzQjJ7MATs1tSpnco1K6ayiYE3figslrXA72G2HQ/n76RzvYlofyi5QM+iX4YRs/pu3yzxlVQSST23+dMDknw== +joi@^17.6.0: + version "17.7.0" + resolved "https://registry.yarnpkg.com/joi/-/joi-17.7.0.tgz#591a33b1fe1aca2bc27f290bcad9b9c1c570a6b3" + integrity sha512-1/ugc8djfn93rTE3WRKdCzGGt/EtiYKxITMO4Wiv6q5JL1gl9ePt4kBsl1S499nbosspfctIQTpYIhSmHA3WAg== + dependencies: + "@hapi/hoek" "^9.0.0" + "@hapi/topo" "^5.0.0" + "@sideway/address" "^4.1.3" + "@sideway/formula" "^3.0.0" + "@sideway/pinpoint" "^2.0.0" + joycon@^3.0.1: version "3.0.1" resolved "https://registry.npmjs.org/joycon/-/joycon-3.0.1.tgz" @@ -17753,9 +17784,9 @@ meow@^3.3.0: redent "^1.0.0" trim-newlines "^1.0.0" -merge-deep@^3.0.2: +merge-deep@^3.0.3: version "3.0.3" - resolved "https://registry.npmjs.org/merge-deep/-/merge-deep-3.0.3.tgz" + resolved "https://registry.yarnpkg.com/merge-deep/-/merge-deep-3.0.3.tgz#1a2b2ae926da8b2ae93a0ac15d90cd1922766003" integrity sha512-qtmzAS6t6grwEkNrunqTBdn0qKwFgNWvlxUbAV8es9M7Ot1EbyApytCnvE0jALPa46ZpKDUo527kKiaWplmlFA== dependencies: arr-union "^3.1.0" @@ -20961,7 +20992,7 @@ promise@^8.1.0: dependencies: asap "~2.0.6" -prompts@^2.0.1, prompts@^2.3.0: +prompts@^2.0.1: version "2.3.2" resolved "https://registry.npmjs.org/prompts/-/prompts-2.3.2.tgz" dependencies: @@ -22218,7 +22249,7 @@ replace-ext@^1.0.0: version "1.0.1" resolved "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.1.tgz" -request@^2.68.0, request@^2.81.0, request@^2.88.0, request@^2.88.2: +request@^2.68.0, request@^2.81.0, request@^2.88.2: version "2.88.2" resolved "https://registry.npmjs.org/request/-/request-2.88.2.tgz" dependencies: @@ -22564,10 +22595,6 @@ rx-lite@^3.1.2: resolved "https://registry.npmjs.org/rx-lite/-/rx-lite-3.1.2.tgz" integrity sha512-1I1+G2gteLB8Tkt8YI1sJvSIfa0lWuRtC8GjvtyPBcLSF5jBCCJJqKrpER5JU5r6Bhe+i9/pK3VMuUcXu0kdwQ== -rx@^4.1.0: - version "4.1.0" - resolved "https://registry.npmjs.org/rx/-/rx-4.1.0.tgz" - rxjs@^6.3.3, rxjs@^6.4.0, rxjs@^6.6.2: version "6.6.7" resolved "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz" @@ -22575,6 +22602,13 @@ rxjs@^6.3.3, rxjs@^6.4.0, rxjs@^6.6.2: dependencies: tslib "^1.9.0" +rxjs@^7.5.4: + version "7.8.0" + resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.8.0.tgz#90a938862a82888ff4c7359811a595e14e1e09a4" + integrity sha512-F2+gxDshqmIub1KdvZkaEfGDwLNpPvk9Fs6LD/MyQxNgMds/WH9OdDDXOmxUZpME+iSK3rQCctkL0DYyytUqMg== + dependencies: + tslib "^2.1.0" + safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1: version "5.1.2" resolved "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz" @@ -23350,14 +23384,14 @@ sparkles@^1.0.0: resolved "https://registry.npmjs.org/sparkles/-/sparkles-1.0.1.tgz" integrity sha512-dSO0DDYUahUt/0/pD/Is3VIm5TGJjludZ0HVymmhYF6eNA53PVLhnUk0znSYbH8IYBuJdCE+1luR22jNLMaQdw== -spawnd@^4.4.0: - version "4.4.0" - resolved "https://registry.npmjs.org/spawnd/-/spawnd-4.4.0.tgz" +spawnd@^6.2.0: + version "6.2.0" + resolved "https://registry.yarnpkg.com/spawnd/-/spawnd-6.2.0.tgz#255bb3f405d0fbacefa1c5398cec58588c263c81" + integrity sha512-qX/I4lQy4KgVEcNle0kuc4FxFWHISzBhZW1YemPfwmrmQjyZmfTK/OhBKkhrD2ooAaFZEm1maEBLE6/6enwt+g== dependencies: exit "^0.1.2" - signal-exit "^3.0.2" + signal-exit "^3.0.7" tree-kill "^1.2.2" - wait-port "^0.2.7" spdx-correct@^3.0.0: version "3.1.0" @@ -24732,6 +24766,11 @@ tslib@^2.0.0, tslib@^2.0.1, tslib@^2.0.3, tslib@^2.3.1, tslib@^2.4.0, tslib@~2.4 resolved "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz" integrity sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ== +tslib@^2.1.0: + version "2.4.1" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.4.1.tgz#0d0bfbaac2880b91e22df0768e55be9753a5b17e" + integrity sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA== + tslib@^2.2.0: version "2.3.1" resolved "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz" @@ -25507,15 +25546,16 @@ w3c-xmlserializer@^2.0.0: dependencies: xml-name-validator "^3.0.0" -wait-on@^3.3.0: - version "3.3.0" - resolved "https://registry.npmjs.org/wait-on/-/wait-on-3.3.0.tgz" +wait-on@^6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/wait-on/-/wait-on-6.0.1.tgz#16bbc4d1e4ebdd41c5b4e63a2e16dbd1f4e5601e" + integrity sha512-zht+KASY3usTY5u2LgaNqn/Cd8MukxLGjdcZxT2ns5QzDmTFc4XoWBgC+C/na+sMRZTuVygQoMYwdcVjHnYIVw== dependencies: - "@hapi/joi" "^15.0.3" - core-js "^2.6.5" - minimist "^1.2.0" - request "^2.88.0" - rx "^4.1.0" + axios "^0.25.0" + joi "^17.6.0" + lodash "^4.17.21" + minimist "^1.2.5" + rxjs "^7.5.4" wait-port@^0.2.2: version "0.2.14" @@ -25526,14 +25566,6 @@ wait-port@^0.2.2: commander "^3.0.2" debug "^4.1.1" -wait-port@^0.2.7: - version "0.2.7" - resolved "https://registry.npmjs.org/wait-port/-/wait-port-0.2.7.tgz" - dependencies: - chalk "^2.4.2" - commander "^3.0.2" - debug "^4.1.1" - walk-up-path@^1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/walk-up-path/-/walk-up-path-1.0.0.tgz"