Skip to content

Commit

Permalink
upgrade apollo-server-lambda; remove resolution (redwoodjs#2153)
Browse files Browse the repository at this point in the history 
Co-authored-by: Peter Pistorius <peter.pistorius@gmail.com>
  • Loading branch information
@thedavidprice @peterp
thedavidprice and peterp committed Mar 30, 2021
1 parent cbde257 commit b8f1209
Show file tree
Hide file tree
Showing 4 changed files with 149 additions and 160 deletions.
2 changes: 1 addition & 1 deletion packages/api/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"@prisma/client": "2.19.0",
"@redwoodjs/internal": "^0.28.2",
"@types/pino": "^6.3.6",
"apollo-server-lambda": "2.18.2",
"apollo-server-lambda": "2.22.2",
"core-js": "3.6.5",
"graphql": "15.5.0",
"graphql-scalars": "1.9.0",
Expand Down
6 changes: 2 additions & 4 deletions packages/create-redwood-app/template/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@
},
"resolutions": {
"react": "17.0.1",
"react-dom": "17.0.1",
"// Temporary fix for": "https://github.com/redwoodjs/redwood/issues/2127",
"apollo-server-core": "2.21.2"
"react-dom": "17.0.1"
}
}
}
168 changes: 84 additions & 84 deletions packages/create-redwood-app/template/yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1782,10 +1782,10 @@
tslib "^2.1.0"
warning "^4.0.3"

"@redwoodjs/api-server@^0.28.0":
version "0.28.0"
resolved "https://registry.yarnpkg.com/@redwoodjs/api-server/-/api-server-0.28.0.tgz#29ee2dc206066a4636725835a8e85f40beb5d6bf"
integrity sha512-Tb9j2k13rRfXPYRBU4kaheUIUNTMpQyojaTaE2QVAX7Jc8muueLnQIkDcQasAJFBQUqMdt+kp6PkrMS6vE9qMA==
"@redwoodjs/api-server@^0.28.2":
version "0.28.2"
resolved "https://registry.yarnpkg.com/@redwoodjs/api-server/-/api-server-0.28.2.tgz#5c66b5fec74f2c17d086019b31ff9181f1cc8dc3"
integrity sha512-h3fD8xrZ55aGBc5YXfz92+wdL5iH42uAqE+dm5abdQRAyaiIIwSXoUtdezk5h6F66zj9lV2aQniAIffqUjZ0Lw==
dependencies:
body-parser "^1.19.0"
chokidar "3.5.1"
Expand All @@ -1799,14 +1799,14 @@
youch "^2.1.1"
youch-terminal "^1.0.1"

"@redwoodjs/api@^0.28.0":
version "0.28.0"
resolved "https://registry.yarnpkg.com/@redwoodjs/api/-/api-0.28.0.tgz#427e2639b37d761b6d99a53524d3205917369fc0"
integrity sha512-re1u/FeYE/pJQ+GQSgZcLm1t/8Figgm64oa1MuSD5IuTZ7YnbS2TNjA7Q8JU71Fan3xJGugtxD4RVk+Ye+gsvw==
"@redwoodjs/api@^0.28.2":
version "0.28.2"
resolved "https://registry.yarnpkg.com/@redwoodjs/api/-/api-0.28.2.tgz#2e08e770927a1b68138c9916fa7d26172705c277"
integrity sha512-+i0Y75D/akB5hekDPIVWKoFw4nDyY35xSksqWy5Ev/neteIheLxo5TBa+fZYKVokoCu1pUCbfA2iBQgZNPqxwg==
dependencies:
"@graphql-tools/merge" "6.2.10"
"@prisma/client" "2.19.0"
"@redwoodjs/internal" "^0.28.0"
"@redwoodjs/internal" "^0.28.2"
"@types/pino" "^6.3.6"
apollo-server-lambda "2.18.2"
core-js "3.6.5"
Expand All @@ -1819,20 +1819,20 @@
pino "^6.11.1"
pino-pretty "^4.7.0"

"@redwoodjs/auth@^0.28.0":
version "0.28.0"
resolved "https://registry.yarnpkg.com/@redwoodjs/auth/-/auth-0.28.0.tgz#1360dad65df9981d98b3fe9e44c96c4388790b9a"
integrity sha512-TiBDrszWdWBBpdtQt5+/eeZPgS9iATRzLCY7VjnlJu4R+PMzH/iIxRzNoN/oWx6Xv4fjs6uIdFSSPm+R2d8H7A==
"@redwoodjs/auth@^0.28.2":
version "0.28.2"
resolved "https://registry.yarnpkg.com/@redwoodjs/auth/-/auth-0.28.2.tgz#8a90767cc261cc511e235060b7bc673a24da5cb4"
integrity sha512-AqKtEG5BdIyK8XyxgetpIasTMwRQHCOt5Cjf5sYyj0sk2csTT/jbSORTGEXwuZBef6WnWJiTgS8U1UnQhdD6hQ==

