Skip to content

Commit

Permalink
Some work on setup
Browse files Browse the repository at this point in the history
  • Loading branch information
kamilkisiela committed Mar 27, 2020
1 parent ea9293d commit 95d5038
Show file tree
Hide file tree
Showing 5 changed files with 63 additions and 59 deletions.
1 change: 1 addition & 0 deletions .npmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
save-exact = true
1 change: 0 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
"node_modules": true,
"test-lib": true,
"lib": true,
"dist": true,
"coverage": true,
"npm": true
},
Expand Down
24 changes: 12 additions & 12 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,25 +4,25 @@

#### Features

* Adds [graphql-upload](https://github.com/jaydenseric/graphql-upload) compatible scalar and link for proxying remote file uploads #671
* Adds [graphql-upload](https://github.com/jaydenseric/graphql-upload) compatible scalar and link for proxying remote file uploads [#671](https://github.com/apollographql/graphql-tools/issues/671)
* Add ability to merge fields from types from different schemas
* Adds transforms to wrap, extract, and rename fields #1183
* Adds transform to filter object fields #819
* Exports visitSchema, SchemaVisitor, healSchema, healTypes, cloneSchema, cloneType, cloneDirective to enable more custom transforms. #1070
* Allows removing extra delegation layers by passing fetcher/link options directly to delegateToSchema, mergeSchemas, and transformSchema and by filtering directly with filterSchema without additional transformation round #1165
* Adds transforms to wrap, extract, and rename fields [#1183](https://github.com/apollographql/graphql-tools/issues/1183)
* Adds transform to filter object fields [#819](https://github.com/apollographql/graphql-tools/issues/819)
* Exports visitSchema, SchemaVisitor, healSchema, healTypes, cloneSchema, cloneType, cloneDirective to enable more custom transforms. [#1070](https://github.com/apollographql/graphql-tools/issues/1070)
* Allows removing extra delegation layers by passing fetcher/link options directly to delegateToSchema, mergeSchemas, and transformSchema and by filtering directly with filterSchema without additional transformation round [#1165](https://github.com/apollographql/graphql-tools/issues/1165)

#### Bug Fixes

* Filter unused variables from map when proxying requests
* Preserve subscription errors when using makeRemoteExecutableSchema
* Preserve extensions when transforming schemas
* Fix merging and transforming of custom scalars and enums #501, #1056, #1200
* Allow renaming of subscription root fields #997, #1002
* Fix alias resolution to no longer incorrectly fallback to non-aliased field when null #1171
* Do not remove default directives (skip, include, deprecated) when not merging custom directives #1159
* Fixes errors support #743, #1037, #1046
* Fix mergeSchemas to allow resolvers to return fields defined as functions #1061
* Fix default values with mergeSchemas and addResolveFunctionsToSchema #1121
* Fix merging and transforming of custom scalars and enums [#501](https://github.com/apollographql/graphql-tools/issues/501), [#1056](https://github.com/apollographql/graphql-tools/issues/1056), [#1200](https://github.com/apollographql/graphql-tools/issues/1200)
* Allow renaming of subscription root fields [#997](https://github.com/apollographql/graphql-tools/issues/997), [#1002](https://github.com/apollographql/graphql-tools/issues/1002)
* Fix alias resolution to no longer incorrectly fallback to non-aliased field when null [#1171](https://github.com/apollographql/graphql-tools/issues/1171)
* Do not remove default directives (skip, include, deprecated) when not merging custom directives [#1159](https://github.com/apollographql/graphql-tools/issues/1159)
* Fixes errors support [#743](https://github.com/apollographql/graphql-tools/issues/743), [#1037](https://github.com/apollographql/graphql-tools/issues/1037), [#1046](https://github.com/apollographql/graphql-tools/issues/1046)
* Fix mergeSchemas to allow resolvers to return fields defined as functions [#1061](https://github.com/apollographql/graphql-tools/issues/1061)
* Fix default values with mergeSchemas and addResolveFunctionsToSchema [#1121](https://github.com/apollographql/graphql-tools/issues/1121)
* Fix interface and union healing
* Fix stitching unions of types with enums
* Fix mocking to work when schema stitching
Expand Down
74 changes: 36 additions & 38 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"sideEffects": false,
"scripts": {
"clean": "rimraf dist",
"build": "npm run compile",
"precompile": "npm run clean",
"compile": "tsc",
"pretest": "npm run clean && npm run compile",
Expand All @@ -25,10 +26,7 @@
"coverage": "nyc report --reporter=text-lcov | coveralls",
"prepublishOnly": "npm run compile",
"prettier": "prettier --trailing-comma all --single-quote --write src/**/*.ts",
"prettier:check": "prettier --trailing-comma all --single-quote --check src/**/*.ts",
"prerelease": "npm test",
"release": "npm run releaseonly",
"releaseonly": "standard-version"
"prettier:check": "prettier --trailing-comma all --single-quote --check src/**/*.ts"
},
"repository": {
"type": "git",
Expand Down Expand Up @@ -58,46 +56,46 @@
"form-data": "^3.0.0",
"iterall": "^1.3.0",
"node-fetch": "^2.6.0",
"tslib": "^1.11.0",
"uuid": "^7.0.2"
},
"peerDependencies": {
"graphql": "^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0-rc"
},
"devDependencies": {
"@types/chai": "^4.2.11",
"@types/dateformat": "^3.0.1",
"@types/express": "^4.17.3",
"@types/extract-files": "^3.1.0",
"@types/graphql-type-json": "^0.3.2",
"@types/graphql-upload": "^8.0.3",
"@types/mocha": "^7.0.2",
"@types/node": "^13.9.3",
"@types/node-fetch": "^2.5.5",
"@types/uuid": "^7.0.2",
"@typescript-eslint/eslint-plugin": "^2.25.0",
"@typescript-eslint/parser": "^2.25.0",
"babel-eslint": "^10.1.0",
"body-parser": "^1.19.0",
"chai": "^4.2.0",
"coveralls": "^3.0.11",
"dataloader": "^2.0.0",
"dateformat": "^3.0.3",
"eslint": "^6.8.0",
"@types/chai": "4.2.11",
"@types/dateformat": "3.0.1",
"@types/express": "4.17.3",
"@types/extract-files": "3.1.0",
"@types/graphql-type-json": "0.3.2",
"@types/graphql-upload": "8.0.3",
"@types/mocha": "7.0.2",
"@types/node": "13.9.3",
"@types/node-fetch": "2.5.5",
"@types/uuid": "7.0.2",
"@typescript-eslint/eslint-plugin": "2.25.0",
"@typescript-eslint/parser": "2.25.0",
"babel-eslint": "10.1.0",
"body-parser": "1.19.0",
"chai": "4.2.0",
"coveralls": "3.0.11",
"dataloader": "2.0.0",
"dateformat": "3.0.3",
"eslint": "6.8.0",
"eslint-plugin-import": "2.20.1",
"eslint-watch": "^6.0.1",
"express": "^4.17.1",
"express-graphql": "^0.9.0",
"graphql": "^14.6.0",
"graphql-subscriptions": "^1.1.0",
"graphql-type-json": "^0.3.1",
"graphql-upload": "^10.0.0",
"mocha": "^7.1.1",
"nyc": "^15.0.0",
"prettier": "^2.0.2",
"rimraf": "^3.0.2",
"source-map-support": "^0.5.16",
"standard-version": "^7.1.0",
"typescript": "^3.8.3",
"zen-observable-ts": "^0.8.20"
"eslint-watch": "6.0.1",
"express": "4.17.1",
"express-graphql": "0.9.0",
"graphql": "14.6.0",
"graphql-subscriptions": "1.1.0",
"graphql-type-json": "0.3.1",
"graphql-upload": "10.0.0",
"mocha": "7.1.1",
"nyc": "15.0.0",
"prettier": "2.0.2",
"rimraf": "3.0.2",
"source-map-support": "0.5.16",
"typescript": "3.8.3",
"zen-observable-ts": "0.8.20"
}
}
22 changes: 14 additions & 8 deletions tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,21 +1,27 @@
{
"compilerOptions": {
"experimentalDecorators": true,
"rootDir": "./src",
"outDir": "./dist",

"lib": ["es7", "esnext.asynciterable", "dom"],
"module": "commonjs",

"target": "es5",
"module": "commonjs",
"moduleResolution": "node",
"esModuleInterop": true,
"importHelpers": true,

"noImplicitAny": true,
"noImplicitUseStrict": true,
"suppressImplicitAnyIndexErrors": true,
"moduleResolution": "node",
"emitDecoratorMetadata": true,
"noUnusedLocals": true,

"experimentalDecorators": true,
"emitDecoratorMetadata": true,

"sourceMap": true,
"declaration": true,
"rootDir": "./src",
"outDir": "./dist",
"removeComments": false,
"esModuleInterop": true,
"removeComments": false
},
"exclude": ["node_modules", "dist"]
}

0 comments on commit 95d5038

Please sign in to comment.