Skip to content

Commit c860fd1

Browse files
committed
Merge remote-tracking branch 'origin/trunk' into akarshit-feat-account-js-auth
Signed-off-by: Akarshit Wal <[email protected]>
2 parents 7a509c9 + 7e6f7e0 commit c860fd1

File tree

6 files changed

+149
-103
lines changed

6 files changed

+149
-103
lines changed

CHANGELOG.md

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,21 @@
1+
## [4.1.2](https://github.com/reactioncommerce/example-storefront/compare/v4.1.1...v4.1.2) (2021-08-23)
2+
3+
4+
### Bug Fixes
5+
6+
* snyk vulnerability of apollo client ([9f8fecb](https://github.com/reactioncommerce/example-storefront/commit/9f8fecbef4d852ed2177aa722151e56a711420b1))
7+
* upgrade @apollo/client from 3.0.0-rc.4 to 3.3.21 ([a6f3099](https://github.com/reactioncommerce/example-storefront/commit/a6f3099a4f6ec64083e25ec98b5e1b5d459e4986))
8+
9+
## [4.1.1](https://github.com/reactioncommerce/example-storefront/compare/v4.1.0...v4.1.1) (2021-08-23)
10+
11+
12+
### Bug Fixes
13+
14+
* upgrade graphql from 14.1.1 to 14.7.0 ([3b97799](https://github.com/reactioncommerce/example-storefront/commit/3b977990afd068a72bc13f48bac7382d50fbb3a2))
15+
* upgrade mdi-material-ui from 5.9.0 to 5.33.1 ([323fdff](https://github.com/reactioncommerce/example-storefront/commit/323fdff30afb5a0601f40b7c8c67a97479955bbf))
16+
* upgrade styled-components from 5.1.1 to 5.3.0 ([7672cad](https://github.com/reactioncommerce/example-storefront/commit/7672cad4f37844ae1839a2d90b8bd6a107586b34))
17+
* upgrade swr from 0.1.18 to 0.5.6 ([cb39c7a](https://github.com/reactioncommerce/example-storefront/commit/cb39c7a9b2bd1c625a6096199dac1d128af74e35))
18+
119
# [4.1.0](https://github.com/reactioncommerce/example-storefront/compare/v4.0.2...v4.1.0) (2021-06-23)
220

321

components/Entry/SignUp.js

Lines changed: 23 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -85,17 +85,34 @@ export default function SignUp(props) {
8585
</FormControl>
8686
<FormControl>
8787
<InputLabel htmlFor="password">Password</InputLabel>
88-
<Input id="password" aria-describedby="password" onChange={handlePasswordChange} value={password}
88+
<Input
89+
id="password"
90+
aria-describedby="password"
91+
onChange={handlePasswordChange}
92+
value={password}
8993
type="password"
9094
/>
9195
</FormControl>
92-
<Button onClick={registerUser} color="primary" variant="contained" className={classes.signUpButton}
93-
tabIndex="0" role="button"
94-
>Sign Up</Button>
96+
<Button
97+
onClick={registerUser}
98+
color="primary"
99+
variant="contained"
100+
className={classes.signUpButton}
101+
tabIndex="0"
102+
role="button"
103+
>
104+
Sign Up
105+
</Button>
95106
{!!error && <div className={classes.error}>{error}</div>}
96-
<div className={classes.switchEntryMode} onClick={handleOpenLogIn} onKeyDown={handleOpenLogIn} role="button"
107+
<div
108+
className={classes.switchEntryMode}
109+
onClick={handleOpenLogIn}
110+
onKeyDown={handleOpenLogIn}
111+
role="button"
97112
tabIndex={0}
98-
>Already have an account? Log In</div>
113+
>
114+
Already have an account? Log In
115+
</div>
99116
</form>
100117
);
101118
}

docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ networks:
1313

1414
services:
1515
web:
16-
image: reactioncommerce/example-storefront:4.1.0
16+
image: reactioncommerce/example-storefront:4.1.2
1717
env_file:
1818
- ./.env
1919
networks:

lib/accountsServer.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import { ApolloLink } from "apollo-link";
2-
import { ApolloClient, HttpLink } from "@apollo/client";
3-
import { InMemoryCache } from "apollo-cache-inmemory";
2+
import { ApolloClient, HttpLink, InMemoryCache } from "@apollo/client";
43
import { AccountsClient } from "@accounts/client";
54
import { AccountsClientPassword } from "@accounts/client-password";
65
import { AccountsGraphQLClient } from "@accounts/graphql-client";

package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "example-storefront",
3-
"version": "4.1.0",
3+
"version": "4.1.2",
44
"description": "The Example Storefront serves as a reference for implementing a web based storefront using the Reaction Commerce GraphQL API.",
55
"keywords": [],
66
"author": {
@@ -97,7 +97,7 @@
9797
"@accounts/client": "^0.32.0",
9898
"@accounts/client-password": "^0.32.0",
9999
"@accounts/graphql-client": "^0.32.0",
100-
"@apollo/client": "^3.3.15",
100+
"@apollo/client": "^3.3.21",
101101
"@apollo/link-context": "^2.0.0-beta.3",
102102
"@apollo/link-error": "^2.0.0-beta.3",
103103
"@apollo/react-components": "^3.1.3",
@@ -118,14 +118,14 @@
118118
"date-fns": "~1.30.1",
119119
"envalid": "~4.2.0",
120120
"express": "~4.16.4",
121-
"graphql": "~14.1.1",
121+
"graphql": "~14.7.0",
122122
"graphql-request": "^2.0.0",
123123
"graphql-tag": "~2.10.1",
124124
"isomorphic-unfetch": "^3.0.0",
125125
"js-cookie": "~2.2.0",
126126
"keymirror": "~0.1.1",
127127
"lodash": "~4.17.20",
128-
"mdi-material-ui": "~5.9.0",
128+
"mdi-material-ui": "~5.33.1",
129129
"next": "9.4.1",
130130
"passport": "~0.4.0",
131131
"passport-oauth2": "~1.4.0",
@@ -137,9 +137,9 @@
137137
"react-stripe-elements": "~2.0.3",
138138
"react-tracking": "~5.6.0",
139139
"reacto-form": "~1.4.0",
140-
"styled-components": "^5.0.1",
140+
"styled-components": "^5.3.0",
141141
"subscriptions-transport-ws": "~0.9.15",
142-
"swr": "^0.1.18"
142+
"swr": "^0.5.6"
143143
},
144144
"devDependencies": {
145145
"@commitlint/cli": "^11.0.0",

0 commit comments

Comments
 (0)