Skip to content

Commit

Permalink
#Apollo: Updating Apollo version, #BrowserHistory: Setting browserHis…
Browse files Browse the repository at this point in the history
…tory as default
  • Loading branch information
Danjavia committed Mar 29, 2017
1 parent 2a1648c commit 9dedb17
Show file tree
Hide file tree
Showing 3 changed files with 39 additions and 20 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"sw-precache": "^4.2.3"
},
"dependencies": {
"apollo-client": "^0.8.7",
"apollo-client": "^1.0.0-rc.7",
"enzyme": "^2.7.1",
"graphql-tag": "^1.2.4",
"material-ui": "^0.17.0",
Expand Down
4 changes: 2 additions & 2 deletions src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
**/
import React from 'react';
import ReactDOM from 'react-dom';
import { Router, hashHistory } from 'react-router';
import { Router, browserHistory } from 'react-router';
import ApolloClient, { createNetworkInterface } from 'apollo-client';
import { ApolloProvider } from 'react-apollo';
import MuiThemeProvider from 'material-ui/styles/MuiThemeProvider';
Expand All @@ -28,7 +28,7 @@ const client = new ApolloClient({
ReactDOM.render(
<ApolloProvider client={client}>
<MuiThemeProvider>
<Router history={hashHistory} routes={Routes} />
<Router history={browserHistory} routes={Routes} />
</MuiThemeProvider>
</ApolloProvider>,
document.getElementById('root')
Expand Down
53 changes: 36 additions & 17 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@
version "2.0.38"
resolved "https://registry.yarnpkg.com/@types/async/-/async-2.0.38.tgz#5c369dcb14788da0621daafa8594a053b0edcb21"

"@types/graphql@^0.8.0":
version "0.8.6"
resolved "https://registry.yarnpkg.com/@types/graphql/-/graphql-0.8.6.tgz#b34fb880493ba835b0c067024ee70130d6f9bb68"
"@types/graphql@^0.9.0":
version "0.9.0"
resolved "https://registry.yarnpkg.com/@types/graphql/-/graphql-0.9.0.tgz#fccf859f0d2817687f210737dc3be48a18b1d754"

"@types/[email protected].30":
version "0.0.30"
resolved "https://registry.yarnpkg.com/@types/isomorphic-fetch/-/isomorphic-fetch-0.0.30.tgz#a21717624cde9a48c2db53a4e500fc5c32a99bbc"
"@types/[email protected].33":
version "0.0.33"
resolved "https://registry.yarnpkg.com/@types/isomorphic-fetch/-/isomorphic-fetch-0.0.33.tgz#3ea1b86f8b73e6a7430d01d4dbd5b1f63fd72718"

abab@^1.0.3:
version "1.0.3"
Expand Down Expand Up @@ -107,19 +107,20 @@ anymatch@^1.3.0:
arrify "^1.0.0"
micromatch "^2.1.5"

apollo-client@^0.8.7:
version "0.8.7"
resolved "https://registry.yarnpkg.com/apollo-client/-/apollo-client-0.8.7.tgz#73f52d1dd6dfe0f07e8bfe05a8e47c4bcd3bf7a3"
apollo-client@^1.0.0-rc.7:
version "1.0.0-rc.8"
resolved "https://registry.yarnpkg.com/apollo-client/-/apollo-client-1.0.0-rc.8.tgz#30105eb33f59ecab63f493177416d720ba0a8fd9"
dependencies:
graphql-anywhere "^2.1.0"
graphql-tag "^1.1.1"
graphql "^0.9.1"
graphql-anywhere "^3.0.1"
graphql-tag "^2.0.0"
redux "^3.4.0"
symbol-observable "^1.0.2"
whatwg-fetch "^2.0.0"
optionalDependencies:
"@types/async" "^2.0.31"
"@types/graphql" "^0.8.0"
"@types/isomorphic-fetch" "0.0.30"
"@types/graphql" "^0.9.0"
"@types/isomorphic-fetch" "0.0.33"

append-transform@^0.4.0:
version "0.4.0"
Expand Down Expand Up @@ -2532,14 +2533,28 @@ graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.1.9:
version "1.0.1"
resolved "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz#4cafad76bc62f02fa039b2f94e9a3dd3a391a725"

graphql-anywhere@^2.0.0, graphql-anywhere@^2.1.0:
graphql-anywhere@^2.0.0:
version "2.2.0"
resolved "https://registry.yarnpkg.com/graphql-anywhere/-/graphql-anywhere-2.2.0.tgz#652c3fa23a4a6cfeb98817512fb48100b97f3d5c"

graphql-tag@^1.1.1, graphql-tag@^1.2.4:
graphql-anywhere@^3.0.1:
version "3.0.1"
resolved "https://registry.yarnpkg.com/graphql-anywhere/-/graphql-anywhere-3.0.1.tgz#73531db861174c8f212eafb9f8e84944b38b4e5a"

graphql-tag@^1.2.4:
version "1.2.4"
resolved "https://registry.yarnpkg.com/graphql-tag/-/graphql-tag-1.2.4.tgz#90c59bea41378513fd7213dc92537fcd20e4570f"

graphql-tag@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/graphql-tag/-/graphql-tag-2.0.0.tgz#f3efe3b4d64f33bfe8479ae06a461c9d72f2a6fe"

graphql@^0.9.1:
version "0.9.1"
resolved "https://registry.yarnpkg.com/graphql/-/graphql-0.9.1.tgz#f4d154cbec054d4a5d3b1be95f23435c09aa86c8"
dependencies:
iterall "1.0.3"

growly@^1.2.0:
version "1.3.0"
resolved "https://registry.yarnpkg.com/growly/-/growly-1.3.0.tgz#f10748cbe76af964b7c96c93c6bcc28af120c081"
Expand Down Expand Up @@ -3121,6 +3136,10 @@ istanbul@^0.4.5:
which "^1.1.1"
wordwrap "^1.0.0"

[email protected]:
version "1.0.3"
resolved "https://registry.yarnpkg.com/iterall/-/iterall-1.0.3.tgz#e0b31958f835013c323ff0b10943829ac69aa4b7"

jest-changed-files@^17.0.2:
version "17.0.2"
resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-17.0.2.tgz#f5657758736996f590a51b87e5c9369d904ba7b7"
Expand Down Expand Up @@ -6004,11 +6023,11 @@ whatwg-encoding@^1.0.1:
dependencies:
iconv-lite "0.4.13"

[email protected]:
[email protected], whatwg-fetch@>=0.10.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-1.0.0.tgz#01c2ac4df40e236aaa18480e3be74bd5c8eb798e"

whatwg-fetch@>=0.10.0, whatwg-fetch@^2.0.0:
whatwg-fetch@^2.0.0:
version "2.0.2"
resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-2.0.2.tgz#fe294d1d89e36c5be8b3195057f2e4bc74fc980e"

Expand Down

0 comments on commit 9dedb17

Please sign in to comment.