"@redwoodjs/cli@^0.28.0":
version "0.28.0"
resolved "https://registry.yarnpkg.com/@redwoodjs/cli/-/cli-0.28.0.tgz#5b816caae2835a067d504b48f3f5c38da15c3af5"
integrity sha512-2mAFt0eXtriOTbw+Sh643jXKPdlZHlfJbVLYZKH83xSe0RsLW9L0+aCUBdMtN0jjR7TWjyzX05tVoHPJA4VxMA==
"@redwoodjs/cli@^0.28.2":
version "0.28.2"
resolved "https://registry.yarnpkg.com/@redwoodjs/cli/-/cli-0.28.2.tgz#2777e74fe00177c601568abd1dad46882ad373b7"
integrity sha512-E9nfdYuL2QzGkWuoymHCLI8G248BluiZEVi/+t0owQ7jvT0Y8CiJTU7jcSg5OG1JWsQacZLFsN+GLSt1uLRR0Q==
dependencies:
"@prisma/sdk" "2.19.0"
"@redwoodjs/internal" "^0.28.0"
"@redwoodjs/prerender" "^0.28.0"
"@redwoodjs/structure" "^0.28.0"
"@redwoodjs/internal" "^0.28.2"
"@redwoodjs/prerender" "^0.28.2"
"@redwoodjs/structure" "^0.28.2"
boxen "^4.2.0"
camelcase "^6.0.0"
chalk "^4.1.0"
Expand All @@ -1857,10 +1857,10 @@
terminal-link "^2.1.1"
yargs "^16.0.3"

"@redwoodjs/core@^0.28.0":
version "0.28.0"
resolved "https://registry.yarnpkg.com/@redwoodjs/core/-/core-0.28.0.tgz#77d16f562c379a16d79dffda68fbd807ed4b689a"
integrity sha512-pilFGA5egzsS5Xwvr/Rqd+RPQ5Ge4Q+Kg7W+8Epnqik99kjzQ+F3hDnXFBAwbsoTpfQBeqrWVVS9Bf26/43oZA==
"@redwoodjs/core@^0.28.2":
version "0.28.2"
resolved "https://registry.yarnpkg.com/@redwoodjs/core/-/core-0.28.2.tgz#951952908b53865eaa0f753ddd3a7044fead38f7"
integrity sha512-Y6PpjZPkDhwO3YwfjuziXG44ZAyjTfPLlhGV8yRLqhHcbzFPt337lVNLLgWotjJp3jf9lN4N0dikbx/9qTPNfg==
dependencies:
"@babel/cli" "^7.11.6"
"@babel/core" "^7.11.6"
Expand All @@ -1872,11 +1872,11 @@
"@babel/preset-typescript" "^7.10.4"
"@babel/runtime-corejs3" "^7.11.2"
"@pmmmwh/react-refresh-webpack-plugin" "^0.4.3"
"@redwoodjs/cli" "^0.28.0"
"@redwoodjs/dev-server" "^0.28.0"
"@redwoodjs/eslint-config" "^0.28.0"
"@redwoodjs/internal" "^0.28.0"
"@redwoodjs/testing" "^0.28.0"
"@redwoodjs/cli" "^0.28.2"
"@redwoodjs/dev-server" "^0.28.2"
"@redwoodjs/eslint-config" "^0.28.2"
"@redwoodjs/internal" "^0.28.2"
"@redwoodjs/testing" "^0.28.2"
"@storybook/addon-a11y" "^6.1.19"
"@storybook/react" "^6.1.21"
"@testing-library/jest-dom" "5.11.6"
Expand Down Expand Up @@ -1925,13 +1925,13 @@
webpack-retry-chunk-load-plugin "^1.4.0"
whatwg-fetch "^3.5.0"

