Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use TypeScript project references #1772

Merged
merged 7 commits into from
Oct 8, 2018
Merged

Use TypeScript project references #1772

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5d03ae1
Update to TypeScript 3.1
martijnwalraven Oct 5, 2018
fcaa6ad
Enable TypeScript project references
martijnwalraven Oct 5, 2018
1aee215
Switch to tsc --build and remove run scripts from packages
martijnwalraven Oct 5, 2018
8932091
Add root level tsconfig.json as entry point
martijnwalraven Oct 5, 2018
11a13cd
Remove apollo-server-env as a project reference
martijnwalraven Oct 5, 2018
669b35c
Upgrade ts-jest and fix config
martijnwalraven Oct 5, 2018
6654c0d
Remove unused configuration options from tsconfig.test.json
martijnwalraven Oct 5, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
88 changes: 61 additions & 27 deletions package-lock.json
View file
Open in desktop

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

21 changes: 13 additions & 8 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -111,9 +111,9 @@
"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.0.3",
"typescript": "3.1.1",
"ws": "6.0.0",
"yup": "0.26.5"
},
Expand All @@ -122,9 +122,8 @@
"setupFiles": [
"<rootDir>/packages/apollo-server-env/dist/index.js"
],
"transform": {
"^.+\\.ts$": "ts-jest"
},
"preset": "ts-jest",
"testMatch": null,
"testRegex": "/__tests__/.*\\.test\\.(js|ts)$",
"moduleFileExtensions": [
"ts",
Expand All @@ -134,6 +133,12 @@
"/node_modules/",
"/dist/"
],
"clearMocks": true
"clearMocks": true,
"globals": {
"ts-jest": {
"tsConfig": "tsconfig.test.json",
"diagnostics": false
}
}
}
}
5 changes: 0 additions & 5 deletions packages/apollo-cache-control/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 <martijn@martijnwalraven.com>",
Expand Down
7 changes: 5 additions & 2 deletions packages/apollo-cache-control/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
{
"extends": "../../tsconfig",
"extends": "../../tsconfig.base",
"compilerOptions": {
"rootDir": "./src",
"outDir": "./dist"
},
"include": ["src/**/*"],
"exclude": ["**/__tests__", "**/__mocks__"]
"exclude": ["**/__tests__", "**/__mocks__"],
"references": [
{ "path": "../graphql-extensions" }
]
}
5 changes: 0 additions & 5 deletions packages/apollo-datasource-rest/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
9 changes: 7 additions & 2 deletions packages/apollo-datasource-rest/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,14 @@
{
"extends": "../../tsconfig",
"extends": "../../tsconfig.base",
"compilerOptions": {
"rootDir": "./src",
"outDir": "./dist"
},
"include": ["src/**/*"],
"exclude": ["**/__tests__", "**/__mocks__"]
"exclude": ["**/__tests__", "**/__mocks__"],
"references": [
{ "path": "../apollo-datasource" },
{ "path": "../apollo-server-caching" },
{ "path": "../apollo-server-errors" }
]
}
5 changes: 0 additions & 5 deletions packages/apollo-datasource/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
7 changes: 5 additions & 2 deletions packages/apollo-datasource/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
{
"extends": "../../tsconfig",
"extends": "../../tsconfig.base",
"compilerOptions": {
"rootDir": "./src",
"outDir": "./dist"
},
"include": ["src/**/*"],
"exclude": ["**/__tests__", "**/__mocks__"]
"exclude": ["**/__tests__", "**/__mocks__"],
"references": [
{ "path": "../apollo-server-caching" },
]
}
9 changes: 0 additions & 9 deletions packages/apollo-engine-reporting-protobuf/tsconfig.json
View file
Open in desktop

This file was deleted.

7 changes: 0 additions & 7 deletions packages/apollo-engine-reporting/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 <community@apollographql.com>",
Expand Down
7 changes: 5 additions & 2 deletions packages/apollo-engine-reporting/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
{
"extends": "../../tsconfig",
"extends": "../../tsconfig.base",
"compilerOptions": {
"rootDir": "./src",
"outDir": "./dist"
},
"include": ["src/**/*"],
"exclude": ["**/__tests__", "**/__mocks__"]
"exclude": ["**/__tests__", "**/__mocks__"],
"references": [
{ "path": "../graphql-extensions" }
]
}
5 changes: 0 additions & 5 deletions packages/apollo-server-cache-memcached/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
7 changes: 5 additions & 2 deletions packages/apollo-server-cache-memcached/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
{
"extends": "../../tsconfig",
"extends": "../../tsconfig.base",
"compilerOptions": {
"rootDir": "./src",
"outDir": "./dist"
},
"include": ["src/**/*"],
"exclude": ["**/__tests__", "**/__mocks__"]
"exclude": ["**/__tests__", "**/__mocks__"],
"references": [
{ "path": "../apollo-server-caching" },
]
}
5 changes: 0 additions & 5 deletions packages/apollo-server-cache-redis/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
7 changes: 5 additions & 2 deletions packages/apollo-server-cache-redis/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
{
"extends": "../../tsconfig",
"extends": "../../tsconfig.base",
"compilerOptions": {
"rootDir": "./src",
"outDir": "./dist"
},
"include": ["src/**/*"],
"exclude": ["**/__tests__", "**/__mocks__"]
"exclude": ["**/__tests__", "**/__mocks__"],
"references": [
{ "path": "../apollo-server-caching" },
]
}
5 changes: 0 additions & 5 deletions packages/apollo-server-caching/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
2 changes: 1 addition & 1 deletion packages/apollo-server-caching/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": "../../tsconfig",
"extends": "../../tsconfig.base",
"compilerOptions": {
"rootDir": "./src",
"outDir": "./dist"
Expand Down
5 changes: 0 additions & 5 deletions packages/apollo-server-cloud-function/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Loading