jos3duardo/upload-apollo-client
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into apollo-fetch-upload

Browse Source 
# Conflicts:
#	api/package-lock.json
#	app/package-lock.json
#	app/package.json
This commit is contained in:
Jayden Seric 2017-08-10 18:35:23 +10:00
commit 352f5beacc
5 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
api/package-lock.json generated
View File

@ -1130,7 +1130,7 @@
"integrity": "sha512-YSRvpyaxDBBAPkwYO0THouUmA+cvYbyBHZrP/byJEUGDT9r/6TQcDASBtrAj4S45Le6JZbV8oeUAPR9wT8tisg==", "integrity": "sha512-YSRvpyaxDBBAPkwYO0THouUmA+cvYbyBHZrP/byJEUGDT9r/6TQcDASBtrAj4S45Le6JZbV8oeUAPR9wT8tisg==",
"requires": { "requires": {
"caniuse-lite": "1.0.30000713", "caniuse-lite": "1.0.30000713",
"electron-to-chromium": "1.3.17" "electron-to-chromium": "1.3.18"
} }
}, },
"buffer": { "buffer": {
@ -1597,9 +1597,9 @@
"integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=" "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0="
}, },
"electron-to-chromium": { "electron-to-chromium": {
"version": "1.3.17", "version": "1.3.18",
"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.17.tgz", "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.18.tgz",
"integrity": "sha1-QcE0V8xxZsXBXnZ65h2GqMrN7l0=" "integrity": "sha1-PcyZ2j5rZl9qu8ccKK1Ros1zGpw="
}, },
"elliptic": { "elliptic": {
"version": "6.4.0", "version": "6.4.0",

8
app/helpers/get-display-name.js
View File

@ -1,8 +0,0 @@
/**
* Gets the display name of a JSX component for dev tools.
* @param {Object | Function} component - A JSX component.
* @returns {String} The component display name.
*/
export default function getDisplayName({ displayName, name }) {
return displayName ? displayName : name && name !== '' ? name : 'Unknown'
}

2
app/helpers/with-data.js
View File

@ -1,8 +1,8 @@
import { Component } from 'react' import { Component } from 'react'
import { ApolloProvider, getDataFromTree } from 'react-apollo' import { ApolloProvider, getDataFromTree } from 'react-apollo'
import getDisplayName from 'react-display-name'
import Head from 'next/head' import Head from 'next/head'
import initApolloClient from './init-apollo-client' import initApolloClient from './init-apollo-client'
import getDisplayName from './get-display-name'
export default ComposedComponent => { export default ComposedComponent => {
return class WithData extends Component { return class WithData extends Component {

5
app/package-lock.json generated
View File

@ -4667,6 +4667,11 @@
"resolved": "https://registry.npmjs.org/react-deep-force-update/-/react-deep-force-update-2.1.0.tgz", "resolved": "https://registry.npmjs.org/react-deep-force-update/-/react-deep-force-update-2.1.0.tgz",
"integrity": "sha512-mzaG67FKON++K2UioBUWrVR4b8TgKQVlhGkYOsD4CxzFgj8jnF8tb7TslC6k2NN5VXNWNKN2g+EqkCuoVT5X0A==" "integrity": "sha512-mzaG67FKON++K2UioBUWrVR4b8TgKQVlhGkYOsD4CxzFgj8jnF8tb7TslC6k2NN5VXNWNKN2g+EqkCuoVT5X0A=="
}, },
"react-display-name": {
"version": "0.2.3",
"resolved": "https://registry.npmjs.org/react-display-name/-/react-display-name-0.2.3.tgz",
"integrity": "sha1-9QIE1DDJyoGbwLreAwbpF12NGYc="
},
"react-dom": { "react-dom": {
"version": "15.6.1", "version": "15.6.1",
"resolved": "https://registry.npmjs.org/react-dom/-/react-dom-15.6.1.tgz", "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-15.6.1.tgz",

1
app/package.json
View File

@ -8,6 +8,7 @@
"next": "^3.0.3", "next": "^3.0.3",
"react": "^15.6.1", "react": "^15.6.1",
"react-apollo": "^1.4.11", "react-apollo": "^1.4.11",
"react-display-name": "^0.2.3",
"react-dom": "^15.6.1", "react-dom": "^15.6.1",
"zoo": "^0.1.9" "zoo": "^0.1.9"
}, },