Skip to content

Commit

Permalink
More preperation
Browse files Browse the repository at this point in the history
  • Loading branch information
kamilkisiela committed Dec 6, 2019

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
1 parent dc2fd93 commit c0f45ab
Showing 27 changed files with 227 additions and 172 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -28,6 +28,6 @@
"typescript": "3.6.4"
},
"resolutions": {
"@apollo/client": "3.0.0-beta.14"
"@apollo/client": "3.0.0-beta.15"
}
}
18 changes: 8 additions & 10 deletions packages/apollo-angular-link-headers/package.json
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@
"main": "build/bundles/ngApolloLinkHeaders.umd.js",
"module": "build/fesm5/ngApolloLinkHeaders.js",
"typings": "build/ngApolloLinkHeaders.d.ts",
"version": "2.0.0-alpha.2",
"version": "2.0.0-alpha.7",
"repository": "https://github.com/apollographql/apollo-angular/tree/master/packages/apollo-angular-link-headers",
"keywords": [
"apollo",
@@ -18,24 +18,22 @@
"build": "ng-packagr -p ng-package.js",
"test": "yarn test-only",
"test-only": "jest --config jest.config.js",
"deploy": "yarn build && npm publish build --tag next"
"deploy": "yarn build && npm publish build --tag next --registry http://localhost:4873"
},
"peerDependencies": {
"@angular/common": "^6.0.0 || ^7.0.0 || ^8.0.0 || ^9.0.0 || ^9.0.0-rc.0",
"@angular/core": "^6.0.0 || ^7.0.0 || ^8.0.0 || ^9.0.0 || ^9.0.0-rc.0",
"@apollo/client": "^3.0.0-beta.14",
"apollo-angular": "^2.0.0-alpha.3"
"@apollo/client": "^3.0.0-beta.14"
},
"devDependencies": {
"@angular/common": "9.0.0-rc.3",
"@angular/core": "9.0.0-rc.3",
"@apollo/client": "3.0.0-beta.14",
"@angular/common": "9.0.0-rc.5",
"@angular/core": "9.0.0-rc.5",
"@apollo/client": "3.0.0-beta.15",
"@types/jest": "24.0.23",
"apollo-angular": "2.0.0-alpha.3",
"graphql": "14.5.8",
"jest": "24.9.0",
"ng-packagr": "9.0.0-rc.2",
"ng-packagr": "9.0.0-rc.3",
"ts-jest": "24.2.0",
"typescript": "3.6.4"
}
}
}
2 changes: 1 addition & 1 deletion packages/apollo-angular-link-headers/src/index.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {HttpHeaders} from '@angular/common/http';
import {ApolloLink, Operation, NextLink} from 'apollo-angular';
import {ApolloLink, Operation, NextLink} from '@apollo/client/core';

