Skip to content

Commit

Permalink
Feat/upgrade lerna+npm workspace (#234)
Browse files Browse the repository at this point in the history
* Upgraded lerna version

* Upgraded @babel/core dependency which had vulnerability

* Upgraded registry-subgraph dependencies

* Migrated to npm workspace

* remove lerna bootstrap

* remove lerna bootstrap / 2

* Fixed tsconfig.json issues

* Fixed linting issues

* Fixed solhint issues

* Fixed website generate issue

* update README.md

* empty commit

---------

Co-authored-by: Matías <mjlescano@protonmail.com>
  • Loading branch information
aminlatifi and mjlescano authored Jun 9, 2023
1 parent 776d3f7 commit cb5a4d1
Show file tree
Hide file tree
Showing 29 changed files with 82,427 additions and 143,224 deletions.
4 changes: 1 addition & 3 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@ jobs:
with:
cache: npm
node-version: '16.16.0'
- run: |
npm ci
npx lerna bootstrap
- run: npm ci
- run: npm run lint:js
- run: npm run lint:sol
1 change: 0 additions & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ jobs:
node-version: '16.16.0'
- run: |
npm ci
npx lerna bootstrap
npm run build
- run: cd ./packages/builder && npm test
- run: cd ./packages/registry && REPORT_GAS=1 npm test
1 change: 0 additions & 1 deletion .github/workflows/verify.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,5 @@ jobs:
node-version: ${{ matrix.node-version }}
cache: 'npm'
- run: npm ci
- run: npx lerna bootstrap
- run: npm run build
- run: cd ./packages/sample-hardhat-project && npm run test
1 change: 1 addition & 0 deletions .solhint.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
"compiler-version": ["error", "^0.8.0"],
"contract-name-camelcase": "off",
"func-visibility": ["error", { "ignoreConstructors": true }],
"no-console": "off",
"no-complex-fallback": "off",
"no-inline-assembly": "off",
"private-vars-leading-underscore": ["error", { "strict": false }],
Expand Down
7 changes: 3 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,10 @@ For more information, please see documentation in the modules listed below:

Community contributions to Cannon are greatly appreciated. Please open pull requests, issues, and discussions in the GitHub repository.

To load a development version of Cannon, start by bootstrapping the project from the root directory:
To load a development version of Cannon, start by installing the dependencies from the root directory:

```
npx lerna bootstrap
npm i
npm ci
```

After making changes, rebuild the project:
Expand Down Expand Up @@ -53,7 +52,7 @@ cd ./packages/website && npm run dev

### Publishing

With appropriate permissions on npm, publish updates using the [lerna publish](https://github.com/lerna/lerna/tree/main/commands/publish) command. For example, `npx lerna publish patch` will publish updated packages as the next patch version.
With appropriate permissions on npm, publish updates using the [npx lerna publish](https://github.com/lerna/lerna/tree/main/commands/publish) command. For example, `npx lerna publish patch` will publish updated packages as the next patch version.

## License

Expand Down
4 changes: 1 addition & 3 deletions lerna.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
{
"packages": [
"packages/*"
],
"npmClient": "npm",
"version": "2.4.15"
}
Loading

0 comments on commit cb5a4d1

Please sign in to comment.