Skip to content

Commit

Permalink
Merge branch 'master' into bugfix/clear-store
Browse files Browse the repository at this point in the history
  • Loading branch information
ds8k committed Apr 15, 2019
2 parents 866f51f + 271da45 commit 3cbadf9
Show file tree
Hide file tree
Showing 8 changed files with 728 additions and 467 deletions.
1,017 changes: 633 additions & 384 deletions docs/package-lock.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"types": "cd ../packages/apollo-client && typedoc --json ../../docs/docs.json --ignoreCompilerErrors ./src/index.ts"
},
"dependencies": {
"gatsby": "2.2.11",
"gatsby": "2.3.22",
"gatsby-theme-apollo-docs": "0.2.47"
},
"devDependencies": {
Expand Down
156 changes: 84 additions & 72 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
"@types/lodash": "4.14.123",
"@types/node": "11.13.4",
"@types/react": "16.8.13",
"@types/react-dom": "16.8.3",
"@types/react-dom": "16.8.4",
"benchmark": "2.1.4",
"check-if-folder-contents-changed-in-git-commit-range": "1.0.0",
"codecov": "3.3.0",
Expand All @@ -88,22 +88,22 @@
"prettier": "1.16.4",
"react": "16.8.6",
"react-dom": "16.8.6",
"rollup": "1.9.0",
"rollup": "1.10.0",
"rollup-plugin-invariant": "0.5.2",
"rollup-plugin-local-resolve": "1.0.7",
"rollup-plugin-node-resolve": "4.0.1",
"rollup-plugin-node-resolve": "4.2.3",
"rollup-plugin-sourcemaps": "0.4.2",
"rollup-plugin-terser": "4.0.4",
"rollup-plugin-typescript2": "0.18.1",
"rxjs": "6.4.0",
"ts-jest": "23.1.4",
"tsc-watch": "2.1.2",
"tslib": "1.9.3",
"tslint": "5.14.0",
"tslint": "5.15.0",
"typescript": "3.3.4000",
"uglify-js": "3.5.2",
"uglify-js": "3.5.4",
"webpack": "3.12.0",
"webpack-bundle-analyzer": "3.1.0"
"webpack-bundle-analyzer": "3.3.2"
},
"renovate": {
"extends": [
Expand Down
2 changes: 1 addition & 1 deletion packages/apollo-boost/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
"apollo-link-error": "^1.0.3",
"apollo-link-http": "^1.3.1",
"graphql-tag": "^2.4.2",
"ts-invariant": "^0.3.2",
"ts-invariant": "^0.4.0",
"tslib": "^1.9.3"
},
"peerDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/apollo-cache-inmemory/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
"apollo-cache": "file:../apollo-cache",
"apollo-utilities": "file:../apollo-utilities",
"optimism": "^0.6.9",
"ts-invariant": "^0.3.2",
"ts-invariant": "^0.4.0",
"tslib": "^1.9.3"
},
"peerDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/apollo-client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
"apollo-link-dedup": "^1.0.0",
"apollo-utilities": "file:../apollo-utilities",
"symbol-observable": "^1.0.2",
"ts-invariant": "^0.3.2",
"ts-invariant": "^0.4.0",
"tslib": "^1.9.3",
"zen-observable": "^0.8.0"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/apollo-utilities/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
},
"dependencies": {
"fast-json-stable-stringify": "^2.0.0",
"ts-invariant": "^0.3.2",
"ts-invariant": "^0.4.0",
"tslib": "^1.9.3"
}
}

0 comments on commit 3cbadf9

Please sign in to comment.