export const httpHeaders = () => {
return new ApolloLink((operation: Operation, forward: NextLink) => {
2 changes: 1 addition & 1 deletion packages/apollo-angular-link-headers/tests/index.spec.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {ApolloLink, execute, Observable, gql} from 'apollo-angular';
import {ApolloLink, execute, Observable, gql} from '@apollo/client/core';
import {HttpHeaders} from '@angular/common/http';

import {httpHeaders} from '../src';
30 changes: 14 additions & 16 deletions packages/apollo-angular-link-http-batch/package.json
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@
"main": "build/bundles/ngApolloLinkHttpBatch.umd.js",
"module": "build/fesm5/ngApolloLinkHttpBatch.js",
"typings": "build/ngApolloLinkHttpBatch.d.ts",
"version": "2.0.0-alpha.2",
"version": "2.0.0-alpha.7",
"repository": "https://github.com/apollographql/apollo-angular/tree/master/packages/apollo-angular-link-http-batch",
"keywords": [
"apollo",
@@ -18,38 +18,36 @@
"build": "ng-packagr -p ng-package.js",
"test": "yarn test-only",
"test-only": "jest --config jest.config.js",
"deploy": "yarn build && npm publish build --tag next"
"deploy": "yarn build && npm publish build --tag next --registry http://localhost:4873"
},
"peerDependencies": {
"@angular/common": "^6.0.0 || ^7.0.0 || ^8.0.0 || ^9.0.0 || ^9.0.0-rc.0",
"@angular/core": "^6.0.0 || ^7.0.0 || ^8.0.0 || ^9.0.0 || ^9.0.0-rc.0",
"@apollo/client": "^3.0.0-beta.14",
"apollo-angular": "^2.0.0-alpha.3",
"graphql": ">=0.11.0 <0.14.0 || ^14.0.0"
},
"dependencies": {
"apollo-angular-link-http-common": "~2.0.0-alpha.2",
"apollo-angular-link-http-common": "~2.0.0-alpha.7",
"apollo-link-batch": "^2.0.0-beta.0"
},
"devDependencies": {
"@angular/animations": "9.0.0-rc.3",
"@angular/common": "9.0.0-rc.3",
"@angular/compiler": "9.0.0-rc.3",
"@angular/compiler-cli": "9.0.0-rc.3",
"@angular/core": "9.0.0-rc.3",
"@angular/platform-browser": "9.0.0-rc.3",
"@angular/platform-browser-dynamic": "9.0.0-rc.3",
"@angular/platform-server": "9.0.0-rc.3",
"@apollo/client": "3.0.0-beta.14",
"apollo-angular": "2.0.0-alpha.3",
"@angular/animations": "9.0.0-rc.5",
"@angular/common": "9.0.0-rc.5",
"@angular/compiler": "9.0.0-rc.5",
"@angular/compiler-cli": "9.0.0-rc.5",
"@angular/core": "9.0.0-rc.5",
"@angular/platform-browser": "9.0.0-rc.5",
"@angular/platform-browser-dynamic": "9.0.0-rc.5",
"@angular/platform-server": "9.0.0-rc.5",
"@apollo/client": "3.0.0-beta.15",
"@types/jest": "24.0.23",
"graphql": "14.5.8",
"jest": "24.9.0",
"jest-zone-patch": "0.0.10",
"ng-packagr": "9.0.0-rc.2",
"ng-packagr": "9.0.0-rc.3",
"rxjs": "6.5.3",
"ts-jest": "24.2.0",
"typescript": "3.6.4",
"zone.js": "0.10.2"
}
}
}
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@ import {
Observable as LinkObservable,
Operation,
FetchResult,
} from 'apollo-angular';
} from '@apollo/client/core';
import {BatchLink, BatchHandler} from 'apollo-link-batch';
import {print} from 'graphql';
import {
2 changes: 1 addition & 1 deletion packages/apollo-angular-link-http-batch/src/types.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {Operation} from 'apollo-angular';
import {Operation} from '@apollo/client/core';
import {Options} from 'apollo-angular-link-http-common';

export type BatchOptions = {
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@ import {
HttpClientTestingModule,
HttpTestingController,
} from '@angular/common/http/testing';
import {execute, gql, ApolloLink, Operation} from 'apollo-angular';
import {execute, gql, ApolloLink, Operation} from '@apollo/client/core';

import {HttpBatchLink} from '../src/HttpBatchLink';

31 changes: 15 additions & 16 deletions packages/apollo-angular-link-http-common/package.json
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@
"main": "build/bundles/ngApolloLinkHttpCommon.umd.js",
"module": "build/fesm5/ngApolloLinkHttpCommon.js",
"typings": "build/ngApolloLinkHttpCommon.d.ts",
"version": "2.0.0-alpha.2",
"version": "2.0.0-alpha.7",
"repository": "https://github.com/apollographql/apollo-angular/tree/master/packages/apollo-angular-link-http-common",
"keywords": [
"apollo",
@@ -18,34 +18,33 @@
"build": "ng-packagr -p ng-package.js",
"test": "yarn test-only",
"test-only": "exit 0",
"deploy": "yarn build && npm publish build --tag next"
"deploy": "yarn build && npm publish build --tag next --registry http://localhost:4873"
},
"peerDependencies": {
"@angular/common": "^6.0.0 || ^7.0.0 || ^8.0.0 || ^9.0.0 || ^9.0.0-rc.0",
"@angular/core": "^6.0.0 || ^7.0.0 || ^8.0.0 || ^9.0.0 || ^9.0.0-rc.0",
"@apollo/client": "^3.0.0-beta.14",
"apollo-angular": "^2.0.0-alpha.3",
"graphql": ">=0.11.0 <0.14.0 || ^14.0.0"
"graphql": ">=0.11.0 <0.14.0 || ^14.0.0",
"rxjs": "^6.0.0"
},
"devDependencies": {
"@angular/animations": "9.0.0-rc.3",
"@angular/common": "9.0.0-rc.3",
"@angular/compiler": "9.0.0-rc.3",
"@angular/compiler-cli": "9.0.0-rc.3",
"@angular/core": "9.0.0-rc.3",
"@angular/platform-browser": "9.0.0-rc.3",
"@angular/platform-browser-dynamic": "9.0.0-rc.3",
"@angular/platform-server": "9.0.0-rc.3",
"@apollo/client": "3.0.0-beta.14",
"@angular/animations": "9.0.0-rc.5",
"@angular/common": "9.0.0-rc.5",
"@angular/compiler": "9.0.0-rc.5",
"@angular/compiler-cli": "9.0.0-rc.5",
"@angular/core": "9.0.0-rc.5",
"@angular/platform-browser": "9.0.0-rc.5",
"@angular/platform-browser-dynamic": "9.0.0-rc.5",
"@angular/platform-server": "9.0.0-rc.5",
"@apollo/client": "3.0.0-beta.15",
"@types/jest": "24.0.23",
"apollo-angular": "2.0.0-alpha.3",
"graphql": "14.5.8",
"jest": "24.9.0",
"jest-zone-patch": "0.0.10",
"ng-packagr": "9.0.0-rc.2",
"ng-packagr": "9.0.0-rc.3",
"rxjs": "6.5.3",
"ts-jest": "24.2.0",
"typescript": "3.6.4",
"zone.js": "0.10.2"
}
}
}
2 changes: 1 addition & 1 deletion packages/apollo-angular-link-http-common/src/types.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {HttpHeaders} from '@angular/common/http';
import {Operation} from 'apollo-angular';
import {Operation} from '@apollo/client/core';

