Skip to content

Commit db6a5d6

Browse files
benjiebenjie
authored
Upgrade all dependencies (except ...) (#261)
1 parent 73df537 commit db6a5d6

File tree

27 files changed

+5678
-5754
lines changed

27 files changed

+5678
-5754
lines changed

‎.eslintrc.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@ module.exports = {
88
"plugin:import/errors",
99
"plugin:import/typescript",
1010
"prettier",
11-
"prettier/@typescript-eslint",
12-
"prettier/react",
1311
],
1412
plugins: [
1513
"jest",

‎.github/workflows/cypress.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515

1616
strategy:
1717
matrix:
18-
node-version: [12.x]
18+
node-version: [14.x]
1919

2020
services:
2121
postgres:

‎.github/workflows/nodejs.yml

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

1414
strategy:
1515
matrix:
16-
node-version: [10.x, 12.x, 14.x]
16+
node-version: [14.x, 16.x]
1717

1818
services:
1919
postgres:

‎.github/workflows/pgrita.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ jobs:
66
build:
77
runs-on: ubuntu-latest
88

9+
strategy:
10+
matrix:
11+
node-version: [14.x]
12+
913
services:
1014
postgres:
1115
image: postgres:11.6

‎.github/workflows/production-docker.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ jobs:
66
build:
77
runs-on: ubuntu-latest
88

9+
strategy:
10+
matrix:
11+
node-version: [14.x]
12+
913
services:
1014
postgres:
1115
image: postgres:11.6

‎@app/client/package.json

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -7,38 +7,38 @@
77
"test": "cross-env NODE_ENV=test NODE_OPTIONS=\"$NODE_OPTIONS -r @app/config/env\" jest"
88
},
99
"dependencies": {
10-
"@ant-design/icons": "^4.1.0",
11-
"@apollo/client": "^3.3.15",
10+
"@ant-design/icons": "^4.6.2",
11+
"@apollo/client": "^3.3.19",
1212
"@app/components": "0.0.0",
1313
"@app/config": "0.0.0",
1414
"@app/graphql": "0.0.0",
1515
"@app/lib": "0.0.0",
16-
"@types/lodash": "^4.14.161",
17-
"@types/node": "^14.10.1",
16+
"@types/lodash": "^4.14.170",
17+
"@types/node": "^15.6.1",
1818
"@types/nprogress": "^0.2.0",
19-
"@types/react": "^17.0.0",
19+
"@types/react": "^17.0.8",
2020
"@zeit/next-css": "^1.0.1",
2121
"@zeit/next-less": "^1.0.1",
22-
"antd": "^4.2.0",
23-
"antd-dayjs-webpack-plugin": "^1.0.0",
24-
"dayjs": "^1.8.26",
22+
"antd": "4.15.6",
23+
"antd-dayjs-webpack-plugin": "^1.0.6",
24+
"dayjs": "^1.10.5",
2525
"graphql": "^15.4.0",
26-
"less": "^3.11.1",
26+
"less": "^4.1.1",
2727
"less-vars-to-js": "^1.3.0",
28-
"lodash": "^4.17.15",
28+
"lodash": "^4.17.21",
2929
"net": "^1.0.2",
30-
"next": "^10.0.3",
30+
"next": "^10.2.3",
3131
"nprogress": "^0.2.0",
32-
"rc-field-form": "~1.17.2",
33-
"react": "^17.0.1",
34-
"react-dom": "^17.0.1",
35-
"slugify": "^1.4.0",
32+
"rc-field-form": "~1.20.1",
33+
"react": "^17.0.2",
34+
"react-dom": "^17.0.2",
35+
"slugify": "^1.5.3",
3636
"tls": "^0.0.1",
3737
"webpack": "^4.43.0"
3838
},
3939
"devDependencies": {
4040
"babel-plugin-import": "^1.13.0",
4141
"cross-env": "^7.0.2",
42-
"jest": "^26.6.3"
42+
"jest": "^27.0.1"
4343
}
4444
}

‎@app/client/src/pages/create-organization/index.tsx

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,8 @@ const CreateOrganizationPage: NextPage = () => {
5858
}, [checkSlug, slug]);
5959