"@redwoodjs/dev-server@^0.28.0":
version "0.28.0"
resolved "https://registry.yarnpkg.com/@redwoodjs/dev-server/-/dev-server-0.28.0.tgz#c339c0b0ae6bf6e80d492d1aeed97db76d27c4cb"
integrity sha512-GJu/TOkjfxjsbMCcIAXK5YKISfwrCVKGzvnJPH9YH1yuKReWjUgb+Ai1X6E5ZTulEBkCVhaOsuNgtG9zFDuRyw==
"@redwoodjs/dev-server@^0.28.2":
version "0.28.2"
resolved "https://registry.yarnpkg.com/@redwoodjs/dev-server/-/dev-server-0.28.2.tgz#c3480684e6fe3e866c2dc3617b539f65fc26f794"
integrity sha512-sMb3LTA4bvDBcIsl1kNRJJaH4wcngg46TQFAHVfa5xT3HOzPQoCXR0dstaG++Imf3frQiOH1U95azIE6JQXyzw==
dependencies:
"@babel/register" "^7.9.0"
"@redwoodjs/internal" "^0.28.0"
"@redwoodjs/internal" "^0.28.2"
body-parser "^1.19.0"
chokidar "^3.4.3"
express "^4.17.1"
Expand All @@ -1942,12 +1942,12 @@
youch "^2.1.1"
youch-terminal "^1.0.1"

"@redwoodjs/eslint-config@^0.28.0":
version "0.28.0"
resolved "https://registry.yarnpkg.com/@redwoodjs/eslint-config/-/eslint-config-0.28.0.tgz#1926e83a9cfaaf4897ccbe08b4f36acdad2ae064"
integrity sha512-HueUYOoWzISvtdeMmtjlwYH1Cp/T4KITYHLnqgZUvg6YdLil6+ObmwRuCd8pmX6Tgi/tAoXqscr1GqKCaPSNZA==
"@redwoodjs/eslint-config@^0.28.2":
version "0.28.2"
resolved "https://registry.yarnpkg.com/@redwoodjs/eslint-config/-/eslint-config-0.28.2.tgz#7a718a1a70fd7fe73cf9d6ab7bcb47ccd10be5e1"
integrity sha512-4NbKWS8B0EGMoiWYGM+chhSDxdIB20acMvZUlFHz7S3wNrh8o0soPym9R0s//zLVsmhluyJijOzfHPBnrtd6fA==
dependencies:
"@redwoodjs/eslint-plugin-redwood" "^0.28.0"
"@redwoodjs/eslint-plugin-redwood" "^0.28.2"
"@typescript-eslint/eslint-plugin" "^4.0.1"
"@typescript-eslint/parser" "^4.0.1"
babel-eslint "^10.1.0"
Expand All @@ -1963,25 +1963,25 @@
eslint-plugin-react-hooks "^4.1.0"
prettier "^2.1.1"

"@redwoodjs/eslint-plugin-redwood@^0.28.0":
version "0.28.0"
resolved "https://registry.yarnpkg.com/@redwoodjs/eslint-plugin-redwood/-/eslint-plugin-redwood-0.28.0.tgz#8d543f2aa28f160c3f6bae7c9c5dc2b6c6199535"
integrity sha512-GhFNRsHUl2qeA4o3jkbLnjmvNjcWp20I6PvWSBZj6ZZlLKn1iZqeBkJr9gMRkmBWHav3YX/xV7hq95FWa3bFhg==
"@redwoodjs/eslint-plugin-redwood@^0.28.2":
version "0.28.2"
resolved "https://registry.yarnpkg.com/@redwoodjs/eslint-plugin-redwood/-/eslint-plugin-redwood-0.28.2.tgz#14d9edc141ccc4e3f3e24877766e9b7103a4622b"
integrity sha512-oJFdDAjUmvc1c4L4fBCtrfpFrAK7iNhZTD3H7iqBr5Cc1z08RbV6LnGHz4CetV4TwXHLWnRYX/a++incvNjxQw==

"@redwoodjs/forms@^0.28.0":
version "0.28.0"
resolved "https://registry.yarnpkg.com/@redwoodjs/forms/-/forms-0.28.0.tgz#106d782a3c1a7d2925f72a72d9ef6db3e9e34600"
integrity sha512-1vKJuizOfuznErfIN7B5C4p5WR+9kduWs5bytkNAkjKko3/cDY5eB0+fi2ci9zZer5s86ZagS8sJWuBQWyeC2g==
"@redwoodjs/forms@^0.28.2":
version "0.28.2"
resolved "https://registry.yarnpkg.com/@redwoodjs/forms/-/forms-0.28.2.tgz#febc056029ddc523a353ac3568231d5cf24db766"
integrity sha512-I+bNAMrqLdRBoIYuJAAF1mWpqV0bJbGuHMioiRxV/SQnSQCvdSemXNoIDueeDvURBpEjwCGb9Ov/dyS6HZT38A==
dependencies:
"@types/pascalcase" "^1.0.0"
core-js "3.6.5"
pascalcase "1.0.0"
react-hook-form "^6.9.5"

