From f0ae0690a9314e250bca201b5b7fe0eaa947d393 Mon Sep 17 00:00:00 2001 From: David S Price Date: Tue, 30 Mar 2021 21:54:28 -0700 Subject: [PATCH 1/2] v0.28.3 --- api/package.json | 2 +- package.json | 2 +- web/package.json | 8 +- yarn.lock | 298 +++++++++++++++++++++++------------------------ 4 files changed, 154 insertions(+), 156 deletions(-) diff --git a/api/package.json b/api/package.json index 14a7368..e3e802e 100644 --- a/api/package.json +++ b/api/package.json @@ -3,6 +3,6 @@ "version": "0.0.0", "private": true, "dependencies": { - "@redwoodjs/api": "^0.28.0" + "@redwoodjs/api": "^0.28.3" } } diff --git a/package.json b/package.json index 8bf3b78..19b6388 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ ] }, "devDependencies": { - "@redwoodjs/core": "^0.28.0" + "@redwoodjs/core": "^0.28.3" }, "eslintConfig": { "extends": "@redwoodjs/eslint-config" diff --git a/web/package.json b/web/package.json index 9029ddd..6873991 100644 --- a/web/package.json +++ b/web/package.json @@ -13,10 +13,10 @@ ] }, "dependencies": { - "@redwoodjs/auth": "^0.28.0", - "@redwoodjs/forms": "^0.28.0", - "@redwoodjs/router": "^0.28.0", - "@redwoodjs/web": "^0.28.0", + "@redwoodjs/auth": "^0.28.3", + "@redwoodjs/forms": "^0.28.3", + "@redwoodjs/router": "^0.28.3", + "@redwoodjs/web": "^0.28.3", "netlify-identity-widget": "^1.9.1", "prop-types": "^15.7.2", "react": "^17.0.1", diff --git a/yarn.lock b/yarn.lock index 99d567b..03edf06 100644 --- a/yarn.lock +++ b/yarn.lock @@ -47,12 +47,12 @@ dependencies: apollo-env "^0.6.6" -"@apollographql/graphql-playground-html@1.6.26": - version "1.6.26" - resolved "https://registry.yarnpkg.com/@apollographql/graphql-playground-html/-/graphql-playground-html-1.6.26.tgz#2f7b610392e2a872722912fc342b43cf8d641cb3" - integrity sha512-XAwXOIab51QyhBxnxySdK3nuMEUohhDsHQ5Rbco/V1vjlP75zZ0ZLHD9dTpXTN8uxKxopb2lUvJTq+M4g2Q0HQ== +"@apollographql/graphql-playground-html@1.6.27": + version "1.6.27" + resolved "https://registry.yarnpkg.com/@apollographql/graphql-playground-html/-/graphql-playground-html-1.6.27.tgz#bc9ab60e9445aa2a8813b4e94f152fa72b756335" + integrity sha512-tea2LweZvn6y6xFV11K0KC8ETjmm52mQrW+ezgB2O/aTQf8JGyFmMcRPFgUaQZeHbWdm8iisDC6EjOKsXu0nfw== dependencies: - xss "^1.0.6" + xss "^1.0.8" "@apollographql/graphql-upload-8-fork@^8.1.3": version "8.1.3" @@ -1991,6 +1991,11 @@ "@types/yargs" "^15.0.0" chalk "^4.0.0" +"@josephg/resolvable@^1.0.0": + version "1.0.0" + resolved "https://registry.yarnpkg.com/@josephg/resolvable/-/resolvable-1.0.0.tgz#cd75b09cfad18cd945de9221d403203aa07e3d0a" + integrity sha512-OfTtjoqB2doov5aTJxkyAMK8dXoo7CjCUQSYUEtiY34jbWduOGV7+168tmCT8COMsUEd5DMSFg/0iAOPCBTNAQ== + "@mrmlnc/readdir-enhanced@^2.2.1": version "2.2.1" resolved "https://registry.yarnpkg.com/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz#524af240d1a360527b730475ecfa1344aa540dde" @@ -2276,16 +2281,16 @@ tslib "^2.1.0" warning "^4.0.3" -"@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.3": + version "0.28.3" + resolved "https://registry.yarnpkg.com/@redwoodjs/api/-/api-0.28.3.tgz#0c9e3d8d970ecdebaa4860f29ac4a256d9aa00db" + integrity sha512-czNfX68T6++DNdO1ISV+dRPX7KGI2CuN4zpEZGDI4ug3IDzwt9kw5pcvp201l4lMhS/IINlYIAaqXyyB3Iywlw== dependencies: "@graphql-tools/merge" "6.2.10" "@prisma/client" "2.19.0" - "@redwoodjs/internal" "^0.28.0" + "@redwoodjs/internal" "^0.28.3" "@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" @@ -2296,20 +2301,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.3": + version "0.28.3" + resolved "https://registry.yarnpkg.com/@redwoodjs/auth/-/auth-0.28.3.tgz#e23477061f8689841d856df96f76a4fc82adf2dc" + integrity sha512-PYWwQE+4kCp7NOnr26bs8bMU2A8DDLuntm7mRv45naefsK4nBsTxzfdHbOZ20OnosQEj5IT/5syiowWN1NKMXw== -"@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.3": + version "0.28.3" + resolved "https://registry.yarnpkg.com/@redwoodjs/cli/-/cli-0.28.3.tgz#a9a9c975ee2a9119acc3ffdbd25d7611ccc761ad" + integrity sha512-rEqZYhS0n6nNpxBtX0Kbq7frigqMI3rjc5kkVdPSu5i8bcIWxGcSj7eImoj8106z12wr5mw4mopNO7NvLba6EQ== 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.3" + "@redwoodjs/prerender" "^0.28.3" + "@redwoodjs/structure" "^0.28.3" boxen "^4.2.0" camelcase "^6.0.0" chalk "^4.1.0" @@ -2334,10 +2339,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.3": + version "0.28.3" + resolved "https://registry.yarnpkg.com/@redwoodjs/core/-/core-0.28.3.tgz#61cc00d176d33d68249ba4ed1f5fc3510cd13fca" + integrity sha512-nSsMubOEv++sFsOEkXWAK9EpCXzQsBX0aenR8Xk6aRmn+1CEUCPxaR4jkjqk9nL7qBfqM2iswcCzdaEaY3NW5A== dependencies: "@babel/cli" "^7.11.6" "@babel/core" "^7.11.6" @@ -2349,11 +2354,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.3" + "@redwoodjs/dev-server" "^0.28.3" + "@redwoodjs/eslint-config" "^0.28.3" + "@redwoodjs/internal" "^0.28.3" + "@redwoodjs/testing" "^0.28.3" "@storybook/addon-a11y" "^6.1.19" "@storybook/react" "^6.1.21" "@testing-library/jest-dom" "5.11.6" @@ -2402,13 +2407,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.3": + version "0.28.3" + resolved "https://registry.yarnpkg.com/@redwoodjs/dev-server/-/dev-server-0.28.3.tgz#f7fcf781aed13be3812827c5f61e53a045207695" + integrity sha512-cp2I4t+hLABanirVtW4nxjvWMzk/AUBM5Pq4H+XIN+yIwuCUB7MnQLWnNZK0DRZwk10Xz4gkVfR8YJV7XShJaQ== dependencies: "@babel/register" "^7.9.0" - "@redwoodjs/internal" "^0.28.0" + "@redwoodjs/internal" "^0.28.3" body-parser "^1.19.0" chokidar "^3.4.3" express "^4.17.1" @@ -2419,12 +2424,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.3": + version "0.28.3" + resolved "https://registry.yarnpkg.com/@redwoodjs/eslint-config/-/eslint-config-0.28.3.tgz#76a663288d92dda56aedbc2847b24a3d35433410" + integrity sha512-neuFMY9vlVxPUWHZxbp0bBrgh5uYbFSAUXHCrJ3xdoA6rcuk0Vn3s2on8o4Lp9fJRZhP8uwj4xf8Wp3rNnLu6w== dependencies: - "@redwoodjs/eslint-plugin-redwood" "^0.28.0" + "@redwoodjs/eslint-plugin-redwood" "^0.28.3" "@typescript-eslint/eslint-plugin" "^4.0.1" "@typescript-eslint/parser" "^4.0.1" babel-eslint "^10.1.0" @@ -2440,25 +2445,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.3": + version "0.28.3" + resolved "https://registry.yarnpkg.com/@redwoodjs/eslint-plugin-redwood/-/eslint-plugin-redwood-0.28.3.tgz#5bf62c7b5c1d1d6b47f8f3a70d70dad2870f49f2" + integrity sha512-yORDCZ8qz5i0LpiRdUtmZ0JrqWYmdz3igEg0YnVIn3fgnQZgm6idilJqfPVB1TyJZ9FTwDzcGOMqWyfyfhtXEQ== -"@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.3": + version "0.28.3" + resolved "https://registry.yarnpkg.com/@redwoodjs/forms/-/forms-0.28.3.tgz#356ba7aa661d2101c14ea8897a07e96dc052b0f2" + integrity sha512-FxJEI8CAArcUK531FPqFEFPH3BvI+mLLKjU6jJTlg4w8c2IimSpptO3BQL4FginaWEXJy/c7OW/NAURoTZBjIg== 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.3": + version "0.28.3" + resolved "https://registry.yarnpkg.com/@redwoodjs/internal/-/internal-0.28.3.tgz#a08887663ddfb588f6b89a98af9df907c8ab8b8f" + integrity sha512-M57+uSQZoOAZDunUFYxXX11jXh3F9v7UCZ2SZjDUkrG9hZBnPOHLQqzKcZTSvjTA3edKlgc8CmuqryhKLUQWFg== dependencies: "@babel/plugin-transform-typescript" "^7.11.6" deepmerge "^4.2.2" @@ -2467,37 +2472,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.3": + version "0.28.3" + resolved "https://registry.yarnpkg.com/@redwoodjs/prerender/-/prerender-0.28.3.tgz#0f3af9917575a18388a47c620c086a94f6a39490" + integrity sha512-QTZ7GzO6yXeQ3TavPpZbobghXPJPVxPSG5c6lpLzj5y4qXTF+xeNkRaijOc+5GMztk3cYcidG+usj9xHtzJ5Fg== 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.3" + "@redwoodjs/internal" "^0.28.3" + "@redwoodjs/router" "^0.28.3" + "@redwoodjs/structure" "^0.28.3" + "@redwoodjs/web" "^0.28.3" 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.3": + version "0.28.3" + resolved "https://registry.yarnpkg.com/@redwoodjs/router/-/router-0.28.3.tgz#e2b1856995ce3886d5a4bfba5e17922c8cbdd93c" + integrity sha512-Kss7mDYSrayMqIETGevOKYW1p7tdKgYJpAR1W6cJfgTWqVBv+WMqPVCbSD88VmkFQDc8SLVUUolNEPZGqGpV4Q== dependencies: "@reach/skip-nav" "^0.13.2" - "@redwoodjs/auth" "^0.28.0" + "@redwoodjs/auth" "^0.28.3" 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.3": + version "0.28.3" + resolved "https://registry.yarnpkg.com/@redwoodjs/structure/-/structure-0.28.3.tgz#c7651ee1055940cbedeec2f051344cc6a3a83e6a" + integrity sha512-ocLfj5lYcVbHLoIpzBKm/7SDsMympruKv6iLQVFv44kqphJ/oaHgGZARj/9ddNYAhMmp+UdDJHFXPCjF3Sjy5A== dependencies: "@prisma/sdk" "2.19.0" - "@redwoodjs/internal" "^0.28.0" + "@redwoodjs/internal" "^0.28.3" "@types/line-column" "^1.0.0" camelcase "^6.0.0" deepmerge "^4.2.2" @@ -2518,26 +2523,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.3": + version "0.28.3" + resolved "https://registry.yarnpkg.com/@redwoodjs/testing/-/testing-0.28.3.tgz#545cd1d889bf9834caec56f44bbc2863cac85655" + integrity sha512-FAir8ssWzKOBNXKRWOeBbX3G8dc59K2Bo8R1rQAgndsvr/6mNp4Sg7kR4TG9WFv3MP5ZVm3YY/83nmTnXirAyQ== 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.3" + "@redwoodjs/internal" "^0.28.3" + "@redwoodjs/router" "^0.28.3" + "@redwoodjs/web" "^0.28.3" "@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.3": + version "0.28.3" + resolved "https://registry.yarnpkg.com/@redwoodjs/web/-/web-0.28.3.tgz#ab9ba12928273898bc6ce135807c29e517cd6034" + integrity sha512-wWgGUE04ljaDkgwajY8pmih8UL7fNZlrJQbjG8Gi6kJyp2rDJ37+DDNP2yNGMSTr/szUPkoriLaJmZ1ahMyeJA== dependencies: "@apollo/client" "^3.3.11" - "@redwoodjs/auth" "^0.28.0" + "@redwoodjs/auth" "^0.28.3" core-js "3.6.5" graphql "^15.3.0" proptypes "^1.1.0" @@ -4051,20 +4056,20 @@ anymatch@^3.0.3, anymatch@~3.1.1: normalize-path "^3.0.0" picomatch "^2.0.4" -apollo-cache-control@^0.11.6: - version "0.11.6" - resolved "https://registry.yarnpkg.com/apollo-cache-control/-/apollo-cache-control-0.11.6.tgz#f7bdf924272af47ac474cf3f3f35cfc038cc9485" - integrity sha512-YZ+uuIG+fPy+mkpBS2qKF0v1qlzZ3PW6xZVaDukeK3ed3iAs4L/2YnkTqau3OmoF/VPzX2FmSkocX/OVd59YSw== +apollo-cache-control@^0.12.0: + version "0.12.0" + resolved "https://registry.yarnpkg.com/apollo-cache-control/-/apollo-cache-control-0.12.0.tgz#45aea0a232d0704e33c2b1a3c428a5500b29818c" + integrity sha512-kClF5rfAm159Nboul1LxA+l58Tjz0M8L1GUknEMpZt0UHhILLAn3BfcG3ToX4TbNoR9M57kKMUcbPWLdy3Up7w== dependencies: apollo-server-env "^3.0.0" - apollo-server-plugin-base "^0.10.4" + apollo-server-plugin-base "^0.11.0" -apollo-datasource@^0.7.3: - version "0.7.3" - resolved "https://registry.yarnpkg.com/apollo-datasource/-/apollo-datasource-0.7.3.tgz#c824eb1457bdee5a3173ced0e35e594547e687a0" - integrity sha512-PE0ucdZYjHjUyXrFWRwT02yLcx2DACsZ0jm1Mp/0m/I9nZu/fEkvJxfsryXB6JndpmQO77gQHixf/xGCN976kA== +apollo-datasource@^0.8.0: + version "0.8.0" + resolved "https://registry.yarnpkg.com/apollo-datasource/-/apollo-datasource-0.8.0.tgz#8cf9103e83558bd30b3b522cb8ec80725c3160ce" + integrity sha512-gXgsGVLuejLc138z/2jUjPAzadDQxWbcLJyBgaQsg5BaXJNkv5uW/NjiSPk00cK51hyZrb0Xx8a+L+wPk2qIBA== dependencies: - apollo-server-caching "^0.5.3" + apollo-server-caching "^0.6.0" apollo-server-env "^3.0.0" apollo-env@^0.6.6: @@ -4102,35 +4107,36 @@ apollo-reporting-protobuf@^0.6.2: dependencies: "@apollo/protobufjs" "^1.0.3" -apollo-server-caching@^0.5.3: - version "0.5.3" - resolved "https://registry.yarnpkg.com/apollo-server-caching/-/apollo-server-caching-0.5.3.tgz#cf42a77ad09a46290a246810075eaa029b5305e1" - integrity sha512-iMi3087iphDAI0U2iSBE9qtx9kQoMMEWr6w+LwXruBD95ek9DWyj7OeC2U/ngLjRsXM43DoBDXlu7R+uMjahrQ== +apollo-server-caching@^0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/apollo-server-caching/-/apollo-server-caching-0.6.0.tgz#3140a023ce0be8c43ba0b2f5be9cc5d15d1a32f6" + integrity sha512-SfjKaccrhRzUQ8TAke9FrYppp4pZV3Rp8KCs+4Ox3kGtbco68acRPJkiYYtSVc4idR8XNAUOOVfAEZVNHdZQKQ== dependencies: lru-cache "^6.0.0" -apollo-server-core@^2.18.2: - version "2.21.0" - resolved "https://registry.yarnpkg.com/apollo-server-core/-/apollo-server-core-2.21.0.tgz#12ee11aee61fa124f11b1d73cae2e068112a3a53" - integrity sha512-GtIiq2F0dVDLzzIuO5+dK/pGq/sGxYlKCqAuQQqzYg0fvZ7fukyluXtcTe0tMI+FJZjU0j0WnKgiLsboCoAlPQ== +apollo-server-core@^2.22.2: + version "2.22.2" + resolved "https://registry.yarnpkg.com/apollo-server-core/-/apollo-server-core-2.22.2.tgz#daee67a17aa4f1bf0df3e448e237a37324906b5d" + integrity sha512-YPrhfN+I5vUerc4c0I6pd89fdqP5UNYCt/+MGv4bDA/a0kOCLvzylkQ3NlEepK1fewtqf4QO+S1LscC8vMmYdg== dependencies: "@apollographql/apollo-tools" "^0.4.3" - "@apollographql/graphql-playground-html" "1.6.26" + "@apollographql/graphql-playground-html" "1.6.27" "@apollographql/graphql-upload-8-fork" "^8.1.3" + "@josephg/resolvable" "^1.0.0" "@types/ws" "^7.0.0" - apollo-cache-control "^0.11.6" - apollo-datasource "^0.7.3" + apollo-cache-control "^0.12.0" + apollo-datasource "^0.8.0" apollo-graphql "^0.6.0" apollo-reporting-protobuf "^0.6.2" - apollo-server-caching "^0.5.3" + apollo-server-caching "^0.6.0" apollo-server-env "^3.0.0" apollo-server-errors "^2.4.2" - apollo-server-plugin-base "^0.10.4" - apollo-server-types "^0.6.3" - apollo-tracing "^0.12.2" + apollo-server-plugin-base "^0.11.0" + apollo-server-types "^0.7.0" + apollo-tracing "^0.13.0" async-retry "^1.2.1" fast-json-stable-stringify "^2.0.0" - graphql-extensions "^0.12.8" + graphql-extensions "^0.13.0" graphql-tag "^2.11.0" graphql-tools "^4.0.8" loglevel "^1.6.7" @@ -4140,14 +4146,6 @@ apollo-server-core@^2.18.2: uuid "^8.0.0" ws "^6.0.0" -apollo-server-env@^2.4.5: - version "2.4.5" - resolved "https://registry.yarnpkg.com/apollo-server-env/-/apollo-server-env-2.4.5.tgz#73730b4f0439094a2272a9d0caa4079d4b661d5f" - integrity sha512-nfNhmGPzbq3xCEWT8eRpoHXIPNcNy3QcEoBlzVMjeglrBGryLG2LXwBSPnVmTRRrzUYugX0ULBtgE3rBFNoUgA== - dependencies: - node-fetch "^2.1.2" - util.promisify "^1.0.0" - apollo-server-env@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/apollo-server-env/-/apollo-server-env-3.0.0.tgz#0157c51f52b63aee39af190760acf789ffc744d9" @@ -4161,41 +4159,41 @@ apollo-server-errors@^2.4.2: resolved "https://registry.yarnpkg.com/apollo-server-errors/-/apollo-server-errors-2.4.2.tgz#1128738a1d14da989f58420896d70524784eabe5" integrity sha512-FeGxW3Batn6sUtX3OVVUm7o56EgjxDlmgpTLNyWcLb0j6P8mw9oLNyAm3B+deHA4KNdNHO5BmHS2g1SJYjqPCQ== -apollo-server-lambda@2.18.2: - version "2.18.2" - resolved "https://registry.yarnpkg.com/apollo-server-lambda/-/apollo-server-lambda-2.18.2.tgz#3d89afd49ac617b44b141949d9acae6d77d671e6" - integrity sha512-w1PxAAyrNLXOTeKl+Kp4fp37CGuAwn/ubSsWv+dz9fLgs/AXnPhb9B9mWCwLW5LOBOTWH7zYDqtSNqs/J7+r1Q== +apollo-server-lambda@2.22.2: + version "2.22.2" + resolved "https://registry.yarnpkg.com/apollo-server-lambda/-/apollo-server-lambda-2.22.2.tgz#8beb0f2cfbb9048ae8dfa609afbfcb8fa42de622" + integrity sha512-QOVHg6u1+jqnY6c+fb4njUtfQEQr118guerDveZgG3vQP1t8/AtYDT33m03JhsKWRkzZjOgj5cs0RA1iSYw7cg== dependencies: - "@apollographql/graphql-playground-html" "1.6.26" + "@apollographql/graphql-playground-html" "1.6.27" "@types/aws-lambda" "^8.10.31" - apollo-server-core "^2.18.2" - apollo-server-env "^2.4.5" - apollo-server-types "^0.6.0" - graphql-tools "^4.0.0" + apollo-server-core "^2.22.2" + apollo-server-env "^3.0.0" + apollo-server-types "^0.7.0" + graphql-tools "^4.0.8" -apollo-server-plugin-base@^0.10.4: - version "0.10.4" - resolved "https://registry.yarnpkg.com/apollo-server-plugin-base/-/apollo-server-plugin-base-0.10.4.tgz#fbf73f64f95537ca9f9639dd7c535eb5eeb95dcd" - integrity sha512-HRhbyHgHFTLP0ImubQObYhSgpmVH4Rk1BinnceZmwudIVLKrqayIVOELdyext/QnSmmzg5W7vF3NLGBcVGMqDg== +apollo-server-plugin-base@^0.11.0: + version "0.11.0" + resolved "https://registry.yarnpkg.com/apollo-server-plugin-base/-/apollo-server-plugin-base-0.11.0.tgz#6ceeb4d5f643ed739fd00e8b26d9981186c200d0" + integrity sha512-Du68x0XCyQ6EWlgoL9Z+1s8fJfXgY131QbKP7ao617StQPzwB0aGCwxBDfcMt1A75VXf4TkvV1rdUH5YeJFlhQ== dependencies: - apollo-server-types "^0.6.3" + apollo-server-types "^0.7.0" -apollo-server-types@^0.6.0, apollo-server-types@^0.6.3: - version "0.6.3" - resolved "https://registry.yarnpkg.com/apollo-server-types/-/apollo-server-types-0.6.3.tgz#f7aa25ff7157863264d01a77d7934aa6e13399e8" - integrity sha512-aVR7SlSGGY41E1f11YYz5bvwA89uGmkVUtzMiklDhZ7IgRJhysT5Dflt5IuwDxp+NdQkIhVCErUXakopocFLAg== +apollo-server-types@^0.7.0: + version "0.7.0" + resolved "https://registry.yarnpkg.com/apollo-server-types/-/apollo-server-types-0.7.0.tgz#a9b62974ada5da5edb6157a41d8ddb993b57203a" + integrity sha512-pJ6ri2N4xJ+e2PUUPHeCNpMDzHUagJyn0DDZGQmXDz6aoMlSd4B2KUvK81hHyHkw3wHk9clgcpfM9hKqbfZweA== dependencies: apollo-reporting-protobuf "^0.6.2" - apollo-server-caching "^0.5.3" + apollo-server-caching "^0.6.0" apollo-server-env "^3.0.0" -apollo-tracing@^0.12.2: - version "0.12.2" - resolved "https://registry.yarnpkg.com/apollo-tracing/-/apollo-tracing-0.12.2.tgz#a261c3970bb421b6dadf50cd85d75b2567a7e52c" - integrity sha512-SYN4o0C0wR1fyS3+P0FthyvsQVHFopdmN3IU64IaspR/RZScPxZ3Ae8uu++fTvkQflAkglnFM0aX6DkZERBp6w== +apollo-tracing@^0.13.0: + version "0.13.0" + resolved "https://registry.yarnpkg.com/apollo-tracing/-/apollo-tracing-0.13.0.tgz#8621b1ae351f862bb48b6de7a85696288977d148" + integrity sha512-28z4T+XfLQ6t696usU0nTFDxVN8BfF3o74d2p/zsT4eu1OuoyoDOEmVJqdInmVRpyTJK0tDEOjkIuDJJHZftog== dependencies: apollo-server-env "^3.0.0" - apollo-server-plugin-base "^0.10.4" + apollo-server-plugin-base "^0.11.0" apollo-utilities@^1.0.1, apollo-utilities@^1.3.0: version "1.3.4" @@ -8548,14 +8546,14 @@ graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6 resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.6.tgz#ff040b2b0853b23c3d31027523706f1885d76bee" integrity sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ== -graphql-extensions@^0.12.8: - version "0.12.8" - resolved "https://registry.yarnpkg.com/graphql-extensions/-/graphql-extensions-0.12.8.tgz#9cdc2c43d8fe5e0f6c3177a004ac011da2a8aa0f" - integrity sha512-xjsSaB6yKt9jarFNNdivl2VOx52WySYhxPgf8Y16g6GKZyAzBoIFiwyGw5PJDlOSUa6cpmzn6o7z8fVMbSAbkg== +graphql-extensions@^0.13.0: + version "0.13.0" + resolved "https://registry.yarnpkg.com/graphql-extensions/-/graphql-extensions-0.13.0.tgz#34d7f9c1bf49d09c4f1fa8b5d33e6c961a1889fb" + integrity sha512-Bb7E97nvfX4gtrIdZ/i5YFlqOd6MGzrw8ED+t4wQVraYje6NQ+8P8MHMOV2WZLfbW8zsNTx8NdnnlbsdH5siag== dependencies: "@apollographql/apollo-tools" "^0.4.3" apollo-server-env "^3.0.0" - apollo-server-types "^0.6.3" + apollo-server-types "^0.7.0" graphql-scalars@1.9.0: version "1.9.0" @@ -8576,7 +8574,7 @@ graphql-tag@^2.12.0: dependencies: tslib "^1.14.1" -graphql-tools@^4.0.0, graphql-tools@^4.0.8: +graphql-tools@^4.0.8: version "4.0.8" resolved "https://registry.yarnpkg.com/graphql-tools/-/graphql-tools-4.0.8.tgz#e7fb9f0d43408fb0878ba66b522ce871bafe9d30" integrity sha512-MW+ioleBrwhRjalKjYaLQbr+920pHBgy9vM/n47sswtns8+96sRn5M/G+J1eu7IMeKWiN/9p6tmwCHU7552VJg== @@ -15887,7 +15885,7 @@ xregexp@4.0.0: resolved "https://registry.yarnpkg.com/xregexp/-/xregexp-4.0.0.tgz#e698189de49dd2a18cc5687b05e17c8e43943020" integrity sha512-PHyM+sQouu7xspQQwELlGwwd05mXUFqwFYfqPO0cC7x4fxyHnnuetmQr6CjJiafIDoH4MogHb9dOoJzR/Y4rFg== -xss@^1.0.6: +xss@^1.0.8: version "1.0.8" resolved "https://registry.yarnpkg.com/xss/-/xss-1.0.8.tgz#32feb87feb74b3dcd3d404b7a68ababf10700535" integrity sha512-3MgPdaXV8rfQ/pNn16Eio6VXYPTkqwa0vc7GkiymmY/DqR1SE/7VPAAVZz1GJsJFrllMYO3RHfEaiUGjab6TNw== From e1bbc3f1ce20d73528cdbf26131ecbf2812ad0dd Mon Sep 17 00:00:00 2001 From: David S Price Date: Tue, 30 Mar 2021 22:13:06 -0700 Subject: [PATCH 2/2] swap Flash for Toast --- web/src/pages/ContactPage/ContactPage.js | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/web/src/pages/ContactPage/ContactPage.js b/web/src/pages/ContactPage/ContactPage.js index 5e4ae43..8271a0a 100644 --- a/web/src/pages/ContactPage/ContactPage.js +++ b/web/src/pages/ContactPage/ContactPage.js @@ -7,7 +7,8 @@ import { Label, FormError, } from '@redwoodjs/forms' -import { Flash, useFlash, useMutation } from '@redwoodjs/web' +import { useMutation } from '@redwoodjs/web' +import { toast, Toaster } from '@redwoodjs/web/toast' import { useForm } from 'react-hook-form' const CREATE_CONTACT = gql` @@ -20,13 +21,10 @@ const CREATE_CONTACT = gql` const ContactPage = () => { const formMethods = useForm() - const { addMessage } = useFlash() const [create, { loading, error }] = useMutation(CREATE_CONTACT, { onCompleted: () => { - addMessage('Thank you for your submission!', { - style: { backgroundColor: 'green', color: 'white', padding: '1rem' }, - }) + toast.success('Thank you for your submission!') formMethods.reset() }, }) @@ -38,7 +36,7 @@ const ContactPage = () => { return ( <> - +