chore: fix build and tests, update packages

kamilkisiela · Oct 18, 2017 · 46737d9 · 46737d9
1 parent 23d92de
commit 46737d9
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 13 deletions.
diff --git a/packages/apollo-angular-link-http/package.json b/packages/apollo-angular-link-http/package.json
@@ -18,13 +18,12 @@
  "test-only": "jest --config jest.config.js",
  "lint": "tslint -c ../../tslint.json -p tsconfig.json --type-check {src,tests}/*.ts",
  "postbuild": "npm run bundle",
- "prepare": "npm run build",
  "deploy": "../../scripts/deploy.sh"
  },
  "peerDependencies": {
  "@angular/core": "^4.3.0 || ^5.0.0-rc.0",
  "@angular/common": "^4.3.0 || ^5.0.0-rc.0",
- "apollo-link": "^0.7.0",
+ "apollo-link": "^0.8.0",
  "graphql": "^0.11.2"
  },
  "devDependencies": {
@@ -39,9 +38,11 @@
  "@angular/platform-server": "^4.4.4",
  "@types/graphql": "^0.10.2",
  "@types/jest": "^21.1.2",
+ "@types/zen-observable": "^0.5.3",
  "apollo-cache-inmemory": "^0.2.0-rc.0",
- "apollo-client": "^2.0.0-rc.0",
- "apollo-link": "^0.7.0",
+ "apollo-client": "^2.0.0-rc.3",
+ "apollo-link": "^0.8.0",
+ "graphql": "^0.11.7",
  "graphql-tag": "^2.4.2",
  "jest": "^21.2.1",
  "jest-zone-patch": "0.0.8",

diff --git a/packages/apollo-angular-link-http/tests/HttpLink.spec.ts b/packages/apollo-angular-link-http/tests/HttpLink.spec.ts
@@ -51,7 +51,7 @@ describe('HttpLink', () => {
  };
 
  execute(link, op).subscribe({
- next: result => expect(result).toEqual({data}),
+ next: (result: any) => expect(result).toEqual({data}),
  error: () => {
  throw new Error('Should not be here');
  },

diff --git a/packages/apollo-angular/package.json b/packages/apollo-angular/package.json
@@ -18,13 +18,12 @@
  "test-only": "jest --config jest.config.js",
  "lint": "tslint -c ../../tslint.json -p tsconfig.json --type-check {src,tests}/*.ts",
  "postbuild": "npm run bundle",
- "prepare": "npm run build",
  "deploy": "../../scripts/deploy.sh"
  },
  "peerDependencies": {
  "@angular/core": "^4.0.0 || ^5.0.0-rc.0",
- "apollo-client": "^2.0.0-rc.2",
- "apollo-link": "^0.7.0",
+ "apollo-client": "^2.0.0-rc.3",
+ "apollo-link": "^0.8.0",
  "rxjs": "^5.0.1",
  "zone.js": "^0.8.4"
  },
@@ -37,9 +36,11 @@
  "@angular/platform-browser-dynamic": "^4.4.4",
  "@types/graphql": "^0.10.2",
  "@types/jest": "^21.1.2",
+ "@types/zen-observable": "^0.5.3",
  "apollo-cache-inmemory": "^0.2.0-rc.0",
- "apollo-client": "^2.0.0-rc.2",
- "apollo-link": "^0.7.0",
+ "apollo-client": "^2.0.0-rc.3",
+ "apollo-link": "^0.8.0",
+ "graphql": "^0.11.7",
  "graphql-tag": "^2.4.2",
  "jest": "^21.2.1",
  "jest-zone-patch": "0.0.8",

diff --git a/packages/apollo-angular/tests/Apollo.spec.ts b/packages/apollo-angular/tests/Apollo.spec.ts
@@ -5,7 +5,7 @@ import gql from 'graphql-tag';
 import {ApolloLink} from 'apollo-link';
 import {TestBed, inject, async} from '@angular/core/testing';
 import {Observable} from 'rxjs/Observable';
-import InMemoryCache, {NormalizedCache} from 'apollo-cache-inmemory';
+import {InMemoryCache, NormalizedCache} from 'apollo-cache-inmemory';
 
 import {Apollo, ApolloBase} from '../src/Apollo';
 import {mockSingleLink} from './mocks/mockLinks';

diff --git a/packages/apollo-angular/tests/QueryRef.spec.ts b/packages/apollo-angular/tests/QueryRef.spec.ts
@@ -3,9 +3,9 @@ import './_setup';
 import {ObservableQuery} from 'apollo-client';
 import {map} from 'rxjs/operator/map';
 import {ApolloLink} from 'apollo-link';
+import {InMemoryCache} from 'apollo-cache-inmemory';
 
 import ApolloClient from 'apollo-client';
-import InMemoryCache from 'apollo-cache-inmemory';
 import gql from 'graphql-tag';
 
 import {QueryRef} from '../src/QueryRef';

diff --git a/scripts/deploy.sh b/scripts/deploy.sh
@@ -41,5 +41,5 @@ node -e "var package = require('./package.json'); \
  "
 
 echo '[Deploy] Deploying to npm...'
-cd npm && npm publish --tag latest --access public && git push --tags
+cd npm && npm publish --tag latest && git push --tags
 echo '[Deploy] Completed'