"@redwoodjs/internal@^0.28.0":
version "0.28.0"
resolved "https://registry.yarnpkg.com/@redwoodjs/internal/-/internal-0.28.0.tgz#70d42f5a4502e9026f51895f6a59c0f474024725"
integrity sha512-0VrS5VqGAmKlqEhX5iHKQAISEIltnq7rEls5WrVNXZ/9P6W5tbPFZqgNSp2gzw6FCH+LgVPy3r57knkGI6AyZg==
"@redwoodjs/internal@^0.28.2":
version "0.28.2"
resolved "https://registry.yarnpkg.com/@redwoodjs/internal/-/internal-0.28.2.tgz#439eb96bcdd525d1f4724b6868b2f68427f1380b"
integrity sha512-gQOESZxAa9XApVFSs0fwSS1a+CdHy+4wgULHVg0qaa/Q314wG3phqoHwUWYg2+0rF+66ZxI4v8rg7WEe8SkrbQ==
dependencies:
"@babel/plugin-transform-typescript" "^7.11.6"
deepmerge "^4.2.2"
Expand All @@ -1990,37 +1990,37 @@
kill-port "^1.6.1"
toml "^3.0.0"

"@redwoodjs/prerender@^0.28.0":
version "0.28.0"
resolved "https://registry.yarnpkg.com/@redwoodjs/prerender/-/prerender-0.28.0.tgz#72bc9a709f42379e24bcd18765b3965a5674e36d"
integrity sha512-gGBV1w92rbVNf7GHIMHuWlTYYS3Q0wKLFP8xomazzlma5sXfwGnAMY8xRx9XdlzF6AL+jTKbrn4f9tx4EU4oAQ==
"@redwoodjs/prerender@^0.28.2":
version "0.28.2"
resolved "https://registry.yarnpkg.com/@redwoodjs/prerender/-/prerender-0.28.2.tgz#489369f3cac85bf0956a41100edc8b8dfea2119e"
integrity sha512-W7b0ZtAL/a4rO9OMEh14F+EQa2iITpmcQMpksaPj6Rh3oeC5Xdy9VZ1qEbvEBRF1XMnNiwX0V2SaZgNcOvQbwQ==
dependencies:
"@babel/register" "^7.9.0"
"@redwoodjs/auth" "^0.28.0"
"@redwoodjs/internal" "^0.28.0"
"@redwoodjs/router" "^0.28.0"
"@redwoodjs/structure" "^0.28.0"
"@redwoodjs/web" "^0.28.0"
"@redwoodjs/auth" "^0.28.2"
"@redwoodjs/internal" "^0.28.2"
"@redwoodjs/router" "^0.28.2"
"@redwoodjs/structure" "^0.28.2"
"@redwoodjs/web" "^0.28.2"
babel-plugin-ignore-html-and-css-imports "^0.1.0"
node-fetch "^2.6.1"

"@redwoodjs/router@^0.28.0":
version "0.28.0"
resolved "https://registry.yarnpkg.com/@redwoodjs/router/-/router-0.28.0.tgz#9437b01401a6755b6d94e85b0daa455c6ad88a49"
integrity sha512-fuO+BucZvo+bb1IHAK0ZsT7JAzojqP4pNPCNwS/55/oomKdPXDmk4tBHBzKID5RoGLAcio3OmZhE4p1UCNWKLQ==
"@redwoodjs/router@^0.28.2":
version "0.28.2"
resolved "https://registry.yarnpkg.com/@redwoodjs/router/-/router-0.28.2.tgz#b4a65fb77312921d0c1153e009b0d531cf28e336"
integrity sha512-uahtinqcH0xW63NGylGW3NM41ZdRlhLjA6jumRIpqjd8bPlXYCoNlLfVCM4cvVn84V/t9FCdp/mvBXgMtHzn9Q==
dependencies:
"@reach/skip-nav" "^0.13.2"
"@redwoodjs/auth" "^0.28.0"
"@redwoodjs/auth" "^0.28.2"
core-js "3.6.5"
lodash.isequal "^4.5.0"

