Skip to content

Commit

Permalink
Upgrade all dependencies (except ...) (#261)
Browse files Browse the repository at this point in the history
  • Loading branch information
benjie authored May 27, 2021
1 parent 73df537 commit db6a5d6
Show file tree
Hide file tree
Showing 27 changed files with 5,678 additions and 5,754 deletions.
2 changes: 0 additions & 2 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@ module.exports = {
"plugin:import/errors",
"plugin:import/typescript",
"prettier",
"prettier/@typescript-eslint",
"prettier/react",
],
plugins: [
"jest",
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cypress.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:

strategy:
matrix:
node-version: [12.x]
node-version: [14.x]

services:
postgres:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/nodejs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:

strategy:
matrix:
node-version: [10.x, 12.x, 14.x]
node-version: [14.x, 16.x]

services:
postgres:
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/pgrita.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ jobs:
build:
runs-on: ubuntu-latest

strategy:
matrix:
node-version: [14.x]

services:
postgres:
image: postgres:11.6
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/production-docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ jobs:
build:
runs-on: ubuntu-latest

strategy:
matrix:
node-version: [14.x]

services:
postgres:
image: postgres:11.6
Expand Down
32 changes: 16 additions & 16 deletions @app/client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,38 +7,38 @@
"test": "cross-env NODE_ENV=test NODE_OPTIONS=\"$NODE_OPTIONS -r @app/config/env\" jest"
},
"dependencies": {
"@ant-design/icons": "^4.1.0",
"@apollo/client": "^3.3.15",
"@ant-design/icons": "^4.6.2",
"@apollo/client": "^3.3.19",
"@app/components": "0.0.0",
"@app/config": "0.0.0",
"@app/graphql": "0.0.0",
"@app/lib": "0.0.0",
"@types/lodash": "^4.14.161",
"@types/node": "^14.10.1",
"@types/lodash": "^4.14.170",
"@types/node": "^15.6.1",
"@types/nprogress": "^0.2.0",
"@types/react": "^17.0.0",
"@types/react": "^17.0.8",
"@zeit/next-css": "^1.0.1",
"@zeit/next-less": "^1.0.1",
"antd": "^4.2.0",
"antd-dayjs-webpack-plugin": "^1.0.0",
"dayjs": "^1.8.26",
"antd": "4.15.6",
"antd-dayjs-webpack-plugin": "^1.0.6",
"dayjs": "^1.10.5",
"graphql": "^15.4.0",
"less": "^3.11.1",
"less": "^4.1.1",
"less-vars-to-js": "^1.3.0",
"lodash": "^4.17.15",
"lodash": "^4.17.21",
"net": "^1.0.2",
"next": "^10.0.3",
"next": "^10.2.3",
"nprogress": "^0.2.0",
"rc-field-form": "~1.17.2",
"react": "^17.0.1",
"react-dom": "^17.0.1",
"slugify": "^1.4.0",
"rc-field-form": "~1.20.1",
"react": "^17.0.2",
"react-dom": "^17.0.2",
"slugify": "^1.5.3",
"tls": "^0.0.1",
"webpack": "^4.43.0"
},
"devDependencies": {
"babel-plugin-import": "^1.13.0",
"cross-env": "^7.0.2",
"jest": "^26.6.3"
"jest": "^27.0.1"
}
}
6 changes: 2 additions & 4 deletions @app/client/src/pages/create-organization/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -58,10 +58,8 @@ const CreateOrganizationPage: NextPage = () => {
}, [checkSlug, slug]);

