Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: ardatan/graphql-tools
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: @graphql-tools/load-files@6.5.0
Choose a base ref
...
head repository: ardatan/graphql-tools
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: @graphql-tools/load-files@6.5.1
Choose a head ref

Commits on Sep 30, 2021

  1. fix(deps): update dependency is-glob to v4.0.3 (#3615)

    Co-authored-by: Renovate Bot <bot@renovateapp.com>
    renovate[bot] and renovate-bot authored Sep 30, 2021
    1
    Copy the full SHA
    1bcdf39 View commit details
  2. chore(deps): update dependency @types/react to v17.0.26 (#3618)

    Co-authored-by: Renovate Bot <bot@renovateapp.com>
    renovate[bot] and renovate-bot authored Sep 30, 2021
    1
    Copy the full SHA
    fb96986 View commit details
  3. chore(deps): update dependency mock-socket to v9.0.5 (#3619)

    Co-authored-by: Renovate Bot <bot@renovateapp.com>
    renovate[bot] and renovate-bot authored Sep 30, 2021
    1
    Copy the full SHA
    7c22260 View commit details
  4. fix(deps): update dependency value-or-promise to v1.0.11 (#3620)

    Co-authored-by: Renovate Bot <bot@renovateapp.com>
    renovate[bot] and renovate-bot authored Sep 30, 2021
    1
    Copy the full SHA
    a0b2837 View commit details

Commits on Oct 2, 2021

  1. chore(deps): update dependency concurrently to v6.3.0 (#3623)

    Co-authored-by: Renovate Bot <bot@renovateapp.com>
    renovate[bot] and renovate-bot authored Oct 2, 2021
    1
    Copy the full SHA
    d51095a View commit details
  2. fix(deps): update dependency @guild-docs/client to v1.0.7 (#3627)

    Co-authored-by: Renovate Bot <bot@renovateapp.com>
    renovate[bot] and renovate-bot authored Oct 2, 2021
    1
    Copy the full SHA
    d6d938b View commit details
  3. fix(deps): update dependency ws to v8.2.3 (#3628)

    Co-authored-by: Renovate Bot <bot@renovateapp.com>
    renovate[bot] and renovate-bot authored Oct 2, 2021
    1
    Copy the full SHA
    237c496 View commit details

Commits on Oct 3, 2021

  1. chore(deps): update dependency @types/react to v17.0.27 (#3630)

    Co-authored-by: Renovate Bot <bot@renovateapp.com>
    renovate[bot] and renovate-bot authored Oct 3, 2021
    1
    Copy the full SHA
    c9dfe55 View commit details
  2. fix(deps): update dependency react-icons to v4.3.1 (#3631)

    Co-authored-by: Renovate Bot <bot@renovateapp.com>
    renovate[bot] and renovate-bot authored Oct 3, 2021
    1
    Copy the full SHA
    33182ec View commit details

Commits on Oct 4, 2021

  1. Fix broken README links (#3632)

    Co-authored-by: Patrick Szmucer <pszmucer@palantir.com>
    patrickszmucer and Patrick Szmucer authored Oct 4, 2021
    1
    Copy the full SHA
    72d5f7a View commit details
  2. 1
    Copy the full SHA
    7f86ca5 View commit details
  3. chore(deps): update typescript-eslint monorepo to v4.33.0 (#3634)

    Co-authored-by: Renovate Bot <bot@renovateapp.com>
    renovate[bot] and renovate-bot authored Oct 4, 2021
    1
    Copy the full SHA
    193f548 View commit details
  4. chore(deps): update dependency lint-staged to v11.2.0 (#3633)

    Co-authored-by: Renovate Bot <bot@renovateapp.com>
    renovate[bot] and renovate-bot authored Oct 4, 2021
    1
    Copy the full SHA
    5d3b5c3 View commit details

Commits on Oct 5, 2021

  1. chore(deps): update dependency @apollo/client to v3.4.16 (#3635)

    Co-authored-by: Renovate Bot <bot@renovateapp.com>
    renovate[bot] and renovate-bot authored Oct 5, 2021
    1
    Copy the full SHA
    34f1efd View commit details
  2. [deploy_website] Refactor processImport from @graphql-tools/import (#…

    …3639)
    
    * Break import code up into more functions
    
    * A few more refactors
    
    * revert
    
    * Add changelog
    patrickszmucer authored Oct 5, 2021
    1
    Copy the full SHA
    1e90f09 View commit details
  3. feat(loader): provide option to raise any errors found when loading v…

    …alid and invalid schema files (#3596)
    
    * test(file-loader): raise error if pattern includes valid and invalid schemas
    
    * fix: add option to raise errors when glob matches valid and invalid schema files
    
    * chore: add changeset
    
    * test: commit fixture file for git test
    
    * feat(git-loader): allow errors to be raised with new option
    
    * feat(code-file): allow errors to be raised with new option
    
    * feat(json-file): allow errors to be raised with new option
    
    * chore: update changeset
    
    * test(loaders/git): use different glob style to appease windows maybe
    
    * chore: remove option for git-loader
    rperryng authored Oct 5, 2021
    Copy the full SHA
    00d06c2 View commit details
  4. chore(release): update monorepo packages versions (#3640)

    Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
    github-actions[bot] and github-actions[bot] authored Oct 5, 2021
    1
    Copy the full SHA
    7a454c5 View commit details
  5. chore(deps): update dependency graphql to v15.6.1 (#3642)

    Co-authored-by: Renovate Bot <bot@renovateapp.com>
    renovate[bot] and renovate-bot authored Oct 5, 2021
    1
    Copy the full SHA
    2269765 View commit details
  6. chore(deps): update dependency esbuild to v0.13.4 (#3643)

    Co-authored-by: Renovate Bot <bot@renovateapp.com>
    renovate[bot] and renovate-bot authored Oct 5, 2021
    1
    Copy the full SHA
    b02795f View commit details
  7. chore(deps): update dependency graphql-scalars to v1.11.0 (#3644)

    Co-authored-by: Renovate Bot <bot@renovateapp.com>
    renovate[bot] and renovate-bot authored Oct 5, 2021
    1
    Copy the full SHA
    601fc1b View commit details
  8. 1
    Copy the full SHA
    be9fad0 View commit details
  9. chore(release): update monorepo packages versions (#3648)

    Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
    github-actions[bot] and github-actions[bot] authored Oct 5, 2021
    1
    Copy the full SHA
    1447274 View commit details
  10. fix(deps): update dependency @chakra-ui/react to v1.6.9 (#3647)

    Co-authored-by: Renovate Bot <bot@renovateapp.com>
    renovate[bot] and renovate-bot authored Oct 5, 2021
    1
    Copy the full SHA
    346df40 View commit details
  11. chore(deps): update dependency @types/node to v14.17.21 (#3646)

    Co-authored-by: Renovate Bot <bot@renovateapp.com>
    renovate[bot] and renovate-bot authored Oct 5, 2021
    Copy the full SHA
    0179950 View commit details
  12. chore(deps): update dependency @types/concurrently to v6.3.0 (#3649)

    Co-authored-by: Renovate Bot <bot@renovateapp.com>
    renovate[bot] and renovate-bot authored Oct 5, 2021
    1
    Copy the full SHA
    4c78b1d View commit details

Commits on Oct 6, 2021

  1. fix implicit dependencies

    ardatan committed Oct 6, 2021
    1
    Copy the full SHA
    1043219 View commit details
  2. chore(release): update monorepo packages versions (#3652)

    Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
    github-actions[bot] and github-actions[bot] authored Oct 6, 2021
    1
    Copy the full SHA
    789de0c View commit details
Showing with 701 additions and 476 deletions.
  1. +6 −4 .eslintrc.json
  2. +1 −1 benchmark/federation/package.json
  3. +4 −4 benchmark/federation/yarn.lock
  4. +7 −7 package.json
  5. +1 −1 packages/batch-execute/package.json
  6. +1 −1 packages/delegate/package.json
  7. +8 −0 packages/graphql-tag-pluck/CHANGELOG.md
  8. +1 −1 packages/graphql-tag-pluck/README.md
  9. +2 −2 packages/graphql-tag-pluck/package.json
  10. +2 −4 packages/graphql-tag-pluck/src/index.ts
  11. +19 −0 packages/import/CHANGELOG.md
  12. +1 −1 packages/import/README.md
  13. +2 −1 packages/import/package.json
  14. +265 −190 packages/import/src/index.ts
  15. +1 −1 packages/links/README.md
  16. +1 −1 packages/links/package.json
  17. +6 −0 packages/load-files/CHANGELOG.md
  18. +1 −1 packages/load-files/README.md
  19. +1 −1 packages/load-files/package.json
  20. +1 −2 packages/load-files/src/index.ts
  21. +1 −1 packages/load/README.md
  22. +6 −0 packages/loaders/code-file/CHANGELOG.md
  23. +1 −1 packages/loaders/code-file/package.json
  24. +7 −2 packages/loaders/code-file/src/index.ts
  25. +36 −0 packages/loaders/code-file/tests/load-from-code-file.spec.ts
  26. +1 −1 packages/loaders/git/package.json
  27. +1 −0 packages/loaders/git/tests/loader.spec.ts
  28. +3 −0 packages/loaders/git/tests/test-files/type-defs-invalid.graphql
  29. +11 −0 packages/loaders/graphql-file/CHANGELOG.md
  30. +2 −2 packages/loaders/graphql-file/package.json
  31. +7 −2 packages/loaders/graphql-file/src/index.ts
  32. +23 −0 packages/loaders/graphql-file/tests/loader.spec.ts
  33. +5 −0 packages/loaders/graphql-file/tests/test-files/type-defs-with-failing-import.graphql
  34. +6 −0 packages/loaders/json-file/CHANGELOG.md
  35. +1 −1 packages/loaders/json-file/package.json
  36. +8 −3 packages/loaders/json-file/src/index.ts
  37. +11 −0 packages/loaders/json-file/tests/loader.spec.ts
  38. +3 −3 packages/loaders/url/package.json
  39. +1 −1 packages/merge/README.md
  40. +1 −1 packages/mock/README.md
  41. +1 −1 packages/relay-operation-optimizer/README.md
  42. +1 −1 packages/resolvers-composition/README.md
  43. +1 −1 packages/schema/README.md
  44. +2 −2 packages/schema/package.json
  45. +1 −1 packages/stitch/package.json
  46. +6 −0 packages/utils/CHANGELOG.md
  47. +2 −2 packages/utils/package.json
  48. +1 −1 packages/utils/src/comments.ts
  49. +1 −1 packages/utils/src/implementsAbstractType.ts
  50. +1 −1 packages/wrap/README.md
  51. +1 −1 packages/wrap/package.json
  52. +8 −8 website/docs/schema-directives.mdx
  53. +8 −8 website/package.json
  54. +201 −207 yarn.lock
10 changes: 6 additions & 4 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -34,7 +34,8 @@
"@typescript-eslint/naming-convention": "off",
"@typescript-eslint/interface-name-prefix": "off",
"@typescript-eslint/explicit-module-boundary-types": "off",
"default-param-last": "off"
"default-param-last": "off",
"import/no-extraneous-dependencies": ["error", {"devDependencies": ["**/*.test.ts", "**/*.spec.ts"]}]
},
"env": {
"es6": true,
@@ -43,14 +44,15 @@
"overrides": [
{
"files": [
"**/test/**/*.{ts,js}",
"*.spec.ts"
"**/{test,tests,testing}/**/*.{ts,js}",
"*.{spec,test}.{ts,js}"
],
"env": {
"jest": true
},
"rules": {
"@typescript-eslint/no-unused-vars": "off"
"@typescript-eslint/no-unused-vars": "off",
"import/no-extraneous-dependencies": "off"
}
}
],
2 changes: 1 addition & 1 deletion benchmark/federation/package.json
Original file line number Diff line number Diff line change
@@ -14,7 +14,7 @@
"@graphql-tools/stitch": "8.3.1",
"@graphql-tools/stitching-directives": "2.1.1",
"express": "4.17.1",
"graphql": "15.6.0",
"graphql": "15.6.1",
"graphql-tag": "2.12.5",
"wait-on": "6.0.0",
"cross-env": "7.0.3"
8 changes: 4 additions & 4 deletions benchmark/federation/yarn.lock
Original file line number Diff line number Diff line change
@@ -979,10 +979,10 @@ graphql-tag@2.12.5, graphql-tag@^2.11.0:
dependencies:
tslib "^2.1.0"

graphql@15.6.0:
version "15.6.0"
resolved "https://registry.yarnpkg.com/graphql/-/graphql-15.6.0.tgz#e69323c6a9780a1a4b9ddf7e35ca8904bb04df02"
integrity sha512-WJR872Zlc9hckiEPhXgyUftXH48jp2EjO5tgBBOyNMRJZ9fviL2mJBD6CAysk6N5S0r9BTs09Qk39nnJBkvOXQ==
graphql@15.6.1:
version "15.6.1"
resolved "https://registry.yarnpkg.com/graphql/-/graphql-15.6.1.tgz#9125bdf057553525da251e19e96dab3d3855ddfc"
integrity sha512-3i5lu0z6dRvJ48QP9kFxBkJ7h4Kso7PS8eahyTFz5Jm6CvQfLtNIE8LX9N6JLnXTuwR+sIYnXzaWp6anOg0QQw==

has-bigints@^1.0.1:
version "1.0.1"
14 changes: 7 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
@@ -46,13 +46,13 @@
"@changesets/cli": "2.17.0",
"@types/debug": "4.1.7",
"@types/jest": "27.0.2",
"@types/node": "14.17.20",
"@typescript-eslint/eslint-plugin": "4.32.0",
"@typescript-eslint/parser": "4.32.0",
"@types/node": "14.17.21",
"@typescript-eslint/eslint-plugin": "4.33.0",
"@typescript-eslint/parser": "4.33.0",
"babel-jest": "27.2.4",
"bob-the-bundler": "1.5.1",
"chalk": "4.1.2",
"concurrently": "6.2.2",
"concurrently": "6.3.0",
"eslint": "7.32.0",
"eslint-config-prettier": "8.3.0",
"eslint-config-standard": "16.0.3",
@@ -61,12 +61,12 @@
"eslint-plugin-promise": "5.1.0",
"eslint-plugin-standard": "5.0.0",
"globby": "11.0.4",
"graphql": "15.6.0",
"graphql": "15.6.1",
"graphql-helix": "1.8.0",
"graphql-subscriptions": "1.2.1",
"husky": "7.0.2",
"jest": "27.2.4",
"lint-staged": "11.1.2",
"lint-staged": "11.2.0",
"nock": "13.1.3",
"patch-package": "6.4.7",
"prettier": "2.4.1",
@@ -95,7 +95,7 @@
]
},
"resolutions": {
"graphql": "15.6.0",
"graphql": "15.6.1",
"esbuild": "^0.13.0",
"@changesets/apply-release-plan": "5.0.1"
}
2 changes: 1 addition & 1 deletion packages/batch-execute/package.json
Original file line number Diff line number Diff line change
@@ -35,7 +35,7 @@
"@graphql-tools/utils": "^8.2.4",
"dataloader": "2.0.0",
"tslib": "~2.3.0",
"value-or-promise": "1.0.10"
"value-or-promise": "1.0.11"
},
"publishConfig": {
"access": "public",
2 changes: 1 addition & 1 deletion packages/delegate/package.json
Original file line number Diff line number Diff line change
@@ -37,7 +37,7 @@
"@graphql-tools/utils": "^8.2.4",
"dataloader": "2.0.0",
"tslib": "~2.3.0",
"value-or-promise": "1.0.10"
"value-or-promise": "1.0.11"
},
"publishConfig": {
"access": "public",
8 changes: 8 additions & 0 deletions packages/graphql-tag-pluck/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# @graphql-tools/graphql-tag-pluck

## 7.1.2

### Patch Changes

- 1043219f: fix implicit dependencies
- Updated dependencies [1043219f]
- @graphql-tools/utils@8.2.5

## 7.1.1

### Patch Changes
2 changes: 1 addition & 1 deletion packages/graphql-tag-pluck/README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Check API Reference for more information about this package;
https://www.graphql-tools.com/docs/api/modules/graphql-tag-pluck
https://www.graphql-tools.com/docs/api/modules/graphql_tag_pluck_src

You can also learn more about GraphQL Tag Pluck in this chapter;
https://www.graphql-tools.com/docs/graphql-tag-pluck
4 changes: 2 additions & 2 deletions packages/graphql-tag-pluck/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@graphql-tools/graphql-tag-pluck",
"version": "7.1.1",
"version": "7.1.2",
"description": "Pluck graphql-tag template literals",
"license": "MIT",
"repository": {
@@ -32,7 +32,7 @@
"@babel/parser": "7.15.7",
"@babel/traverse": "7.15.4",
"@babel/types": "7.15.6",
"@graphql-tools/utils": "^8.2.0",
"@graphql-tools/utils": "^8.2.5",
"tslib": "~2.3.0"
},
"devDependencies": {
6 changes: 2 additions & 4 deletions packages/graphql-tag-pluck/src/index.ts
Original file line number Diff line number Diff line change
@@ -228,10 +228,9 @@ const MissingVueTemplateCompilerError = new Error(
);

async function pluckVueFileScript(fileData: string) {
// tslint:disable-next-line: no-implicit-dependencies
let vueTemplateCompiler: typeof import('@vue/compiler-sfc');
try {
// tslint:disable-next-line: no-implicit-dependencies
// eslint-disable-next-line import/no-extraneous-dependencies
vueTemplateCompiler = await import('@vue/compiler-sfc');
} catch (e: any) {
throw MissingVueTemplateCompilerError;
@@ -241,11 +240,10 @@ async function pluckVueFileScript(fileData: string) {
}

function pluckVueFileScriptSync(fileData: string) {
// tslint:disable-next-line: no-implicit-dependencies
let vueTemplateCompiler: typeof import('@vue/compiler-sfc');

try {
// tslint:disable-next-line: no-implicit-dependencies
// eslint-disable-next-line import/no-extraneous-dependencies
vueTemplateCompiler = require('@vue/compiler-sfc');
} catch (e: any) {
throw MissingVueTemplateCompilerError;
19 changes: 19 additions & 0 deletions packages/import/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,24 @@
# @graphql-tools/import

## 6.5.2

### Patch Changes

- Updated dependencies [1043219f]
- @graphql-tools/utils@8.2.5

## 6.5.1

### Patch Changes

- be9fad09: fix(import): add missing dependency

## 6.5.0

### Minor Changes

- 1e90f094: Refactor processImport and export helper functions for parsing GraphQL imports

## 6.4.2

### Patch Changes
2 changes: 1 addition & 1 deletion packages/import/README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Check API Reference for more information about this package;
https://www.graphql-tools.com/docs/api/modules/import
https://www.graphql-tools.com/docs/api/modules/import_src

You can also learn more about GraphQL Import in this chapter;
https://www.graphql-tools.com/docs/schema-loading#using-import-expression
3 changes: 2 additions & 1 deletion packages/import/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@graphql-tools/import",
"version": "6.4.2",
"version": "6.5.2",
"description": "A set of utils for faster development of GraphQL tools",
"repository": {
"type": "git",
@@ -34,6 +34,7 @@
"directory": "dist"
},
"dependencies": {
"@graphql-tools/utils": "8.2.5",
"resolve-from": "5.0.0",
"tslib": "~2.3.0"
}
Loading