aboutsummaryrefslogtreecommitdiffstats
path: root/packages/react-shared
diff options
context:
space:
mode:
authorLeonid Logvinov <logvinov.leon@gmail.com>2019-01-10 18:51:13 +0800
committerLeonid Logvinov <logvinov.leon@gmail.com>2019-01-10 18:56:15 +0800
commitcee29542451d3bf8c99bd08963a2108768072195 (patch)
treef3d657be53459ce3851fcf9632bd94f32ee80184 /packages/react-shared
parenta8d9263062e586b90ee4c303d3d3aca72e428edc (diff)
parent686f27a96f0cd749f6315d7edd2bb56cf1819245 (diff)
downloaddexon-0x-contracts-cee29542451d3bf8c99bd08963a2108768072195.tar.gz
dexon-0x-contracts-cee29542451d3bf8c99bd08963a2108768072195.tar.zst
dexon-0x-contracts-cee29542451d3bf8c99bd08963a2108768072195.zip
Merge development
Diffstat (limited to 'packages/react-shared')
-rw-r--r--packages/react-shared/CHANGELOG.json3
-rw-r--r--packages/react-shared/CHANGELOG.md4
-rw-r--r--packages/react-shared/package.json8
3 files changed, 10 insertions, 5 deletions
diff --git a/packages/react-shared/CHANGELOG.json b/packages/react-shared/CHANGELOG.json
index 9ef0d079f..aaf2485d1 100644
--- a/packages/react-shared/CHANGELOG.json
+++ b/packages/react-shared/CHANGELOG.json
@@ -7,7 +7,8 @@
"Change implementation to use react-router-dom NavLink instead of Link. Expose `activeStyle` prop.",
"pr": 1448
}
- ]
+ ],
+ "timestamp": 1547040760
},
{
"version": "1.0.25",
diff --git a/packages/react-shared/CHANGELOG.md b/packages/react-shared/CHANGELOG.md
index 8afa94e04..a8f2764dd 100644
--- a/packages/react-shared/CHANGELOG.md
+++ b/packages/react-shared/CHANGELOG.md
@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
+## v1.1.0 - _January 9, 2019_
+
+ * Change implementation to use react-router-dom NavLink instead of Link. Expose `activeStyle` prop. (#1448)
+
## v1.0.25 - _December 13, 2018_
* Dependencies updated
diff --git a/packages/react-shared/package.json b/packages/react-shared/package.json
index 17defe35a..5754e238b 100644
--- a/packages/react-shared/package.json
+++ b/packages/react-shared/package.json
@@ -1,6 +1,6 @@
{
"name": "@0x/react-shared",
- "version": "1.0.25",
+ "version": "1.1.0",
"engines": {
"node": ">=6.12"
},
@@ -25,7 +25,7 @@
"url": "https://github.com/0xProject/0x-monorepo.git"
},
"devDependencies": {
- "@0x/dev-utils": "^1.0.21",
+ "@0x/dev-utils": "^1.0.22",
"@0x/tslint-config": "^2.0.0",
"make-promises-safe": "^1.1.0",
"shx": "^0.2.2",
@@ -33,7 +33,7 @@
"typescript": "3.0.1"
},
"dependencies": {
- "@0x/types": "^1.4.1",
+ "@0x/types": "^1.5.0",
"@material-ui/core": "^3.0.1",
"@types/is-mobile": "0.3.0",
"@types/lodash": "4.14.104",
@@ -43,7 +43,7 @@
"@types/react-dom": "*",
"@types/react-router-dom": "^4.0.4",
"@types/react-scroll": "1.5.3",
- "@types/styled-components": "^4.0.0",
+ "@types/styled-components": "4.0.0",
"@types/valid-url": "^1.0.2",
"basscss": "^8.0.3",
"change-case": "^3.0.2",