Skip to content

Commit

Permalink
Merge pull request #324 from Thetta/master
Browse files Browse the repository at this point in the history
master -> dev
  • Loading branch information
AnthonyAkentiev committed Aug 27, 2018
2 parents 8bb5b69 + cf1ce70 commit d028674
Show file tree
Hide file tree
Showing 3 changed files with 32 additions and 9 deletions.
23 changes: 14 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@thetta/core",
"version": "1.3.3",
"version": "1.3.4",
"description": "Thetta Decentralized Autonomous Organizations framework core",
"main": "truffle.js",
"scripts": {
Expand All @@ -14,7 +14,8 @@
"lint:sol": "solium -d .",
"lint:sol:fix": "solium -d . --fix",
"lint:all": "npm run lint && npm run lint:sol",
"lint:all:fix": "npm run lint:fix && npm run lint:sol:fix"
"lint:all:fix": "npm run lint:fix && npm run lint:sol:fix",
"docs": "npx docusaurus-init && cd scripts && node ./gen-docs.js"
},
"repository": {
"type": "git",
Expand All @@ -27,24 +28,28 @@
},
"homepage": "https://web.thetta.io",
"dependencies": {
"babel-eslint": "^8.2.3",
"babel-eslint": "^8.2.6",
"babel-polyfill": "^6.26.0",
"babel-register": "^6.26.0",
"chai": "4.1.2",
"chai-as-promised": "7.1.1",
"chai-bignumber": "2.0.2",
"coveralls": "^3.0.2",
"eslint": "^5.2.0",
"docusaurus-init": "^1.0.2",
"eslint": "^5.4.0",
"eslint-config-standard": "^10.2.1",
"eslint-plugin-import": "^2.13.0",
"eslint-plugin-import": "^2.14.0",
"eslint-plugin-node": "^5.2.1",
"eslint-plugin-promise": "^3.8.0",
"eslint-plugin-standard": "^3.1.0",
"eth-gas-reporter": "^0.1.10",
"ganache-cli": "^6.1.3",
"growl": "^1.10.0",
"solidity-coverage": "^0.5.5",
"solium": "^1.1.7",
"ganache-cli": "^6.1.8",
"growl": "^1.10.5",
"install": "^0.12.1",
"solc": "^0.4.24",
"solidity-coverage": "^0.5.7",
"solidity-docgen": "^0.1.0",
"solium": "^1.1.8",
"truffle": "^4.1.14",
"zeppelin-solidity": "^1.12.0"
}
Expand Down
2 changes: 2 additions & 0 deletions scripts/gen-docs.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
const { spawn } = require('child_process');
spawn('./gen-docs.sh', ["zeppelin-solidity=" +__dirname.slice(0, -8) + "/node_modules/zeppelin-solidity"]);
16 changes: 16 additions & 0 deletions scripts/gen-docs.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@

cd ..
mv docs-examples-from-docusaurus docs
cd docs
mkdir docs
cd ..
mv ./website ./docs
cd docs
rm -r doc1.md
rm -r doc2.md
rm -r doc3.md
rm -r exampledoc4.md
rm -r exampledoc5.md
cd ..
cd scripts
SOLC_ARGS=$1 solidity-docgen ../ ../contracts ../docs

0 comments on commit d028674

Please sign in to comment.