"@redwoodjs/structure@^0.28.0":
version "0.28.0"
resolved "https://registry.yarnpkg.com/@redwoodjs/structure/-/structure-0.28.0.tgz#c93ccc7e8720b6d550cf63b0b1205d3545466590"
integrity sha512-OHAzP8TmI/ghlhwIoxmW32+Dd82NWBHnhI9HVrBI8BzkcL9fokwugHlQiPfesc31TA5M32rJglaVZbriRmMJlg==
"@redwoodjs/structure@^0.28.2":
version "0.28.2"
resolved "https://registry.yarnpkg.com/@redwoodjs/structure/-/structure-0.28.2.tgz#b9d3a58304fa02d0009dc934a71c3ef74a1b2e3a"
integrity sha512-+E7r6VAbVOHoxLkYfmKSHpgI6bbUnN+0eGeX2RiuiyHO1RnADAFgZxEAVjEmaTuGAwEZacwqdZeIfnjSTPgpUg==
dependencies:
"@prisma/sdk" "2.19.0"
"@redwoodjs/internal" "^0.28.0"
"@redwoodjs/internal" "^0.28.2"
"@types/line-column" "^1.0.0"
camelcase "^6.0.0"
deepmerge "^4.2.2"
Expand All @@ -2041,26 +2041,26 @@
vscode-languageserver-types "3.15.1"
yargs-parser "^18.1.3"

"@redwoodjs/testing@^0.28.0":
version "0.28.0"
resolved "https://registry.yarnpkg.com/@redwoodjs/testing/-/testing-0.28.0.tgz#f963a7445d67ccbcdd9948bb5802b876678e6644"
integrity sha512-cc2WoK1Y3m3RG5Y7zNU4FcLoqOM/ZTJtYqo6TKT0qzp7jLtzK1zUZdSU4+opsf3+p/mZidrwFNQVXsrTlzqOEA==
"@redwoodjs/testing@^0.28.2":
version "0.28.2"
resolved "https://registry.yarnpkg.com/@redwoodjs/testing/-/testing-0.28.2.tgz#decd0e4d825ccf1adc755554d7bf95c647d0a769"
integrity sha512-YRNleZQiV64OCFUHrm3tfRAAdU41x/1gfUqAkSQFPac/oSgUznsMNPbsuh/woSY0GXWAX8UOZPX0aW7yRDmYSg==
dependencies:
"@redwoodjs/auth" "^0.28.0"
"@redwoodjs/internal" "^0.28.0"
"@redwoodjs/router" "^0.28.0"
"@redwoodjs/web" "^0.28.0"
"@redwoodjs/auth" "^0.28.2"
"@redwoodjs/internal" "^0.28.2"
"@redwoodjs/router" "^0.28.2"
"@redwoodjs/web" "^0.28.2"
"@testing-library/react" "11.2.2"
"@types/react" "17.0.3"
msw "^0.21.2"

"@redwoodjs/web@^0.28.0":
version "0.28.0"
resolved "https://registry.yarnpkg.com/@redwoodjs/web/-/web-0.28.0.tgz#e67f46c64fd6676c7afb0ea34b0f08bdfb13324d"
integrity sha512-X8QEskhgOl2g+a2YgoNYS34AzdYfrgz53DYXmOW2GPttjc+ry44S7gyjnkR5X+asleeWJGeRPCe7lrJtOqdM+A==
"@redwoodjs/web@^0.28.2":
version "0.28.2"
resolved "https://registry.yarnpkg.com/@redwoodjs/web/-/web-0.28.2.tgz#7e5856a65631f0699d8f0047d59bd2df2a3b127e"
integrity sha512-iFc0iHN9We9PUK8/hBnxC0wahB+1OLan07g2MMPPUIaZdJqJjmR/w8lF0WRrtgP+PNdevOfHmobvEYx5bd9Uyg==
dependencies:
"@apollo/client" "^3.3.11"
"@redwoodjs/auth" "^0.28.0"
"@redwoodjs/auth" "^0.28.2"
core-js "3.6.5"
graphql "^15.3.0"
proptypes "^1.1.0"
Expand Down Expand Up @@ -3610,7 +3610,7 @@ apollo-server-caching@^0.5.3:
dependencies:
lru-cache "^6.0.0"

apollo-server-core@2.21.2, apollo-server-core@^2.18.2:
apollo-server-core@^2.18.2:
version "2.21.2"
resolved "https://registry.yarnpkg.com/apollo-server-core/-/apollo-server-core-2.21.2.tgz#9f44bdcb4d5467a426f0fecd112afc95479d4b07"
integrity sha512-jIXMVQPOUzIOl4El/mzSixxJ5IDrqSk3L9uJ1U+ncwiQj0IjtkkyDSuYngcgyEi+KfO2lAzxeOiAy9fIjjkC2A==
Expand Down

0 comments on commit b8f1209

Please sign in to comment.