From bd8968ddb47f11781c73f09e891391fe997baed4 Mon Sep 17 00:00:00 2001 From: Rikki Date: Fri, 11 Sep 2020 11:49:19 -0400 Subject: [PATCH 1/4] ci: ignore CRA example from root eslint config --- .eslintignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.eslintignore b/.eslintignore index 1c959a50539..ee2ef9e8f93 100644 --- a/.eslintignore +++ b/.eslintignore @@ -11,6 +11,9 @@ # Now un-ignore source code, tests, configuration, etc !/{packages,examples}/*/{src,cypress,resources}/** +# CRA example has its own eslint config +examples/graphiql-create-react-app + !.eslintrc.js !babel.config.js # From f38791bdfa2085152aaa389dffbbfd05d208b308 Mon Sep 17 00:00:00 2001 From: Rikki Schulte Date: Fri, 18 Sep 2020 11:28:16 -0400 Subject: [PATCH 2/4] improvement: completion for implicit fragments, LSP settings (#1665) - add optional completion for implicit fragments (outside the operation document) to LSP - add `useSchemaFileDefinitions` setting to LSP server, evaluate from IDE settings - instantiate the LSP server later to pick up custom `rootDir` setting - fix bug with multi-project configs where `file://` protocol prefix was mismatching uri <> project lookup - move parser benchmarks outside of src directory so they don't accidentally get bundled or impact bundle size --- .../src/GraphQLLanguageService.ts | 17 +- .../__tests__/GraphQLLanguageService-test.ts | 4 + .../src/getAutocompleteSuggestions.ts | 10 +- .../benchmark/fixtures/github.graphql | 0 .../benchmark/fixtures/kitchen-sink.graphql | 0 .../{src => }/benchmark/index.ts | 2 +- .../package.json | 2 +- .../src/GraphQLCache.ts | 6 +- .../src/MessageProcessor.ts | 155 +++++++++--------- .../src/index.ts | 2 + 10 files changed, 113 insertions(+), 85 deletions(-) rename packages/graphql-language-service-parser/{src => }/benchmark/fixtures/github.graphql (100%) rename packages/graphql-language-service-parser/{src => }/benchmark/fixtures/kitchen-sink.graphql (100%) rename packages/graphql-language-service-parser/{src => }/benchmark/index.ts (98%) diff --git a/packages/graphql-language-service-interface/src/GraphQLLanguageService.ts b/packages/graphql-language-service-interface/src/GraphQLLanguageService.ts index 4db7c4588f0..b5c291f8caf 100644 --- a/packages/graphql-language-service-interface/src/GraphQLLanguageService.ts +++ b/packages/graphql-language-service-interface/src/GraphQLLanguageService.ts @@ -106,7 +106,7 @@ export class GraphQLLanguageService { } getConfigForURI(uri: Uri) { - const config = this._graphQLConfig.getProjectForFile(uri); + const config = this._graphQLCache.getProjectForFile(uri); if (config) { return config; } @@ -226,9 +226,22 @@ export class GraphQLLanguageService { ): Promise> { const projectConfig = this.getConfigForURI(filePath); const schema = await this._graphQLCache.getSchema(projectConfig.name); + const fragmentDefinitions = await this._graphQLCache.getFragmentDefinitions( + projectConfig, + ); + + const fragmentInfo = Array.from(fragmentDefinitions).map( + ([, info]) => info, + ); if (schema) { - return getAutocompleteSuggestions(schema, query, position); + return getAutocompleteSuggestions( + schema, + query, + position, + undefined, + fragmentInfo, + ); } return []; } diff --git a/packages/graphql-language-service-interface/src/__tests__/GraphQLLanguageService-test.ts b/packages/graphql-language-service-interface/src/__tests__/GraphQLLanguageService-test.ts index 36cc70cd6a6..c5989c729d3 100644 --- a/packages/graphql-language-service-interface/src/__tests__/GraphQLLanguageService-test.ts +++ b/packages/graphql-language-service-interface/src/__tests__/GraphQLLanguageService-test.ts @@ -33,6 +33,10 @@ describe('GraphQLLanguageService', () => { return new GraphQLConfig(MOCK_CONFIG, []); }, + getProjectForFile(uri: string) { + return this.getGraphQLConfig().getProjectForFile(uri); + }, + getObjectTypeDefinitions() { return { Episode: { diff --git a/packages/graphql-language-service-interface/src/getAutocompleteSuggestions.ts b/packages/graphql-language-service-interface/src/getAutocompleteSuggestions.ts index 7eb30748835..9a381a2c0cb 100644 --- a/packages/graphql-language-service-interface/src/getAutocompleteSuggestions.ts +++ b/packages/graphql-language-service-interface/src/getAutocompleteSuggestions.ts @@ -27,6 +27,7 @@ import { CompletionItem, AllTypeInfo, Position, + FragmentInfo, } from 'graphql-language-service-types'; import { @@ -70,6 +71,7 @@ export function getAutocompleteSuggestions( queryText: string, cursor: Position, contextToken?: ContextToken, + fragmentDefs?: FragmentInfo[], ): Array { const token = contextToken || getTokenAtPosition(queryText, cursor); @@ -209,7 +211,7 @@ export function getAutocompleteSuggestions( typeInfo, schema, queryText, - kind, + fragmentDefs, ); } @@ -367,12 +369,16 @@ function getSuggestionsForFragmentSpread( typeInfo: AllTypeInfo, schema: GraphQLSchema, queryText: string, - _kind: string, + fragmentDefs?: FragmentInfo[], ): Array { const typeMap = schema.getTypeMap(); const defState = getDefinitionState(token.state); const fragments = getFragmentDefinitions(queryText); + if (fragmentDefs) { + fragments.push(...fragmentDefs.map(info => info.definition)); + } + // Filter down to only the fragments which may exist here. const relevantFrags = fragments.filter( frag => diff --git a/packages/graphql-language-service-parser/src/benchmark/fixtures/github.graphql b/packages/graphql-language-service-parser/benchmark/fixtures/github.graphql similarity index 100% rename from packages/graphql-language-service-parser/src/benchmark/fixtures/github.graphql rename to packages/graphql-language-service-parser/benchmark/fixtures/github.graphql diff --git a/packages/graphql-language-service-parser/src/benchmark/fixtures/kitchen-sink.graphql b/packages/graphql-language-service-parser/benchmark/fixtures/kitchen-sink.graphql similarity index 100% rename from packages/graphql-language-service-parser/src/benchmark/fixtures/kitchen-sink.graphql rename to packages/graphql-language-service-parser/benchmark/fixtures/kitchen-sink.graphql diff --git a/packages/graphql-language-service-parser/src/benchmark/index.ts b/packages/graphql-language-service-parser/benchmark/index.ts similarity index 98% rename from packages/graphql-language-service-parser/src/benchmark/index.ts rename to packages/graphql-language-service-parser/benchmark/index.ts index c8c6cd95969..87e6a339106 100644 --- a/packages/graphql-language-service-parser/src/benchmark/index.ts +++ b/packages/graphql-language-service-parser/benchmark/index.ts @@ -3,7 +3,7 @@ import fs from 'fs'; import path from 'path'; import Benchmark from 'benchmark'; import { parse } from 'graphql'; -import { onlineParser, CharacterStream } from '../'; +import { onlineParser, CharacterStream } from '../src'; interface IStats { mean: number; diff --git a/packages/graphql-language-service-parser/package.json b/packages/graphql-language-service-parser/package.json index 24f65b76820..0e0340c45f6 100644 --- a/packages/graphql-language-service-parser/package.json +++ b/packages/graphql-language-service-parser/package.json @@ -39,6 +39,6 @@ "typescript": "^3.9.5" }, "scripts": { - "benchmark": "ts-node src/benchmark/index.ts" + "benchmark": "ts-node benchmark/index.ts" } } diff --git a/packages/graphql-language-service-server/src/GraphQLCache.ts b/packages/graphql-language-service-server/src/GraphQLCache.ts index c2e586b48cd..929a6e4dfd3 100644 --- a/packages/graphql-language-service-server/src/GraphQLCache.ts +++ b/packages/graphql-language-service-server/src/GraphQLCache.ts @@ -61,7 +61,7 @@ export async function getGraphQLCache({ parser: typeof parseDocument; loadConfigOptions: LoadConfigOptions; config?: GraphQLConfig; -}): Promise { +}): Promise { let graphQLConfig = config; if (!graphQLConfig) { graphQLConfig = await loadConfig(loadConfigOptions); @@ -104,6 +104,10 @@ export class GraphQLCache implements GraphQLCacheInterface { getGraphQLConfig = (): GraphQLConfig => this._graphQLConfig; + getProjectForFile = (uri: string): GraphQLProjectConfig => { + return this._graphQLConfig.getProjectForFile(uri.replace('file://', '')); + }; + getFragmentDependencies = async ( query: string, fragmentDefinitions?: Map | null, diff --git a/packages/graphql-language-service-server/src/MessageProcessor.ts b/packages/graphql-language-service-server/src/MessageProcessor.ts index 79f4df3eec0..7c1886f3629 100644 --- a/packages/graphql-language-service-server/src/MessageProcessor.ts +++ b/packages/graphql-language-service-server/src/MessageProcessor.ts @@ -13,7 +13,6 @@ import { URL } from 'url'; import * as path from 'path'; import { CachedContent, - GraphQLCache, Uri, GraphQLConfig, GraphQLProjectConfig, @@ -57,7 +56,7 @@ import type { import type { UnnormalizedTypeDefPointer } from '@graphql-tools/load'; -import { getGraphQLCache } from './GraphQLCache'; +import { getGraphQLCache, GraphQLCache } from './GraphQLCache'; import { parseDocument, DEFAULT_SUPPORTED_EXTENSIONS } from './parseDocument'; import { Logger } from './Logger'; @@ -91,6 +90,7 @@ export class MessageProcessor { _loadConfigOptions: LoadConfigOptions; _schemaCacheInit: boolean = false; _rootPath: string = process.cwd(); + _settings: any; constructor({ logger, @@ -180,29 +180,16 @@ export class MessageProcessor { 'no rootPath configured in extension or server, defaulting to cwd', ); } - this._loadConfigOptions.rootDir = this._rootPath; - - this._graphQLCache = await getGraphQLCache({ - parser: this._parser, - loadConfigOptions: this._loadConfigOptions, - config: this._graphQLConfig, - }); - this._languageService = new GraphQLLanguageService(this._graphQLCache); - if (!serverCapabilities) { throw new Error('GraphQL Language Server is not initialized.'); } - this._isInitialized = true; - this._logger.log( JSON.stringify({ type: 'usage', messageType: 'initialize', }), ); - const config = this._graphQLCache.getGraphQLConfig(); - await this._cacheAllProjectFiles(config); return serverCapabilities; } @@ -210,24 +197,46 @@ export class MessageProcessor { async handleDidOpenOrSaveNotification( params: DidSaveTextDocumentParams | DidOpenTextDocumentParams, ): Promise { + /** + * Initialize the LSP server when the first file is opened or saved, + * so that we can access the user settings for config rootDir, etc + */ if (!this._isInitialized || !this._graphQLCache) { - return null; - } + if (!this._settings) { + const settings = await this._connection.workspace.getConfiguration({ + section: 'graphql-config', + }); + const vscodeSettings = await this._connection.workspace.getConfiguration( + { + section: 'vscode-graphql', + }, + ); + this._settings = { ...settings, ...vscodeSettings }; + const rootDir = this._settings.rootDir || this._rootPath; + this._rootPath = rootDir; + this._loadConfigOptions.rootDir = rootDir; + + this._graphQLCache = await getGraphQLCache({ + parser: this._parser, + loadConfigOptions: this._loadConfigOptions, + config: this._graphQLConfig, + }); + this._languageService = new GraphQLLanguageService(this._graphQLCache); + if (this._graphQLCache?.getGraphQLConfig) { + const config = this._graphQLCache.getGraphQLConfig(); + await this._cacheAllProjectFiles(config); + } - const settings = await this._connection.workspace.getConfiguration({ - section: 'graphql-config', - }); - if (settings.rootDir && settings.rootDir !== this._rootPath) { - this._rootPath = settings.rootDir; - this._loadConfigOptions.rootDir = settings.rootDir; - - this._graphQLCache = await getGraphQLCache({ - parser: this._parser, - loadConfigOptions: this._loadConfigOptions, - config: this._graphQLConfig, - }); - this._languageService = new GraphQLLanguageService(this._graphQLCache); + this._isInitialized = true; + } else { + return null; + } } + // Here, we set the workspace settings in memory, + // and re-initialize the language service when a different + // root path is detected. + // We aren't able to use initialization event for this + // and the config change event is after the fact. if (!params || !params.textDocument) { throw new Error('`textDocument` argument is required.'); @@ -253,32 +262,32 @@ export class MessageProcessor { contents = cachedDocument.contents; } } - - await Promise.all( - contents.map(async ({ query, range }) => { - const results = await this._languageService.getDiagnostics( - query, - uri, - this._isRelayCompatMode(query) ? false : true, - ); - if (results && results.length > 0) { - diagnostics.push(...processDiagnosticsMessage(results, query, range)); - } - }), - ); - - const project = this._graphQLCache - .getGraphQLConfig() - .getProjectForFile(uri); - - this._logger.log( - JSON.stringify({ - type: 'usage', - messageType: 'textDocument/didOpen', - projectName: project && project.name, - fileName: uri, - }), - ); + if (this._isInitialized && this._graphQLCache) { + await Promise.all( + contents.map(async ({ query, range }) => { + const results = await this._languageService.getDiagnostics( + query, + uri, + this._isRelayCompatMode(query) ? false : true, + ); + if (results && results.length > 0) { + diagnostics.push( + ...processDiagnosticsMessage(results, query, range), + ); + } + }), + ); + const project = this._graphQLCache.getProjectForFile(uri); + + this._logger.log( + JSON.stringify({ + type: 'usage', + messageType: 'textDocument/didOpen', + projectName: project && project.name, + fileName: uri, + }), + ); + } return { uri, diagnostics }; } @@ -337,9 +346,7 @@ export class MessageProcessor { }), ); - const project = this._graphQLCache - .getGraphQLConfig() - .getProjectForFile(uri); + const project = this._graphQLCache.getProjectForFile(uri); this._logger.log( JSON.stringify({ @@ -370,9 +377,7 @@ export class MessageProcessor { this._textDocumentCache.delete(uri); } - const project = this._graphQLCache - .getGraphQLConfig() - .getProjectForFile(uri); + const project = this._graphQLCache.getProjectForFile(uri); this._logger.log( JSON.stringify({ @@ -451,9 +456,7 @@ export class MessageProcessor { textDocument.uri, ); - const project = this._graphQLCache - .getGraphQLConfig() - .getProjectForFile(textDocument.uri); + const project = this._graphQLCache.getProjectForFile(textDocument.uri); this._logger.log( JSON.stringify({ @@ -550,9 +553,7 @@ export class MessageProcessor { ) ).reduce((left, right) => left.concat(right), []); - const project = this._graphQLCache - .getGraphQLConfig() - .getProjectForFile(uri); + const project = this._graphQLCache.getProjectForFile(uri); this._logger.log( JSON.stringify({ @@ -593,9 +594,7 @@ export class MessageProcessor { } const textDocument = params.textDocument; const position = params.position; - const project = this._graphQLCache - .getGraphQLConfig() - .getProjectForFile(textDocument.uri); + const project = this._graphQLCache.getProjectForFile(textDocument.uri); if (project) { await this._cacheSchemaFilesForProject(project); } @@ -786,7 +785,6 @@ export class MessageProcessor { uri = uri.toString(); const isFileUri = existsSync(uri); - let version = 1; if (isFileUri) { const schemaUri = 'file://' + path.join(project.dirpath, uri); @@ -822,7 +820,7 @@ export class MessageProcessor { } async _cacheSchemaFilesForProject(project: GraphQLProjectConfig) { const schema = project?.schema; - const config = project?.extensions?.vscode; + const config = project?.extensions?.languageService; /** * By default, let's only cache the full graphql config schema. * This allows us to rely on graphql-config's schema building features @@ -833,13 +831,14 @@ export class MessageProcessor { * * The default temporary schema file seems preferrable until we have graphql source maps */ - const cacheSchemaFiles = config?.cacheSchemaFiles || false; - const cacheConfigSchema = config?.cacheConfigSchema || true; + const useSchemaFileDefinitions = + config?.useSchemaFileDefinitions ?? + this?._settings?.useSchemaFileDefinitions ?? + false; - if (cacheConfigSchema) { + if (!useSchemaFileDefinitions) { await this._cacheConfigSchema(project); - } - if (cacheSchemaFiles && schema) { + } else { if (Array.isArray(schema)) { Promise.all( schema.map(async (uri: UnnormalizedTypeDefPointer) => { diff --git a/packages/graphql-language-service-types/src/index.ts b/packages/graphql-language-service-types/src/index.ts index 12fe201e0e0..dba3c646e0f 100644 --- a/packages/graphql-language-service-types/src/index.ts +++ b/packages/graphql-language-service-types/src/index.ts @@ -44,6 +44,8 @@ export type { export interface GraphQLCache { getGraphQLConfig: () => GraphQLConfig; + getProjectForFile: (uri: string) => GraphQLProjectConfig; + getObjectTypeDependencies: ( query: string, fragmentDefinitions: Map, From 80c66f672c01f9e70073f0d95cdbe1741368e058 Mon Sep 17 00:00:00 2001 From: Rikki Date: Fri, 18 Sep 2020 11:35:35 -0400 Subject: [PATCH 3/4] chore: cleanup, simplify implicit fragment completion API --- .../src/GraphQLLanguageService.ts | 2 +- .../src/getAutocompleteSuggestions.ts | 7 ++- yarn.lock | 51 ------------------- 3 files changed, 4 insertions(+), 56 deletions(-) diff --git a/packages/graphql-language-service-interface/src/GraphQLLanguageService.ts b/packages/graphql-language-service-interface/src/GraphQLLanguageService.ts index b5c291f8caf..9b15322edf6 100644 --- a/packages/graphql-language-service-interface/src/GraphQLLanguageService.ts +++ b/packages/graphql-language-service-interface/src/GraphQLLanguageService.ts @@ -240,7 +240,7 @@ export class GraphQLLanguageService { query, position, undefined, - fragmentInfo, + fragmentInfo.map(({ definition }) => definition), ); } return []; diff --git a/packages/graphql-language-service-interface/src/getAutocompleteSuggestions.ts b/packages/graphql-language-service-interface/src/getAutocompleteSuggestions.ts index 9a381a2c0cb..33e779c22ab 100644 --- a/packages/graphql-language-service-interface/src/getAutocompleteSuggestions.ts +++ b/packages/graphql-language-service-interface/src/getAutocompleteSuggestions.ts @@ -27,7 +27,6 @@ import { CompletionItem, AllTypeInfo, Position, - FragmentInfo, } from 'graphql-language-service-types'; import { @@ -71,7 +70,7 @@ export function getAutocompleteSuggestions( queryText: string, cursor: Position, contextToken?: ContextToken, - fragmentDefs?: FragmentInfo[], + fragmentDefs?: FragmentDefinitionNode[], ): Array { const token = contextToken || getTokenAtPosition(queryText, cursor); @@ -369,14 +368,14 @@ function getSuggestionsForFragmentSpread( typeInfo: AllTypeInfo, schema: GraphQLSchema, queryText: string, - fragmentDefs?: FragmentInfo[], + fragmentDefs?: FragmentDefinitionNode[], ): Array { const typeMap = schema.getTypeMap(); const defState = getDefinitionState(token.state); const fragments = getFragmentDefinitions(queryText); if (fragmentDefs) { - fragments.push(...fragmentDefs.map(info => info.definition)); + fragments.push(...fragmentDefs); } // Filter down to only the fragments which may exist here. diff --git a/yarn.lock b/yarn.lock index 713af734136..9aff45d3230 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7048,14 +7048,6 @@ codecov@^3.6.5: teeny-request "6.0.1" urlgrey "0.4.4" -codemirror-graphql@^0.12.0: - version "0.12.1" - resolved "https://registry.yarnpkg.com/codemirror-graphql/-/codemirror-graphql-0.12.1.tgz#02ce19ffe15397c049ca87c195ac13080d2abe8f" - integrity sha512-PlOCTpfBBUwDZXQo60ZfzD/nGZsaJoE1tA07Uf9xJN7R0kBDGJeD4AVfdUTprZr27p0JIntJzmL6mt/G4Zkzeg== - dependencies: - graphql-language-service-interface "^2.4.1" - graphql-language-service-parser "^1.6.1" - codemirror@^5.52.2, codemirror@^5.54.0: version "5.57.0" resolved "https://registry.yarnpkg.com/codemirror/-/codemirror-5.57.0.tgz#d26365b72f909f5d2dbb6b1209349ca1daeb2d50" @@ -10401,49 +10393,6 @@ graphql-config@^3.0.2, graphql-config@^3.0.3: string-env-interpolation "1.0.1" tslib "^2.0.0" -graphql-language-service-interface@^2.4.0-alpha.7, graphql-language-service-interface@^2.4.1: - version "2.4.1" - resolved "https://registry.yarnpkg.com/graphql-language-service-interface/-/graphql-language-service-interface-2.4.1.tgz#62aca7880469d0f9079aec22a9b297cf78994f52" - integrity sha512-cKT0ia7xNVpkLlI0vuwxVpPVIXwy02ah4I+N6s4mxFKVgo+lPlX9r933EWX6t1P1vzGJmNf+dip2dK3gHg2bBw== - dependencies: - graphql-language-service-parser "^1.6.1" - graphql-language-service-types "^1.6.1" - graphql-language-service-utils "^2.4.1" - vscode-languageserver-types "^3.15.1" - -graphql-language-service-server@^2.4.0-alpha.7: - version "2.4.1" - resolved "https://registry.yarnpkg.com/graphql-language-service-server/-/graphql-language-service-server-2.4.1.tgz#1baea9095e92109dd51beb2126b5053664039ee2" - integrity sha512-fA4ZBB0hfERwCDA9p49Z325Zm5kafyW8PyAeDhoJ3tdSiwY8MRzK52d0HLUx6+AZmEVyYOkVjKhXeD4V6IV6Sg== - dependencies: - "@babel/parser" "^7.9.0" - glob "^7.1.2" - graphql-config "^3.0.2" - graphql-language-service "^3.0.1" - graphql-language-service-utils "^2.4.1" - nullthrows "^1.0.0" - vscode-jsonrpc "^5.0.1" - vscode-languageserver "^6.1.1" - -graphql-language-service@^2.4.0-alpha.7: - version "2.4.0-alpha.7" - resolved "https://registry.yarnpkg.com/graphql-language-service/-/graphql-language-service-2.4.0-alpha.7.tgz#cd7eef87f7a89426c30d34534e6206e2d78d42ad" - integrity sha512-Uc3OmtbT2jegmhcrEdo4AF2M6JmchSFX+i+sNhJEADg0CtzoXQQd05TPvMm3l1xYALzQCD/9iAXvYSGrQrfggA== - dependencies: - "@babel/polyfill" "7.8.7" - graphql-language-service-interface "^2.4.0-alpha.7" - graphql-language-service-server "^2.4.0-alpha.7" - graphql-language-service-utils "^2.4.0-alpha.6" - yargs "^15.3.1" - -graphql-language-service@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/graphql-language-service/-/graphql-language-service-3.0.1.tgz#1253a5cb3affe7c272bbcfadd89c1f0eb78ece2f" - integrity sha512-79EGvEECgn1HIX0VBh3pXqetqgdtRHfkNTws0mcirCtFowwqt+QZAKKBNKVLY2vMya9wNVLDWUvzl0FF5wbBTA== - dependencies: - graphql-language-service-interface "^2.4.1" - graphql-language-service-types "^1.6.1" - graphql@15.0.0, graphql@^15.0.0: version "15.0.0" resolved "https://registry.yarnpkg.com/graphql/-/graphql-15.0.0.tgz#042a5eb5e2506a2e2111ce41eb446a8e570b8be9" From 71ee5fa6d57d55c231925601f4dcbf6c1824b373 Mon Sep 17 00:00:00 2001 From: Rikki Date: Fri, 18 Sep 2020 11:38:07 -0400 Subject: [PATCH 4/4] chore(release): publish - codemirror-graphql@0.12.2 - graphiql-2-rfc-context@2.0.0 - graphiql@1.0.5 - graphql-language-service-cli@3.1.0 - graphql-language-service-interface@2.4.2 - graphql-language-service-parser@1.6.4 - graphql-language-service-server@2.5.0 - graphql-language-service-types@1.6.3 - graphql-language-service-utils@2.4.3 - graphql-language-service@3.0.2 - monaco-graphql@0.3.1 --- packages/codemirror-graphql/CHANGELOG.md | 4 ++++ packages/codemirror-graphql/package.json | 6 +++--- packages/graphiql-2-rfc-context/CHANGELOG.md | 4 ++++ packages/graphiql-2-rfc-context/package.json | 6 +++--- packages/graphiql/CHANGELOG.md | 4 ++++ packages/graphiql/package.json | 4 ++-- packages/graphql-language-service-cli/CHANGELOG.md | 4 ++++ packages/graphql-language-service-cli/package.json | 8 ++++---- packages/graphql-language-service-interface/CHANGELOG.md | 4 ++++ packages/graphql-language-service-interface/package.json | 8 ++++---- packages/graphql-language-service-parser/CHANGELOG.md | 4 ++++ packages/graphql-language-service-parser/package.json | 4 ++-- packages/graphql-language-service-server/CHANGELOG.md | 4 ++++ packages/graphql-language-service-server/package.json | 6 +++--- packages/graphql-language-service-types/CHANGELOG.md | 4 ++++ packages/graphql-language-service-types/package.json | 2 +- packages/graphql-language-service-utils/CHANGELOG.md | 4 ++++ packages/graphql-language-service-utils/package.json | 4 ++-- packages/graphql-language-service/CHANGELOG.md | 4 ++++ packages/graphql-language-service/package.json | 6 +++--- packages/monaco-graphql/CHANGELOG.md | 4 ++++ packages/monaco-graphql/package.json | 6 +++--- 22 files changed, 74 insertions(+), 30 deletions(-) diff --git a/packages/codemirror-graphql/CHANGELOG.md b/packages/codemirror-graphql/CHANGELOG.md index fd2dd85371a..6f0c9c89743 100644 --- a/packages/codemirror-graphql/CHANGELOG.md +++ b/packages/codemirror-graphql/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [0.12.2](https://github.com/graphql/graphiql/compare/codemirror-graphql@0.12.2-alpha.2...codemirror-graphql@0.12.2) (2020-09-18) + +**Note:** Version bump only for package codemirror-graphql + ## [0.12.2-alpha.2](https://github.com/graphql/graphiql/compare/codemirror-graphql@0.12.2-alpha.1...codemirror-graphql@0.12.2-alpha.2) (2020-09-11) **Note:** Version bump only for package codemirror-graphql diff --git a/packages/codemirror-graphql/package.json b/packages/codemirror-graphql/package.json index 13486b9dfc8..ccafaafc2b9 100644 --- a/packages/codemirror-graphql/package.json +++ b/packages/codemirror-graphql/package.json @@ -1,6 +1,6 @@ { "name": "codemirror-graphql", - "version": "0.12.2-alpha.2", + "version": "0.12.2", "description": "GraphQL mode and helpers for CodeMirror.", "contributors": [ "Hyohyeon Jeong ", @@ -50,8 +50,8 @@ "graphql": "^14.0.0 || ^15.0.0" }, "dependencies": { - "graphql-language-service-interface": "^2.4.2-alpha.2", - "graphql-language-service-parser": "^1.6.3" + "graphql-language-service-interface": "^2.4.2", + "graphql-language-service-parser": "^1.6.4" }, "devDependencies": { "chai": "4.2.0", diff --git a/packages/graphiql-2-rfc-context/CHANGELOG.md b/packages/graphiql-2-rfc-context/CHANGELOG.md index b130fdfaa6c..0417149dd37 100644 --- a/packages/graphiql-2-rfc-context/CHANGELOG.md +++ b/packages/graphiql-2-rfc-context/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +# [2.0.0](https://github.com/graphql/graphiql/compare/graphiql-2-rfc-context@2.0.0-alpha.6...graphiql-2-rfc-context@2.0.0) (2020-09-18) + +**Note:** Version bump only for package graphiql-2-rfc-context + # 2.0.0-alpha.6 (2020-09-11) **Note:** Version bump only for package graphiql-2-rfc-context diff --git a/packages/graphiql-2-rfc-context/package.json b/packages/graphiql-2-rfc-context/package.json index 6d4e08c922b..0d0e4c3c96d 100644 --- a/packages/graphiql-2-rfc-context/package.json +++ b/packages/graphiql-2-rfc-context/package.json @@ -1,6 +1,6 @@ { "name": "graphiql-2-rfc-context", - "version": "2.0.0-alpha.6", + "version": "2.0.0", "description": "An graphical interactive in-browser GraphQL IDE.", "private": true, "contributors": [ @@ -47,12 +47,12 @@ "@theme-ui/core": "^0.4.0-alpha.1", "copy-to-clipboard": "^3.2.0", "entities": "^2.0.0", - "graphql-language-service": "^3.0.2-alpha.3", + "graphql-language-service": "^3.0.2", "i18next": "^19.4.4", "i18next-browser-languagedetector": "^4.1.1", "markdown-it": "^10.0.0", "monaco-editor": "^0.20.0", - "monaco-graphql": "^0.3.1-alpha.3", + "monaco-graphql": "^0.3.1", "react-i18next": "^11.4.0", "theme-ui": "^0.3.1" }, diff --git a/packages/graphiql/CHANGELOG.md b/packages/graphiql/CHANGELOG.md index f7bd1bd1397..f3e8fa6cd08 100644 --- a/packages/graphiql/CHANGELOG.md +++ b/packages/graphiql/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.0.5](https://github.com/graphql/graphiql/compare/graphiql@1.0.4...graphiql@1.0.5) (2020-09-18) + +**Note:** Version bump only for package graphiql + ## [1.0.4](https://github.com/graphql/graphiql/compare/graphiql@2.0.0-alpha.5...graphiql@1.0.4) (2020-09-11) ### Bug Fixes diff --git a/packages/graphiql/package.json b/packages/graphiql/package.json index cedf511b927..75784912542 100644 --- a/packages/graphiql/package.json +++ b/packages/graphiql/package.json @@ -1,6 +1,6 @@ { "name": "graphiql", - "version": "1.0.4", + "version": "1.0.5", "description": "An graphical interactive in-browser GraphQL IDE.", "contributors": [ "Hyohyeon Jeong ", @@ -43,7 +43,7 @@ }, "dependencies": { "codemirror": "^5.54.0", - "codemirror-graphql": "^0.12.2-alpha.2", + "codemirror-graphql": "^0.12.2", "copy-to-clipboard": "^3.2.0", "entities": "^2.0.0", "markdown-it": "^10.0.0" diff --git a/packages/graphql-language-service-cli/CHANGELOG.md b/packages/graphql-language-service-cli/CHANGELOG.md index 4dca89cace2..678678b3131 100644 --- a/packages/graphql-language-service-cli/CHANGELOG.md +++ b/packages/graphql-language-service-cli/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +# [3.1.0](https://github.com/graphql/graphiql/compare/graphql-language-service-cli@3.1.0-alpha.5...graphql-language-service-cli@3.1.0) (2020-09-18) + +**Note:** Version bump only for package graphql-language-service-cli + # [3.1.0-alpha.5](https://github.com/graphql/graphiql/compare/graphql-language-service-cli@3.1.0-alpha.4...graphql-language-service-cli@3.1.0-alpha.5) (2020-09-11) **Note:** Version bump only for package graphql-language-service-cli diff --git a/packages/graphql-language-service-cli/package.json b/packages/graphql-language-service-cli/package.json index afa68dbbca2..6f87378254b 100644 --- a/packages/graphql-language-service-cli/package.json +++ b/packages/graphql-language-service-cli/package.json @@ -1,6 +1,6 @@ { "name": "graphql-language-service-cli", - "version": "3.1.0-alpha.5", + "version": "3.1.0", "description": "An interface for building GraphQL language services for IDEs", "contributors": [ "Hyohyeon Jeong ", @@ -31,9 +31,9 @@ }, "dependencies": { "@babel/polyfill": "7.8.7", - "graphql-language-service": "^3.0.2-alpha.3", - "graphql-language-service-server": "^2.5.0-alpha.5", - "graphql-language-service-utils": "^2.4.2", + "graphql-language-service": "^3.0.2", + "graphql-language-service-server": "^2.5.0", + "graphql-language-service-utils": "^2.4.3", "yargs": "^15.3.1" } } diff --git a/packages/graphql-language-service-interface/CHANGELOG.md b/packages/graphql-language-service-interface/CHANGELOG.md index 3116a057ec0..256d3390dc7 100644 --- a/packages/graphql-language-service-interface/CHANGELOG.md +++ b/packages/graphql-language-service-interface/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [2.4.2](https://github.com/graphql/graphiql/compare/graphql-language-service-interface@2.4.2-alpha.2...graphql-language-service-interface@2.4.2) (2020-09-18) + +**Note:** Version bump only for package graphql-language-service-interface + ## [2.4.2-alpha.2](https://github.com/graphql/graphiql/compare/graphql-language-service-interface@2.4.2-alpha.1...graphql-language-service-interface@2.4.2-alpha.2) (2020-09-11) **Note:** Version bump only for package graphql-language-service-interface diff --git a/packages/graphql-language-service-interface/package.json b/packages/graphql-language-service-interface/package.json index 35d601b4862..d50c286b5d5 100644 --- a/packages/graphql-language-service-interface/package.json +++ b/packages/graphql-language-service-interface/package.json @@ -1,6 +1,6 @@ { "name": "graphql-language-service-interface", - "version": "2.4.2-alpha.2", + "version": "2.4.2", "description": "Interface to the GraphQL Language Service", "contributors": [ "Greg Hurrell (https://greg.hurrell.net/)", @@ -27,9 +27,9 @@ "graphql": "^14.0.0 || ^15.0.0" }, "dependencies": { - "graphql-language-service-parser": "^1.6.3", - "graphql-language-service-types": "^1.6.2", - "graphql-language-service-utils": "^2.4.2", + "graphql-language-service-parser": "^1.6.4", + "graphql-language-service-types": "^1.6.3", + "graphql-language-service-utils": "^2.4.3", "vscode-languageserver-types": "^3.15.1" }, "devDependencies": { diff --git a/packages/graphql-language-service-parser/CHANGELOG.md b/packages/graphql-language-service-parser/CHANGELOG.md index 02c96d680cb..35ca5cd8b31 100644 --- a/packages/graphql-language-service-parser/CHANGELOG.md +++ b/packages/graphql-language-service-parser/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.6.4](https://github.com/graphql/graphiql/compare/graphql-language-service-parser@1.6.3...graphql-language-service-parser@1.6.4) (2020-09-18) + +**Note:** Version bump only for package graphql-language-service-parser + ## [1.6.3](https://github.com/graphql/graphiql/compare/graphql-language-service-parser@1.6.2...graphql-language-service-parser@1.6.3) (2020-09-11) **Note:** Version bump only for package graphql-language-service-parser diff --git a/packages/graphql-language-service-parser/package.json b/packages/graphql-language-service-parser/package.json index 0e0340c45f6..5550d777412 100644 --- a/packages/graphql-language-service-parser/package.json +++ b/packages/graphql-language-service-parser/package.json @@ -1,6 +1,6 @@ { "name": "graphql-language-service-parser", - "version": "1.6.3", + "version": "1.6.4", "description": "An online parser for GraphQL for use in syntax-highlighters and code intelligence tools", "contributors": [ "Greg Hurrell (https://greg.hurrell.net/)", @@ -35,7 +35,7 @@ "vscode-languageserver-types": "3.15.1" }, "dependencies": { - "graphql-language-service-types": "^1.6.2", + "graphql-language-service-types": "^1.6.3", "typescript": "^3.9.5" }, "scripts": { diff --git a/packages/graphql-language-service-server/CHANGELOG.md b/packages/graphql-language-service-server/CHANGELOG.md index acf5d129bc8..0e359fa2835 100644 --- a/packages/graphql-language-service-server/CHANGELOG.md +++ b/packages/graphql-language-service-server/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +# [2.5.0](https://github.com/graphql/graphiql/compare/graphql-language-service-server@2.5.0-alpha.5...graphql-language-service-server@2.5.0) (2020-09-18) + +**Note:** Version bump only for package graphql-language-service-server + # [2.5.0-alpha.5](https://github.com/graphql/graphiql/compare/graphql-language-service-server@2.5.0-alpha.4...graphql-language-service-server@2.5.0-alpha.5) (2020-09-11) **Note:** Version bump only for package graphql-language-service-server diff --git a/packages/graphql-language-service-server/package.json b/packages/graphql-language-service-server/package.json index ba71cd51028..35d1fda33cc 100644 --- a/packages/graphql-language-service-server/package.json +++ b/packages/graphql-language-service-server/package.json @@ -1,6 +1,6 @@ { "name": "graphql-language-service-server", - "version": "2.5.0-alpha.5", + "version": "2.5.0", "description": "Server process backing the GraphQL Language Service", "contributors": [ "Greg Hurrell (https://greg.hurrell.net/)", @@ -32,8 +32,8 @@ "@babel/parser": "^7.9.0", "glob": "^7.1.2", "graphql-config": "^3.0.3", - "graphql-language-service": "^3.0.2-alpha.3", - "graphql-language-service-utils": "^2.4.2", + "graphql-language-service": "^3.0.2", + "graphql-language-service-utils": "^2.4.3", "mkdirp": "^1.0.4", "nullthrows": "^1.0.0", "vscode-jsonrpc": "^5.0.1", diff --git a/packages/graphql-language-service-types/CHANGELOG.md b/packages/graphql-language-service-types/CHANGELOG.md index fcad00e56b9..4ec2a58fa4f 100644 --- a/packages/graphql-language-service-types/CHANGELOG.md +++ b/packages/graphql-language-service-types/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.6.3](https://github.com/graphql/graphiql/compare/graphql-language-service-types@1.6.2...graphql-language-service-types@1.6.3) (2020-09-18) + +**Note:** Version bump only for package graphql-language-service-types + ## [1.6.2](https://github.com/graphql/graphiql/compare/graphql-language-service-types@1.6.1...graphql-language-service-types@1.6.2) (2020-09-11) **Note:** Version bump only for package graphql-language-service-types diff --git a/packages/graphql-language-service-types/package.json b/packages/graphql-language-service-types/package.json index e9e28053d5a..f51069267c1 100644 --- a/packages/graphql-language-service-types/package.json +++ b/packages/graphql-language-service-types/package.json @@ -1,6 +1,6 @@ { "name": "graphql-language-service-types", - "version": "1.6.2", + "version": "1.6.3", "description": "Types for building GraphQL language services for IDEs", "contributors": [ "Greg Hurrell (https://greg.hurrell.net/)", diff --git a/packages/graphql-language-service-utils/CHANGELOG.md b/packages/graphql-language-service-utils/CHANGELOG.md index 3d9225d542d..5db3d016026 100644 --- a/packages/graphql-language-service-utils/CHANGELOG.md +++ b/packages/graphql-language-service-utils/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [2.4.3](https://github.com/graphql/graphiql/compare/graphql-language-service-utils@2.4.2...graphql-language-service-utils@2.4.3) (2020-09-18) + +**Note:** Version bump only for package graphql-language-service-utils + ## [2.4.2](https://github.com/graphql/graphiql/compare/graphql-language-service-utils@2.4.1...graphql-language-service-utils@2.4.2) (2020-09-11) **Note:** Version bump only for package graphql-language-service-utils diff --git a/packages/graphql-language-service-utils/package.json b/packages/graphql-language-service-utils/package.json index 12fb19ed34f..dfc3d79cb2d 100644 --- a/packages/graphql-language-service-utils/package.json +++ b/packages/graphql-language-service-utils/package.json @@ -1,6 +1,6 @@ { "name": "graphql-language-service-utils", - "version": "2.4.2", + "version": "2.4.3", "description": "Utilities to support the GraphQL Language Service", "contributors": [ "Greg Hurrell (https://greg.hurrell.net/)", @@ -27,7 +27,7 @@ "graphql": "^14.0.0 || ^15.0.0" }, "dependencies": { - "graphql-language-service-types": "^1.6.2" + "graphql-language-service-types": "^1.6.3" }, "devDependencies": { "@types/jest": "^25.2.1" diff --git a/packages/graphql-language-service/CHANGELOG.md b/packages/graphql-language-service/CHANGELOG.md index 2ca6e45b8e9..056d0684c03 100644 --- a/packages/graphql-language-service/CHANGELOG.md +++ b/packages/graphql-language-service/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [3.0.2](https://github.com/graphql/graphiql/compare/graphql-language-service@3.0.2-alpha.3...graphql-language-service@3.0.2) (2020-09-18) + +**Note:** Version bump only for package graphql-language-service + ## [3.0.2-alpha.3](https://github.com/graphql/graphiql/compare/graphql-language-service@3.0.2-alpha.2...graphql-language-service@3.0.2-alpha.3) (2020-09-11) **Note:** Version bump only for package graphql-language-service diff --git a/packages/graphql-language-service/package.json b/packages/graphql-language-service/package.json index ab40d62c602..c65cc9a9f96 100644 --- a/packages/graphql-language-service/package.json +++ b/packages/graphql-language-service/package.json @@ -1,6 +1,6 @@ { "name": "graphql-language-service", - "version": "3.0.2-alpha.3", + "version": "3.0.2", "description": "The official, runtime independent Language Service for GraphQL", "contributors": [ "GraphQL Contributors" @@ -33,7 +33,7 @@ "graphql-language-service-types": "^1.6.0-alpha.5" }, "dependencies": { - "graphql-language-service-interface": "^2.4.2-alpha.2", - "graphql-language-service-types": "^1.6.2" + "graphql-language-service-interface": "^2.4.2", + "graphql-language-service-types": "^1.6.3" } } diff --git a/packages/monaco-graphql/CHANGELOG.md b/packages/monaco-graphql/CHANGELOG.md index 83d5dfa16c3..29a99f7d611 100644 --- a/packages/monaco-graphql/CHANGELOG.md +++ b/packages/monaco-graphql/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [0.3.1](https://github.com/graphql/graphiql/compare/monaco-graphql@0.3.1-alpha.3...monaco-graphql@0.3.1) (2020-09-18) + +**Note:** Version bump only for package monaco-graphql + ## [0.3.1-alpha.3](https://github.com/graphql/graphiql/compare/monaco-graphql@0.3.1-alpha.2...monaco-graphql@0.3.1-alpha.3) (2020-09-11) **Note:** Version bump only for package monaco-graphql diff --git a/packages/monaco-graphql/package.json b/packages/monaco-graphql/package.json index dfa24a503f8..3ab76f3475f 100644 --- a/packages/monaco-graphql/package.json +++ b/packages/monaco-graphql/package.json @@ -1,7 +1,7 @@ { "name": "monaco-graphql", "description": "full service, official monaco mode for GraphQL", - "version": "0.3.1-alpha.3", + "version": "0.3.1", "license": "MIT", "main": "dist/monaco.contribution.js", "module": "esm/monaco.contribution.js", @@ -22,8 +22,8 @@ "src" ], "dependencies": { - "graphql-language-service": "^3.0.2-alpha.3", - "graphql-language-service-utils": "^2.4.2", + "graphql-language-service": "^3.0.2", + "graphql-language-service-utils": "^2.4.3", "monaco-editor": "^0.20.0" }, "devDependencies": {