const code = getCodeFromError(formError);
const [
organization,
setOrganization,
] = useState<null | CreatedOrganizationFragment>(null);
const [organization, setOrganization] =
useState<null | CreatedOrganizationFragment>(null);
const [createOrganization] = useCreateOrganizationMutation();
const handleSubmit = useCallback(
async (values: Store) => {
Expand Down
14 changes: 7 additions & 7 deletions @app/components/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,17 @@
"test": "cross-env NODE_ENV=test NODE_OPTIONS=\"$NODE_OPTIONS -r @app/config/env\" jest"
},
"dependencies": {
"@ant-design/icons": "^4.1.0",
"@apollo/client": "^3.3.15",
"@ant-design/icons": "^4.6.2",
"@apollo/client": "^3.3.19",
"@app/graphql": "0.0.0",
"antd": "^4.2.0",
"next": "^10.0.3",
"react": "^17.0.1",
"tslib": "^2.0.1"
"antd": "4.15.6",
"next": "^10.2.3",
"react": "^17.0.2",
"tslib": "^2.2.0"
},
"devDependencies": {
"cross-env": "^7.0.2",
"jest": "^26.6.3",
"jest": "^27.0.1",
"typescript": "^4.0.2"
}
}
4 changes: 2 additions & 2 deletions @app/config/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@
"test": "cross-env NODE_ENV=test NODE_OPTIONS=\"$NODE_OPTIONS -r @app/config/env\" jest"
},
"dependencies": {
"dotenv": "^8.2.0"
"dotenv": "^10.0.0"
},
"devDependencies": {
"cross-env": "^7.0.2",
"jest": "^26.6.3"
"jest": "^27.0.1"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,7 @@ it("can delete account with verified emails", () =>
const { token, email } = jobs[0].payload;
expect(email).toEqual(user._email);
expect(token).toBeTruthy();
const {
rows,
} = await client.query(
const { rows } = await client.query(
"select app_public.confirm_account_deletion($1) as deleted",
[token]
);
Expand All @@ -38,9 +36,7 @@ it("can delete account with no verified emails", () =>
const { token, email } = jobs[0].payload;
expect(email).toEqual(user._email);
expect(token).toBeTruthy();
const {
rows,
} = await client.query(
const { rows } = await client.query(
"select app_public.confirm_account_deletion($1) as deleted",
[token]
);
Expand Down Expand Up @@ -120,9 +116,7 @@ it("can delete account if organization billing contact", () =>
);

await becomeUser(client, orgOwner.id);
const {
rows,
} = await client.query(
const { rows } = await client.query(
"select * from app_public.organization_memberships where organization_id = $1",
[org.id]
);
Expand Down
8 changes: 2 additions & 6 deletions @app/db/__tests__/app_public/tables/user_emails.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -209,9 +209,7 @@ it("can delete all but one verified email", () =>
"delete from app_public.user_emails where user_id = $1 and id <> $2",
[user.id, email2.id]
);
const {
rows,
} = await client.query(
const { rows } = await client.query(
"select * from app_public.user_emails where user_id = $1",
[user.id]
);
Expand All @@ -233,9 +231,7 @@ it("can delete all but one email if unverified", () =>
"delete from app_public.user_emails where user_id = $1 and id <> $2",
[user.id, email2.id]
);
const {
rows,
} = await client.query(
const { rows } = await client.query(
"select * from app_public.user_emails where user_id = $1",
[user.id]
);
Expand Down
3 changes: 2 additions & 1 deletion @app/db/__tests__/helpers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,8 @@ export const pruneIds = (row: { [key: string]: unknown }) =>
: v
);

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

export const pruneUUIDs = (row: { [key: string]: unknown }) =>
mapValues(row, (v, k) => {
Expand Down
6 changes: 3 additions & 3 deletions @app/db/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@
"test": "cross-env NODE_ENV=test NODE_OPTIONS=\"$NODE_OPTIONS -r @app/config/env\" jest"
},
"dependencies": {
"cross-env": "^7.0.2",
"cross-env": "^7.0.3",
"graphile-migrate": "^1.0.1"
},
"devDependencies": {
"@types/pg": "^7.14.4",
"@types/pg": "^8.6.0",
"graphile-worker": "^0.11.0",
"jest": "^26.6.3",
"jest": "^27.0.1",
"lodash": "^4.17.15",
"pg": "^8.0.3"
}
Expand Down
8 changes: 2 additions & 6 deletions @app/e2e/cypress/support/commands.ts
Original file line number Diff line number Diff line change
Expand Up @@ -39,18 +39,14 @@ function getCy(cyName: string): Chainable<JQuery<HTMLElement>> {
/**
* Deletes all users with username starting 'test'.
*/
function serverCommand(
command: "clearTestUsers"
): Chainable<{
function serverCommand(command: "clearTestUsers"): Chainable<{
success: true;
}>;

/**
* Deletes all organizations with slug starting 'test'.
*/
function serverCommand(
command: "clearTestOrganizations"
): Chainable<{
function serverCommand(command: "clearTestOrganizations"): Chainable<{
success: true;
}>;

Expand Down
4 changes: 2 additions & 2 deletions @app/e2e/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
"devDependencies": {
"@cypress/webpack-preprocessor": "^5.5.0",
"cross-env": "^7.0.2",
"cypress": "^6.1.0",
"jest": "^26.6.3",
"cypress": "^7.4.0",
"jest": "^27.0.1",
"webpack": "^4.43.0"
}
}
10 changes: 5 additions & 5 deletions @app/graphql/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,17 @@
"test": "cross-env NODE_ENV=test NODE_OPTIONS=\"$NODE_OPTIONS -r @app/config/env\" jest"
},
"dependencies": {
"@apollo/client": "^3.3.15",
"react": "^17.0.1",
"tslib": "^2.0.1"
"@apollo/client": "^3.3.19",
"react": "^17.0.2",
"tslib": "^2.2.0"
},
"devDependencies": {
"@graphql-codegen/add": "^2.0.1",
"@graphql-codegen/cli": "^1.17.9",
"@graphql-codegen/typescript": "^1.17.10",
"@graphql-codegen/typescript-operations": "^1.17.8",
"@graphql-codegen/typescript-react-apollo": "2.2.1",
"@graphql-codegen/typescript-react-apollo": "2.2.5",
"cross-env": "^7.0.2",
"jest": "^26.6.3"
"jest": "^27.0.1"
}
}
20 changes: 10 additions & 10 deletions @app/lib/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,24 +7,24 @@
"test": "cross-env NODE_ENV=test NODE_OPTIONS=\"$NODE_OPTIONS -r @app/config/env\" jest"
},
"dependencies": {
"@apollo/client": "^3.3.15",
"@apollo/client": "^3.3.19",
"graphql": "^15.4.0",
"graphql-ws": "^4.1.1",
"next": "^10.0.3",
"next-with-apollo": "^5.0.1",
"rc-field-form": "^1.2.2",
"react": "^17.0.1",
"react-dom": "^17.0.1",
"tslib": "^2.0.1",
"graphql-ws": "^4.5.1",
"next": "^10.2.3",
"next-with-apollo": "^5.1.1",
"rc-field-form": "^1.20.1",
"react": "^17.0.2",
"react-dom": "^17.0.2",
"tslib": "^2.2.0",
"zxcvbn": "^4.4.2"
},
"devDependencies": {
"@types/express": "^4.17.8",
"@types/zxcvbn": "^4.4.0",
"cross-env": "^7.0.2",
"express": "^4.17.1",
"jest": "^26.6.3",
"postgraphile": "^4.11.0",
"jest": "^27.0.1",
"postgraphile": "^4.12.1",
"typescript": "^4.0.2"
}
}
29 changes: 15 additions & 14 deletions @app/lib/src/GraphileApolloLink.ts
Original file line number Diff line number Diff line change
Expand Up @@ -49,20 +49,21 @@ export class GraphileApolloLink extends ApolloLink {
return;
}
const schema = await postgraphileMiddleware.getGraphQLSchema();
const data = await postgraphileMiddleware.withPostGraphileContextFromReqRes(
req,
res,
{},
(context) =>
execute(
schema,
operation.query,
rootValue || {},
context,
operation.variables,
operation.operationName
)
);
const data =
await postgraphileMiddleware.withPostGraphileContextFromReqRes(
req,
res,
{},
(context) =>
execute(
schema,
operation.query,
rootValue || {},
context,
operation.variables,
operation.operationName
)
);
if (!observer.closed) {
observer.next(data);
observer.complete();
Expand Down
6 changes: 2 additions & 4 deletions @app/server/__tests__/helpers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,8 @@ export async function createUserAndLogIn() {
}
}

let known: Record<
string,
{ counter: number; values: Map<unknown, string> }
> = {};
let known: Record<string, { counter: number; values: Map<unknown, string> }> =
{};
beforeEach(() => {
known = {};
});
Expand Down
Loading

0 comments on commit db6a5d6

Please sign in to comment.