6060
const code = getCodeFromError(formError);
61-
const [
62-
organization,
63-
setOrganization,
64-
] = useState<null | CreatedOrganizationFragment>(null);
61+
const [organization, setOrganization] =
62+
useState<null | CreatedOrganizationFragment>(null);
6563
const [createOrganization] = useCreateOrganizationMutation();
6664
const handleSubmit = useCallback(
6765
async (values: Store) => {

‎@app/components/package.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,17 @@
77
"test": "cross-env NODE_ENV=test NODE_OPTIONS=\"$NODE_OPTIONS -r @app/config/env\" jest"
88
},
99
"dependencies": {
10-
"@ant-design/icons": "^4.1.0",
11-
"@apollo/client": "^3.3.15",
10+
"@ant-design/icons": "^4.6.2",
11+
"@apollo/client": "^3.3.19",
1212
"@app/graphql": "0.0.0",
13-
"antd": "^4.2.0",
14-
"next": "^10.0.3",
15-
"react": "^17.0.1",
16-
"tslib": "^2.0.1"
13+
"antd": "4.15.6",
14+
"next": "^10.2.3",
15+
"react": "^17.0.2",
16+
"tslib": "^2.2.0"
1717
},
1818
"devDependencies": {
1919
"cross-env": "^7.0.2",
20-
"jest": "^26.6.3",
20+
"jest": "^27.0.1",
2121
"typescript": "^4.0.2"
2222
}
2323
}

‎@app/config/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
"test": "cross-env NODE_ENV=test NODE_OPTIONS=\"$NODE_OPTIONS -r @app/config/env\" jest"
1010
},
1111
"dependencies": {
12-
"dotenv": "^8.2.0"
12+
"dotenv": "^10.0.0"
1313
},
1414
"devDependencies": {
1515
"cross-env": "^7.0.2",
16-
"jest": "^26.6.3"
16+
"jest": "^27.0.1"
1717
}
1818
}