export type Headers = HttpHeaders | {[header: string]: string | string[]};

30 changes: 14 additions & 16 deletions packages/apollo-angular-link-http/package.json
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@
"main": "build/bundles/ngApolloLinkHttp.umd.js",
"module": "build/fesm5/ngApolloLinkHttp.js",
"typings": "build/ngApolloLinkHttp.d.ts",
"version": "2.0.0-alpha.2",
"version": "2.0.0-alpha.7",
"repository": "https://github.com/apollographql/apollo-angular/tree/master/packages/apollo-angular-link-http",
"keywords": [
"apollo",
@@ -18,38 +18,36 @@
"build": "ng-packagr -p ng-package.js",
"test": "yarn test-only",
"test-only": "jest --config jest.config.js",
"deploy": "yarn build && npm publish build --tag next"
"deploy": "yarn build && npm publish build --tag next --registry http://localhost:4873"
},
"peerDependencies": {
"@angular/common": "^6.0.0 || ^7.0.0 || ^8.0.0 || ^9.0.0 || ^9.0.0-rc.0",
"@angular/core": "^6.0.0 || ^7.0.0 || ^8.0.0 || ^9.0.0 || ^9.0.0-rc.0",
"@apollo/client": "^3.0.0-beta.14",
"apollo-angular": "^2.0.0-alpha.3",
"graphql": ">=0.11.0 <0.14.0 || ^14.0.0"
},
"dependencies": {
"apollo-angular-link-http-common": "~2.0.0-alpha.2",
"apollo-angular-link-http-common": "~2.0.0-alpha.7",
"extract-files": "5.0.1"
},
"devDependencies": {
"@angular/animations": "9.0.0-rc.3",
"@angular/common": "9.0.0-rc.3",
"@angular/compiler": "9.0.0-rc.3",
"@angular/compiler-cli": "9.0.0-rc.3",
"@angular/core": "9.0.0-rc.3",
"@angular/platform-browser": "9.0.0-rc.3",
"@angular/platform-browser-dynamic": "9.0.0-rc.3",
"@angular/platform-server": "9.0.0-rc.3",
"@apollo/client": "3.0.0-beta.14",
"@angular/animations": "9.0.0-rc.5",
"@angular/common": "9.0.0-rc.5",
"@angular/compiler": "9.0.0-rc.5",
"@angular/compiler-cli": "9.0.0-rc.5",
"@angular/core": "9.0.0-rc.5",
"@angular/platform-browser": "9.0.0-rc.5",
"@angular/platform-browser-dynamic": "9.0.0-rc.5",
"@angular/platform-server": "9.0.0-rc.5",
"@apollo/client": "3.0.0-beta.15",
"@types/jest": "24.0.23",
"apollo-angular": "2.0.0-alpha.3",
"graphql": "14.5.8",
"jest": "24.9.0",
"jest-zone-patch": "0.0.10",
"ng-packagr": "9.0.0-rc.2",
"ng-packagr": "9.0.0-rc.3",
"rxjs": "6.5.3",
"ts-jest": "24.2.0",
"typescript": "3.6.4",
"zone.js": "0.10.2"
}
}
}
2 changes: 1 addition & 1 deletion packages/apollo-angular-link-http/src/HttpLink.ts
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@ import {
Observable as LinkObservable,
Operation,
FetchResult,
} from 'apollo-angular';
} from '@apollo/client/core';
import {print} from 'graphql';
import {
fetch,
10 changes: 2 additions & 8 deletions packages/apollo-angular-link-http/tests/HttpLink.spec.ts
Original file line number Diff line number Diff line change
@@ -6,14 +6,8 @@ import {
HttpClientTestingModule,
HttpTestingController,
} from '@angular/common/http/testing';
import {
ApolloModule,
Apollo,
InMemoryCache,
gql,
ApolloLink,
execute,
} from 'apollo-angular';
import {ApolloModule, Apollo} from 'apollo-angular';
import {InMemoryCache, gql, ApolloLink, execute} from '@apollo/client/core';
import {mergeMap} from 'rxjs/operators';

import {HttpLink} from '../src/HttpLink';
2 changes: 1 addition & 1 deletion packages/apollo-angular-link-http/tests/SSR.spec.ts
Original file line number Diff line number Diff line change
@@ -22,7 +22,7 @@ import {
HttpTestingController,
} from '@angular/common/http/testing';
import {BrowserModule} from '@angular/platform-browser';
import {gql, execute} from 'apollo-angular';
import {gql, execute} from '@apollo/client/core';
import {filter, first} from 'rxjs/operators';

import {HttpLink} from '../src/HttpLink';
12 changes: 5 additions & 7 deletions packages/apollo-angular-link-persisted/package.json
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@
"main": "build/bundles/ngApolloLinkPersisted.umd.js",
"module": "build/fesm5/ngApolloLinkPersisted.js",
"typings": "build/ngApolloLinkPersisted.d.ts",
"version": "2.0.0-alpha.2",
"version": "2.0.0-alpha.7",
"repository": "https://github.com/apollographql/apollo-angular/tree/master/packages/apollo-angular-link-persisted",
"keywords": [
"apollo",
@@ -18,23 +18,21 @@
"build": "ng-packagr -p ng-package.js",
"test": "yarn test-only",
"test-only": "jest --config jest.config.js",
"deploy": "yarn build && npm publish build --tag next"
"deploy": "yarn build && npm publish build --tag next --registry http://localhost:4873"
},
"peerDependencies": {
"@apollo/client": "^3.0.0-beta.14",
"apollo-angular": "^2.0.0-alpha.3"
"@apollo/client": "^3.0.0-beta.14"
},
"dependencies": {
"apollo-link-context": "^2.0.0-beta.0",
"apollo-link-persisted-queries": "~0.2.0"
},
"devDependencies": {
"@types/jest": "24.0.23",
"apollo-angular": "2.0.0-alpha.3",
"graphql": "14.5.8",
"jest": "24.9.0",
"ng-packagr": "9.0.0-rc.2",
"ng-packagr": "9.0.0-rc.3",
"ts-jest": "24.2.0",
"typescript": "3.6.4"
}
}
}
2 changes: 1 addition & 1 deletion packages/apollo-angular-link-persisted/src/index.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {DocumentNode} from 'graphql';
import {ApolloLink} from 'apollo-angular';
import {ApolloLink} from '@apollo/client/core';
import {setContext} from 'apollo-link-context';
import {
createPersistedQueryLink as _createPersistedQueryLink,
8 changes: 7 additions & 1 deletion packages/apollo-angular-link-persisted/tests/index.spec.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
import {gql, ApolloLink, execute, Observable, Operation} from 'apollo-angular';
import {
gql,
ApolloLink,
execute,
Observable,
Operation,
} from '@apollo/client/core';

import {createPersistedQueryLink} from '../src';

4 changes: 1 addition & 3 deletions packages/apollo-angular/ng-package.js
Original file line number Diff line number Diff line change
@@ -7,7 +7,5 @@ module.exports = {
flatModuleFile: 'ngApollo',
umdModuleIds,
},
whitelistedNonPeerDependencies: [
"semver"
]
whitelistedNonPeerDependencies: ['semver'],
};
Loading

0 comments on commit c0f45ab

Please sign in to comment.