[Tooling] switch to yarn (#92)

pull/93/head
Chris Mckay 5 years ago committed by GitHub
parent adce56d59e
commit 27dbc38729
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 14
      Jenkinsfile
  2. 9
      README.md
  3. 24936
      package-lock.json
  4. 30
      package.json
  5. 2
      truffle-config.js
  6. 14744
      yarn.lock

14
Jenkinsfile vendored

@ -14,34 +14,34 @@ pipeline {
}
stage('Contracts: Build') {
steps {
sh 'npm install'
sh 'npm run build:contracts'
sh 'yarn install'
sh 'yarn run build:contracts'
}
}
stage('Contracts: Lint') {
steps {
sh 'npm run lint:contracts'
sh 'yarn run lint:contracts'
}
}
stage('Contracts: Test') {
steps {
sh 'npm run test:contracts'
sh 'yarn run test:contracts'
}
}
stage('Contracts: Coverage') {
steps {
sh 'npm run coverage:contracts'
sh 'yarn run coverage:contracts'
sh './node_modules/.bin/istanbul report cobertura --root .'
}
}
stage('Dapp: Build') {
steps {
sh 'npm run build:app'
sh 'yarn run build:app'
}
}
stage('Dapp: Test') {
steps {
sh 'npm run test:app:ci'
sh 'yarn run test:app:ci'
}
}
}

@ -11,10 +11,10 @@ describes how to use the contracts for onchain permissioning.
## Development
### Linting
Linting is set up using solium. To run it over your code execute `npm run lint`.
Linting is set up using solium. To run it over your code execute `yarn run lint`.
### Testing
`npm test`
`yarn test`
### Permissioning Management Dapp (under development)
@ -33,7 +33,7 @@ This is the easiest way to get started for development with the permissioning Da
#### Start the development server ####
1. In a new terminal session, navigate to the `app/` directory
1. Run `npm install` to install all required dependencies and `npm start` to start the web server that is serving our dapp. You only need to run `npm install` if you are running the app for the first time.
1. Run `yarn install` to install all required dependencies and `yarn run start` to start the web server that is serving our dapp. You only need to run `yarn install` if you are running the app for the first time.
1. In your browser, connect Metamask to the Ganache network (the default endpoint is `http://127.0.0.1:9545/`)
1. When you start Ganache, it gives you a list of accounts and private keys. Import the first one in Metamask to impersonate the first admin of the system.
1. Navigate to `http://localhost:3000` to access the Permissioning Dapp.
@ -42,7 +42,6 @@ This is the easiest way to get started for development with the permissioning Da
#### Build the permissioning Dapp for deployment ####
1. [Compile and migrate the contracts](#compile-and-migrate-the-contracts)
1. In a new terminal session, navigate to the `app/` directory
1. Run `npm run build` will assemble index.html and all other files in `build/`
1. Run `yarn run build` will assemble index.html and all other files in `build/`
1. You can use your preferred web server technology to serve the contents of `build/` as static files.
1. You will need to set up MetaMask as for [the development server](#start-the-development-server)

24936
package-lock.json generated

File diff suppressed because it is too large Load Diff

@ -5,20 +5,20 @@
"license": "Apache-2.0",
"private": true,
"scripts": {
"lint:contracts": "solium -d contracts",
"lint": "npm run lint:contracts",
"test:app": "react-scripts test --env=jsdom --watchAll=false",
"test:app:watch": "react-scripts test --env=jsdom",
"test:app:ci": "react-scripts test --reporters=default --reporters=jest-junit",
"test:contracts": "truffle test --network develop",
"test": "npm run test:contracts && npm run test:app",
"coverage:contracts": "solidity-coverage",
"coverage": "npm run coverage:contracts",
"build:app": "react-scripts build",
"build:contracts": "truffle compile",
"build": "npm run build:contracts && npm run build:app",
"start": "react-scripts start",
"eject": "react-scripts eject"
"lint:contracts": "yarn solium -d contracts",
"lint": "yarn run lint:contracts",
"test:app": "yarn react-scripts test --env=jsdom --watchAll=false",
"test:app:watch": "yarn react-scripts test --env=jsdom",
"test:app:ci": "yarn react-scripts test --reporters=default --reporters=jest-junit",
"test:contracts": "yarn truffle test --network develop",
"test": "yarn run test:contracts && yarn run test:app",
"coverage:contracts": "yarn solidity-coverage",
"coverage": "yarn run coverage:contracts",
"build:app": "yarn react-scripts build",
"build:contracts": "yarn truffle compile",
"build": "yarn run build:contracts && yarn run build:app",
"start": "yarn react-scripts start",
"eject": "yarn react-scripts eject"
},
"eslintConfig": {
"extends": "react-app"
@ -72,7 +72,7 @@
"prettier": "^1.17.0",
"solidity-coverage": "github:sc-forks/solidity-coverage#leapdao",
"solium": "^1.2.4",
"truffle": "^5.0.12"
"truffle": "5.0.17"
},
"lint-staged": {
"src/**/*.{js,jsx,json,css}": [

@ -43,7 +43,7 @@ module.exports = {
compilers: {
solc: {
version: "0.5.7",
version: "0.5.9",
settings: {
optimizer: {
enabled: false,

14744
yarn.lock

File diff suppressed because it is too large Load Diff
Loading…
Cancel
Save