diff --git a/.travis.yml b/.travis.yml index 4eb48b6f8..0a2c74f44 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,9 @@ sudo: false language: node_js node_js: - - '8' + - '10' + - '11' + - '12' notifications: email: false diff --git a/package.json b/package.json index 8ba71b1d9..222d6ebb0 100644 --- a/package.json +++ b/package.json @@ -26,6 +26,6 @@ "rimraf": "2.6.3", "shelljs": "0.8.3", "tsickle": "0.35.0", - "typescript": "3.2.4" + "typescript": "3.4.5" } } diff --git a/packages/apollo-angular-boost/package.json b/packages/apollo-angular-boost/package.json index e5a6beae3..5e85a72a5 100644 --- a/packages/apollo-angular-boost/package.json +++ b/packages/apollo-angular-boost/package.json @@ -23,8 +23,8 @@ "deploy": "yarn build && npm publish build" }, "peerDependencies": { - "@angular/core": "^6.1.0 || ^7.0.0", - "@angular/common": "^6.1.0 || ^7.0.0" + "@angular/core": "^6.1.0 || ^7.0.0 || ^8.0.0", + "@angular/common": "^6.1.0 || ^7.0.0 || ^8.0.0" }, "dependencies": { "apollo-cache-inmemory": "~1.5.0", @@ -37,24 +37,24 @@ "graphql-tag": "~2.10.0" }, "devDependencies": { - "@angular/animations": "7.2.13", - "@angular/common": "7.2.13", - "@angular/compiler": "7.2.13", - "@angular/compiler-cli": "7.2.13", - "@angular/core": "7.2.13", + "@angular/animations": "8.0.0", + "@angular/common": "8.0.0", + "@angular/compiler": "8.0.0", + "@angular/compiler-cli": "8.0.0", + "@angular/core": "8.0.0", "@angular/http": "7.2.13", - "@angular/platform-browser": "7.2.13", - "@angular/platform-browser-dynamic": "7.2.13", - "@angular/platform-server": "7.2.13", + "@angular/platform-browser": "8.0.0", + "@angular/platform-browser-dynamic": "8.0.0", + "@angular/platform-server": "8.0.0", "@types/graphql": "14.2.0", "@types/jest": "23.3.13", "graphql": "14.3.0", "jest": "24.5.0", "jest-zone-patch": "0.0.10", - "ng-packagr": "5.1.0", + "ng-packagr": "5.2.0", "rxjs": "6.5.2", "ts-jest": "24.0.2", - "typescript": "3.2.4", + "typescript": "3.4.5", "zone.js": "0.9.1" } } diff --git a/packages/apollo-angular-cache-ngrx/package.json b/packages/apollo-angular-cache-ngrx/package.json index 4b59fd5d2..3871b1de9 100644 --- a/packages/apollo-angular-cache-ngrx/package.json +++ b/packages/apollo-angular-cache-ngrx/package.json @@ -26,19 +26,19 @@ "deploy": "yarn build && npm publish build" }, "peerDependencies": { - "@angular/core": "^6.1.0 || ^7.0.0", + "@angular/core": "^6.1.0 || ^7.0.0 || ^8.0.0", "@ngrx/store": "^6.0.0 || ^7.0.0", "rxjs": "^6.0.0" }, "devDependencies": { - "@angular/animations": "7.2.13", - "@angular/common": "7.2.13", - "@angular/compiler": "7.2.13", - "@angular/compiler-cli": "7.2.13", - "@angular/core": "7.2.13", + "@angular/animations": "8.0.0", + "@angular/common": "8.0.0", + "@angular/compiler": "8.0.0", + "@angular/compiler-cli": "8.0.0", + "@angular/core": "8.0.0", "@angular/http": "7.2.13", - "@angular/platform-browser": "7.2.13", - "@angular/platform-browser-dynamic": "7.2.13", + "@angular/platform-browser": "8.0.0", + "@angular/platform-browser-dynamic": "8.0.0", "@ngrx/store": "7.4.0", "@types/graphql": "14.2.0", "@types/jest": "23.3.13", @@ -46,10 +46,10 @@ "graphql-tag": "2.10.1", "jest": "24.5.0", "jest-zone-patch": "0.0.10", - "ng-packagr": "5.1.0", + "ng-packagr": "5.2.0", "rxjs": "6.5.2", "ts-jest": "24.0.2", - "typescript": "3.2.4", + "typescript": "3.4.5", "zone.js": "0.9.1" }, "dependencies": { diff --git a/packages/apollo-angular-link-headers/package.json b/packages/apollo-angular-link-headers/package.json index 87bf99790..5d55ccc16 100644 --- a/packages/apollo-angular-link-headers/package.json +++ b/packages/apollo-angular-link-headers/package.json @@ -24,20 +24,20 @@ "deploy": "yarn build && npm publish build" }, "peerDependencies": { - "@angular/common": "^6.0.0 || ^7.0.0", + "@angular/common": "^6.0.0 || ^7.0.0 || ^8.0.0", "apollo-link": "^1.0.0" }, "devDependencies": { - "@angular/common": "7.2.13", - "@angular/core": "7.2.13", + "@angular/common": "8.0.0", + "@angular/core": "8.0.0", "@types/graphql": "14.2.0", "@types/jest": "23.3.13", "apollo-link": "1.2.11", "graphql": "14.3.0", "graphql-tag": "2.10.1", "jest": "24.5.0", - "ng-packagr": "5.1.0", + "ng-packagr": "5.2.0", "ts-jest": "24.0.2", - "typescript": "3.2.4" + "typescript": "3.4.5" } } diff --git a/packages/apollo-angular-link-http-batch/package.json b/packages/apollo-angular-link-http-batch/package.json index ff435822c..e27b91dfc 100644 --- a/packages/apollo-angular-link-http-batch/package.json +++ b/packages/apollo-angular-link-http-batch/package.json @@ -24,8 +24,8 @@ "deploy": "yarn build && npm publish build" }, "peerDependencies": { - "@angular/core": "^6.0.0 || ^7.0.0", - "@angular/common": "^6.0.0 || ^7.0.0", + "@angular/core": "^6.0.0 || ^7.0.0 || ^8.0.0", + "@angular/common": "^6.0.0 || ^7.0.0 || ^8.0.0", "graphql": ">=0.11.0 <0.14.0 || ^14.0.0" }, "dependencies": { @@ -34,15 +34,15 @@ "apollo-angular-link-http-common": "~1.5.0" }, "devDependencies": { - "@angular/animations": "7.2.13", - "@angular/common": "7.2.13", - "@angular/compiler": "7.2.13", - "@angular/compiler-cli": "7.2.13", - "@angular/core": "7.2.13", + "@angular/animations": "8.0.0", + "@angular/common": "8.0.0", + "@angular/compiler": "8.0.0", + "@angular/compiler-cli": "8.0.0", + "@angular/core": "8.0.0", "@angular/http": "7.2.13", - "@angular/platform-browser": "7.2.13", - "@angular/platform-browser-dynamic": "7.2.13", - "@angular/platform-server": "7.2.13", + "@angular/platform-browser": "8.0.0", + "@angular/platform-browser-dynamic": "8.0.0", + "@angular/platform-server": "8.0.0", "@types/graphql": "14.2.0", "@types/jest": "23.3.13", "apollo-cache-inmemory": "1.5.1", @@ -51,10 +51,10 @@ "graphql-tag": "2.10.1", "jest": "24.5.0", "jest-zone-patch": "0.0.10", - "ng-packagr": "5.1.0", + "ng-packagr": "5.2.0", "rxjs": "6.5.2", "ts-jest": "24.0.2", - "typescript": "3.2.4", + "typescript": "3.4.5", "zone.js": "0.9.1" } } diff --git a/packages/apollo-angular-link-http-common/package.json b/packages/apollo-angular-link-http-common/package.json index ed18eebc7..d1134e867 100644 --- a/packages/apollo-angular-link-http-common/package.json +++ b/packages/apollo-angular-link-http-common/package.json @@ -24,22 +24,22 @@ "deploy": "yarn build && npm publish build" }, "peerDependencies": { - "@angular/core": "^6.0.0 || ^7.0.0", - "@angular/common": "^6.0.0 || ^7.0.0", + "@angular/core": "^6.0.0 || ^7.0.0 || ^8.0.0", + "@angular/common": "^6.0.0 || ^7.0.0 || ^8.0.0", "apollo-link": "^1.0.0", "extract-files": "^5.0.1", "graphql": ">=0.11.0 <0.14.0 || ^14.0.0" }, "devDependencies": { - "@angular/animations": "7.2.13", - "@angular/common": "7.2.13", - "@angular/compiler": "7.2.13", - "@angular/compiler-cli": "7.2.13", - "@angular/core": "7.2.13", + "@angular/animations": "8.0.0", + "@angular/common": "8.0.0", + "@angular/compiler": "8.0.0", + "@angular/compiler-cli": "8.0.0", + "@angular/core": "8.0.0", "@angular/http": "7.2.13", - "@angular/platform-browser": "7.2.13", - "@angular/platform-browser-dynamic": "7.2.13", - "@angular/platform-server": "7.2.13", + "@angular/platform-browser": "8.0.0", + "@angular/platform-browser-dynamic": "8.0.0", + "@angular/platform-server": "8.0.0", "@types/graphql": "14.2.0", "@types/jest": "23.3.13", "apollo-cache-inmemory": "1.5.1", @@ -49,10 +49,10 @@ "graphql-tag": "2.10.1", "jest": "24.5.0", "jest-zone-patch": "0.0.10", - "ng-packagr": "5.1.0", + "ng-packagr": "5.2.0", "rxjs": "6.5.2", "ts-jest": "24.0.2", - "typescript": "3.2.4", + "typescript": "3.4.5", "zone.js": "0.9.1" } } diff --git a/packages/apollo-angular-link-http/package.json b/packages/apollo-angular-link-http/package.json index d2b7b2f5e..59aba8508 100644 --- a/packages/apollo-angular-link-http/package.json +++ b/packages/apollo-angular-link-http/package.json @@ -24,8 +24,8 @@ "deploy": "yarn build && npm publish build" }, "peerDependencies": { - "@angular/core": "^6.0.0 || ^7.0.0", - "@angular/common": "^6.0.0 || ^7.0.0", + "@angular/core": "^6.0.0 || ^7.0.0 || ^8.0.0", + "@angular/common": "^6.0.0 || ^7.0.0 || ^8.0.0", "apollo-link": "^1.0.0", "graphql": ">=0.11.0 <0.14.0 || ^14.0.0" }, @@ -34,15 +34,15 @@ "extract-files": "5.0.1" }, "devDependencies": { - "@angular/animations": "7.2.13", - "@angular/common": "7.2.13", - "@angular/compiler": "7.2.13", - "@angular/compiler-cli": "7.2.13", - "@angular/core": "7.2.13", + "@angular/animations": "8.0.0", + "@angular/common": "8.0.0", + "@angular/compiler": "8.0.0", + "@angular/compiler-cli": "8.0.0", + "@angular/core": "8.0.0", "@angular/http": "7.2.13", - "@angular/platform-browser": "7.2.13", - "@angular/platform-browser-dynamic": "7.2.13", - "@angular/platform-server": "7.2.13", + "@angular/platform-browser": "8.0.0", + "@angular/platform-browser-dynamic": "8.0.0", + "@angular/platform-server": "8.0.0", "@types/graphql": "14.2.0", "@types/jest": "23.3.13", "apollo-angular": "1.4.1", @@ -53,10 +53,10 @@ "graphql-tag": "2.10.1", "jest": "24.5.0", "jest-zone-patch": "0.0.10", - "ng-packagr": "5.1.0", + "ng-packagr": "5.2.0", "rxjs": "6.5.2", "ts-jest": "24.0.2", - "typescript": "3.2.4", + "typescript": "3.4.5", "zone.js": "0.9.1" } } diff --git a/packages/apollo-angular-link-persisted/package.json b/packages/apollo-angular-link-persisted/package.json index 04f6f0165..d2a41af5f 100644 --- a/packages/apollo-angular-link-persisted/package.json +++ b/packages/apollo-angular-link-persisted/package.json @@ -37,8 +37,8 @@ "graphql": "14.3.0", "graphql-tag": "2.10.1", "jest": "24.5.0", - "ng-packagr": "5.1.0", + "ng-packagr": "5.2.0", "ts-jest": "24.0.2", - "typescript": "3.2.4" + "typescript": "3.4.5" } } diff --git a/packages/apollo-angular/package.json b/packages/apollo-angular/package.json index c95fd4784..9d0167d62 100644 --- a/packages/apollo-angular/package.json +++ b/packages/apollo-angular/package.json @@ -32,7 +32,7 @@ "deploy": "yarn build && npm publish build" }, "peerDependencies": { - "@angular/core": "^6.1.0 || ^7.0.0", + "@angular/core": "^6.1.0 || ^7.0.0 || ^8.0.0", "apollo-client": "^2.3.4", "apollo-link": "^1.0.0", "rxjs": "^6.0.0", @@ -42,15 +42,15 @@ "semver": "^6.0.0" }, "devDependencies": { - "@angular-devkit/core": "7.3.9", - "@angular-devkit/schematics": "7.3.9", - "@angular/common": "7.2.13", - "@angular/compiler": "7.2.13", - "@angular/compiler-cli": "7.2.13", - "@angular/core": "7.2.13", - "@angular/platform-browser": "7.2.13", - "@angular/platform-browser-dynamic": "7.2.13", - "@schematics/angular": "7.3.9", + "@angular-devkit/core": "8.0.0", + "@angular-devkit/schematics": "8.0.0", + "@angular/common": "8.0.0", + "@angular/compiler": "8.0.0", + "@angular/compiler-cli": "8.0.0", + "@angular/core": "8.0.0", + "@angular/platform-browser": "8.0.0", + "@angular/platform-browser-dynamic": "8.0.0", + "@schematics/angular": "8.0.0", "@types/graphql": "14.2.0", "@types/jest": "23.3.13", "@types/node": "10.14.7", @@ -63,10 +63,10 @@ "graphql-tag": "2.10.1", "jest": "24.5.0", "jest-zone-patch": "0.0.10", - "ng-packagr": "5.1.0", + "ng-packagr": "5.2.0", "rxjs": "6.5.2", "ts-jest": "24.0.2", - "typescript": "3.2.4", + "typescript": "3.4.5", "zone.js": "0.9.1" }, "schematics": "./schematics/collection.json" diff --git a/packages/apollo-angular/schematics/tests/ng-add.spec.ts b/packages/apollo-angular/schematics/tests/ng-add.spec.ts index 4f421b5d2..143bbeb6f 100644 --- a/packages/apollo-angular/schematics/tests/ng-add.spec.ts +++ b/packages/apollo-angular/schematics/tests/ng-add.spec.ts @@ -13,8 +13,8 @@ describe('ng-add', () => { let runner: SchematicTestRunner; let appTree: Tree; - beforeEach(() => { - appTree = createTestApp(); + beforeEach(async () => { + appTree = await createTestApp(); runner = new SchematicTestRunner('schematics', collectionPath); }); diff --git a/packages/apollo-angular/schematics/utils/test.ts b/packages/apollo-angular/schematics/utils/test.ts index 01a601418..9bb9cd87c 100644 --- a/packages/apollo-angular/schematics/utils/test.ts +++ b/packages/apollo-angular/schematics/utils/test.ts @@ -7,26 +7,26 @@ import { const collectionPath = join(__dirname, '../collection.json'); -export function createTestApp(appOptions = {}): UnitTestTree { +export async function createTestApp(appOptions = {}): Promise { const baseRunner = new SchematicTestRunner('schematics', collectionPath); - const workspaceTree = baseRunner.runExternalSchematic( - '@schematics/angular', - 'workspace', - { + const workspaceTree = await baseRunner + .runExternalSchematicAsync('@schematics/angular', 'workspace', { name: 'workspace', version: '6.0.0', newProjectRoot: 'projects', - }, - ); + }) + .toPromise(); - return baseRunner.runExternalSchematic( - '@schematics/angular', - 'application', - { - ...appOptions, - name: 'apollo', - }, - workspaceTree, - ); + return baseRunner + .runExternalSchematicAsync( + '@schematics/angular', + 'application', + { + ...appOptions, + name: 'apollo', + }, + workspaceTree, + ) + .toPromise(); }