Skip to content

Commit

Permalink
Merge pull request #392 from reactioncommerce/fix-mikemurray-componen…
Browse files Browse the repository at this point in the history
…t-context-peer-dep

fix/chore: component context dependencies
  • Loading branch information
nnnnat authored Jan 25, 2019
2 parents 7b79874 + 188994a commit 0659d5d
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 9 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@
"suiteName": "jest-tests"
},
"dependencies": {
"@reactioncommerce/components-context": "^1.1.0",
"@reactioncommerce/components-context": "^1.2.0",
"babel-polyfill": "^6.26.0",
"prop-types": "15.6.2",
"react": "16.4.2",
Expand Down
2 changes: 1 addition & 1 deletion package/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
"access": "public"
},
"peerDependencies": {
"@reactioncommerce/components-context": "^1.0.0",
"@reactioncommerce/components-context": "^1.2.0",
"prop-types": "^15.6.2",
"react": "^16.4.2",
"react-container-query": "^0.11.0",
Expand Down
4 changes: 2 additions & 2 deletions styleguide/src/sections/InstallingandImporting.md
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
#### Install

```bash
npm install --save [email protected] [email protected] [email protected] [email protected] @reactioncommerce/components-context@1.0.0 @reactioncommerce/components
npm install --save [email protected] [email protected] [email protected] [email protected] @reactioncommerce/components-context@1.2.0 @reactioncommerce/components
```

or

```bash
yarn add [email protected] [email protected] [email protected] [email protected] @reactioncommerce/components-context@1.0.0 @reactioncommerce/components
yarn add [email protected] [email protected] [email protected] [email protected] @reactioncommerce/components-context@1.2.0 @reactioncommerce/components
```

Note that the minimum required React version is 16.4.1 because this package uses newer APIs like `createContext` and `forwardRef`. The `react`, `prop-types`, `@reactioncommerce/components-context`, `reacto-form`, and `styled-components` packages are peer dependencies, which means that you must install the proper versions in your app. They are not included with this package.
Expand Down
8 changes: 3 additions & 5 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -238,10 +238,9 @@
node-fetch "^2.1.1"
url-template "^2.0.8"

"@reactioncommerce/components-context@^1.1.0":
version "1.1.0"
resolved "https://registry.yarnpkg.com/@reactioncommerce/components-context/-/components-context-1.1.0.tgz#d50ab030423f5c2802f7342c30589493b1d9ed73"
integrity sha512-WhMplFH1z6FMC6zVsPTMIpGGdkNnQ2mFO+TZZee+zhwdiPtLVHAtuhEwBCCuaIA3OjCS4qThf8r6Eg2an8AjsQ==
"@reactioncommerce/components-context@^1.2.0":
version "1.2.0"
resolved "https://registry.yarnpkg.com/@reactioncommerce/components-context/-/components-context-1.2.0.tgz#4874a08268272cfacc9f2b6a166f36f42f0a3444"
dependencies:
hoist-non-react-statics "^3.2.0"

Expand Down Expand Up @@ -4847,7 +4846,6 @@ hoist-non-react-statics@^2.5.0:
hoist-non-react-statics@^3.2.0:
version "3.2.1"
resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-3.2.1.tgz#c09c0555c84b38a7ede6912b61efddafd6e75e1e"
integrity sha512-TFsu3TV3YLY+zFTZDrN8L2DTFanObwmBLpWvJs1qfUuEQ5bTAdFcwfx2T/bsCXfM9QHSLvjfP+nihEl0yvozxw==
dependencies:
react-is "^16.3.2"

Expand Down

0 comments on commit 0659d5d

Please sign in to comment.