Skip to content

Commit

Permalink
Upgrade dependencies (MetaFam#486)
Browse files Browse the repository at this point in the history
* upgraded storybook dependencies

* upgraded web dependencies

* updated timezone selector

* upgrade chakra in metamaps

* upgraded react-dnd in metamaps

* upgraded framer-motion

* fixed types in metamaps

* upgraded eslint

* upgraded lerna, husky and graphql

* upgraded node version

* removed metamaps package

* fixed all eslint issues

* ran yarn format to prettier format all files

* updated lint-staged & husky scripts

* add executable perms to pre-push scripts

* updated yarn.lock

* fixed eslint and moved chakra icons to ds

* fixed emotion errors

* removed extra useContext

* update yarn.lock

* upgraded more packages

* removed unnecessary .huskyrc.json

* lint fix
  • Loading branch information
dan13ram authored May 1, 2021
1 parent 96f40d9 commit 8517a26
Show file tree
Hide file tree
Showing 155 changed files with 8,246 additions and 13,792 deletions.
2 changes: 0 additions & 2 deletions .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@
"plugin:@typescript-eslint/eslint-recommended",
"plugin:@typescript-eslint/recommended",
"plugin:jest/recommended",
"prettier/@typescript-eslint",
"prettier/react",
"prettier"
],
"parserOptions": {
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/PR-CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-node@v1
with:
node-version: 12.x
node-version: 14.x

- uses: actions/cache@v2
with:
Expand Down Expand Up @@ -62,7 +62,7 @@ jobs:

- uses: actions/setup-node@v1
with:
node-version: 12.x
node-version: 14.x

- uses: actions/cache@v2
with:
Expand Down
1 change: 1 addition & 0 deletions .husky/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
_
1 change: 1 addition & 0 deletions .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
yarn precommit
1 change: 1 addition & 0 deletions .husky/pre-push
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
yarn prepush
6 changes: 0 additions & 6 deletions .huskyrc.json

This file was deleted.

2 changes: 1 addition & 1 deletion .lintstagedrc.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"*.{ts,tsx,js}": ["eslint --fix", "prettier --write"],
"*.{ts,tsx,js,jsx}": ["eslint --fix", "prettier --write"],
"*.{json,yml,md}": "prettier --write"
}
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,6 @@ If you want to locally start the backend server (not in Docker) for debugging pu
yarn backend:dev
```


### Run NextJS Web App dev mode (new)

```shell script
Expand Down
67 changes: 30 additions & 37 deletions guides/C4.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
SAIP1 - Collective Code Construction Contract (C4)
-------------------------------------
## SAIP1 - Collective Code Construction Contract (C4)