‎@app/db/__tests__/app_public/functions/confirm_account_deletion.test.ts

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,7 @@ it("can delete account with verified emails", () =>
1414
const { token, email } = jobs[0].payload;
1515
expect(email).toEqual(user._email);
1616
expect(token).toBeTruthy();
17-
const {
18-
rows,
19-
} = await client.query(
17+
const { rows } = await client.query(
2018
"select app_public.confirm_account_deletion($1) as deleted",
2119
[token]
2220
);
@@ -38,9 +36,7 @@ it("can delete account with no verified emails", () =>
3836
const { token, email } = jobs[0].payload;
3937
expect(email).toEqual(user._email);
4038
expect(token).toBeTruthy();
41-
const {
42-
rows,
43-
} = await client.query(
39+
const { rows } = await client.query(
4440
"select app_public.confirm_account_deletion($1) as deleted",
4541
[token]
4642
);
@@ -120,9 +116,7 @@ it("can delete account if organization billing contact", () =>
120116
);
121117

122118
await becomeUser(client, orgOwner.id);
123-
const {
124-
rows,
125-
} = await client.query(
119+
const { rows } = await client.query(
126120
"select * from app_public.organization_memberships where organization_id = $1",
127121
[org.id]
128122
);

‎@app/db/__tests__/app_public/tables/user_emails.test.ts

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -209,9 +209,7 @@ it("can delete all but one verified email", () =>
209209
"delete from app_public.user_emails where user_id = $1 and id <> $2",
210210
[user.id, email2.id]
211211
);
212-
const {
213-
rows,
214-
} = await client.query(
212+
const { rows } = await client.query(
215213
"select * from app_public.user_emails where user_id = $1",
216214
[user.id]
217215
);
@@ -233,9 +231,7 @@ it("can delete all but one email if unverified", () =>
233231
"delete from app_public.user_emails where user_id = $1 and id <> $2",
234232
[user.id, email2.id]
235233
);
236-
const {
237-
rows,
238-
} = await client.query(
234+
const { rows } = await client.query(
239235
"select * from app_public.user_emails where user_id = $1",
240236
[user.id]
241237
);

‎@app/db/__tests__/helpers.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,8 @@ export const pruneIds = (row: { [key: string]: unknown }) =>
137137
: v
138138
);
139139

140-
const uuidRegexp = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
140+
const uuidRegexp =
141+
/^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
141142

142143
export const pruneUUIDs = (row: { [key: string]: unknown }) =>
143144
mapValues(row, (v, k) => {

‎@app/db/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@
1414
"test": "cross-env NODE_ENV=test NODE_OPTIONS=\"$NODE_OPTIONS -r @app/config/env\" jest"
1515
},
1616
"dependencies": {
17-
"cross-env": "^7.0.2",
17+
"cross-env": "^7.0.3",
1818
"graphile-migrate": "^1.0.1"
1919
},
2020
"devDependencies": {
21-
"@types/pg": "^7.14.4",
21+
"@types/pg": "^8.6.0",
2222
"graphile-worker": "^0.11.0",
23-
"jest": "^26.6.3",
23+
"jest": "^27.0.1",
2424
"lodash": "^4.17.15",
2525
"pg": "^8.0.3"
2626
}

‎@app/e2e/cypress/support/commands.ts

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,18 +39,14 @@ function getCy(cyName: string): Chainable<JQuery<HTMLElement>> {
3939
/**
4040
* Deletes all users with username starting 'test'.
4141
*/
42-
function serverCommand(
43-
command: "clearTestUsers"
44-
): Chainable<{
42+
function serverCommand(command: "clearTestUsers"): Chainable<{
4543
success: true;
4644
}>;
4745

4846
/**
4947
* Deletes all organizations with slug starting 'test'.
5048
*/
51-
function serverCommand(
52-
command: "clearTestOrganizations"
53-
): Chainable<{
49+
function serverCommand(command: "clearTestOrganizations"): Chainable<{
5450
success: true;
5551
}>;
5652

‎@app/e2e/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
"devDependencies": {
1212
"@cypress/webpack-preprocessor": "^5.5.0",
1313
"cross-env": "^7.0.2",
14-
"cypress": "^6.1.0",
15-
"jest": "^26.6.3",
14+
"cypress": "^7.4.0",
15+
"jest": "^27.0.1",
1616
"webpack": "^4.43.0"
1717
}
1818
}

‎@app/graphql/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,17 @@
1111
"test": "cross-env NODE_ENV=test NODE_OPTIONS=\"$NODE_OPTIONS -r @app/config/env\" jest"
1212
},
1313
"dependencies": {
14-
"@apollo/client": "^3.3.15",
15-
"react": "^17.0.1",
16-
"tslib": "^2.0.1"
14+
"@apollo/client": "^3.3.19",
15+
"react": "^17.0.2",
16+
"tslib": "^2.2.0"
1717
},
1818
"devDependencies": {
1919
"@graphql-codegen/add": "^2.0.1",
2020
"@graphql-codegen/cli": "^1.17.9",
2121
"@graphql-codegen/typescript": "^1.17.10",
2222
"@graphql-codegen/typescript-operations": "^1.17.8",
23-
"@graphql-codegen/typescript-react-apollo": "2.2.1",
23+
"@graphql-codegen/typescript-react-apollo": "2.2.5",
2424
"cross-env": "^7.0.2",
25-
"jest": "^26.6.3"
25+
"jest": "^27.0.1"
2626
}
2727
}

‎@app/lib/package.json

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,24 +7,24 @@
77
"test": "cross-env NODE_ENV=test NODE_OPTIONS=\"$NODE_OPTIONS -r @app/config/env\" jest"
88
},
99
"dependencies": {
10-
"@apollo/client": "^3.3.15",
10+
"@apollo/client": "^3.3.19",
1111
"graphql": "^15.4.0",
12-
"graphql-ws": "^4.1.1",
13-
"next": "^10.0.3",
14-
"next-with-apollo": "^5.0.1",
15-
"rc-field-form": "^1.2.2",
16-
"react": "^17.0.1",
17-
"react-dom": "^17.0.1",
18-
"tslib": "^2.0.1",
12+
"graphql-ws": "^4.5.1",
13+
"next": "^10.2.3",
14+
"next-with-apollo": "^5.1.1",
15+
"rc-field-form": "^1.20.1",
16+
"react": "^17.0.2",
17+
"react-dom": "^17.0.2",
18+
"tslib": "^2.2.0",
1919
"zxcvbn": "^4.4.2"
2020
},
2121
"devDependencies": {
2222
"@types/express": "^4.17.8",
2323
"@types/zxcvbn": "^4.4.0",
2424
"cross-env": "^7.0.2",
2525
"express": "^4.17.1",
26-
"jest": "^26.6.3",
27-
"postgraphile": "^4.11.0",
26+
"jest": "^27.0.1",
27+
"postgraphile": "^4.12.1",
2828
"typescript": "^4.0.2"
2929
}
3030
}

‎@app/lib/src/GraphileApolloLink.ts

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -49,20 +49,21 @@ export class GraphileApolloLink extends ApolloLink {
4949
return;
5050
}
5151
const schema = await postgraphileMiddleware.getGraphQLSchema();
52-
const data = await postgraphileMiddleware.withPostGraphileContextFromReqRes(
53-
req,
54-
res,
55-
{},
56-
(context) =>
57-
execute(
58-
schema,
59-
operation.query,
60-
rootValue || {},
61-
context,
62-
operation.variables,
63-
operation.operationName
64-
)
65-
);
52+
const data =
53+
await postgraphileMiddleware.withPostGraphileContextFromReqRes(
54+
req,
55+
res,
56+
{},
57+
(context) =>
58+
execute(
59+
schema,
60+
operation.query,
61+
rootValue || {},
62+
context,
63+
operation.variables,
64+
operation.operationName
65+
)
66+
);
6667
if (!observer.closed) {
6768
observer.next(data);
6869
observer.complete();

‎@app/server/__tests__/helpers.ts

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,8 @@ export async function createUserAndLogIn() {
3030
}
3131
}
3232

33-
let known: Record<
34-
string,
35-
{ counter: number; values: Map<unknown, string> }
36-
> = {};
33+
let known: Record<string, { counter: number; values: Map<unknown, string> }> =
34+
{};
3735
beforeEach(() => {
3836
known = {};
3937
});

0 commit comments

Comments
 (0)