From 5d03ae1650f7eb71ef220def57713167c39d7ee2 Mon Sep 17 00:00:00 2001 From: Martijn Walraven Date: Fri, 5 Oct 2018 17:18:13 +0200 Subject: [PATCH 1/7] Update to TypeScript 3.1 --- package-lock.json | 6 +++--- package.json | 2 +- packages/apollo-server-core/src/runHttpQuery.ts | 9 ++++++--- packages/graphql-extensions/src/index.ts | 2 +- 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index f74410e0e60..768b34d4411 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12470,9 +12470,9 @@ "dev": true }, "typescript": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.0.3.tgz", - "integrity": "sha512-kk80vLW9iGtjMnIv11qyxLqZm20UklzuR2tL0QAnDIygIUIemcZMxlMWudl9OOt76H3ntVzcTiddQ1/pAAJMYg==", + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.1.1.tgz", + "integrity": "sha512-Veu0w4dTc/9wlWNf2jeRInNodKlcdLgemvPsrNpfu5Pq39sgfFjvIIgTsvUHCoLBnMhPoUA+tFxsXjU6VexVRQ==", "dev": true }, "uglify-js": { diff --git a/package.json b/package.json index 9f5d46baf29..40b9b3b24de 100644 --- a/package.json +++ b/package.json @@ -113,7 +113,7 @@ "test-listen": "1.1.0", "ts-jest": "23.1.4", "tslint": "5.11.0", - "typescript": "3.0.3", + "typescript": "3.1.1", "ws": "6.0.0", "yup": "0.26.5" }, diff --git a/packages/apollo-server-core/src/runHttpQuery.ts b/packages/apollo-server-core/src/runHttpQuery.ts index e49d1a7b7ad..158f5d43046 100644 --- a/packages/apollo-server-core/src/runHttpQuery.ts +++ b/packages/apollo-server-core/src/runHttpQuery.ts @@ -313,7 +313,7 @@ export async function runHttpQuery( context = {} as Record; } else if (typeof context === 'function') { try { - context = await context(); + context = await (context as Function)(); } catch (e) { e.message = `Context creation failed: ${e.message}`; // For errors that are not internal, such as authentication, we @@ -342,11 +342,14 @@ export async function runHttpQuery( for (const dataSource of Object.values(dataSources)) { if (dataSource.initialize) { - dataSource.initialize({ context, cache: optionsObject.cache! }); + dataSource.initialize({ + context: context!, + cache: optionsObject.cache!, + }); } } - if ('dataSources' in context) { + if ('dataSources' in context!) { throw new Error( 'Please use the dataSources config option instead of putting dataSources on the context yourself.', ); diff --git a/packages/graphql-extensions/src/index.ts b/packages/graphql-extensions/src/index.ts index b4455109da6..1c4ed0157ea 100644 --- a/packages/graphql-extensions/src/index.ts +++ b/packages/graphql-extensions/src/index.ts @@ -20,7 +20,7 @@ export type EndHandler = (...errors: Array) => void; // arguments. type StartHandlerInvoker = ( ext: GraphQLExtension, -) => void; +) => EndHandler | void; // Copied from runQuery in apollo-server-core. // XXX Will this work properly if it's an identical interface of the From fcaa6ad79d647ba2adfef7c3e1f39f26413f12bb Mon Sep 17 00:00:00 2001 From: Martijn Walraven Date: Fri, 5 Oct 2018 17:47:29 +0200 Subject: [PATCH 2/7] Enable TypeScript project references --- packages/apollo-cache-control/tsconfig.json | 6 +++++- packages/apollo-datasource-rest/tsconfig.json | 8 +++++++- packages/apollo-datasource/tsconfig.json | 6 +++++- packages/apollo-engine-reporting/tsconfig.json | 7 ++++++- packages/apollo-server-cache-memcached/tsconfig.json | 6 +++++- packages/apollo-server-cache-redis/tsconfig.json | 6 +++++- packages/apollo-server-cloud-function/tsconfig.json | 7 ++++++- packages/apollo-server-cloudflare/tsconfig.json | 7 ++++++- packages/apollo-server-core/tsconfig.json | 12 +++++++++++- packages/apollo-server-env/tsconfig.json | 1 + packages/apollo-server-express/tsconfig.json | 7 ++++++- packages/apollo-server-hapi/tsconfig.json | 7 ++++++- .../tsconfig.json | 5 ++++- packages/apollo-server-koa/tsconfig.json | 7 ++++++- packages/apollo-server-lambda/tsconfig.json | 7 ++++++- packages/apollo-server-micro/tsconfig.json | 7 ++++++- packages/apollo-server/tsconfig.json | 6 +++++- packages/apollo-tracing/tsconfig.json | 6 +++++- packages/graphql-extensions/tsconfig.json | 5 ++++- tsconfig.json | 1 + 20 files changed, 106 insertions(+), 18 deletions(-) diff --git a/packages/apollo-cache-control/tsconfig.json b/packages/apollo-cache-control/tsconfig.json index b8b81721105..7da8a617ac9 100644 --- a/packages/apollo-cache-control/tsconfig.json +++ b/packages/apollo-cache-control/tsconfig.json @@ -5,5 +5,9 @@ "outDir": "./dist" }, "include": ["src/**/*"], - "exclude": ["**/__tests__", "**/__mocks__"] + "exclude": ["**/__tests__", "**/__mocks__"], + "references": [ + { "path": "../apollo-server-env" }, + { "path": "../graphql-extensions" } + ] } diff --git a/packages/apollo-datasource-rest/tsconfig.json b/packages/apollo-datasource-rest/tsconfig.json index b8b81721105..1879473356a 100644 --- a/packages/apollo-datasource-rest/tsconfig.json +++ b/packages/apollo-datasource-rest/tsconfig.json @@ -5,5 +5,11 @@ "outDir": "./dist" }, "include": ["src/**/*"], - "exclude": ["**/__tests__", "**/__mocks__"] + "exclude": ["**/__tests__", "**/__mocks__"], + "references": [ + { "path": "../apollo-datasource" }, + { "path": "../apollo-server-caching" }, + { "path": "../apollo-server-env" }, + { "path": "../apollo-server-errors" } + ] } diff --git a/packages/apollo-datasource/tsconfig.json b/packages/apollo-datasource/tsconfig.json index b8b81721105..690669b1071 100644 --- a/packages/apollo-datasource/tsconfig.json +++ b/packages/apollo-datasource/tsconfig.json @@ -5,5 +5,9 @@ "outDir": "./dist" }, "include": ["src/**/*"], - "exclude": ["**/__tests__", "**/__mocks__"] + "exclude": ["**/__tests__", "**/__mocks__"], + "references": [ + { "path": "../apollo-server-caching" }, + { "path": "../apollo-server-env" } + ] } diff --git a/packages/apollo-engine-reporting/tsconfig.json b/packages/apollo-engine-reporting/tsconfig.json index b8b81721105..b9e1cc8ccbd 100644 --- a/packages/apollo-engine-reporting/tsconfig.json +++ b/packages/apollo-engine-reporting/tsconfig.json @@ -5,5 +5,10 @@ "outDir": "./dist" }, "include": ["src/**/*"], - "exclude": ["**/__tests__", "**/__mocks__"] + "exclude": ["**/__tests__", "**/__mocks__"], + "references": [ + { "path": "../apollo-engine-reporting-protobuf" }, + { "path": "../apollo-server-env" }, + { "path": "../graphql-extensions" } + ] } diff --git a/packages/apollo-server-cache-memcached/tsconfig.json b/packages/apollo-server-cache-memcached/tsconfig.json index b8b81721105..84a98c59953 100644 --- a/packages/apollo-server-cache-memcached/tsconfig.json +++ b/packages/apollo-server-cache-memcached/tsconfig.json @@ -5,5 +5,9 @@ "outDir": "./dist" }, "include": ["src/**/*"], - "exclude": ["**/__tests__", "**/__mocks__"] + "exclude": ["**/__tests__", "**/__mocks__"], + "references": [ + { "path": "../apollo-server-caching" }, + { "path": "../apollo-server-env" }, + ] } diff --git a/packages/apollo-server-cache-redis/tsconfig.json b/packages/apollo-server-cache-redis/tsconfig.json index b8b81721105..690669b1071 100644 --- a/packages/apollo-server-cache-redis/tsconfig.json +++ b/packages/apollo-server-cache-redis/tsconfig.json @@ -5,5 +5,9 @@ "outDir": "./dist" }, "include": ["src/**/*"], - "exclude": ["**/__tests__", "**/__mocks__"] + "exclude": ["**/__tests__", "**/__mocks__"], + "references": [ + { "path": "../apollo-server-caching" }, + { "path": "../apollo-server-env" } + ] } diff --git a/packages/apollo-server-cloud-function/tsconfig.json b/packages/apollo-server-cloud-function/tsconfig.json index b8b81721105..cd1c039beca 100644 --- a/packages/apollo-server-cloud-function/tsconfig.json +++ b/packages/apollo-server-cloud-function/tsconfig.json @@ -5,5 +5,10 @@ "outDir": "./dist" }, "include": ["src/**/*"], - "exclude": ["**/__tests__", "**/__mocks__"] + "exclude": ["**/__tests__", "**/__mocks__"], + "references": [ + { "path": "../apollo-server-core" }, + { "path": "../apollo-server-env" }, + { "path": "../apollo-server-integration-testsuite" } + ] } diff --git a/packages/apollo-server-cloudflare/tsconfig.json b/packages/apollo-server-cloudflare/tsconfig.json index b8b81721105..cd1c039beca 100644 --- a/packages/apollo-server-cloudflare/tsconfig.json +++ b/packages/apollo-server-cloudflare/tsconfig.json @@ -5,5 +5,10 @@ "outDir": "./dist" }, "include": ["src/**/*"], - "exclude": ["**/__tests__", "**/__mocks__"] + "exclude": ["**/__tests__", "**/__mocks__"], + "references": [ + { "path": "../apollo-server-core" }, + { "path": "../apollo-server-env" }, + { "path": "../apollo-server-integration-testsuite" } + ] } diff --git a/packages/apollo-server-core/tsconfig.json b/packages/apollo-server-core/tsconfig.json index b8b81721105..43cba3fe552 100644 --- a/packages/apollo-server-core/tsconfig.json +++ b/packages/apollo-server-core/tsconfig.json @@ -5,5 +5,15 @@ "outDir": "./dist" }, "include": ["src/**/*"], - "exclude": ["**/__tests__", "**/__mocks__"] + "exclude": ["**/__tests__", "**/__mocks__"], + "references": [ + { "path": "../apollo-cache-control" }, + { "path": "../apollo-datasource" }, + { "path": "../apollo-engine-reporting" }, + { "path": "../apollo-server-caching" }, + { "path": "../apollo-server-env" }, + { "path": "../apollo-server-errors" }, + { "path": "../apollo-tracing" }, + { "path": "../graphql-extensions" } + ] } diff --git a/packages/apollo-server-env/tsconfig.json b/packages/apollo-server-env/tsconfig.json index a279d2621cd..122400dc911 100644 --- a/packages/apollo-server-env/tsconfig.json +++ b/packages/apollo-server-env/tsconfig.json @@ -1,6 +1,7 @@ { "extends": "../../tsconfig", "compilerOptions": { + "composite": false, "rootDir": "./src", "outDir": "./dist", "allowJs": true, diff --git a/packages/apollo-server-express/tsconfig.json b/packages/apollo-server-express/tsconfig.json index 1fb1071218e..6a1326bd964 100644 --- a/packages/apollo-server-express/tsconfig.json +++ b/packages/apollo-server-express/tsconfig.json @@ -7,5 +7,10 @@ "strictNullChecks": false }, "include": ["src/**/*"], - "exclude": ["**/__tests__", "**/__mocks__"] + "exclude": ["**/__tests__", "**/__mocks__"], + "references": [ + { "path": "../apollo-server-core" }, + { "path": "../apollo-server-env" }, + { "path": "../apollo-server-integration-testsuite" } + ] } diff --git a/packages/apollo-server-hapi/tsconfig.json b/packages/apollo-server-hapi/tsconfig.json index 4f9532c3555..7e8b87ad7ac 100644 --- a/packages/apollo-server-hapi/tsconfig.json +++ b/packages/apollo-server-hapi/tsconfig.json @@ -8,5 +8,10 @@ "strictNullChecks": false }, "include": ["src/**/*"], - "exclude": ["**/__tests__", "**/__mocks__"] + "exclude": ["**/__tests__", "**/__mocks__"], + "references": [ + { "path": "../apollo-server-core" }, + { "path": "../apollo-server-env" }, + { "path": "../apollo-server-integration-testsuite" } + ] } diff --git a/packages/apollo-server-integration-testsuite/tsconfig.json b/packages/apollo-server-integration-testsuite/tsconfig.json index 1fc001ddcc5..5d56146e9ac 100644 --- a/packages/apollo-server-integration-testsuite/tsconfig.json +++ b/packages/apollo-server-integration-testsuite/tsconfig.json @@ -8,5 +8,8 @@ "lib": ["es2017", "esnext.asynciterable", "dom"] }, "include": ["src/**/*"], - "exclude": ["**/__tests__", "**/__mocks__"] + "exclude": ["**/__tests__", "**/__mocks__"], + "references": [ + { "path": "../apollo-server-core" } + ] } diff --git a/packages/apollo-server-koa/tsconfig.json b/packages/apollo-server-koa/tsconfig.json index 967b4d28b36..c00c5fb7ea4 100644 --- a/packages/apollo-server-koa/tsconfig.json +++ b/packages/apollo-server-koa/tsconfig.json @@ -8,5 +8,10 @@ "noImplicitReturns": false }, "include": ["src/**/*"], - "exclude": ["**/__tests__", "**/__mocks__"] + "exclude": ["**/__tests__", "**/__mocks__"], + "references": [ + { "path": "../apollo-server-core" }, + { "path": "../apollo-server-env" }, + { "path": "../apollo-server-integration-testsuite" } + ] } diff --git a/packages/apollo-server-lambda/tsconfig.json b/packages/apollo-server-lambda/tsconfig.json index b8b81721105..cd1c039beca 100644 --- a/packages/apollo-server-lambda/tsconfig.json +++ b/packages/apollo-server-lambda/tsconfig.json @@ -5,5 +5,10 @@ "outDir": "./dist" }, "include": ["src/**/*"], - "exclude": ["**/__tests__", "**/__mocks__"] + "exclude": ["**/__tests__", "**/__mocks__"], + "references": [ + { "path": "../apollo-server-core" }, + { "path": "../apollo-server-env" }, + { "path": "../apollo-server-integration-testsuite" } + ] } diff --git a/packages/apollo-server-micro/tsconfig.json b/packages/apollo-server-micro/tsconfig.json index 1fb1071218e..6a1326bd964 100644 --- a/packages/apollo-server-micro/tsconfig.json +++ b/packages/apollo-server-micro/tsconfig.json @@ -7,5 +7,10 @@ "strictNullChecks": false }, "include": ["src/**/*"], - "exclude": ["**/__tests__", "**/__mocks__"] + "exclude": ["**/__tests__", "**/__mocks__"], + "references": [ + { "path": "../apollo-server-core" }, + { "path": "../apollo-server-env" }, + { "path": "../apollo-server-integration-testsuite" } + ] } diff --git a/packages/apollo-server/tsconfig.json b/packages/apollo-server/tsconfig.json index b8b81721105..dd6694cb6ad 100644 --- a/packages/apollo-server/tsconfig.json +++ b/packages/apollo-server/tsconfig.json @@ -5,5 +5,9 @@ "outDir": "./dist" }, "include": ["src/**/*"], - "exclude": ["**/__tests__", "**/__mocks__"] + "exclude": ["**/__tests__", "**/__mocks__"], + "references": [ + { "path": "../apollo-server-core" }, + { "path": "../apollo-server-express" } + ] } diff --git a/packages/apollo-tracing/tsconfig.json b/packages/apollo-tracing/tsconfig.json index b8b81721105..7da8a617ac9 100644 --- a/packages/apollo-tracing/tsconfig.json +++ b/packages/apollo-tracing/tsconfig.json @@ -5,5 +5,9 @@ "outDir": "./dist" }, "include": ["src/**/*"], - "exclude": ["**/__tests__", "**/__mocks__"] + "exclude": ["**/__tests__", "**/__mocks__"], + "references": [ + { "path": "../apollo-server-env" }, + { "path": "../graphql-extensions" } + ] } diff --git a/packages/graphql-extensions/tsconfig.json b/packages/graphql-extensions/tsconfig.json index b8b81721105..f123c1dc49a 100644 --- a/packages/graphql-extensions/tsconfig.json +++ b/packages/graphql-extensions/tsconfig.json @@ -5,5 +5,8 @@ "outDir": "./dist" }, "include": ["src/**/*"], - "exclude": ["**/__tests__", "**/__mocks__"] + "exclude": ["**/__tests__", "**/__mocks__"], + "references": [ + { "path": "../apollo-server-env" } + ] } diff --git a/tsconfig.json b/tsconfig.json index c1cac892fae..d70e94eb552 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,5 +1,6 @@ { "compilerOptions": { + "composite": true, "target": "es2016", "module": "commonjs", "moduleResolution": "node", From 1aee215e68a3462050c1eb97726379f6311998cc Mon Sep 17 00:00:00 2001 From: Martijn Walraven Date: Fri, 5 Oct 2018 17:48:34 +0200 Subject: [PATCH 3/7] Switch to tsc --build and remove run scripts from packages --- package.json | 4 ++-- packages/apollo-cache-control/package.json | 5 ----- packages/apollo-datasource-rest/package.json | 5 ----- packages/apollo-datasource/package.json | 5 ----- packages/apollo-engine-reporting/package.json | 7 ------- packages/apollo-server-cache-memcached/package.json | 5 ----- packages/apollo-server-cache-redis/package.json | 5 ----- packages/apollo-server-caching/package.json | 5 ----- packages/apollo-server-cloud-function/package.json | 5 ----- packages/apollo-server-cloudflare/package.json | 5 ----- packages/apollo-server-core/package.json | 5 ----- packages/apollo-server-env/package.json | 5 ----- packages/apollo-server-errors/package.json | 5 ----- packages/apollo-server-express/package.json | 5 ----- packages/apollo-server-hapi/package.json | 5 ----- packages/apollo-server-integration-testsuite/package.json | 5 ----- packages/apollo-server-koa/package.json | 5 ----- packages/apollo-server-lambda/package.json | 5 ----- packages/apollo-server-micro/package.json | 5 ----- packages/apollo-server/package.json | 5 ----- packages/apollo-tracing/package.json | 5 ----- packages/graphql-extensions/package.json | 7 ------- 22 files changed, 2 insertions(+), 111 deletions(-) diff --git a/package.json b/package.json index 40b9b3b24de..5eccd2f3497 100644 --- a/package.json +++ b/package.json @@ -5,10 +5,10 @@ "repository": "github:apollographql/apollo-server", "scripts": { "clean": "git clean -dfqX -- ./node_modules **/{dist,node_modules}/", - "compile": "lerna run compile", + "compile": "tsc --build", "release": "npm run clean && npm ci && lerna publish --exact", "precommit": "lint-staged", - "postinstall": "lerna run prepare", + "postinstall": "lerna run prepare && npm run compile", "lint": "prettier-check '**/*.{js,ts}'", "lint-fix": "prettier '**/*.{js,ts}' --write", "test": "jest --verbose", diff --git a/packages/apollo-cache-control/package.json b/packages/apollo-cache-control/package.json index a0230633869..78a84392b18 100644 --- a/packages/apollo-cache-control/package.json +++ b/packages/apollo-cache-control/package.json @@ -4,11 +4,6 @@ "description": "A GraphQL extension for cache control", "main": "./dist/index.js", "types": "./dist/index.d.ts", - "scripts": { - "clean": "rm -rf dist", - "compile": "tsc", - "prepare": "npm run clean && npm run compile" - }, "license": "MIT", "repository": "apollographql/apollo-cache-control-js", "author": "Martijn Walraven ", diff --git a/packages/apollo-datasource-rest/package.json b/packages/apollo-datasource-rest/package.json index 61aca07ce9c..fa8ae64de02 100644 --- a/packages/apollo-datasource-rest/package.json +++ b/packages/apollo-datasource-rest/package.json @@ -11,11 +11,6 @@ "bugs": { "url": "https://github.com/apollographql/apollo-server/issues" }, - "scripts": { - "clean": "rm -rf dist", - "compile": "tsc", - "prepare": "npm run clean && npm run compile" - }, "main": "dist/index.js", "types": "dist/index.d.ts", "engines": { diff --git a/packages/apollo-datasource/package.json b/packages/apollo-datasource/package.json index 5b958e86d1a..23ee4bcb10c 100644 --- a/packages/apollo-datasource/package.json +++ b/packages/apollo-datasource/package.json @@ -11,11 +11,6 @@ "bugs": { "url": "https://github.com/apollographql/apollo-server/issues" }, - "scripts": { - "clean": "rm -rf dist", - "compile": "tsc", - "prepare": "npm run clean && npm run compile" - }, "main": "dist/index.js", "types": "dist/index.d.ts", "engines": { diff --git a/packages/apollo-engine-reporting/package.json b/packages/apollo-engine-reporting/package.json index 6f44d5919e1..b08b4030964 100644 --- a/packages/apollo-engine-reporting/package.json +++ b/packages/apollo-engine-reporting/package.json @@ -4,13 +4,6 @@ "description": "Send reports about your GraphQL services to Apollo Engine", "main": "./dist/index.js", "types": "./dist/index.d.ts", - "scripts": { - "clean": "rm -rf dist", - "compile": "tsc", - "prepare": "npm run clean && npm run compile", - "lint": "prettier -l 'src/**/*.{ts,js}' && tslint -p tsconfig.json 'src/**/*.ts'", - "lint-fix": "prettier --write 'src/**/*.{ts,js}' && tslint --fix -p tsconfig.json 'src/**/*.ts'" - }, "license": "MIT", "repository": "https://github.com/apollographql/apollo-engine-reporting", "author": "Apollo ", diff --git a/packages/apollo-server-cache-memcached/package.json b/packages/apollo-server-cache-memcached/package.json index eb7cf22e62e..bd09f1b7b7b 100644 --- a/packages/apollo-server-cache-memcached/package.json +++ b/packages/apollo-server-cache-memcached/package.json @@ -11,11 +11,6 @@ "bugs": { "url": "https://github.com/apollographql/apollo-server/issues" }, - "scripts": { - "clean": "rm -rf dist", - "compile": "tsc", - "prepare": "npm run clean && npm run compile" - }, "main": "dist/index.js", "types": "dist/index.d.ts", "engines": { diff --git a/packages/apollo-server-cache-redis/package.json b/packages/apollo-server-cache-redis/package.json index 84bb9979e95..8b2179fc91a 100644 --- a/packages/apollo-server-cache-redis/package.json +++ b/packages/apollo-server-cache-redis/package.json @@ -11,11 +11,6 @@ "bugs": { "url": "https://github.com/apollographql/apollo-server/issues" }, - "scripts": { - "clean": "rm -rf dist", - "compile": "tsc", - "prepare": "npm run clean && npm run compile" - }, "main": "dist/index.js", "types": "dist/index.d.ts", "engines": { diff --git a/packages/apollo-server-caching/package.json b/packages/apollo-server-caching/package.json index ff497f93f31..15b06a53128 100644 --- a/packages/apollo-server-caching/package.json +++ b/packages/apollo-server-caching/package.json @@ -11,11 +11,6 @@ "bugs": { "url": "https://github.com/apollographql/apollo-server/issues" }, - "scripts": { - "clean": "rm -rf dist", - "compile": "tsc", - "prepare": "npm run clean && npm run compile" - }, "main": "dist/index.js", "types": "dist/index.d.ts", "engines": { diff --git a/packages/apollo-server-cloud-function/package.json b/packages/apollo-server-cloud-function/package.json index 35c9a98f0ca..114222b8930 100644 --- a/packages/apollo-server-cloud-function/package.json +++ b/packages/apollo-server-cloud-function/package.json @@ -24,11 +24,6 @@ "engines": { "node": ">=6" }, - "scripts": { - "clean": "rm -rf dist", - "compile": "tsc", - "prepublish": "npm run clean && npm run compile" - }, "dependencies": { "@apollographql/graphql-playground-html": "^1.6.0", "apollo-server-core": "file:../apollo-server-core", diff --git a/packages/apollo-server-cloudflare/package.json b/packages/apollo-server-cloudflare/package.json index be338c6552d..c8c9a5c2f0c 100644 --- a/packages/apollo-server-cloudflare/package.json +++ b/packages/apollo-server-cloudflare/package.json @@ -4,11 +4,6 @@ "description": "Production-ready Node.js GraphQL server for Cloudflare workers", "main": "dist/index.js", "types": "dist/index.d.ts", - "scripts": { - "clean": "rm -rf dist", - "compile": "tsc", - "prepare": "npm run clean && npm run compile" - }, "repository": { "type": "git", "url": "https://github.com/apollographql/apollo-server/tree/master/packages/apollo-server-cloudflare-workers" diff --git a/packages/apollo-server-core/package.json b/packages/apollo-server-core/package.json index fa62eb7302d..348cf043d7a 100644 --- a/packages/apollo-server-core/package.json +++ b/packages/apollo-server-core/package.json @@ -4,11 +4,6 @@ "description": "Core engine for Apollo GraphQL server", "main": "dist/index.js", "types": "dist/index.d.ts", - "scripts": { - "clean": "rm -rf dist", - "compile": "tsc", - "prepare": "npm run clean && npm run compile" - }, "repository": { "type": "git", "url": "https://github.com/apollographql/apollo-server/tree/master/packages/apollo-server-core" diff --git a/packages/apollo-server-env/package.json b/packages/apollo-server-env/package.json index d4201aa56a1..99a7c32767e 100644 --- a/packages/apollo-server-env/package.json +++ b/packages/apollo-server-env/package.json @@ -11,11 +11,6 @@ "bugs": { "url": "https://github.com/apollographql/apollo-server/issues" }, - "scripts": { - "clean": "rm -rf dist", - "compile": "tsc && cp src/*.d.ts dist", - "prepare": "npm run clean && npm run compile" - }, "main": "dist/index.js", "browser": "dist/index.browser.js", "types": "dist/index.d.ts", diff --git a/packages/apollo-server-errors/package.json b/packages/apollo-server-errors/package.json index 486a802a5ae..26a767d038c 100644 --- a/packages/apollo-server-errors/package.json +++ b/packages/apollo-server-errors/package.json @@ -11,11 +11,6 @@ "bugs": { "url": "https://github.com/apollographql/apollo-server/issues" }, - "scripts": { - "clean": "rm -rf dist", - "compile": "tsc", - "prepare": "npm run clean && npm run compile" - }, "main": "dist/index.js", "types": "dist/index.d.ts", "engines": { diff --git a/packages/apollo-server-express/package.json b/packages/apollo-server-express/package.json index 34369e03f24..23a3c5139cc 100644 --- a/packages/apollo-server-express/package.json +++ b/packages/apollo-server-express/package.json @@ -4,11 +4,6 @@ "description": "Production-ready Node.js GraphQL server for Express and Connect", "main": "dist/index.js", "types": "dist/index.d.ts", - "scripts": { - "clean": "rm -rf dist", - "compile": "tsc", - "prepare": "npm run clean && npm run compile" - }, "repository": { "type": "git", "url": "https://github.com/apollographql/apollo-server/tree/master/packages/apollo-server-express" diff --git a/packages/apollo-server-hapi/package.json b/packages/apollo-server-hapi/package.json index cf5a3a22326..75e71e71e16 100644 --- a/packages/apollo-server-hapi/package.json +++ b/packages/apollo-server-hapi/package.json @@ -4,11 +4,6 @@ "description": "Production-ready Node.js GraphQL server for Hapi", "main": "dist/index.js", "types": "dist/index.d.ts", - "scripts": { - "clean": "rm -rf dist", - "compile": "tsc", - "prepare": "npm run clean && npm run compile" - }, "repository": { "type": "git", "url": "https://github.com/apollographql/apollo-server/tree/master/packages/apollo-server-hapi" diff --git a/packages/apollo-server-integration-testsuite/package.json b/packages/apollo-server-integration-testsuite/package.json index db13059225f..7101f33855c 100644 --- a/packages/apollo-server-integration-testsuite/package.json +++ b/packages/apollo-server-integration-testsuite/package.json @@ -5,11 +5,6 @@ "description": "Apollo Server Integrations testsuite", "main": "dist/index.js", "types": "dist/index.d.ts", - "scripts": { - "clean": "rm -rf dist", - "compile": "tsc", - "prepare": "npm run clean && npm run compile" - }, "repository": { "type": "git", "url": "https://github.com/apollographql/apollo-server/tree/master/packages/apollo-server-integration-testsuite" diff --git a/packages/apollo-server-koa/package.json b/packages/apollo-server-koa/package.json index 5122aaba39c..de2004e6374 100644 --- a/packages/apollo-server-koa/package.json +++ b/packages/apollo-server-koa/package.json @@ -4,11 +4,6 @@ "description": "Production-ready Node.js GraphQL server for Koa", "main": "dist/index.js", "types": "dist/index.d.ts", - "scripts": { - "clean": "rm -rf dist", - "compile": "tsc", - "prepare": "npm run clean && npm run compile" - }, "repository": { "type": "git", "url": "https://github.com/apollographql/apollo-server/tree/master/packages/apollo-server-koa" diff --git a/packages/apollo-server-lambda/package.json b/packages/apollo-server-lambda/package.json index fac2a4b6151..46c32070104 100644 --- a/packages/apollo-server-lambda/package.json +++ b/packages/apollo-server-lambda/package.json @@ -24,11 +24,6 @@ "engines": { "node": ">=6" }, - "scripts": { - "clean": "rm -rf dist", - "compile": "tsc", - "prepare": "npm run clean && npm run compile" - }, "dependencies": { "@apollographql/graphql-playground-html": "^1.6.0", "apollo-server-core": "file:../apollo-server-core", diff --git a/packages/apollo-server-micro/package.json b/packages/apollo-server-micro/package.json index 43f1889eb27..c4ad4ff3323 100644 --- a/packages/apollo-server-micro/package.json +++ b/packages/apollo-server-micro/package.json @@ -4,11 +4,6 @@ "description": "Production-ready Node.js GraphQL server for Micro", "main": "dist/index.js", "types": "dist/index.d.ts", - "scripts": { - "clean": "rm -rf dist", - "compile": "tsc", - "prepare": "npm run clean && npm run compile" - }, "repository": { "type": "git", "url": "https://github.com/apollographql/apollo-server/tree/master/packages/apollo-server-micro" diff --git a/packages/apollo-server/package.json b/packages/apollo-server/package.json index c24f00c3cc3..88fc200a5fe 100644 --- a/packages/apollo-server/package.json +++ b/packages/apollo-server/package.json @@ -5,11 +5,6 @@ "author": "opensource@apollographql.com", "main": "dist/index.js", "types": "dist/index.d.ts", - "scripts": { - "clean": "rm -rf dist", - "compile": "tsc", - "prepare": "npm run clean && npm run compile" - }, "repository": { "type": "git", "url": "https://github.com/apollographql/apollo-server/tree/master/packages/apollo-server" diff --git a/packages/apollo-tracing/package.json b/packages/apollo-tracing/package.json index 58be80f79b1..e2d4dd76594 100644 --- a/packages/apollo-tracing/package.json +++ b/packages/apollo-tracing/package.json @@ -4,11 +4,6 @@ "description": "Collect and expose trace data for GraphQL requests", "main": "./dist/index.js", "types": "./dist/index.d.ts", - "scripts": { - "clean": "rm -rf dist", - "compile": "tsc", - "prepare": "npm run clean && npm run compile" - }, "license": "MIT", "repository": "apollographql/apollo-tracing-js", "author": "Martijn Walraven ", diff --git a/packages/graphql-extensions/package.json b/packages/graphql-extensions/package.json index 7583db64e6a..62d38b77506 100644 --- a/packages/graphql-extensions/package.json +++ b/packages/graphql-extensions/package.json @@ -4,13 +4,6 @@ "description": "Add extensions to GraphQL servers", "main": "./dist/index.js", "types": "./dist/index.d.ts", - "scripts": { - "clean": "rm -rf dist", - "compile": "tsc", - "prepare": "npm run clean && npm run compile", - "lint": "prettier -l 'src/**/*.ts' && tslint -p tsconfig.json 'src/**/*.ts'", - "lint-fix": "prettier --write 'src/**/*.ts' && tslint --fix -p tsconfig.json 'src/**/*.ts'" - }, "repository": { "type": "git", "url": "apollographql/graphql-extensions" From 8932091e6739395fe8bbb3b6b8ae27102947328e Mon Sep 17 00:00:00 2001 From: Martijn Walraven Date: Fri, 5 Oct 2018 21:48:49 +0200 Subject: [PATCH 4/7] Add root level tsconfig.json as entry point --- packages/apollo-cache-control/tsconfig.json | 2 +- packages/apollo-datasource-rest/tsconfig.json | 2 +- packages/apollo-datasource/tsconfig.json | 2 +- .../tsconfig.json | 2 +- .../apollo-engine-reporting/tsconfig.json | 2 +- .../tsconfig.json | 2 +- .../apollo-server-cache-redis/tsconfig.json | 2 +- packages/apollo-server-caching/tsconfig.json | 2 +- .../tsconfig.json | 2 +- .../apollo-server-cloudflare/tsconfig.json | 2 +- packages/apollo-server-core/tsconfig.json | 2 +- packages/apollo-server-env/tsconfig.json | 2 +- packages/apollo-server-errors/tsconfig.json | 2 +- packages/apollo-server-express/tsconfig.json | 2 +- packages/apollo-server-hapi/tsconfig.json | 2 +- .../tsconfig.json | 2 +- packages/apollo-server-koa/tsconfig.json | 2 +- packages/apollo-server-lambda/tsconfig.json | 2 +- packages/apollo-server-micro/tsconfig.json | 2 +- packages/apollo-server/tsconfig.json | 2 +- packages/apollo-tracing/tsconfig.json | 2 +- packages/graphql-extensions/tsconfig.json | 2 +- tsconfig.base.json | 21 ++++++++++ tsconfig.json | 42 ++++++++++--------- 24 files changed, 66 insertions(+), 41 deletions(-) create mode 100644 tsconfig.base.json diff --git a/packages/apollo-cache-control/tsconfig.json b/packages/apollo-cache-control/tsconfig.json index 7da8a617ac9..bbc3f270aca 100644 --- a/packages/apollo-cache-control/tsconfig.json +++ b/packages/apollo-cache-control/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../tsconfig", + "extends": "../../tsconfig.base", "compilerOptions": { "rootDir": "./src", "outDir": "./dist" diff --git a/packages/apollo-datasource-rest/tsconfig.json b/packages/apollo-datasource-rest/tsconfig.json index 1879473356a..188183e03e6 100644 --- a/packages/apollo-datasource-rest/tsconfig.json +++ b/packages/apollo-datasource-rest/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../tsconfig", + "extends": "../../tsconfig.base", "compilerOptions": { "rootDir": "./src", "outDir": "./dist" diff --git a/packages/apollo-datasource/tsconfig.json b/packages/apollo-datasource/tsconfig.json index 690669b1071..8c9231dc47e 100644 --- a/packages/apollo-datasource/tsconfig.json +++ b/packages/apollo-datasource/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../tsconfig", + "extends": "../../tsconfig.base", "compilerOptions": { "rootDir": "./src", "outDir": "./dist" diff --git a/packages/apollo-engine-reporting-protobuf/tsconfig.json b/packages/apollo-engine-reporting-protobuf/tsconfig.json index b8b81721105..15916a62101 100644 --- a/packages/apollo-engine-reporting-protobuf/tsconfig.json +++ b/packages/apollo-engine-reporting-protobuf/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../tsconfig", + "extends": "../../tsconfig.base", "compilerOptions": { "rootDir": "./src", "outDir": "./dist" diff --git a/packages/apollo-engine-reporting/tsconfig.json b/packages/apollo-engine-reporting/tsconfig.json index b9e1cc8ccbd..38bc5da4140 100644 --- a/packages/apollo-engine-reporting/tsconfig.json +++ b/packages/apollo-engine-reporting/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../tsconfig", + "extends": "../../tsconfig.base", "compilerOptions": { "rootDir": "./src", "outDir": "./dist" diff --git a/packages/apollo-server-cache-memcached/tsconfig.json b/packages/apollo-server-cache-memcached/tsconfig.json index 84a98c59953..15bd3cd134c 100644 --- a/packages/apollo-server-cache-memcached/tsconfig.json +++ b/packages/apollo-server-cache-memcached/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../tsconfig", + "extends": "../../tsconfig.base", "compilerOptions": { "rootDir": "./src", "outDir": "./dist" diff --git a/packages/apollo-server-cache-redis/tsconfig.json b/packages/apollo-server-cache-redis/tsconfig.json index 690669b1071..8c9231dc47e 100644 --- a/packages/apollo-server-cache-redis/tsconfig.json +++ b/packages/apollo-server-cache-redis/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../tsconfig", + "extends": "../../tsconfig.base", "compilerOptions": { "rootDir": "./src", "outDir": "./dist" diff --git a/packages/apollo-server-caching/tsconfig.json b/packages/apollo-server-caching/tsconfig.json index b8b81721105..15916a62101 100644 --- a/packages/apollo-server-caching/tsconfig.json +++ b/packages/apollo-server-caching/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../tsconfig", + "extends": "../../tsconfig.base", "compilerOptions": { "rootDir": "./src", "outDir": "./dist" diff --git a/packages/apollo-server-cloud-function/tsconfig.json b/packages/apollo-server-cloud-function/tsconfig.json index cd1c039beca..7832aa9c0f2 100644 --- a/packages/apollo-server-cloud-function/tsconfig.json +++ b/packages/apollo-server-cloud-function/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../tsconfig", + "extends": "../../tsconfig.base", "compilerOptions": { "rootDir": "./src", "outDir": "./dist" diff --git a/packages/apollo-server-cloudflare/tsconfig.json b/packages/apollo-server-cloudflare/tsconfig.json index cd1c039beca..7832aa9c0f2 100644 --- a/packages/apollo-server-cloudflare/tsconfig.json +++ b/packages/apollo-server-cloudflare/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../tsconfig", + "extends": "../../tsconfig.base", "compilerOptions": { "rootDir": "./src", "outDir": "./dist" diff --git a/packages/apollo-server-core/tsconfig.json b/packages/apollo-server-core/tsconfig.json index 43cba3fe552..3a10b898905 100644 --- a/packages/apollo-server-core/tsconfig.json +++ b/packages/apollo-server-core/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../tsconfig", + "extends": "../../tsconfig.base", "compilerOptions": { "rootDir": "./src", "outDir": "./dist" diff --git a/packages/apollo-server-env/tsconfig.json b/packages/apollo-server-env/tsconfig.json index 122400dc911..f4d7c2e2456 100644 --- a/packages/apollo-server-env/tsconfig.json +++ b/packages/apollo-server-env/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../tsconfig", + "extends": "../../tsconfig.base", "compilerOptions": { "composite": false, "rootDir": "./src", diff --git a/packages/apollo-server-errors/tsconfig.json b/packages/apollo-server-errors/tsconfig.json index fbed8c00866..0d67d38983d 100644 --- a/packages/apollo-server-errors/tsconfig.json +++ b/packages/apollo-server-errors/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../tsconfig", + "extends": "../../tsconfig.base", "compilerOptions": { "rootDir": "./src", "outDir": "./dist", diff --git a/packages/apollo-server-express/tsconfig.json b/packages/apollo-server-express/tsconfig.json index 6a1326bd964..419db544b96 100644 --- a/packages/apollo-server-express/tsconfig.json +++ b/packages/apollo-server-express/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../tsconfig", + "extends": "../../tsconfig.base", "compilerOptions": { "rootDir": "./src", "outDir": "./dist", diff --git a/packages/apollo-server-hapi/tsconfig.json b/packages/apollo-server-hapi/tsconfig.json index 7e8b87ad7ac..eed02c57061 100644 --- a/packages/apollo-server-hapi/tsconfig.json +++ b/packages/apollo-server-hapi/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../tsconfig", + "extends": "../../tsconfig.base", "compilerOptions": { "rootDir": "./src", "outDir": "./dist", diff --git a/packages/apollo-server-integration-testsuite/tsconfig.json b/packages/apollo-server-integration-testsuite/tsconfig.json index 5d56146e9ac..869ca3af562 100644 --- a/packages/apollo-server-integration-testsuite/tsconfig.json +++ b/packages/apollo-server-integration-testsuite/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../tsconfig", + "extends": "../../tsconfig.base", "compilerOptions": { "rootDir": "./src", "outDir": "./dist", diff --git a/packages/apollo-server-koa/tsconfig.json b/packages/apollo-server-koa/tsconfig.json index c00c5fb7ea4..058b0d0cc0c 100644 --- a/packages/apollo-server-koa/tsconfig.json +++ b/packages/apollo-server-koa/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../tsconfig", + "extends": "../../tsconfig.base", "compilerOptions": { "rootDir": "./src", "outDir": "./dist", diff --git a/packages/apollo-server-lambda/tsconfig.json b/packages/apollo-server-lambda/tsconfig.json index cd1c039beca..7832aa9c0f2 100644 --- a/packages/apollo-server-lambda/tsconfig.json +++ b/packages/apollo-server-lambda/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../tsconfig", + "extends": "../../tsconfig.base", "compilerOptions": { "rootDir": "./src", "outDir": "./dist" diff --git a/packages/apollo-server-micro/tsconfig.json b/packages/apollo-server-micro/tsconfig.json index 6a1326bd964..419db544b96 100644 --- a/packages/apollo-server-micro/tsconfig.json +++ b/packages/apollo-server-micro/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../tsconfig", + "extends": "../../tsconfig.base", "compilerOptions": { "rootDir": "./src", "outDir": "./dist", diff --git a/packages/apollo-server/tsconfig.json b/packages/apollo-server/tsconfig.json index dd6694cb6ad..dd82131e9a8 100644 --- a/packages/apollo-server/tsconfig.json +++ b/packages/apollo-server/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../tsconfig", + "extends": "../../tsconfig.base", "compilerOptions": { "rootDir": "./src", "outDir": "./dist" diff --git a/packages/apollo-tracing/tsconfig.json b/packages/apollo-tracing/tsconfig.json index 7da8a617ac9..bbc3f270aca 100644 --- a/packages/apollo-tracing/tsconfig.json +++ b/packages/apollo-tracing/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../tsconfig", + "extends": "../../tsconfig.base", "compilerOptions": { "rootDir": "./src", "outDir": "./dist" diff --git a/packages/graphql-extensions/tsconfig.json b/packages/graphql-extensions/tsconfig.json index f123c1dc49a..6373ce224a2 100644 --- a/packages/graphql-extensions/tsconfig.json +++ b/packages/graphql-extensions/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../tsconfig", + "extends": "../../tsconfig.base", "compilerOptions": { "rootDir": "./src", "outDir": "./dist" diff --git a/tsconfig.base.json b/tsconfig.base.json new file mode 100644 index 00000000000..d70e94eb552 --- /dev/null +++ b/tsconfig.base.json @@ -0,0 +1,21 @@ +{ + "compilerOptions": { + "composite": true, + "target": "es2016", + "module": "commonjs", + "moduleResolution": "node", + "esModuleInterop": true, + "sourceMap": true, + "declaration": true, + "declarationMap": true, + "removeComments": true, + "strict": true, + "noImplicitAny": true, + "noImplicitReturns": true, + "noFallthroughCasesInSwitch": true, + "noUnusedParameters": true, + "noUnusedLocals": true, + "lib": ["es2017", "esnext.asynciterable"], + "types": ["node", "jest"] + } +} diff --git a/tsconfig.json b/tsconfig.json index d70e94eb552..8f8cbd31ca5 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,21 +1,25 @@ { - "compilerOptions": { - "composite": true, - "target": "es2016", - "module": "commonjs", - "moduleResolution": "node", - "esModuleInterop": true, - "sourceMap": true, - "declaration": true, - "declarationMap": true, - "removeComments": true, - "strict": true, - "noImplicitAny": true, - "noImplicitReturns": true, - "noFallthroughCasesInSwitch": true, - "noUnusedParameters": true, - "noUnusedLocals": true, - "lib": ["es2017", "esnext.asynciterable"], - "types": ["node", "jest"] - } + "references": [ + { "path": "./packages/apollo-cache-control" }, + { "path": "./packages/apollo-datasource" }, + { "path": "./packages/apollo-datasource-rest" }, + { "path": "./packages/apollo-engine-reporting" }, + { "path": "./packages/apollo-engine-reporting-protobuf" }, + { "path": "./packages/apollo-server" }, + { "path": "./packages/apollo-server-cache-memcached" }, + { "path": "./packages/apollo-server-cache-redis" }, + { "path": "./packages/apollo-server-caching" }, + { "path": "./packages/apollo-server-cloudflare" }, + { "path": "./packages/apollo-server-core" }, + { "path": "./packages/apollo-server-env" }, + { "path": "./packages/apollo-server-errors" }, + { "path": "./packages/apollo-server-express" }, + { "path": "./packages/apollo-server-hapi" }, + { "path": "./packages/apollo-server-integration-testsuite" }, + { "path": "./packages/apollo-server-koa" }, + { "path": "./packages/apollo-server-lambda" }, + { "path": "./packages/apollo-server-micro" }, + { "path": "./packages/apollo-tracing" }, + { "path": "./packages/graphql-extensions" } + ] } From 11a13cd3dda3d009d55332ce4a0d36e84a71535a Mon Sep 17 00:00:00 2001 From: Martijn Walraven Date: Fri, 5 Oct 2018 23:05:49 +0200 Subject: [PATCH 5/7] Remove apollo-server-env as a project reference We can't use `apollo-server-env` as a project reference because that requires `composite: true`, and that implies `declaration: true`, which doesn't work for `apollo-server-env` because we need to write our own declaration files for re-exported imports. This commit also removes `apollo-engine-reporting-protobuf` as a reference, which errored out because it doesn't actually contain any TypeScript code. --- packages/apollo-cache-control/tsconfig.json | 1 - packages/apollo-datasource-rest/tsconfig.json | 1 - packages/apollo-datasource/tsconfig.json | 1 - packages/apollo-engine-reporting-protobuf/tsconfig.json | 9 --------- packages/apollo-engine-reporting/tsconfig.json | 2 -- packages/apollo-server-cache-memcached/tsconfig.json | 1 - packages/apollo-server-cache-redis/tsconfig.json | 1 - packages/apollo-server-cloud-function/tsconfig.json | 1 - packages/apollo-server-cloudflare/tsconfig.json | 1 - packages/apollo-server-core/tsconfig.json | 1 - packages/apollo-server-env/package.json | 5 +++++ packages/apollo-server-express/tsconfig.json | 1 - packages/apollo-server-hapi/tsconfig.json | 1 - packages/apollo-server-koa/tsconfig.json | 1 - packages/apollo-server-lambda/tsconfig.json | 1 - packages/apollo-server-micro/tsconfig.json | 1 - packages/apollo-tracing/tsconfig.json | 1 - packages/graphql-extensions/tsconfig.json | 1 - tsconfig.json | 3 +-- 19 files changed, 6 insertions(+), 28 deletions(-) delete mode 100644 packages/apollo-engine-reporting-protobuf/tsconfig.json diff --git a/packages/apollo-cache-control/tsconfig.json b/packages/apollo-cache-control/tsconfig.json index bbc3f270aca..2f8668da1ac 100644 --- a/packages/apollo-cache-control/tsconfig.json +++ b/packages/apollo-cache-control/tsconfig.json @@ -7,7 +7,6 @@ "include": ["src/**/*"], "exclude": ["**/__tests__", "**/__mocks__"], "references": [ - { "path": "../apollo-server-env" }, { "path": "../graphql-extensions" } ] } diff --git a/packages/apollo-datasource-rest/tsconfig.json b/packages/apollo-datasource-rest/tsconfig.json index 188183e03e6..5037876fe14 100644 --- a/packages/apollo-datasource-rest/tsconfig.json +++ b/packages/apollo-datasource-rest/tsconfig.json @@ -9,7 +9,6 @@ "references": [ { "path": "../apollo-datasource" }, { "path": "../apollo-server-caching" }, - { "path": "../apollo-server-env" }, { "path": "../apollo-server-errors" } ] } diff --git a/packages/apollo-datasource/tsconfig.json b/packages/apollo-datasource/tsconfig.json index 8c9231dc47e..3fa721a4cdc 100644 --- a/packages/apollo-datasource/tsconfig.json +++ b/packages/apollo-datasource/tsconfig.json @@ -8,6 +8,5 @@ "exclude": ["**/__tests__", "**/__mocks__"], "references": [ { "path": "../apollo-server-caching" }, - { "path": "../apollo-server-env" } ] } diff --git a/packages/apollo-engine-reporting-protobuf/tsconfig.json b/packages/apollo-engine-reporting-protobuf/tsconfig.json deleted file mode 100644 index 15916a62101..00000000000 --- a/packages/apollo-engine-reporting-protobuf/tsconfig.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "extends": "../../tsconfig.base", - "compilerOptions": { - "rootDir": "./src", - "outDir": "./dist" - }, - "include": ["src/**/*"], - "exclude": ["**/__tests__", "**/__mocks__"] -} diff --git a/packages/apollo-engine-reporting/tsconfig.json b/packages/apollo-engine-reporting/tsconfig.json index 38bc5da4140..2f8668da1ac 100644 --- a/packages/apollo-engine-reporting/tsconfig.json +++ b/packages/apollo-engine-reporting/tsconfig.json @@ -7,8 +7,6 @@ "include": ["src/**/*"], "exclude": ["**/__tests__", "**/__mocks__"], "references": [ - { "path": "../apollo-engine-reporting-protobuf" }, - { "path": "../apollo-server-env" }, { "path": "../graphql-extensions" } ] } diff --git a/packages/apollo-server-cache-memcached/tsconfig.json b/packages/apollo-server-cache-memcached/tsconfig.json index 15bd3cd134c..3fa721a4cdc 100644 --- a/packages/apollo-server-cache-memcached/tsconfig.json +++ b/packages/apollo-server-cache-memcached/tsconfig.json @@ -8,6 +8,5 @@ "exclude": ["**/__tests__", "**/__mocks__"], "references": [ { "path": "../apollo-server-caching" }, - { "path": "../apollo-server-env" }, ] } diff --git a/packages/apollo-server-cache-redis/tsconfig.json b/packages/apollo-server-cache-redis/tsconfig.json index 8c9231dc47e..3fa721a4cdc 100644 --- a/packages/apollo-server-cache-redis/tsconfig.json +++ b/packages/apollo-server-cache-redis/tsconfig.json @@ -8,6 +8,5 @@ "exclude": ["**/__tests__", "**/__mocks__"], "references": [ { "path": "../apollo-server-caching" }, - { "path": "../apollo-server-env" } ] } diff --git a/packages/apollo-server-cloud-function/tsconfig.json b/packages/apollo-server-cloud-function/tsconfig.json index 7832aa9c0f2..f72903a76b1 100644 --- a/packages/apollo-server-cloud-function/tsconfig.json +++ b/packages/apollo-server-cloud-function/tsconfig.json @@ -8,7 +8,6 @@ "exclude": ["**/__tests__", "**/__mocks__"], "references": [ { "path": "../apollo-server-core" }, - { "path": "../apollo-server-env" }, { "path": "../apollo-server-integration-testsuite" } ] } diff --git a/packages/apollo-server-cloudflare/tsconfig.json b/packages/apollo-server-cloudflare/tsconfig.json index 7832aa9c0f2..f72903a76b1 100644 --- a/packages/apollo-server-cloudflare/tsconfig.json +++ b/packages/apollo-server-cloudflare/tsconfig.json @@ -8,7 +8,6 @@ "exclude": ["**/__tests__", "**/__mocks__"], "references": [ { "path": "../apollo-server-core" }, - { "path": "../apollo-server-env" }, { "path": "../apollo-server-integration-testsuite" } ] } diff --git a/packages/apollo-server-core/tsconfig.json b/packages/apollo-server-core/tsconfig.json index 3a10b898905..9b89580de76 100644 --- a/packages/apollo-server-core/tsconfig.json +++ b/packages/apollo-server-core/tsconfig.json @@ -11,7 +11,6 @@ { "path": "../apollo-datasource" }, { "path": "../apollo-engine-reporting" }, { "path": "../apollo-server-caching" }, - { "path": "../apollo-server-env" }, { "path": "../apollo-server-errors" }, { "path": "../apollo-tracing" }, { "path": "../graphql-extensions" } diff --git a/packages/apollo-server-env/package.json b/packages/apollo-server-env/package.json index 99a7c32767e..6957c45b76c 100644 --- a/packages/apollo-server-env/package.json +++ b/packages/apollo-server-env/package.json @@ -14,6 +14,11 @@ "main": "dist/index.js", "browser": "dist/index.browser.js", "types": "dist/index.d.ts", + "scripts": { + "clean": "rm -rf dist", + "compile": "tsc && cp src/*.d.ts dist", + "prepare": "npm run clean && npm run compile" + }, "engines": { "node": ">=6" }, diff --git a/packages/apollo-server-express/tsconfig.json b/packages/apollo-server-express/tsconfig.json index 419db544b96..92d9dcee2b7 100644 --- a/packages/apollo-server-express/tsconfig.json +++ b/packages/apollo-server-express/tsconfig.json @@ -10,7 +10,6 @@ "exclude": ["**/__tests__", "**/__mocks__"], "references": [ { "path": "../apollo-server-core" }, - { "path": "../apollo-server-env" }, { "path": "../apollo-server-integration-testsuite" } ] } diff --git a/packages/apollo-server-hapi/tsconfig.json b/packages/apollo-server-hapi/tsconfig.json index eed02c57061..88907f56d2c 100644 --- a/packages/apollo-server-hapi/tsconfig.json +++ b/packages/apollo-server-hapi/tsconfig.json @@ -11,7 +11,6 @@ "exclude": ["**/__tests__", "**/__mocks__"], "references": [ { "path": "../apollo-server-core" }, - { "path": "../apollo-server-env" }, { "path": "../apollo-server-integration-testsuite" } ] } diff --git a/packages/apollo-server-koa/tsconfig.json b/packages/apollo-server-koa/tsconfig.json index 058b0d0cc0c..2be22df56de 100644 --- a/packages/apollo-server-koa/tsconfig.json +++ b/packages/apollo-server-koa/tsconfig.json @@ -11,7 +11,6 @@ "exclude": ["**/__tests__", "**/__mocks__"], "references": [ { "path": "../apollo-server-core" }, - { "path": "../apollo-server-env" }, { "path": "../apollo-server-integration-testsuite" } ] } diff --git a/packages/apollo-server-lambda/tsconfig.json b/packages/apollo-server-lambda/tsconfig.json index 7832aa9c0f2..f72903a76b1 100644 --- a/packages/apollo-server-lambda/tsconfig.json +++ b/packages/apollo-server-lambda/tsconfig.json @@ -8,7 +8,6 @@ "exclude": ["**/__tests__", "**/__mocks__"], "references": [ { "path": "../apollo-server-core" }, - { "path": "../apollo-server-env" }, { "path": "../apollo-server-integration-testsuite" } ] } diff --git a/packages/apollo-server-micro/tsconfig.json b/packages/apollo-server-micro/tsconfig.json index 419db544b96..92d9dcee2b7 100644 --- a/packages/apollo-server-micro/tsconfig.json +++ b/packages/apollo-server-micro/tsconfig.json @@ -10,7 +10,6 @@ "exclude": ["**/__tests__", "**/__mocks__"], "references": [ { "path": "../apollo-server-core" }, - { "path": "../apollo-server-env" }, { "path": "../apollo-server-integration-testsuite" } ] } diff --git a/packages/apollo-tracing/tsconfig.json b/packages/apollo-tracing/tsconfig.json index bbc3f270aca..2f8668da1ac 100644 --- a/packages/apollo-tracing/tsconfig.json +++ b/packages/apollo-tracing/tsconfig.json @@ -7,7 +7,6 @@ "include": ["src/**/*"], "exclude": ["**/__tests__", "**/__mocks__"], "references": [ - { "path": "../apollo-server-env" }, { "path": "../graphql-extensions" } ] } diff --git a/packages/graphql-extensions/tsconfig.json b/packages/graphql-extensions/tsconfig.json index 6373ce224a2..24895f8f083 100644 --- a/packages/graphql-extensions/tsconfig.json +++ b/packages/graphql-extensions/tsconfig.json @@ -7,6 +7,5 @@ "include": ["src/**/*"], "exclude": ["**/__tests__", "**/__mocks__"], "references": [ - { "path": "../apollo-server-env" } ] } diff --git a/tsconfig.json b/tsconfig.json index 8f8cbd31ca5..e4bf7160934 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,17 +1,16 @@ { + "files": [], "references": [ { "path": "./packages/apollo-cache-control" }, { "path": "./packages/apollo-datasource" }, { "path": "./packages/apollo-datasource-rest" }, { "path": "./packages/apollo-engine-reporting" }, - { "path": "./packages/apollo-engine-reporting-protobuf" }, { "path": "./packages/apollo-server" }, { "path": "./packages/apollo-server-cache-memcached" }, { "path": "./packages/apollo-server-cache-redis" }, { "path": "./packages/apollo-server-caching" }, { "path": "./packages/apollo-server-cloudflare" }, { "path": "./packages/apollo-server-core" }, - { "path": "./packages/apollo-server-env" }, { "path": "./packages/apollo-server-errors" }, { "path": "./packages/apollo-server-express" }, { "path": "./packages/apollo-server-hapi" }, From 669b35c3282e8cc7e3a0d39348cf3cedcc5c174e Mon Sep 17 00:00:00 2001 From: Martijn Walraven Date: Fri, 5 Oct 2018 23:43:46 +0200 Subject: [PATCH 6/7] Upgrade ts-jest and fix config --- package-lock.json | 82 ++++++++++++++++++++++++++++++++-------------- package.json | 15 ++++++--- tsconfig.test.json | 7 ++++ 3 files changed, 75 insertions(+), 29 deletions(-) create mode 100644 tsconfig.test.json diff --git a/package-lock.json b/package-lock.json index 768b34d4411..7295e988acb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2995,6 +2995,15 @@ "resolve": "1.1.7" } }, + "bs-logger": { + "version": "0.2.5", + "resolved": "https://registry.npmjs.org/bs-logger/-/bs-logger-0.2.5.tgz", + "integrity": "sha512-uFLE0LFMxrH8Z5Hd9QgivvRbrl/NFkOTHzGhlqQxsnmx5JBLrp4bc249afLL+GccyY/8hkcGi2LpVaOzaEY0nQ==", + "dev": true, + "requires": { + "fast-json-stable-stringify": "^2.0.0" + } + }, "bser": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/bser/-/bser-2.0.0.tgz", @@ -3348,12 +3357,6 @@ "integrity": "sha1-2jCcwmPfFZlMaIypAheco8fNfH4=", "dev": true }, - "closest-file-data": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/closest-file-data/-/closest-file-data-0.1.4.tgz", - "integrity": "sha1-l1+HwTLymdJKA3W59jyj+4j3Kzo=", - "dev": true - }, "cmd-shim": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/cmd-shim/-/cmd-shim-2.0.2.tgz", @@ -5328,17 +5331,6 @@ } } }, - "fs-extra": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-6.0.1.tgz", - "integrity": "sha512-GnyIkKhhzXZUWFCaJzvyDLEEgDkPfb4/TPvJCJVuS8MWZgoSsErf++QpiAlDnKFcqhRlm+tIOcencCjyJE6ZCA==", - "dev": true, - "requires": { - "graceful-fs": "^4.1.2", - "jsonfile": "^4.0.0", - "universalify": "^0.1.0" - } - }, "fs-minipass": { "version": "1.2.5", "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.5.tgz", @@ -8918,6 +8910,12 @@ "pify": "^3.0.0" } }, + "make-error": { + "version": "1.3.5", + "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.5.tgz", + "integrity": "sha512-c3sIjNUow0+8swNwVpqoH4YCShKNFkMaw6oH1mNS2haDZQqkeZFlHS3dhoeEbKKmJB4vXpJucU6oH75aDYeE9g==", + "dev": true + }, "make-fetch-happen": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-4.0.1.tgz", @@ -12372,15 +12370,51 @@ "dev": true }, "ts-jest": { - "version": "23.1.4", - "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-23.1.4.tgz", - "integrity": "sha512-9rCSxbWfoZxxeXnSoEIzRNr9hDIQ8iEJAWmSRsWhDHDT8OeuGfURhJQUE8jtJlkyEygs6rngH8RYtHz9cfjmEA==", + "version": "23.10.3", + "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-23.10.3.tgz", + "integrity": "sha512-Lgyfw1MYPfqAs1qrFBmqXu8LRrde8ItH70pmp1iQuRbkVXaap7QcaEpN+yiSxuppfvO8rqezVv8wOYZkKhR5wA==", "dev": true, "requires": { - "closest-file-data": "^0.1.4", - "fs-extra": "6.0.1", - "json5": "^0.5.0", - "lodash": "^4.17.10" + "bs-logger": "0.x", + "buffer-from": "1.x", + "fast-json-stable-stringify": "2.x", + "json5": "2.x", + "make-error": "1.x", + "mkdirp": "0.x", + "semver": "^5.5", + "yargs-parser": "10.x" + }, + "dependencies": { + "camelcase": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz", + "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=", + "dev": true + }, + "json5": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/json5/-/json5-2.1.0.tgz", + "integrity": "sha512-8Mh9h6xViijj36g7Dxi+Y4S6hNGV96vcJZr/SrlHh1LR/pEn/8j/+qIBbs44YKl69Lrfctp4QD+AdWLTMqEZAQ==", + "dev": true, + "requires": { + "minimist": "^1.2.0" + } + }, + "minimist": { + "version": "1.2.0", + "resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", + "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", + "dev": true + }, + "yargs-parser": { + "version": "10.1.0", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-10.1.0.tgz", + "integrity": "sha512-VCIyR1wJoEBZUqk5PA+oOBF6ypbwh5aNB3I50guxAL/quggdfs4TtNHQrSazFA3fYZ+tEqfs0zIGlv0c/rgjbQ==", + "dev": true, + "requires": { + "camelcase": "^4.1.0" + } + } } }, "tslib": { diff --git a/package.json b/package.json index 5eccd2f3497..2525d256c74 100644 --- a/package.json +++ b/package.json @@ -111,7 +111,7 @@ "subscriptions-transport-ws": "0.9.15", "supertest": "3.3.0", "test-listen": "1.1.0", - "ts-jest": "23.1.4", + "ts-jest": "23.10.3", "tslint": "5.11.0", "typescript": "3.1.1", "ws": "6.0.0", @@ -122,9 +122,8 @@ "setupFiles": [ "/packages/apollo-server-env/dist/index.js" ], - "transform": { - "^.+\\.ts$": "ts-jest" - }, + "preset": "ts-jest", + "testMatch": null, "testRegex": "/__tests__/.*\\.test\\.(js|ts)$", "moduleFileExtensions": [ "ts", @@ -134,6 +133,12 @@ "/node_modules/", "/dist/" ], - "clearMocks": true + "clearMocks": true, + "globals": { + "ts-jest": { + "tsConfig": "tsconfig.test.json", + "diagnostics": false + } + } } } diff --git a/tsconfig.test.json b/tsconfig.test.json new file mode 100644 index 00000000000..f06bb106034 --- /dev/null +++ b/tsconfig.test.json @@ -0,0 +1,7 @@ +{ + "extends": "./tsconfig.base", + "compilerOptions": { + "rootDir": "./packages", + }, + "include": ["**/__tests__", "**/__mocks__"], +} From 6654c0d1b7d4041a06942e4573ede2f24f265ee5 Mon Sep 17 00:00:00 2001 From: Martijn Walraven Date: Sat, 6 Oct 2018 00:04:03 +0200 Subject: [PATCH 7/7] Remove unused configuration options from tsconfig.test.json --- tsconfig.test.json | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/tsconfig.test.json b/tsconfig.test.json index f06bb106034..82e63f27947 100644 --- a/tsconfig.test.json +++ b/tsconfig.test.json @@ -1,7 +1,3 @@ { - "extends": "./tsconfig.base", - "compilerOptions": { - "rootDir": "./packages", - }, - "include": ["**/__tests__", "**/__mocks__"], + "extends": "./tsconfig.base" }