diff options
author | Fabio Berger <me@fabioberger.com> | 2018-03-20 19:52:22 +0800 |
---|---|---|
committer | Fabio Berger <me@fabioberger.com> | 2018-03-20 19:52:22 +0800 |
commit | 2f7c19e80d31cbcc09c6e87841682e8f35f0ecd5 (patch) | |
tree | 60d846e22cf80416f0dd43ead8dd494c5735152f /packages/react-docs-example | |
parent | 5468358f2142549c68ffae0085ce7d31ea271ea4 (diff) | |
parent | 7d9c357409c25996f9c448dffd69007f69b9d8d6 (diff) | |
download | dexon-sol-tools-2f7c19e80d31cbcc09c6e87841682e8f35f0ecd5.tar dexon-sol-tools-2f7c19e80d31cbcc09c6e87841682e8f35f0ecd5.tar.gz dexon-sol-tools-2f7c19e80d31cbcc09c6e87841682e8f35f0ecd5.tar.bz2 dexon-sol-tools-2f7c19e80d31cbcc09c6e87841682e8f35f0ecd5.tar.lz dexon-sol-tools-2f7c19e80d31cbcc09c6e87841682e8f35f0ecd5.tar.xz dexon-sol-tools-2f7c19e80d31cbcc09c6e87841682e8f35f0ecd5.tar.zst dexon-sol-tools-2f7c19e80d31cbcc09c6e87841682e8f35f0ecd5.zip |
Merge branch 'development' into addExtraDocs
* development: (29 commits)
Set Lodash dep to an exact version since newer versions introduced breaking changes
Update Kovan Ethertoken Address
Update deployer version since manual re-publish
Add new entry into CHANGELOG
Fix bad merge
Update yarn.lock
Change title
Add Blake and Zach to About page
Re-size Jacob and Tom's images
Manually publish 0x.js back to a working state
Publish
Publish
Fix 0x.js assets
Remove assets from connect and _bundles from packages that don't generate the folder
Publish
Fix packages that aren't working as expected
Make new packages default to public on publish
Add new public packages to top-level README
Update top-level package.json
Fix incorrect new versions
...
# Conflicts:
# packages/0x.js/package.json
# packages/connect/package.json
# packages/json-schemas/package.json
# packages/sol-cov/package.json
Diffstat (limited to 'packages/react-docs-example')
-rw-r--r-- | packages/react-docs-example/package.json | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/packages/react-docs-example/package.json b/packages/react-docs-example/package.json index 95a617de7..2dce1a0eb 100644 --- a/packages/react-docs-example/package.json +++ b/packages/react-docs-example/package.json @@ -1,9 +1,8 @@ { - "name": "@0xproject/react-docs-example", - "version": "0.0.1", "private": true, - "description": - "An example app using react-docs", + "name": "@0xproject/react-docs-example", + "version": "0.0.4", + "description": "An example app using react-docs", "scripts": { "lint": "tslint --project . 'ts/**/*.ts' 'ts/**/*.tsx'", "build": "tsc", @@ -11,28 +10,26 @@ "build:watch": "tsc -w", "clean": "shx rm -rf lib; shx rm -f public/bundle*", "dev": "webpack-dev-server --open", - "deploy_example": - "npm run build:example; aws s3 sync ./public/. s3://react-docs-example --profile 0xproject --region us-east-1 --grants read=uri=http://acs.amazonaws.com/groups/global/AllUsers" + "deploy_example": "npm run build:example; aws s3 sync ./public/. s3://react-docs-example --profile 0xproject --region us-east-1 --grants read=uri=http://acs.amazonaws.com/groups/global/AllUsers" }, "author": "Fabio Berger", "license": "Apache-2.0", "bugs": { "url": "https://github.com/0xProject/0x-monorepo/issues" }, - "homepage": - "https://github.com/0xProject/0x-monorepo/packages/react-docs-example/README.md", + "homepage": "https://github.com/0xProject/0x-monorepo/packages/react-docs-example/README.md", "repository": { "type": "git", "url": "https://github.com/0xProject/0x-monorepo.git" }, "devDependencies": { - "@0xproject/tslint-config": "^0.4.9", + "@0xproject/tslint-config": "^0.4.12", + "@types/lodash": "4.14.104", "@types/material-ui": "0.18.0", + "@types/node": "^8.0.53", "@types/react": "^15.0.15", "@types/react-dom": "^0.14.23", "@types/react-tap-event-plugin": "0.0.30", - "@types/lodash": "^4.14.86", - "@types/node": "^8.0.53", "awesome-typescript-loader": "^3.1.3", "copyfiles": "^1.2.0", "css-loader": "^0.28.9", @@ -40,16 +37,16 @@ "less": "^2.7.2", "less-loader": "^2.2.3", "raw-loader": "^0.5.1", + "shx": "^0.2.2", "source-map-loader": "^0.2.3", "style-loader": "^0.20.2", - "shx": "^0.2.2", "tslint": "^5.9.1", "typescript": "2.7.1", "webpack": "^3.11.0", "webpack-dev-server": "^2.11.1" }, "dependencies": { - "@0xproject/react-docs": "^0.0.1", + "@0xproject/react-docs": "^0.0.4", "basscss": "^8.0.3", "lodash": "^4.17.4", "material-ui": "^0.17.1", |