The Collective Code Construction Contract (C4) is an evolution of the github.com [Fork + Pull Model](https://help.github.com/articles/about-pull-requests/), aimed at providing an optimal collaboration model for free software projects. This is intended to deprecate all other unmaintained sources of the C4 protocol.

License
-------
## License

Copyright (c) the Maintainer and Contributors (see end of file).

Expand All @@ -14,18 +12,15 @@ This Specification is distributed in the hope that it will be useful, but WITHOU

You should have received a copy of the GNU General Public License along with this program; if not, see [http://www.gnu.org/licenses](http://www.gnu.org/licenses).

Abstract
--------
## Abstract

C4 provides a standard process for contributing, evaluating and discussing improvements on software projects. It defines specific technical requirements for projects like a style guide, unit tests, `git` and similar platforms. It also establishes different personas for projects, with clear and distinct duties. C4 specifies a process for documenting and discussing issues including seeking consensus and clear descriptions, use of "pull requests" and systematic reviews.

Language
--------
## Language

The key words "MUST", "MUST NOT", "REQUIRED", "SHALL", "SHALL NOT", "SHOULD", "SHOULD NOT", "RECOMMENDED", "MAY", and "OPTIONAL" in this document are to be interpreted as described in [RFC 2119](http://tools.ietf.org/html/rfc2119).

1\. Goals
---------
## 1\. Goals

C4 is meant to provide a reusable optimal collaboration model for open source software projects. It has these specific goals:

Expand All @@ -36,8 +31,7 @@ C4 is meant to provide a reusable optimal collaboration model for open source so
5. To reduce the internal complexity of project repositories, thus making it easier for Contributors to participate and reducing the scope for error;
6. To enforce collective ownership of the project, which increases economic incentive to Contributors and reduces the risk of hijack by hostile entities.

2\. Design
----------
## 2\. Design

### 2.1. Preliminaries

Expand Down Expand Up @@ -80,16 +74,16 @@ C4 is meant to provide a reusable optimal collaboration model for open source so
7. To work on an issue, a Contributor SHALL fork the project repository and then work on their forked repository.
8. To submit a patch, a Contributor SHALL create a Platform pull request back to the project.
9. A Contributor SHALL NOT commit changes directly to the project.
10. If the Platform implements pull requests as issues, a Contributor MAY directly send a pull request without logging a separate issue.
11. To discuss a patch, people MAY comment on the Platform pull request, on the commit, or elsewhere.
12. To accept or reject a patch, a Maintainer SHALL use the Platform interface.
13. Maintainers SHOULD NOT merge their own patches except in exceptional cases, such as non-responsiveness from other Maintainers for an extended period (more than 1-2 days).
14. Maintainers SHALL NOT make value judgments on correct patches.
15. Maintainers SHALL merge correct patches from other Contributors rapidly.
16. Maintainers MAY merge incorrect patches from other Contributors with the goals of (a) ending fruitless discussions, (b) capturing toxic patches in the historical record, (c) engaging with the Contributor on improving their patch quality.
17. The user who created an issue SHOULD close the issue after checking the patch is successful.
18. Any Contributor who has value judgments on a patch SHOULD express these via their own patches.
19. Maintainers SHOULD close user issues that are left open without action for an uncomfortable period of time.
10. If the Platform implements pull requests as issues, a Contributor MAY directly send a pull request without logging a separate issue.
11. To discuss a patch, people MAY comment on the Platform pull request, on the commit, or elsewhere.
12. To accept or reject a patch, a Maintainer SHALL use the Platform interface.
13. Maintainers SHOULD NOT merge their own patches except in exceptional cases, such as non-responsiveness from other Maintainers for an extended period (more than 1-2 days).
14. Maintainers SHALL NOT make value judgments on correct patches.
15. Maintainers SHALL merge correct patches from other Contributors rapidly.
16. Maintainers MAY merge incorrect patches from other Contributors with the goals of (a) ending fruitless discussions, (b) capturing toxic patches in the historical record, (c) engaging with the Contributor on improving their patch quality.
17. The user who created an issue SHOULD close the issue after checking the patch is successful.
18. Any Contributor who has value judgments on a patch SHOULD express these via their own patches.
19. Maintainers SHOULD close user issues that are left open without action for an uncomfortable period of time.

### 2.5. Branches and Releases

Expand All @@ -116,21 +110,20 @@ C4 is meant to provide a reusable optimal collaboration model for open source so
4. Administrators SHOULD remove Maintainers who are inactive for an extended period of time, or who repeatedly fail to apply this process accurately.
5. Administrators SHOULD block or ban "bad actors" who cause stress and pain to others in the project. This should be done after public discussion, with a chance for all parties to speak. A bad actor is someone who repeatedly ignores the rules and culture of the project, who is needlessly argumentative or hostile, or who is offensive, and who is unable to self-correct their behavior when asked to do so by others.

Further Reading
---------------
* [Rationale and history for each line of the C4](DESCRIPTIVE_C4.MD).
## Further Reading

* [Argyris' Models 1 and 2](http://en.wikipedia.org/wiki/Chris_Argyris) \- the goals of C4 are consistent with Argyris' Model 2.

* [Toyota Kata](http://en.wikipedia.org/wiki/Toyota_Kata) \- covering the Improvement Kata (fixing problems one at a time) and the Coaching Kata (helping others to learn the Improvement Kata).
- [Rationale and history for each line of the C4](DESCRIPTIVE_C4.MD).

Other Locations
---------------
* [ZeroMQ](https://rfc.zeromq.org/spec:42/C4/)
* [Unprotocols](https://rfc.unprotocols.org/spec:1/C4)
- [Argyris' Models 1 and 2](http://en.wikipedia.org/wiki/Chris_Argyris) \- the goals of C4 are consistent with Argyris' Model 2.
- [Toyota Kata](http://en.wikipedia.org/wiki/Toyota_Kata) \- covering the Improvement Kata (fixing problems one at a time) and the Coaching Kata (helping others to learn the Improvement Kata).

Contributors
------------
* Pieter Hintjens
* Gareth Hayes
Add your name here if you modify this file.
## Other Locations

- [ZeroMQ](https://rfc.zeromq.org/spec:42/C4/)
- [Unprotocols](https://rfc.unprotocols.org/spec:1/C4)

## Contributors

- Pieter Hintjens
- Gareth Hayes
Add your name here if you modify this file.
18 changes: 6 additions & 12 deletions guides/FRONTEND.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ To connect to production servers, you'll need to create a file `.env.local` unde
NEXT_PUBLIC_GRAPHQL_URL=https://api.metagame.wtf/v1/graphql
```


### Connecting to local server

If you want to connect to locally running backend services, you will need to be able to start the backend with:

```bash
Expand Down Expand Up @@ -174,13 +174,7 @@ import gql from 'fake-tag';

export const CreateMap = gql`
mutation createMap($author: String!, $name: String!) {
insert_Map_one(
object: {
author_address: $author,
name: $name,
data: ""
}
) {
insert_Map_one(object: { author_address: $author, name: $name, data: "" }) {
id
}
}
Expand All @@ -207,15 +201,15 @@ export const Component: FC = () => {
await executeMutation({ author, name });
} catch (err) {
console.error(err);
}
}
}

return(
return (
<button type="button" onClick={() => insertMap('Hello World', 'Test 1234')}>
Generate
</button>
)
}
);
};
```

Keep in mind the following parts of the mutation state:
Expand Down
3 changes: 1 addition & 2 deletions lerna.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,5 @@
"packages": ["packages/**"],
"npmClient": "yarn",
"useWorkspaces": true,
"version": "independent",
"lerna": "3.16.4"
"version": "independent"
}
48 changes: 24 additions & 24 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
"format": "prettier --write \"{*,**/*}.{ts,tsx,js,jsx,json,yml,yaml,md}\"",
"lint": "eslint --ignore-path .gitignore \"./packages/**/*.{ts,tsx,js,jsx}\"",
"typecheck": "lerna run typecheck",
"prepare": "lerna run prepare",
"precommit": "lerna run --concurrency 1 --stream precommit",
"prepare": "lerna run prepare && husky install",
"precommit": "lerna run --concurrency 1 --stream precommit && yarn lint-staged",
"prepush": "yarn typecheck",
"discord-bot": "yarn --cwd packages/discord-bot/",
"backend": "yarn --cwd packages/backend/",
Expand All @@ -38,44 +38,44 @@
"packages/*"
],
"devDependencies": {
"@graphql-codegen/add": "2.0.1",
"@graphql-codegen/cli": "1.17.10",
"@graphql-codegen/introspection": "1.18.1",
"@graphql-codegen/typescript": "1.20.0",
"@graphql-codegen/typescript-graphql-request": "2.0.1",
"@graphql-codegen/typescript-operations": "1.17.13",
"@graphql-codegen/typescript-react-apollo": "2.0.7",
"@graphql-codegen/typescript-resolvers": "1.19.0",
"@graphql-codegen/typescript-urql": "2.0.2",
"@types/node": "14.11.8",
"@types/react": "17.0.3",
"@graphql-codegen/add": "2.0.2",
"@graphql-codegen/cli": "1.21.4",
"@graphql-codegen/introspection": "1.18.2",
"@graphql-codegen/typescript": "1.22.0",
"@graphql-codegen/typescript-graphql-request": "3.1.1",
"@graphql-codegen/typescript-operations": "1.17.16",
"@graphql-codegen/typescript-react-apollo": "2.2.4",
"@graphql-codegen/typescript-resolvers": "1.19.1",
"@graphql-codegen/typescript-urql": "2.0.6",
"@types/node": "15.0.1",
"@types/react": "17.0.4",
"@types/react-dom": "16.9.8",
"@types/react-select": "3.0.22",
"@typescript-eslint/eslint-plugin": "4.18.0",
"@typescript-eslint/parser": "4.18.0",
"@typescript-eslint/eslint-plugin": "4.22.0",
"@typescript-eslint/parser": "4.22.0",
"env-cmd": "10.1.0",
"eslint": "7.22.0",
"eslint": "7.25.0",
"eslint-config-airbnb-typescript": "12.3.1",
"eslint-config-prettier": "6.11.0",
"eslint-config-prettier": "8.3.0",
"eslint-import-resolver-typescript": "2.4.0",
"eslint-plugin-import": "2.22.1",
"eslint-plugin-jest": "24.3.1",
"eslint-plugin-jest": "24.3.6",
"eslint-plugin-jsx-a11y": "6.4.1",
"eslint-plugin-react": "7.22.0",
"eslint-plugin-react": "7.23.2",
"eslint-plugin-react-hooks": "4.2.0",
"eslint-plugin-simple-import-sort": "7.0.0",
"get-graphql-schema": "2.1.2",
"graphql": "15.4.0",
"graphql": "15.5.0",
"hasura-cli": "1.3.3",
"husky": "4.3.0",
"husky": "^6.0.0",
"jest": "26.6.3",
"lerna": "3.22.1",
"lint-staged": "10.4.1",
"lerna": "4.0.0",
"lint-staged": "10.5.4",
"prettier": "2.2.1",
"react": "16.14.0",
"react-dom": "16.14.0",
"tsdx": "0.14.1",
"typescript": "4.2.2",
"typescript": "4.2.4",
"wait-on": "5.3.0"
},
"resolutions": {
Expand Down
5 changes: 4 additions & 1 deletion packages/@types/3box/index.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -64,5 +64,8 @@ declare module '3box' {
username: string;
};
}
export async function openBox(ethAddress: string, web3: unknown): Promise<Box>;
export async function openBox(
ethAddress: string,
web3: unknown,
): Promise<Box>;
}
13 changes: 6 additions & 7 deletions packages/@types/react-timezone-select/index.d.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
declare module 'react-timezone-select' {

// eslint-disable-next-line import/no-extraneous-dependencies
import * as React from 'react';

// eslint-disable-next-line import/no-default-export, react/prefer-stateless-function
export default class TimezoneSelect extends React.Component<SelectTimezoneProps> {}

Expand All @@ -12,11 +11,11 @@ declare module 'react-timezone-select' {
altName: string;
abbrev: string;
}

export interface TimezoneSelectProps extends Props {
value?: TimeZone | string
onBlur?: () => void
onChange?: (timezone:TimeZone) => void
labelStyle: 'original' | 'altName' | 'abbrev'
value?: TimeZone | string;
onBlur?: () => void;
onChange?: (timezone: TimeZone) => void;
labelStyle: 'original' | 'altName' | 'abbrev';
}
}
Loading

0 comments on commit 8517a26

Please sign in to comment.