Skip to content

Commit

Permalink
Merge branch 'master' into fix/typedoc
Browse files Browse the repository at this point in the history
  • Loading branch information
calebmer authored Mar 3, 2017
2 parents a555e72 + 57e049c commit 3446fa9
Show file tree
Hide file tree
Showing 13 changed files with 19 additions and 16 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@
Expect active development and potentially significant breaking changes in the `0.x` track. We'll try to be diligent about releasing a `1.0` version in a timely fashion (ideally within 3 to 6 months), to signal the start of a more stable API.

### vNEXT

### 0.10.1
- Address deprecation warnings coming from `graphql-tag` [graphql-tag#54](https://github.com/apollographql/graphql-tag/issues/54)
- Do not stringify error stack traces [PR #1347](https://github.com/apollographql/apollo-client/pull/1347)

### 0.10.0
Expand Down
10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "apollo-client",
"version": "0.10.0",
"version": "0.10.1",
"description": "A simple yet functional GraphQL client.",
"main": "./lib/apollo.umd.js",
"module": "./lib/src/index.js",
Expand Down Expand Up @@ -48,7 +48,7 @@
"license": "MIT",
"dependencies": {
"graphql-anywhere": "^2.1.0",
"graphql-tag": "^1.1.1",
"graphql-tag": "^1.3.1",
"redux": "^3.4.0",
"symbol-observable": "^1.0.2",
"whatwg-fetch": "^2.0.0"
Expand All @@ -62,8 +62,8 @@
"@types/node": "^7.0.5",
"@types/promises-a-plus": "0.0.27",
"@types/sinon": "^1.16.29",
"browserify": "^14.0.0",
"benchmark": "^2.1.3",
"browserify": "^14.0.0",
"chai": "^3.5.0",
"chai-as-promised": "^6.0.0",
"colors": "^1.1.2",
Expand Down Expand Up @@ -93,7 +93,7 @@
},
"optionalDependencies": {
"@types/async": "^2.0.31",
"@types/isomorphic-fetch": "0.0.33",
"@types/graphql": "^0.8.0"
"@types/graphql": "^0.8.0",
"@types/isomorphic-fetch": "0.0.33"
}
}
2 changes: 1 addition & 1 deletion src/core/QueryManager.ts
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ import {
/* tslint:enable */
} from 'graphql';

import { print } from 'graphql-tag/printer';
import { print } from 'graphql-tag/bundledPrinter';

import {
readQueryFromStore,
Expand Down
2 changes: 1 addition & 1 deletion src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import {

import {
print,
} from 'graphql-tag/printer';
} from 'graphql-tag/bundledPrinter';

import {
createApolloStore,
Expand Down
2 changes: 1 addition & 1 deletion src/transport/Deduplicator.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import {

import {
print,
} from 'graphql-tag/printer';
} from 'graphql-tag/bundledPrinter';

export class Deduplicator {

Expand Down
2 changes: 1 addition & 1 deletion src/transport/networkInterface.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import {
DocumentNode,
} from 'graphql';

import { print } from 'graphql-tag/printer';
import { print } from 'graphql-tag/bundledPrinter';

import {
MiddlewareInterface,
Expand Down
2 changes: 1 addition & 1 deletion test/client.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import gql from 'graphql-tag';

import {
print,
} from 'graphql-tag/printer';
} from 'graphql-tag/bundledPrinter';

import { NetworkStatus } from '../src/queries/networkStatus';

Expand Down
2 changes: 1 addition & 1 deletion test/getFromAST.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import {
OperationDefinitionNode,
} from 'graphql';

import { print } from 'graphql-tag/printer';
import { print } from 'graphql-tag/bundledPrinter';
import gql from 'graphql-tag';
import { assert } from 'chai';

Expand Down
2 changes: 1 addition & 1 deletion test/mocks/mockNetworkInterface.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import {

import {
print,
} from 'graphql-tag/printer';
} from 'graphql-tag/bundledPrinter';

// Pass in multiple mocked responses, so that you can test flows that end up
// making multiple queries to the server
Expand Down
2 changes: 1 addition & 1 deletion test/networkInterface.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import {

import gql from 'graphql-tag';

import { print } from 'graphql-tag/printer';
import { print } from 'graphql-tag/bundledPrinter';

import { withWarning } from './util/wrap';

Expand Down
2 changes: 1 addition & 1 deletion test/proxy.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { assert } from 'chai';
import { createStore } from 'redux';
import gql from 'graphql-tag';
import { print } from 'graphql-tag/printer';
import { print } from 'graphql-tag/bundledPrinter';
import { createApolloStore } from '../src/store';
import { ReduxDataProxy, TransactionDataProxy } from '../src/data/proxy';

Expand Down
2 changes: 1 addition & 1 deletion test/queryTransform.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import {
getQueryDefinition,
} from '../src/queries/getFromAST';

import { print } from 'graphql-tag/printer';
import { print } from 'graphql-tag/bundledPrinter';
import gql from 'graphql-tag';
import { assert } from 'chai';

Expand Down
2 changes: 1 addition & 1 deletion typings.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ declare module 'graphql-tag/parser' {
): DocumentNode;
}

declare module 'graphql-tag/printer' {
declare module 'graphql-tag/bundledPrinter' {
function print(ast: any): string;
}

0 comments on commit 3446fa9

Please sign in to comment.