From 01daed115b4055db5a85afec66ea00d04e035c6f Mon Sep 17 00:00:00 2001 From: Rikki Schulte Date: Sat, 24 Jun 2023 09:14:43 +0200 Subject: [PATCH] fix exec and the dreaded code file loader bug (#3266) * fix exec and the dreaded code file loader bug * fix: allow passing in additional extensions * fix: eslint extension bundling externals --- .changeset/sixty-grapes-rest.md | 9 + .gitignore | 2 +- .vscode/launch.json | 2 +- cspell.json | 6 +- package.json | 7 +- .../package.json | 9 +- .../src/GraphQLCache.ts | 21 +- .../src/GraphQLLanguageService.ts | 2 +- .../src/__tests__/GraphQLCache-test.ts | 5 + .../graphql-language-service/package.json | 2 +- packages/vscode-graphql-execution/esbuild.js | 40 +- .../vscode-graphql-execution/package.json | 39 +- .../vscode-graphql-execution/src/extension.ts | 83 +- .../src/helpers/extensions.ts | 33 + .../src/helpers/network.ts | 17 +- .../src/helpers/source.ts | 43 +- .../src/providers/exec-content.ts | 47 +- packages/vscode-graphql/esbuild.js | 3 + packages/vscode-graphql/package.json | 8 - yarn.lock | 710 +++++++++++------- 20 files changed, 681 insertions(+), 407 deletions(-) create mode 100644 .changeset/sixty-grapes-rest.md create mode 100644 packages/vscode-graphql-execution/src/helpers/extensions.ts diff --git a/.changeset/sixty-grapes-rest.md b/.changeset/sixty-grapes-rest.md new file mode 100644 index 00000000000..3d5973732b0 --- /dev/null +++ b/.changeset/sixty-grapes-rest.md @@ -0,0 +1,9 @@ +--- +'graphql-language-service': minor +'graphql-language-service-server': minor +'vscode-graphql-execution': minor +'graphql-language-service-cli': minor +'vscode-graphql': minor +--- + +Fix code file loader, upgrade graphql-config! diff --git a/.gitignore b/.gitignore index fc35dec95df..c1dc59c4196 100644 --- a/.gitignore +++ b/.gitignore @@ -10,7 +10,7 @@ coverage/ .nyc_output dist/ esm/ -packages/*/out/ +out/ *.vsix *.tsbuildinfo diff --git a/.vscode/launch.json b/.vscode/launch.json index c65063e8077..a6a38fcad01 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -45,7 +45,7 @@ "--extensionDevelopmentPath=${workspaceFolder}/packages/vscode-graphql-execution" ], "outFiles": [ - "${workspaceFolder}/packages/vscode-graphql-execution/dist/extension.js" + "${workspaceFolder}/packages/vscode-graphql-execution/out/extension.js" ], "sourceMaps": true, "preLaunchTask": "watch-vscode-exec" diff --git a/cspell.json b/cspell.json index e1664a77402..059de88a411 100644 --- a/cspell.json +++ b/cspell.json @@ -13,10 +13,6 @@ "addWords": true } ], - "ignorePaths": [ - "**/CHANGELOG.md", - "**/package.json", - "packages/vscode-graphql/esbuild.js" - ], + "ignorePaths": ["**/CHANGELOG.md", "**/package.json", "**/esbuild.js"], "files": ["**/*.{js,cjs,mjs,ts,jsx,tsx,md,mdx,html,json,css,toml,yaml,yml}"] } diff --git a/package.json b/package.json index 1c649cb240b..25f9d1708ea 100644 --- a/package.json +++ b/package.json @@ -45,8 +45,8 @@ "build:packages": "yarn tsc", "build:watch": "yarn tsc --watch", "watch": "yarn build:watch", - "watch-vscode": "concurrently --raw \"yarn tsc && yarn build:watch\" \"yarn workspace vscode-graphql run compile --watch\"", - "watch-vscode-exec": "yarn build:watch", + "watch-vscode": "yarn workspace vscode-graphql run compile", + "watch-vscode-exec": "yarn workspace vscode-graphql-execution run compile", "check": "yarn tsc --noEmit", "cypress-open": "yarn workspace graphiql cypress-open", "dev-graphiql": "yarn workspace graphiql dev", @@ -138,8 +138,5 @@ "typedoc": "^0.19.2", "typescript": "^4.6.3", "wsrun": "^5.2.4" - }, - "resolutions": { - "graphql-config": "4.3.0" } } diff --git a/packages/graphql-language-service-server/package.json b/packages/graphql-language-service-server/package.json index e03f6a7a9bf..664d8aa66b3 100644 --- a/packages/graphql-language-service-server/package.json +++ b/packages/graphql-language-service-server/package.json @@ -39,12 +39,12 @@ "dependencies": { "@babel/parser": "^7.21.2", "@babel/types": "^7.21.2", - "@graphql-tools/load": "^7.5.3", + "@graphql-tools/code-file-loader": "8.0.1", "@vue/compiler-sfc": "^3.2.41", "dotenv": "8.2.0", "fast-glob": "^3.2.7", "glob": "^7.2.0", - "graphql-config": "4.3.0", + "graphql-config": "5.0.2", "graphql-language-service": "^5.1.7-alpha.0", "mkdirp": "^1.0.4", "node-abort-controller": "^3.0.1", @@ -52,7 +52,10 @@ "vscode-jsonrpc": "^8.0.1", "vscode-languageserver": "^8.0.1", "vscode-languageserver-types": "^3.17.2", - "vscode-uri": "^3.0.2" + "vscode-uri": "^3.0.2", + "svelte2tsx": "^0.6.16", + "svelte": "^4.0.0", + "cosmiconfig-toml-loader": "^1.0.0" }, "devDependencies": { "@types/mkdirp": "^1.0.1", diff --git a/packages/graphql-language-service-server/src/GraphQLCache.ts b/packages/graphql-language-service-server/src/GraphQLCache.ts index 4480b029799..0e360600186 100644 --- a/packages/graphql-language-service-server/src/GraphQLCache.ts +++ b/packages/graphql-language-service-server/src/GraphQLCache.ts @@ -33,6 +33,7 @@ import { loadConfig, GraphQLConfig, GraphQLProjectConfig, + GraphQLExtensionDeclaration, } from 'graphql-config'; import type { UnnormalizedTypeDefPointer } from '@graphql-tools/load'; @@ -42,6 +43,16 @@ import stringToHash from './stringToHash'; import glob from 'glob'; import { LoadConfigOptions } from './types'; import { URI } from 'vscode-uri'; +import { CodeFileLoader } from '@graphql-tools/code-file-loader'; + +const LanguageServiceExtension: GraphQLExtensionDeclaration = api => { + // For schema + api.loaders.schema.register(new CodeFileLoader()); + // For documents + api.loaders.documents.register(new CodeFileLoader()); + + return { name: 'languageService' }; +}; // Maximum files to read when processing GraphQL files. const MAX_READS = 200; @@ -57,7 +68,15 @@ export async function getGraphQLCache({ loadConfigOptions: LoadConfigOptions; config?: GraphQLConfig; }): Promise { - const graphQLConfig = config || (await loadConfig(loadConfigOptions)); + const graphQLConfig = + config || + (await loadConfig({ + ...loadConfigOptions, + extensions: [ + ...(loadConfigOptions?.extensions ?? []), + LanguageServiceExtension, + ], + })); return new GraphQLCache({ configDir: loadConfigOptions.rootDir!, config: graphQLConfig!, diff --git a/packages/graphql-language-service-server/src/GraphQLLanguageService.ts b/packages/graphql-language-service-server/src/GraphQLLanguageService.ts index da3fc0f1333..aeaa4c92a8e 100644 --- a/packages/graphql-language-service-server/src/GraphQLLanguageService.ts +++ b/packages/graphql-language-service-server/src/GraphQLLanguageService.ts @@ -351,7 +351,7 @@ export class GraphQLLanguageService { output.push({ // @ts-ignore - name: tree.representativeName, + name: tree.representativeName ?? 'Anonymous', kind: getKind(tree), location: { uri: filePath, diff --git a/packages/graphql-language-service-server/src/__tests__/GraphQLCache-test.ts b/packages/graphql-language-service-server/src/__tests__/GraphQLCache-test.ts index 366463e5600..88b62d564f5 100644 --- a/packages/graphql-language-service-server/src/__tests__/GraphQLCache-test.ts +++ b/packages/graphql-language-service-server/src/__tests__/GraphQLCache-test.ts @@ -32,6 +32,7 @@ import { import { GraphQLCache, getGraphQLCache } from '../GraphQLCache'; import { parseDocument } from '../parseDocument'; import type { FragmentInfo, ObjectTypeInfo } from 'graphql-language-service'; +import { NoopLogger } from '../Logger'; function withoutASTNode(definition: any) { const result = { ...definition }; @@ -39,6 +40,7 @@ function withoutASTNode(definition: any) { return result; } +const logger = new NoopLogger(); describe('GraphQLCache', () => { const configDir = __dirname; let graphQLRC; @@ -46,6 +48,7 @@ describe('GraphQLCache', () => { configDir, config: graphQLRC, parser: parseDocument, + logger, }); beforeEach(async () => { @@ -54,6 +57,7 @@ describe('GraphQLCache', () => { configDir, config: graphQLRC, parser: parseDocument, + logger, }); }); @@ -72,6 +76,7 @@ describe('GraphQLCache', () => { const cacheWithExtensions = await getGraphQLCache({ loadConfigOptions: { rootDir: configDir, extensions }, parser: parseDocument, + logger, }); const config = cacheWithExtensions.getGraphQLConfig(); expect('extensions' in config).toBe(true); diff --git a/packages/graphql-language-service/package.json b/packages/graphql-language-service/package.json index 7de0b49d153..fa7dae62082 100644 --- a/packages/graphql-language-service/package.json +++ b/packages/graphql-language-service/package.json @@ -44,7 +44,7 @@ "@types/json-schema": "7.0.9", "benchmark": "^2.1.4", "graphql": "^16.4.0", - "graphql-config": "4.3.0", + "graphql-config": "5.0.2", "lodash": "^4.17.15", "platform": "^1.3.5", "ts-node": "^8.10.2", diff --git a/packages/vscode-graphql-execution/esbuild.js b/packages/vscode-graphql-execution/esbuild.js index f8f641cd372..76c34bf58c5 100644 --- a/packages/vscode-graphql-execution/esbuild.js +++ b/packages/vscode-graphql-execution/esbuild.js @@ -11,7 +11,45 @@ build({ minify: arg === '--minify', platform: 'node', outdir: 'out/', - external: ['vscode', 'ts-node', 'tslib'], + external: [ + 'squirrelly', + 'teacup', + 'coffee-script', + 'marko', + 'slm', + 'vash', + 'plates', + 'babel-core', + 'htmling', + 'ractive', + 'mote', + 'eco', + 'jqtpl', + 'hamljs', + 'jazz', + 'hamlet', + 'whiskers', + 'haml-coffee', + 'hogan.js', + 'templayed', + 'walrus', + 'mustache', + 'just', + 'ect', + 'toffee', + 'twing', + 'dot', + 'bracket-template', + 'vscode', + 'velocityjs', + 'dustjs-linkedin', + 'atpl', + 'liquor', + 'twig', + 'cosmiconfig', + 'graphql-config', + 'graphql', + ], format: 'cjs', sourcemap: true, watch: isWatchMode, diff --git a/packages/vscode-graphql-execution/package.json b/packages/vscode-graphql-execution/package.json index 9388dc499a7..9c4469981aa 100644 --- a/packages/vscode-graphql-execution/package.json +++ b/packages/vscode-graphql-execution/package.json @@ -9,7 +9,7 @@ "engines": { "vscode": "^1.63.0" }, - "main": "./dist/extension.js", + "main": "./out/extension.js", "icon": "assets/images/logo.png", "contributors": [ { @@ -25,14 +25,12 @@ "Programming Languages" ], "activationEvents": [ + "onCommand:vscode-graphql-execution.contentProvider.isDebugging", + "onCommand:vscode-graphql-execution.contentProvidergit.contentProvider", "workspaceContains:**/.graphqlrc", - "workspaceContains:**/.graphqlconfig", "workspaceContains:**/.graphqlrc.{json,yaml,yml,js,ts,toml}", "workspaceContains:**/graphql.config.{json,yaml,yml,js,ts,toml}", - "workspaceContains:**/package.json", - "onCommand:vscode-graphql-execution.isDebugging", - "onCommand:vscode-graphql-execution.contentProvider", - "onLanguage:graphql" + "workspaceContains:**/package.json" ], "contributes": { "commands": [ @@ -84,7 +82,8 @@ }, "homepage": "https://github.com/graphql/graphiql/blob/main/packages/vscode-graphql-execution/README.md", "scripts": { - "vsce:package": "vsce package --yarn", + "compile": "node esbuild.js", + "vsce:package": "yarn compile && vsce package --yarn", "vsce:prepublish": "npm run vsce:package", "vsce:publish": "vsce publish --yarn", "open-vsx:publish": "ovsx publish --yarn -i . --pat $OVSX_PAT", @@ -105,29 +104,17 @@ "@urql/core": "2.6.1", "capitalize": "2.0.4", "dotenv": "10.0.0", - "graphql-config": "4.3.0", + "graphql-config": "5.0.2", "graphql-tag": "2.12.6", "graphql-ws": "5.10.0", "@whatwg-node/fetch": "0.2.8", "ws": "8.8.1", "graphql": "16.6.0", - "nullthrows": "1.1.1" - }, - "resolutions": { - "cosmiconfig": "^5.0.1" - }, - "workspaces": { - "nohoist": [ - "graphql", - "graphql-config", - "dotenv", - "graphql-ws", - "graphql-tag", - "@urql/core", - "ws", - "nullthrows", - "capitalize", - "@whatwg-node/fetch" - ] + "nullthrows": "1.1.1", + "@graphql-tools/code-file-loader": "8.0.1", + "cosmiconfig": "8.2.0", + "svelte2tsx": "^0.6.16", + "svelte": "^4.0.0", + "cosmiconfig-toml-loader": "^1.0.0" } } diff --git a/packages/vscode-graphql-execution/src/extension.ts b/packages/vscode-graphql-execution/src/extension.ts index 9a06daea5ff..4825f5738a7 100644 --- a/packages/vscode-graphql-execution/src/extension.ts +++ b/packages/vscode-graphql-execution/src/extension.ts @@ -1,4 +1,3 @@ -'use strict'; import { workspace, ExtensionContext, @@ -29,7 +28,7 @@ export function activate(context: ExtensionContext) { if (config.debug) { // eslint-disable-next-line no-console - console.log('Extension "vscode-graphql" is now active!'); + console.log('Extension "vscode-graphql-execution" is now active!'); } const commandShowOutputChannel = commands.registerCommand( @@ -41,7 +40,7 @@ export function activate(context: ExtensionContext) { context.subscriptions.push(commandShowOutputChannel); // const settings = workspace.getConfiguration("vscode-graphql-execution") - + // let provider: GraphQLCodeLensProvider; const registerCodeLens = () => { context.subscriptions.push( languages.registerCodeLensProvider( @@ -61,43 +60,57 @@ export function activate(context: ExtensionContext) { registerCodeLens(); // } - workspace.onDidChangeConfiguration(() => { - // const newSettings = workspace.getConfiguration("vscode-graphql-execution") - // if (newSettings.showExecCodeLens !== false) { - registerCodeLens(); - // } - }); + let commandContentProvider: GraphQLContentProvider; - const commandContentProvider = commands.registerCommand( - 'vscode-graphql-execution.contentProvider', - (literal: ExtractedTemplateLiteral) => { - const uri = Uri.parse('graphql://authority/graphql'); + const registerContentProvider = () => { + return commands.registerCommand( + 'vscode-graphql-execution.contentProvider', + (literal: ExtractedTemplateLiteral) => { + const uri = Uri.parse('graphql://authority/graphql'); - const panel = window.createWebviewPanel( - 'vscode-graphql-execution.results-preview', - 'GraphQL Execution Result', - ViewColumn.Two, - {}, - ); + const panel = window.createWebviewPanel( + 'vscode-graphql-execution.results-preview', + 'GraphQL Execution Result', + ViewColumn.Two, + {}, + ); - const contentProvider = new GraphQLContentProvider( - uri, - outputChannel, - literal, - panel, - ); - const registration = workspace.registerTextDocumentContentProvider( - 'graphql', - contentProvider, - ); - context.subscriptions.push(registration); - panel.webview.html = contentProvider.getCurrentHtml(); - }, - ); - context.subscriptions.push(commandContentProvider); + commandContentProvider = new GraphQLContentProvider( + uri, + outputChannel, + literal, + panel, + ); + const registration = workspace.registerTextDocumentContentProvider( + 'graphql', + commandContentProvider, + ); + context.subscriptions.push(registration); + panel.webview.html = commandContentProvider.getCurrentHtml(); + }, + ); + }; + + const provider = registerContentProvider(); + context.subscriptions.push(provider); + + // workspace.onDidChangeConfiguration(async () => { + // // const newSettings = workspace.getConfiguration("vscode-graphql-execution") + // // if (newSettings.showExecCodeLens !== false) { + // commandContentProvider.dispose() + // // } + // }); + workspace.onDidSaveTextDocument(async e => { + if ( + e.fileName.includes('graphql.config') || + e.fileName.includes('graphqlrc') + ) { + await commandContentProvider.loadConfig(); + } + }); } export function deactivate() { // eslint-disable-next-line no-console console.log('Extension "vscode-graphql-execution" is now de-active!'); -} +} // documents: ["./src/*.ts"], diff --git a/packages/vscode-graphql-execution/src/helpers/extensions.ts b/packages/vscode-graphql-execution/src/helpers/extensions.ts new file mode 100644 index 00000000000..e577367fd5e --- /dev/null +++ b/packages/vscode-graphql-execution/src/helpers/extensions.ts @@ -0,0 +1,33 @@ +import { CodeFileLoader } from '@graphql-tools/code-file-loader'; +import { GraphQLExtensionDeclaration } from 'graphql-config'; + +export declare type WithList = T | T[]; + +export interface Endpoint { + url: string; + headers?: Record>; + introspect?: boolean; + subscription?: { + url: string; + // TODO: remove undefined in v5 + connectionParams?: Record; + }; +} + +export type Endpoints = Record; + +export const EndpointsExtension: GraphQLExtensionDeclaration = () => { + return { + name: 'endpoints', + }; +}; + +export const LanguageServiceExecutionExtension: GraphQLExtensionDeclaration = + api => { + // For schema + api.loaders.schema.register(new CodeFileLoader()); + // For documents + api.loaders.documents.register(new CodeFileLoader()); + + return { name: 'languageServiceExecution' }; + }; diff --git a/packages/vscode-graphql-execution/src/helpers/network.ts b/packages/vscode-graphql-execution/src/helpers/network.ts index e4f8940bb86..ac96216dac0 100644 --- a/packages/vscode-graphql-execution/src/helpers/network.ts +++ b/packages/vscode-graphql-execution/src/helpers/network.ts @@ -6,8 +6,7 @@ import * as ws from 'ws'; // eslint-disable-next-line import/no-extraneous-dependencies import { pipe, subscribe } from 'wonka'; -// eslint-disable-next-line import/no-unresolved -import { Endpoint } from 'graphql-config/extensions/endpoints'; +import { Endpoint } from './extensions'; import { OutputChannel, workspace } from 'vscode'; import { GraphQLProjectConfig } from 'graphql-config'; import { createClient as createWSClient, OperationResult } from 'graphql-ws'; @@ -123,13 +122,15 @@ export class NetworkHelper { projectConfig, ); - const fragmentInfos = await getFragmentDependenciesForAST( - literal.ast, - fragmentDefinitions, - ); + if (fragmentDefinitions) { + const fragmentInfos = await getFragmentDependenciesForAST( + literal.ast, + fragmentDefinitions, + ); - for (const fragmentInfo of fragmentInfos) { - literal.content = fragmentInfo.content + '\n' + literal.content; + for (const fragmentInfo of fragmentInfos) { + literal.content = fragmentInfo.content + '\n' + literal.content; + } } const parsedOperation = gql` diff --git a/packages/vscode-graphql-execution/src/helpers/source.ts b/packages/vscode-graphql-execution/src/helpers/source.ts index d244c41b9f9..2b25ceebc32 100644 --- a/packages/vscode-graphql-execution/src/helpers/source.ts +++ b/packages/vscode-graphql-execution/src/helpers/source.ts @@ -123,26 +123,33 @@ export class SourceHelper { } async getFragmentDefinitions( projectConfig: GraphQLProjectConfig, - ): Promise> { - const sources = await projectConfig.getDocuments(); - const { fragmentDefinitions } = this; + ): Promise | void> { + try { + const sources = await projectConfig.getDocuments(); + const { fragmentDefinitions } = this; - for (const source of sources) { - visit(source.document as DocumentNode, { - FragmentDefinition(node) { - const existingDef = fragmentDefinitions.get(node.name.value); - const newVal = print(node); - if ((existingDef && existingDef.content !== newVal) || !existingDef) { - fragmentDefinitions.set(node.name.value, { - definition: node, - content: newVal, - filePath: source.location, - }); - } - }, - }); + for (const source of sources) { + visit(source.document as DocumentNode, { + FragmentDefinition(node) { + const existingDef = fragmentDefinitions.get(node.name.value); + const newVal = print(node); + if ( + (existingDef && existingDef.content !== newVal) || + !existingDef + ) { + fragmentDefinitions.set(node.name.value, { + definition: node, + content: newVal, + filePath: source.location, + }); + } + }, + }); + } + return fragmentDefinitions; + } catch (err) { + this.outputChannel.append(`${err}`); } - return fragmentDefinitions; } extractAllTemplateLiterals( diff --git a/packages/vscode-graphql-execution/src/providers/exec-content.ts b/packages/vscode-graphql-execution/src/providers/exec-content.ts index ce8c7649578..44015a53787 100644 --- a/packages/vscode-graphql-execution/src/providers/exec-content.ts +++ b/packages/vscode-graphql-execution/src/providers/exec-content.ts @@ -10,12 +10,17 @@ import { WebviewPanel, WorkspaceFolder, } from 'vscode'; -import type { ExtractedTemplateLiteral } from '../helpers/source'; import { loadConfig, GraphQLProjectConfig } from 'graphql-config'; import { visit, VariableDefinitionNode } from 'graphql'; import { NetworkHelper } from '../helpers/network'; import { SourceHelper, GraphQLScalarTSType } from '../helpers/source'; -import type { Endpoints, Endpoint } from 'graphql-config/extensions/endpoints'; +import { + LanguageServiceExecutionExtension, + EndpointsExtension, +} from '../helpers/extensions'; + +import type { Endpoint, Endpoints } from '../helpers/extensions'; +import type { ExtractedTemplateLiteral } from '../helpers/source'; export type UserVariables = { [key: string]: GraphQLScalarTSType }; @@ -29,6 +34,7 @@ export class GraphQLContentProvider implements TextDocumentContentProvider { private panel: WebviewPanel; private rootDir: WorkspaceFolder | undefined; private literal: ExtractedTemplateLiteral; + private _projectConfig: GraphQLProjectConfig | undefined; // Event emitter which invokes document updates private _onDidChange = new EventEmitter(); @@ -127,10 +133,8 @@ export class GraphQLContentProvider implements TextDocumentContentProvider { this.updatePanel(); } - async loadEndpoint( - projectConfig?: GraphQLProjectConfig, - ): Promise { - let endpoints: Endpoints = projectConfig?.extensions?.endpoints; + async loadEndpoint(): Promise { + let endpoints: Endpoints = this._projectConfig?.extensions?.endpoints; if (!endpoints) { endpoints = { @@ -139,11 +143,11 @@ export class GraphQLContentProvider implements TextDocumentContentProvider { this.update(this.uri); this.updatePanel(); - if (projectConfig?.schema) { + if (this._projectConfig?.schema) { this.outputChannel.appendLine( "Warning: endpoints missing from graphql config. will try 'schema' value(s) instead", ); - const { schema } = projectConfig; + const { schema } = this._projectConfig; if (schema && Array.isArray(schema)) { for (const s of schema) { if (this.validUrlFromSchema(s as string)) { @@ -183,16 +187,15 @@ export class GraphQLContentProvider implements TextDocumentContentProvider { this.reportError('Error: this file is outside the workspace.'); return; } - const config = await loadConfig({ - rootDir: rootDir.uri.fsPath, - legacy: true, - }); - const projectConfig = config?.getProjectForFile(this.literal.uri); + + await this.loadConfig(); + const projectConfig = this._projectConfig; + if (!projectConfig) { return; } - const endpoint = await this.loadEndpoint(projectConfig); + const endpoint = await this.loadEndpoint(); if (endpoint?.url) { const variableDefinitionNodes: VariableDefinitionNode[] = []; visit(this.literal.ast, { @@ -249,14 +252,20 @@ export class GraphQLContentProvider implements TextDocumentContentProvider { this.reportError('Error: this file is outside the workspace.'); return; } - const config = await loadConfig({ rootDir: rootDir.uri.fsPath }); - const projectConfig = config?.getProjectForFile(literal.uri); - if (!projectConfig!.schema) { + const config = await loadConfig({ + rootDir: rootDir.uri.fsPath, + throwOnEmpty: false, + throwOnMissing: false, + legacy: true, + extensions: [LanguageServiceExecutionExtension, EndpointsExtension], + }); + this._projectConfig = config?.getProjectForFile(literal.uri); + + // eslint-disable-next-line unicorn/consistent-destructuring + if (!this._projectConfig?.schema) { this.reportError('Error: schema from graphql config'); - return; } - return projectConfig; } get onDidChange(): Event { diff --git a/packages/vscode-graphql/esbuild.js b/packages/vscode-graphql/esbuild.js index 589b0562ee7..79396dfc3b6 100644 --- a/packages/vscode-graphql/esbuild.js +++ b/packages/vscode-graphql/esbuild.js @@ -50,6 +50,9 @@ build({ 'atpl', 'liquor', 'twig', + 'cosmiconfig', + 'graphql-config', + 'graphql', ], }) .then(({ errors, warnings }) => { diff --git a/packages/vscode-graphql/package.json b/packages/vscode-graphql/package.json index e4dff03ee54..56b85338608 100644 --- a/packages/vscode-graphql/package.json +++ b/packages/vscode-graphql/package.json @@ -43,7 +43,6 @@ "activationEvents": [ "onCommand:vscode-graphql.isDebugging", "onCommand:vscode-graphql.contentProvider", - "onLanguage:graphql", "workspaceContains:**/.graphqlrc", "workspaceContains:**/.graphqlrc.{json,yaml,yml,js,ts,toml}", "workspaceContains:**/graphql.config.{json,yaml,yml,js,ts,toml}", @@ -54,12 +53,6 @@ "GraphQL.vscode-graphql-syntax" ], "contributes": { - "snippets": [ - { - "language": "graphql", - "path": "./snippets/graphql.json" - } - ], "icons": { "graphql-logo": { "description": "GraphQL Icon", @@ -172,7 +165,6 @@ "vsce": "^2.13.0" }, "dependencies": { - "graphql": "^16.4.0", "graphql-language-service-server": "^2.11.2-alpha.0", "vscode-languageclient": "8.0.2" } diff --git a/yarn.lock b/yarn.lock index 9c750d9ebda..6e6083dfc76 100644 --- a/yarn.lock +++ b/yarn.lock @@ -22,7 +22,15 @@ "@jridgewell/gen-mapping" "^0.1.0" "@jridgewell/trace-mapping" "^0.3.9" -"@ardatan/sync-fetch@0.0.1": +"@ampproject/remapping@^2.2.1": + version "2.2.1" + resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.2.1.tgz#99e8e11851128b8702cd57c33684f1d0f260b630" + integrity sha512-lFMjJTrFL3j7L9yBxwYfCq2k6qqwHyzuUl/XBnif78PWTJYyL/dfowQHWE3sp6U6ZzqWiiIZnpTMO96zhkjwtg== + dependencies: + "@jridgewell/gen-mapping" "^0.3.0" + "@jridgewell/trace-mapping" "^0.3.9" + +"@ardatan/sync-fetch@^0.0.1": version "0.0.1" resolved "https://registry.yarnpkg.com/@ardatan/sync-fetch/-/sync-fetch-0.0.1.tgz#3385d3feedceb60a896518a1db857ec1e945348f" integrity sha512-xhlTqH0m31mnsG0tIP4ETgfSB6gXDaYYsUWTrlUV93fFQPI9dd8hE0Ot6MHLCtqgB32hwJAC3YZMWlXZw7AleA== @@ -720,6 +728,11 @@ resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.17.10.tgz#873b16db82a8909e0fbd7f115772f4b739f6ce78" integrity sha512-n2Q6i+fnJqzOaq2VkdXxy2TCPCWQZHiCo0XqmrCvDWcZQKRyZzYi4Z0yxlBuN0w+r2ZHmre+Q087DSrw3pbJDQ== +"@babel/parser@^7.16.8", "@babel/parser@^7.22.5": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.22.5.tgz#721fd042f3ce1896238cf1b341c77eb7dee7dbea" + integrity sha512-DFZMC9LJUG9PLOclRC32G63UXwzqS2koQC8dkx+PLdmt1xSePYpbT/NbsrJy8Q/muXz7o/h/d4A7Fuyixm559Q== + "@babel/parser@^7.17.3": version "7.17.3" resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.17.3.tgz#b07702b982990bf6fdc1da5049a23fece4c5c3d0" @@ -735,11 +748,6 @@ resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.21.2.tgz#dacafadfc6d7654c3051a66d6fe55b6cb2f2a0b3" integrity sha512-URpaIJQwEkEC2T9Kn+Ai6Xe/02iNaVCuT/PtoRz3GPVJVDpPd7mLo+VddTbhCRU9TXqW5mSrQfXZyi8kDKOVpQ== -"@babel/parser@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.22.5.tgz#721fd042f3ce1896238cf1b341c77eb7dee7dbea" - integrity sha512-DFZMC9LJUG9PLOclRC32G63UXwzqS2koQC8dkx+PLdmt1xSePYpbT/NbsrJy8Q/muXz7o/h/d4A7Fuyixm559Q== - "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.18.6": version "7.18.6" resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.18.6.tgz#da5b8f9a580acdfbe53494dba45ea389fb09a4d2" @@ -1551,6 +1559,22 @@ "@babel/parser" "^7.12.13" "@babel/types" "^7.12.13" +"@babel/traverse@^7.16.8", "@babel/traverse@^7.22.5": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.22.5.tgz#44bd276690db6f4940fdb84e1cb4abd2f729ccd1" + integrity sha512-7DuIjPgERaNo6r+PZwItpjCZEa5vyw4eJGufeLxrPdBXBoLcCJCIasvK6pK/9DVNrLZTLFhUGqaC6X/PA007TQ== + dependencies: + "@babel/code-frame" "^7.22.5" + "@babel/generator" "^7.22.5" + "@babel/helper-environment-visitor" "^7.22.5" + "@babel/helper-function-name" "^7.22.5" + "@babel/helper-hoist-variables" "^7.22.5" + "@babel/helper-split-export-declaration" "^7.22.5" + "@babel/parser" "^7.22.5" + "@babel/types" "^7.22.5" + debug "^4.1.0" + globals "^11.1.0" + "@babel/traverse@^7.17.3": version "7.17.3" resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.17.3.tgz#0ae0f15b27d9a92ba1f2263358ea7c4e7db47b57" @@ -1583,22 +1607,6 @@ debug "^4.1.0" globals "^11.1.0" -"@babel/traverse@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.22.5.tgz#44bd276690db6f4940fdb84e1cb4abd2f729ccd1" - integrity sha512-7DuIjPgERaNo6r+PZwItpjCZEa5vyw4eJGufeLxrPdBXBoLcCJCIasvK6pK/9DVNrLZTLFhUGqaC6X/PA007TQ== - dependencies: - "@babel/code-frame" "^7.22.5" - "@babel/generator" "^7.22.5" - "@babel/helper-environment-visitor" "^7.22.5" - "@babel/helper-function-name" "^7.22.5" - "@babel/helper-hoist-variables" "^7.22.5" - "@babel/helper-split-export-declaration" "^7.22.5" - "@babel/parser" "^7.22.5" - "@babel/types" "^7.22.5" - debug "^4.1.0" - globals "^11.1.0" - "@babel/traverse@^7.7.2": version "7.18.9" resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.18.9.tgz#deeff3e8f1bad9786874cb2feda7a2d77a904f98" @@ -1632,6 +1640,15 @@ "@babel/helper-validator-identifier" "^7.16.7" to-fast-properties "^2.0.0" +"@babel/types@^7.16.8", "@babel/types@^7.21.3", "@babel/types@^7.22.5": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.22.5.tgz#cd93eeaab025880a3a47ec881f4b096a5b786fbe" + integrity sha512-zo3MIHGOkPOfoRXitsgHLjEXmlDaD/5KU1Uzuc9GNiZPhSqVxVRtxuPaSBZDsYZ9qV88AjtMtWW7ww98loJ9KA== + dependencies: + "@babel/helper-string-parser" "^7.22.5" + "@babel/helper-validator-identifier" "^7.22.5" + to-fast-properties "^2.0.0" + "@babel/types@^7.18.6", "@babel/types@^7.18.9": version "7.18.9" resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.18.9.tgz#7148d64ba133d8d73a41b3172ac4b83a1452205f" @@ -1649,15 +1666,6 @@ "@babel/helper-validator-identifier" "^7.19.1" to-fast-properties "^2.0.0" -"@babel/types@^7.21.3", "@babel/types@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.22.5.tgz#cd93eeaab025880a3a47ec881f4b096a5b786fbe" - integrity sha512-zo3MIHGOkPOfoRXitsgHLjEXmlDaD/5KU1Uzuc9GNiZPhSqVxVRtxuPaSBZDsYZ9qV88AjtMtWW7ww98loJ9KA== - dependencies: - "@babel/helper-string-parser" "^7.22.5" - "@babel/helper-validator-identifier" "^7.22.5" - to-fast-properties "^2.0.0" - "@bcoe/v8-coverage@^0.2.3": version "0.2.3" resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" @@ -2432,16 +2440,6 @@ resolved "https://registry.yarnpkg.com/@emotion/memoize/-/memoize-0.7.4.tgz#19bf0f5af19149111c40d98bb0cf82119f5d9eeb" integrity sha512-Ja/Vfqe3HpuzRsG1oBtWTHk2PGZ7GR+2Vz5iYGelAw8dx32K0y7PjVuxK6z1nMpZOqAFsRUPCkK1YjJ56qJlgw== -"@endemolshinegroup/cosmiconfig-typescript-loader@3.0.2": - version "3.0.2" - resolved "https://registry.yarnpkg.com/@endemolshinegroup/cosmiconfig-typescript-loader/-/cosmiconfig-typescript-loader-3.0.2.tgz#eea4635828dde372838b0909693ebd9aafeec22d" - integrity sha512-QRVtqJuS1mcT56oHpVegkKBlgtWjXw/gHNWO3eL9oyB5Sc7HBoc2OLG/nYpVfT/Jejvo3NUrD0Udk7XgoyDKkA== - dependencies: - lodash.get "^4" - make-error "^1" - ts-node "^9" - tslib "^2" - "@esbuild/android-arm64@0.17.19": version "0.17.19" resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.17.19.tgz#bafb75234a5d3d1b690e7c2956a599345e84a2fd" @@ -2630,184 +2628,201 @@ dependencies: "@floating-ui/dom" "^1.3.0" -"@graphql-tools/batch-execute@8.5.1": - version "8.5.1" - resolved "https://registry.yarnpkg.com/@graphql-tools/batch-execute/-/batch-execute-8.5.1.tgz#fa3321d58c64041650be44250b1ebc3aab0ba7a9" - integrity sha512-hRVDduX0UDEneVyEWtc2nu5H2PxpfSfM/riUlgZvo/a/nG475uyehxR5cFGvTEPEQUKY3vGIlqvtRigzqTfCew== +"@graphql-tools/batch-execute@^9.0.0": + version "9.0.0" + resolved "https://registry.yarnpkg.com/@graphql-tools/batch-execute/-/batch-execute-9.0.0.tgz#9aba67c235dfa8e28e17d204ccb74998064eaec3" + integrity sha512-lT9/1XmPSYzBcEybXPLsuA6C5E0t8438PVUELABcqdvwHgZ3VOOx29MLBEqhr2oewOlDChH6PXNkfxoOoAuzRg== dependencies: - "@graphql-tools/utils" "8.9.0" - dataloader "2.1.0" + "@graphql-tools/utils" "^10.0.0" + dataloader "^2.2.2" tslib "^2.4.0" - value-or-promise "1.0.11" - -"@graphql-tools/delegate@8.8.1": - version "8.8.1" - resolved "https://registry.yarnpkg.com/@graphql-tools/delegate/-/delegate-8.8.1.tgz#0653a72f38947f38ab7917dfac50ebf6a6b883e9" - integrity sha512-NDcg3GEQmdEHlnF7QS8b4lM1PSF+DKeFcIlLEfZFBvVq84791UtJcDj8734sIHLukmyuAxXMfA1qLd2l4lZqzA== - dependencies: - "@graphql-tools/batch-execute" "8.5.1" - "@graphql-tools/schema" "8.5.1" - "@graphql-tools/utils" "8.9.0" - dataloader "2.1.0" - tslib "~2.4.0" - value-or-promise "1.0.11" + value-or-promise "^1.0.12" -"@graphql-tools/graphql-file-loader@^7.3.7": - version "7.3.8" - resolved "https://registry.yarnpkg.com/@graphql-tools/graphql-file-loader/-/graphql-file-loader-7.3.8.tgz#ddd643109077def01c186038d58431ba940c0d2f" - integrity sha512-SpQZQ0klbox/kxYCLFBTmhLuQFm7P6usWVIqwROK4JSomwCuccc2zDsr1H7ayDpanD3yfkzMsl6gPkOkAo52pA== +"@graphql-tools/code-file-loader@8.0.1": + version "8.0.1" + resolved "https://registry.yarnpkg.com/@graphql-tools/code-file-loader/-/code-file-loader-8.0.1.tgz#86ab699cc8ed76010b2f0401e8a4a149338b759e" + integrity sha512-pmg81lsIXGW3uW+nFSCIG0lFQIxWVbgDjeBkSWlnP8CZsrHTQEkB53DT7t4BHLryoxDS4G4cPxM52yNINDSL8w== dependencies: - "@graphql-tools/import" "6.6.10" - "@graphql-tools/utils" "8.6.6" + "@graphql-tools/graphql-tag-pluck" "8.0.1" + "@graphql-tools/utils" "^10.0.0" globby "^11.0.3" - tslib "~2.3.0" + tslib "^2.4.0" unixify "^1.0.0" -"@graphql-tools/import@6.6.10": - version "6.6.10" - resolved "https://registry.yarnpkg.com/@graphql-tools/import/-/import-6.6.10.tgz#b77d19c8e5b6d376c517aa16f959b14197840669" - integrity sha512-yHdlEPTvIjrngtQFNgkMQJt/DjG3hQKvc6Mb8kaatFV4yERN5zx+0vpdrwxTwRNG1N7bI/YCkbrc7PXOb+g89Q== +"@graphql-tools/delegate@^10.0.0": + version "10.0.0" + resolved "https://registry.yarnpkg.com/@graphql-tools/delegate/-/delegate-10.0.0.tgz#c9da70811de8efbf630a74188698941cdc618ccf" + integrity sha512-ZW5/7Q0JqUM+guwn8/cM/1Hz16Zvj6WR6r3gnOwoPO7a9bCbe8QTCk4itT/EO+RiGT8RLUPYaunWR9jxfNqqOA== + dependencies: + "@graphql-tools/batch-execute" "^9.0.0" + "@graphql-tools/executor" "^1.0.0" + "@graphql-tools/schema" "^10.0.0" + "@graphql-tools/utils" "^10.0.0" + dataloader "^2.2.2" + tslib "^2.5.0" + value-or-promise "^1.0.12" + +"@graphql-tools/executor-graphql-ws@^1.0.0": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@graphql-tools/executor-graphql-ws/-/executor-graphql-ws-1.0.1.tgz#d0ff56518ae2ff2087f35f91b07a03f137905bc9" + integrity sha512-mcOEYr+p+Mex03cGtQ+QG4ofh83BxLlVAegkBoNIzb06KH3c7FgmlkRysiEaDtr8L4FjKzNo8LVfzgqaYRRylg== dependencies: - "@graphql-tools/utils" "8.6.6" - resolve-from "5.0.0" - tslib "~2.3.0" + "@graphql-tools/utils" "^10.0.0" + "@repeaterjs/repeater" "3.0.4" + "@types/ws" "^8.0.0" + graphql-ws "5.14.0" + isomorphic-ws "5.0.0" + tslib "^2.4.0" + ws "8.13.0" -"@graphql-tools/json-file-loader@^7.3.7": - version "7.3.8" - resolved "https://registry.yarnpkg.com/@graphql-tools/json-file-loader/-/json-file-loader-7.3.8.tgz#49b946bdaf9d5b54df726515c2d2305c83a8d1d0" - integrity sha512-W3nVLAp8m787A17wja7ysayij7WMRu+lF8LeCWr9eoyiCuw65i63y0G4eqZ5+Q0+E2BYWlKJyk/Z0vsFVJGMUA== +"@graphql-tools/executor-http@^1.0.0": + version "1.0.0" + resolved "https://registry.yarnpkg.com/@graphql-tools/executor-http/-/executor-http-1.0.0.tgz#3d7f1ce70dcc40432fb92b970bd1ab4dd1c37b12" + integrity sha512-7R9IWRN1Iszyayd4qgguITLLTmRUZ3wSS5umK0xwShB8mFQ5cSsVx6rewPhGIwGEenN6e9ahwcGX9ytuLlw55g== + dependencies: + "@graphql-tools/utils" "^10.0.0" + "@repeaterjs/repeater" "^3.0.4" + "@whatwg-node/fetch" "^0.9.0" + dset "^3.1.2" + extract-files "^11.0.0" + meros "^1.2.1" + tslib "^2.4.0" + value-or-promise "^1.0.12" + +"@graphql-tools/executor-legacy-ws@^1.0.0": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@graphql-tools/executor-legacy-ws/-/executor-legacy-ws-1.0.1.tgz#49764812fc93f401cb3f3ef32b2d6db4a9cd8db5" + integrity sha512-PQrTJ+ncHMEQspBARc2lhwiQFfRAX/z/CsOdZTFjIljOHgRWGAA1DAx7pEN0j6PflbLCfZ3NensNq2jCBwF46w== + dependencies: + "@graphql-tools/utils" "^10.0.0" + "@types/ws" "^8.0.0" + isomorphic-ws "5.0.0" + tslib "^2.4.0" + ws "8.13.0" + +"@graphql-tools/executor@^1.0.0": + version "1.1.0" + resolved "https://registry.yarnpkg.com/@graphql-tools/executor/-/executor-1.1.0.tgz#bafddb7c56d8250c5eda83437c10664e702109a8" + integrity sha512-+1wmnaUHETSYxiK/ELsT60x584Rw3QKBB7F/7fJ83HKPnLifmE2Dm/K9Eyt6L0Ppekf1jNUbWBpmBGb8P5hAeg== + dependencies: + "@graphql-tools/utils" "^10.0.0" + "@graphql-typed-document-node/core" "3.2.0" + "@repeaterjs/repeater" "^3.0.4" + tslib "^2.4.0" + value-or-promise "^1.0.12" + +"@graphql-tools/graphql-file-loader@^8.0.0": + version "8.0.0" + resolved "https://registry.yarnpkg.com/@graphql-tools/graphql-file-loader/-/graphql-file-loader-8.0.0.tgz#a2026405bce86d974000455647511bf65df4f211" + integrity sha512-wRXj9Z1IFL3+zJG1HWEY0S4TXal7+s1vVhbZva96MSp0kbb/3JBF7j0cnJ44Eq0ClccMgGCDFqPFXty4JlpaPg== dependencies: - "@graphql-tools/utils" "8.6.6" + "@graphql-tools/import" "7.0.0" + "@graphql-tools/utils" "^10.0.0" globby "^11.0.3" - tslib "~2.3.0" + tslib "^2.4.0" unixify "^1.0.0" -"@graphql-tools/load@^7.5.3": - version "7.5.3" - resolved "https://registry.yarnpkg.com/@graphql-tools/load/-/load-7.5.3.tgz#e7414d11e53ad8b78d5a74a0bd7ae958fa717a5c" - integrity sha512-GYwLyGfX1nKUxg6rnTIdryv9d+ugFRTm2q11+IqNsajwNhxJExkx+e/h81AQR5382sAmPEIT+E1J1VS3xNfjyg== +"@graphql-tools/graphql-tag-pluck@8.0.1": + version "8.0.1" + resolved "https://registry.yarnpkg.com/@graphql-tools/graphql-tag-pluck/-/graphql-tag-pluck-8.0.1.tgz#480d804a0fd7576f5ee06460528f1ee2b426f50e" + integrity sha512-4sfBJSoXxVB4rRCCp2GTFhAYsUJgAPSKxSV+E3Voc600mK52JO+KsHCCTnPgCeyJFMNR9l94J6+tqxVKmlqKvw== dependencies: - "@graphql-tools/schema" "8.3.3" - "@graphql-tools/utils" "8.6.3" - p-limit "3.1.0" - tslib "~2.3.0" + "@babel/parser" "^7.16.8" + "@babel/plugin-syntax-import-assertions" "^7.20.0" + "@babel/traverse" "^7.16.8" + "@babel/types" "^7.16.8" + "@graphql-tools/utils" "^10.0.0" + tslib "^2.4.0" -"@graphql-tools/load@^7.5.5": - version "7.5.7" - resolved "https://registry.yarnpkg.com/@graphql-tools/load/-/load-7.5.7.tgz#8197e1e7be23c0a62721c3c8266ab5f777ea6bfd" - integrity sha512-Z4oKf4MdBvl0EyubmvPL14ldhovKz8C61rQPHD8pjnC8Z0RbvW0a/sns/yuHuCVZoJMsSboU65DPzPTIoQUM4w== +"@graphql-tools/import@7.0.0": + version "7.0.0" + resolved "https://registry.yarnpkg.com/@graphql-tools/import/-/import-7.0.0.tgz#a6a91a90a707d5f46bad0fd3fde2f407b548b2be" + integrity sha512-NVZiTO8o1GZs6OXzNfjB+5CtQtqsZZpQOq+Uu0w57kdUkT4RlQKlwhT8T81arEsbV55KpzkpFsOZP7J1wdmhBw== dependencies: - "@graphql-tools/schema" "8.3.7" - "@graphql-tools/utils" "8.6.6" - p-limit "3.1.0" - tslib "~2.3.0" + "@graphql-tools/utils" "^10.0.0" + resolve-from "5.0.0" + tslib "^2.4.0" -"@graphql-tools/merge@8.2.4": - version "8.2.4" - resolved "https://registry.yarnpkg.com/@graphql-tools/merge/-/merge-8.2.4.tgz#f903545e5693c75418f95671bca1be6bc51bfa53" - integrity sha512-hiNRTsS948F+BB4Q7CZXLaGFOIHQzmimVq3EEI/+PQZsPb7kYDzg0Ow0GyV4conDdEiooLqHf7I1dWzTYwvs0A== +"@graphql-tools/json-file-loader@^8.0.0": + version "8.0.0" + resolved "https://registry.yarnpkg.com/@graphql-tools/json-file-loader/-/json-file-loader-8.0.0.tgz#9b1b62902f766ef3f1c9cd1c192813ea4f48109c" + integrity sha512-ki6EF/mobBWJjAAC84xNrFMhNfnUFD6Y0rQMGXekrUgY0NdeYXHU0ZUgHzC9O5+55FslqUmAUHABePDHTyZsLg== dependencies: - "@graphql-tools/utils" "8.6.3" - tslib "~2.3.0" + "@graphql-tools/utils" "^10.0.0" + globby "^11.0.3" + tslib "^2.4.0" + unixify "^1.0.0" -"@graphql-tools/merge@8.2.7", "@graphql-tools/merge@^8.2.6": - version "8.2.7" - resolved "https://registry.yarnpkg.com/@graphql-tools/merge/-/merge-8.2.7.tgz#add05bcc47df6b7390f31acbcadd986e160d58f9" - integrity sha512-rKxjNogqu1UYAG/y5FOb6lJsmSQbWA+jq4inWjNEVX54VGGE7/WGnmPaqcsyomNOfS3vIRS6NnG+DxiQSqetjg== +"@graphql-tools/load@^8.0.0": + version "8.0.0" + resolved "https://registry.yarnpkg.com/@graphql-tools/load/-/load-8.0.0.tgz#62e00f48c39b4085167a096f66ba6c21fb3fc796" + integrity sha512-Cy874bQJH0FP2Az7ELPM49iDzOljQmK1PPH6IuxsWzLSTxwTqd8dXA09dcVZrI7/LsN26heTY2R8q2aiiv0GxQ== dependencies: - "@graphql-tools/utils" "8.6.6" - tslib "~2.3.0" + "@graphql-tools/schema" "^10.0.0" + "@graphql-tools/utils" "^10.0.0" + p-limit "3.1.0" + tslib "^2.4.0" -"@graphql-tools/merge@8.3.1": - version "8.3.1" - resolved "https://registry.yarnpkg.com/@graphql-tools/merge/-/merge-8.3.1.tgz#06121942ad28982a14635dbc87b5d488a041d722" - integrity sha512-BMm99mqdNZbEYeTPK3it9r9S6rsZsQKtlqJsSBknAclXq2pGEfOxjcIZi+kBSkHZKPKCRrYDd5vY0+rUmIHVLg== +"@graphql-tools/merge@^9.0.0": + version "9.0.0" + resolved "https://registry.yarnpkg.com/@graphql-tools/merge/-/merge-9.0.0.tgz#b0a3636c82716454bff88e9bb40108b0471db281" + integrity sha512-J7/xqjkGTTwOJmaJQJ2C+VDBDOWJL3lKrHJN4yMaRLAJH3PosB7GiPRaSDZdErs0+F77sH2MKs2haMMkywzx7Q== dependencies: - "@graphql-tools/utils" "8.9.0" + "@graphql-tools/utils" "^10.0.0" tslib "^2.4.0" -"@graphql-tools/schema@8.3.3": - version "8.3.3" - resolved "https://registry.yarnpkg.com/@graphql-tools/schema/-/schema-8.3.3.tgz#b69ea495026976f16e697253f08aa7905e7f6265" - integrity sha512-OrRLU9/7UmkDemeyNUy62uH+FofgV3bpVVZJprc9bhe3gZsY7kQNIdY7H1unINlepjLvGOgk7u7iLo2+EhjyWw== - dependencies: - "@graphql-tools/merge" "8.2.4" - "@graphql-tools/utils" "8.6.3" - tslib "~2.3.0" - value-or-promise "1.0.11" - -"@graphql-tools/schema@8.3.7": - version "8.3.7" - resolved "https://registry.yarnpkg.com/@graphql-tools/schema/-/schema-8.3.7.tgz#6e2be8e17a1f97f4d11d5b787c414ec29400fde2" - integrity sha512-7byr9J6rfMPFPfiR4u65dy20xHATTvbgOY7KYd1sYPnMKKfRZe0tUgpnE+noXcfob7N8s366WaVh7bEoztQMwg== - dependencies: - "@graphql-tools/merge" "8.2.7" - "@graphql-tools/utils" "8.6.6" - tslib "~2.3.0" - value-or-promise "1.0.11" - -"@graphql-tools/schema@8.5.1": - version "8.5.1" - resolved "https://registry.yarnpkg.com/@graphql-tools/schema/-/schema-8.5.1.tgz#c2f2ff1448380919a330312399c9471db2580b58" - integrity sha512-0Esilsh0P/qYcB5DKQpiKeQs/jevzIadNTaT0jeWklPMwNbT7yMX4EqZany7mbeRRlSRwMzNzL5olyFdffHBZg== - dependencies: - "@graphql-tools/merge" "8.3.1" - "@graphql-tools/utils" "8.9.0" +"@graphql-tools/schema@^10.0.0": + version "10.0.0" + resolved "https://registry.yarnpkg.com/@graphql-tools/schema/-/schema-10.0.0.tgz#7b5f6b6a59f51c927de8c9069bde4ebbfefc64b3" + integrity sha512-kf3qOXMFcMs2f/S8Y3A8fm/2w+GaHAkfr3Gnhh2LOug/JgpY/ywgFVxO3jOeSpSEdoYcDKLcXVjMigNbY4AdQg== + dependencies: + "@graphql-tools/merge" "^9.0.0" + "@graphql-tools/utils" "^10.0.0" tslib "^2.4.0" - value-or-promise "1.0.11" - -"@graphql-tools/url-loader@^7.9.7": - version "7.13.2" - resolved "https://registry.yarnpkg.com/@graphql-tools/url-loader/-/url-loader-7.13.2.tgz#4663ea817aa60d3d4ce81a47a36cba8fdfff069f" - integrity sha512-4jtGecsxziiggQ9UryQB/ioqFwVkF10sKdk5bPg/fVKSkPddN5lvCgEwk20LojlDT9mDr53ME0ArMBKkvjTxBw== - dependencies: - "@ardatan/sync-fetch" "0.0.1" - "@graphql-tools/delegate" "8.8.1" - "@graphql-tools/utils" "8.9.0" - "@graphql-tools/wrap" "8.5.1" - "@n1ru4l/graphql-live-query" "^0.9.0" + value-or-promise "^1.0.12" + +"@graphql-tools/url-loader@^8.0.0": + version "8.0.0" + resolved "https://registry.yarnpkg.com/@graphql-tools/url-loader/-/url-loader-8.0.0.tgz#8d952d5ebb7325e587cb914aaebded3dbd078cf6" + integrity sha512-rPc9oDzMnycvz+X+wrN3PLrhMBQkG4+sd8EzaFN6dypcssiefgWKToXtRKI8HHK68n2xEq1PyrOpkjHFJB+GwA== + dependencies: + "@ardatan/sync-fetch" "^0.0.1" + "@graphql-tools/delegate" "^10.0.0" + "@graphql-tools/executor-graphql-ws" "^1.0.0" + "@graphql-tools/executor-http" "^1.0.0" + "@graphql-tools/executor-legacy-ws" "^1.0.0" + "@graphql-tools/utils" "^10.0.0" + "@graphql-tools/wrap" "^10.0.0" "@types/ws" "^8.0.0" - "@whatwg-node/fetch" "^0.2.4" - dset "^3.1.2" - extract-files "^11.0.0" - graphql-ws "^5.4.1" + "@whatwg-node/fetch" "^0.9.0" isomorphic-ws "^5.0.0" - meros "^1.1.4" tslib "^2.4.0" value-or-promise "^1.0.11" - ws "^8.3.0" + ws "^8.12.0" -"@graphql-tools/utils@8.6.3": - version "8.6.3" - resolved "https://registry.yarnpkg.com/@graphql-tools/utils/-/utils-8.6.3.tgz#ce9fc9adce4d45b229e314a2261290a88a252aed" - integrity sha512-CNyP7Uu7dlVMQ32IpHWOxz4yic9BYXXVkDhG0UdTKSszvzHdgMilemE9MpUrGzzBPsTe3aYTtNGyPUkyh9yTXA== - dependencies: - tslib "~2.3.0" - -"@graphql-tools/utils@8.6.6", "@graphql-tools/utils@^8.6.5": - version "8.6.6" - resolved "https://registry.yarnpkg.com/@graphql-tools/utils/-/utils-8.6.6.tgz#f7c88d32818b748f3e3867ed87a562769b544417" - integrity sha512-wjY2ljKLCnnbRrDNPPgPNqCujou0LFSOWcxAjV6DYUlfFWTsAEvlYmsmY4T+K12wI/fnqoJ2bUwIlap1plFDMg== - dependencies: - tslib "~2.3.0" - -"@graphql-tools/utils@8.9.0": - version "8.9.0" - resolved "https://registry.yarnpkg.com/@graphql-tools/utils/-/utils-8.9.0.tgz#c6aa5f651c9c99e1aca55510af21b56ec296cdb7" - integrity sha512-pjJIWH0XOVnYGXCqej8g/u/tsfV4LvLlj0eATKQu5zwnxd/TiTHq7Cg313qUPTFFHZ3PP5wJ15chYVtLDwaymg== +"@graphql-tools/utils@^10.0.0": + version "10.0.1" + resolved "https://registry.yarnpkg.com/@graphql-tools/utils/-/utils-10.0.1.tgz#52e6c0ce920b57473823e487184f5017974fe4c4" + integrity sha512-i1FozbDGHgdsFA47V/JvQZ0FE8NAy0Eiz7HGCJO2MkNdZAKNnwei66gOq0JWYVFztwpwbVQ09GkKhq7Kjcq5Cw== dependencies: + "@graphql-typed-document-node/core" "^3.1.1" tslib "^2.4.0" -"@graphql-tools/wrap@8.5.1": - version "8.5.1" - resolved "https://registry.yarnpkg.com/@graphql-tools/wrap/-/wrap-8.5.1.tgz#d4bd1f89850bb1ce0209f35f66d002080b439495" - integrity sha512-KpVVfha2wLSpE08YLX0jeo5nXPfDLASlxOqMlvfa/B4X8SOVmuLyN1L5YZ132tPLDF93uflwlHFnUO5ahpRNlA== +"@graphql-tools/wrap@^10.0.0": + version "10.0.0" + resolved "https://registry.yarnpkg.com/@graphql-tools/wrap/-/wrap-10.0.0.tgz#573ab111482387d4acf4757d5fb7f9553a504bc1" + integrity sha512-HDOeUUh6UhpiH0WPJUQl44ODt1x5pnMUbOJZ7GjTdGQ7LK0AgVt3ftaAQ9duxLkiAtYJmu5YkULirfZGj4HzDg== dependencies: - "@graphql-tools/delegate" "8.8.1" - "@graphql-tools/schema" "8.5.1" - "@graphql-tools/utils" "8.9.0" + "@graphql-tools/delegate" "^10.0.0" + "@graphql-tools/schema" "^10.0.0" + "@graphql-tools/utils" "^10.0.0" tslib "^2.4.0" - value-or-promise "1.0.11" + value-or-promise "^1.0.12" + +"@graphql-typed-document-node/core@3.2.0": + version "3.2.0" + resolved "https://registry.yarnpkg.com/@graphql-typed-document-node/core/-/core-3.2.0.tgz#5f3d96ec6b2354ad6d8a28bf216a1d97b5426861" + integrity sha512-mB9oAsNCm9aM3/SOv4YtBMqZbYj10R7dkq8byBqxGY/ncFwhf2oQzMV+LCRlWoDSEBJ3COiR1yeDvMtsoOsuFQ== "@graphql-typed-document-node/core@^3.1.1": version "3.1.1" @@ -3188,6 +3203,11 @@ resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.11.tgz#771a1d8d744eeb71b6adb35808e1a6c7b9b8c8ec" integrity sha512-Fg32GrJo61m+VqYSdRSjRXMjQ06j8YIYfcTqndLYVAaHmroZHLJZCydsWBOTDqXS2v+mjxohBWEMfg97GXmYQg== +"@jridgewell/sourcemap-codec@^1.4.13", "@jridgewell/sourcemap-codec@^1.4.14", "@jridgewell/sourcemap-codec@^1.4.15": + version "1.4.15" + resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz#d7c6e6755c78567a951e04ab52ef0fd26de59f32" + integrity sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg== + "@jridgewell/trace-mapping@^0.3.0": version "0.3.4" resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.4.tgz#f6a0832dffd5b8a6aaa633b7d9f8e8e94c83a0c3" @@ -3204,6 +3224,14 @@ "@jridgewell/resolve-uri" "3.1.0" "@jridgewell/sourcemap-codec" "1.4.14" +"@jridgewell/trace-mapping@^0.3.18": + version "0.3.18" + resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.18.tgz#25783b2086daf6ff1dcb53c9249ae480e4dd4cd6" + integrity sha512-w+niJYzMHdd7USdiH2U6869nqhD2nbfZXND5Yp93qIbEmnDNk7PD48o+YchRVpzMU7M6jVCbenTR7PA1FLQ9pA== + dependencies: + "@jridgewell/resolve-uri" "3.1.0" + "@jridgewell/sourcemap-codec" "1.4.14" + "@jridgewell/trace-mapping@^0.3.9": version "0.3.14" resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.14.tgz#b231a081d8f66796e475ad588a1ef473112701ed" @@ -3324,11 +3352,6 @@ hey-listen "^1.0.8" tslib "^2.3.1" -"@n1ru4l/graphql-live-query@^0.9.0": - version "0.9.0" - resolved "https://registry.yarnpkg.com/@n1ru4l/graphql-live-query/-/graphql-live-query-0.9.0.tgz#defaebdd31f625bee49e6745934f36312532b2bc" - integrity sha512-BTpWy1e+FxN82RnLz4x1+JcEewVdfmUhV1C6/XYD5AjS7PQp9QFF7K8bCD6gzPTr2l+prvqOyVueQhFJxB1vfg== - "@n1ru4l/push-pull-async-iterable-iterator@^3.1.0": version "3.1.0" resolved "https://registry.yarnpkg.com/@n1ru4l/push-pull-async-iterable-iterator/-/push-pull-async-iterable-iterator-3.1.0.tgz#be450c97d1c7cd6af1a992d53232704454345df9" @@ -3852,6 +3875,11 @@ dependencies: "@babel/runtime" "^7.13.10" +"@repeaterjs/repeater@3.0.4", "@repeaterjs/repeater@^3.0.4": + version "3.0.4" + resolved "https://registry.yarnpkg.com/@repeaterjs/repeater/-/repeater-3.0.4.tgz#a04d63f4d1bf5540a41b01a921c9a7fddc3bd1ca" + integrity sha512-AW8PKd6iX3vAZ0vA43nOUOnbq/X5ihgU+mSXXqunMkeQADGiqw/PY0JNeYtD5sr0PAy51YPgAPbDoeapv9r8WA== + "@rollup/pluginutils@^4.1.1": version "4.1.1" resolved "https://registry.yarnpkg.com/@rollup/pluginutils/-/pluginutils-4.1.1.tgz#1d4da86dd4eded15656a57d933fda2b9a08d47ec" @@ -5215,6 +5243,11 @@ resolved "https://registry.yarnpkg.com/@wessberg/stringutil/-/stringutil-1.0.19.tgz#baadcb6f4471fe2d46462a7d7a8294e4b45b29ad" integrity sha512-9AZHVXWlpN8Cn9k5BC/O0Dzb9E9xfEMXzYrNunwvkUTvuK7xgQPVRZpLo+jWCOZ5r8oBa8NIrHuPEu1hzbb6bg== +"@whatwg-node/events@^0.1.0": + version "0.1.1" + resolved "https://registry.yarnpkg.com/@whatwg-node/events/-/events-0.1.1.tgz#0ca718508249419587e130da26d40e29d99b5356" + integrity sha512-AyQEn5hIPV7Ze+xFoXVU3QTHXVbWPrzaOkxtENMPMuNL6VVHrp4hHfDt9nrQpjO7BgvuM95dMtkycX5M/DZR3w== + "@whatwg-node/fetch@0.2.8": version "0.2.8" resolved "https://registry.yarnpkg.com/@whatwg-node/fetch/-/fetch-0.2.8.tgz#ccfa4a32873fcd5442a6a0c18e3fd3ae934329c4" @@ -5230,20 +5263,24 @@ undici "^5.8.0" web-streams-polyfill "^3.2.0" -"@whatwg-node/fetch@^0.2.4": - version "0.2.6" - resolved "https://registry.yarnpkg.com/@whatwg-node/fetch/-/fetch-0.2.6.tgz#eb8e68624c55aecfa4c6d7ea36b3ce3ad5d5f79e" - integrity sha512-NhHiqeGcKjgqUZvJTZSou9qsFEPBBG1LPm2Npz0cmcPvukhhQfjX+p3quRx6b9AyjNPp1f73VB1z4ApHy9FcNg== +"@whatwg-node/fetch@^0.9.0": + version "0.9.7" + resolved "https://registry.yarnpkg.com/@whatwg-node/fetch/-/fetch-0.9.7.tgz#86b5cda576581beea300191d5c1f626fc7abfff7" + integrity sha512-heClS5ctTmoEvVbFd+6ztX0SyQduI3/Q+77vtNApDU/+Mwajy6ugxaoDGgSzJUoQ37McSV09kcGCt1Jcc6z9lQ== dependencies: - "@peculiar/webcrypto" "^1.4.0" - abort-controller "^3.0.0" + "@whatwg-node/node-fetch" "^0.4.6" + urlpattern-polyfill "^9.0.0" + +"@whatwg-node/node-fetch@^0.4.6": + version "0.4.6" + resolved "https://registry.yarnpkg.com/@whatwg-node/node-fetch/-/node-fetch-0.4.6.tgz#97de52731c15420115a31a82b22033bdfc62e17a" + integrity sha512-9oLD57yW0WWfu4ZtEmybBrx1JfkO4TzDpD2zXlp2Ue3UJplifQRap+MbE0PxRlVWtR4KWsIRamhn7J44DkwoyA== + dependencies: + "@whatwg-node/events" "^0.1.0" busboy "^1.6.0" - event-target-polyfill "^0.0.3" - form-data-encoder "^1.7.1" - formdata-node "^4.3.1" - node-fetch "^2.6.7" - undici "^5.8.0" - web-streams-polyfill "^3.2.0" + fast-querystring "^1.1.1" + fast-url-parser "^1.1.3" + tslib "^2.3.1" "@xtuc/ieee754@^1.2.0": version "1.2.0" @@ -5595,6 +5632,13 @@ aria-query@5.1.3, aria-query@^5.0.0: dependencies: deep-equal "^2.0.5" +aria-query@^5.2.1: + version "5.2.1" + resolved "https://registry.yarnpkg.com/aria-query/-/aria-query-5.2.1.tgz#bc285d9d654d1df121bcd0c134880d415ca67c15" + integrity sha512-7uFg4b+lETFgdaJyETnILsXgnnzVnkHcgRbwbPwevm5x/LmUlt3MjczMRe1zg824iBgXZNRPTBftNYyRSKLp2g== + dependencies: + dequal "^2.0.3" + arr-diff@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-2.0.0.tgz#8f3b827f955a8bd669697e4a4256ac3ceae356cf" @@ -5809,6 +5853,13 @@ axios@^0.21.1: dependencies: follow-redirects "^1.14.0" +axobject-query@^3.2.1: + version "3.2.1" + resolved "https://registry.yarnpkg.com/axobject-query/-/axobject-query-3.2.1.tgz#39c378a6e3b06ca679f29138151e45b2b32da62a" + integrity sha512-jsyHu61e6N4Vbz/v18DHwWYKK0bSWLqn47eeDSKPB7m8tqMHF9YJ+mhIk2lVteyZrY8tnSj/jHOv4YiTCuCJgg== + dependencies: + dequal "^2.0.3" + azure-devops-node-api@^11.0.1: version "11.1.1" resolved "https://registry.yarnpkg.com/azure-devops-node-api/-/azure-devops-node-api-11.1.1.tgz#dd1356031fa4e334e016732594e8fee0f68268c4" @@ -6730,6 +6781,17 @@ code-point-at@^1.0.0: resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77" integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c= +code-red@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/code-red/-/code-red-1.0.3.tgz#bbd3b0a27dc53c9af13f6756120a9dbcdd68a5f2" + integrity sha512-kVwJELqiILQyG5aeuyKFbdsI1fmQy1Cmf7dQ8eGmVuJoaRVdwey7WaMknr2ZFeVSYSKT0rExsa8EGw0aoI/1QQ== + dependencies: + "@jridgewell/sourcemap-codec" "^1.4.14" + "@types/estree" "^1.0.0" + acorn "^8.8.2" + estree-walker "^3.0.3" + periscopic "^3.1.0" + codemirror@^5.65.3: version "5.65.3" resolved "https://registry.yarnpkg.com/codemirror/-/codemirror-5.65.3.tgz#2d029930d5a293bc5fb96ceea64654803c0d4ac7" @@ -7051,23 +7113,22 @@ cors@^2.8.5: object-assign "^4" vary "^1" -cosmiconfig-toml-loader@1.0.0: +cosmiconfig-toml-loader@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/cosmiconfig-toml-loader/-/cosmiconfig-toml-loader-1.0.0.tgz#0681383651cceff918177debe9084c0d3769509b" integrity sha512-H/2gurFWVi7xXvCyvsWRLCMekl4tITJcX0QEsDMpzxtuxDyM59xLatYNg4s/k9AA/HdtCYfj2su8mgA0GSDLDA== dependencies: "@iarna/toml" "^2.2.5" -cosmiconfig@7.0.1, cosmiconfig@^7.0.1: - version "7.0.1" - resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-7.0.1.tgz#714d756522cace867867ccb4474c5d01bbae5d6d" - integrity sha512-a1YWNUV2HwGimB7dU2s1wUMurNKjpx60HxBB6xUM8Re+2s1g1IIfJvFR0/iCF+XHdE0GMTKTuLR32UQff4TEyQ== +cosmiconfig@8.2.0, cosmiconfig@^8.1.0, cosmiconfig@^8.1.3: + version "8.2.0" + resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-8.2.0.tgz#f7d17c56a590856cd1e7cee98734dca272b0d8fd" + integrity sha512-3rTMnFJA1tCOPwRxtgF4wd7Ab2qvDbL8jX+3smjIbS4HlZBagTlpERbdN7iAbWlrfxE3M8c27kTwTawQ7st+OQ== dependencies: - "@types/parse-json" "^4.0.0" import-fresh "^3.2.1" + js-yaml "^4.1.0" parse-json "^5.0.0" path-type "^4.0.0" - yaml "^1.10.0" cosmiconfig@^6.0.0: version "6.0.0" @@ -7091,20 +7152,16 @@ cosmiconfig@^7.0.0: path-type "^4.0.0" yaml "^1.10.0" -cosmiconfig@^8.1.3: - version "8.2.0" - resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-8.2.0.tgz#f7d17c56a590856cd1e7cee98734dca272b0d8fd" - integrity sha512-3rTMnFJA1tCOPwRxtgF4wd7Ab2qvDbL8jX+3smjIbS4HlZBagTlpERbdN7iAbWlrfxE3M8c27kTwTawQ7st+OQ== +cosmiconfig@^7.0.1: + version "7.0.1" + resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-7.0.1.tgz#714d756522cace867867ccb4474c5d01bbae5d6d" + integrity sha512-a1YWNUV2HwGimB7dU2s1wUMurNKjpx60HxBB6xUM8Re+2s1g1IIfJvFR0/iCF+XHdE0GMTKTuLR32UQff4TEyQ== dependencies: + "@types/parse-json" "^4.0.0" import-fresh "^3.2.1" - js-yaml "^4.1.0" parse-json "^5.0.0" path-type "^4.0.0" - -create-require@^1.1.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/create-require/-/create-require-1.1.1.tgz#c1d7e8f1e5f6cfc9ff65f9cd352d37348756c333" - integrity sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ== + yaml "^1.10.0" crelt@^1.0.5: version "1.0.5" @@ -7296,6 +7353,14 @@ css-tree@^1.1.2, css-tree@^1.1.3: mdn-data "2.0.14" source-map "^0.6.1" +css-tree@^2.3.1: + version "2.3.1" + resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-2.3.1.tgz#10264ce1e5442e8572fc82fbe490644ff54b5c20" + integrity sha512-6Fv1DV/TYw//QF5IzQdqsNDjx/wc8TrMBZsqjL9eW01tWb7R7k/mq+/VXfJCl7SoD5emsJop9cOByJZfs8hYIw== + dependencies: + mdn-data "2.0.30" + source-map-js "^1.0.1" + css-what@^5.0.1, css-what@^5.1.0: version "5.1.0" resolved "https://registry.yarnpkg.com/css-what/-/css-what-5.1.0.tgz#3f7b707aadf633baf62c2ceb8579b545bb40f7fe" @@ -7483,16 +7548,16 @@ data-urls@^2.0.0: whatwg-mimetype "^2.3.0" whatwg-url "^8.0.0" -dataloader@2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/dataloader/-/dataloader-2.1.0.tgz#c69c538235e85e7ac6c6c444bae8ecabf5de9df7" - integrity sha512-qTcEYLen3r7ojZNgVUaRggOI+KM7jrKxXeSHhogh/TWxYMeONEMqY+hmkobiYQozsGIyg9OYVzO4ZIfoB4I0pQ== - dataloader@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/dataloader/-/dataloader-1.4.0.tgz#bca11d867f5d3f1b9ed9f737bd15970c65dff5c8" integrity sha512-68s5jYdlvasItOJnCuI2Q9s4q98g0pCyL3HrcKJu8KNugUl8ahgmZYg38ysLTgQjjXX3H8CJLkAvWrclWfcalw== +dataloader@^2.2.2: + version "2.2.2" + resolved "https://registry.yarnpkg.com/dataloader/-/dataloader-2.2.2.tgz#216dc509b5abe39d43a9b9d97e6e5e473dfbe3e0" + integrity sha512-8YnDaaf7N3k/q5HnTJVuzSyLETjoZjVmHc4AeKAzOvKHEFQKcn64OKBfzHYtE9zGjctNM7V9I0MfnUVLpi7M5g== + date-fns@^1.27.2: version "1.30.1" resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-1.30.1.tgz#2e71bf0b119153dbb4cc4e88d9ea5acfb50dc05c" @@ -7580,6 +7645,11 @@ decompress-response@^6.0.0: dependencies: mimic-response "^3.1.0" +dedent-js@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/dedent-js/-/dedent-js-1.0.1.tgz#bee5fb7c9e727d85dffa24590d10ec1ab1255305" + integrity sha512-OUepMozQULMLUmhxS95Vudo0jb0UchLimi3+pQ2plj61Fcy8axbP9hbiD4Sz6DPqn6XG3kfmziVfQ1rSys5AJQ== + dedent@^0.7.0: version "0.7.0" resolved "https://registry.yarnpkg.com/dedent/-/dedent-0.7.0.tgz#2495ddbaf6eb874abb0e1be9df22d2e5a544326c" @@ -7692,7 +7762,7 @@ deprecation@^2.0.0, deprecation@^2.3.1: resolved "https://registry.yarnpkg.com/deprecation/-/deprecation-2.3.1.tgz#6368cbdb40abf3373b525ac87e4a260c3a700919" integrity sha512-xmHIy4F3scKVwMsQ4WnVaS8bHOx0DmVwRywosKhaILI0ywMDWPtBSku2HNxRvF7jtwDRsoEwYQSfbxj8b7RlJQ== -dequal@^2.0.0: +dequal@^2.0.0, dequal@^2.0.3: version "2.0.3" resolved "https://registry.yarnpkg.com/dequal/-/dequal-2.0.3.tgz#2644214f1997d39ed0ee0ece72335490a7ac67be" integrity sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA== @@ -8804,6 +8874,13 @@ estree-walker@^2.0.1, estree-walker@^2.0.2: resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-2.0.2.tgz#52f010178c2a4c117a7757cfe942adb7d2da4cac" integrity sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w== +estree-walker@^3.0.0, estree-walker@^3.0.3: + version "3.0.3" + resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-3.0.3.tgz#67c3e549ec402a487b4fc193d1953a524752340d" + integrity sha512-7RUKfXgSMMkzt6ZuXmqapOurLGPPfgj6l9uRZ7lRGolvk0y2yocc35LdcxKC5PQZdn2DMqioAQ2NoWcrTKmm6g== + dependencies: + "@types/estree" "^1.0.0" + esutils@^2.0.2: version "2.0.3" resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64" @@ -9165,6 +9242,11 @@ extsprintf@^1.2.0: resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f" integrity sha1-4mifjzVvrWLMplo6kcXfX5VRaS8= +fast-decode-uri-component@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/fast-decode-uri-component/-/fast-decode-uri-component-1.0.1.tgz#46f8b6c22b30ff7a81357d4f59abfae938202543" + integrity sha512-WKgKWg5eUxvRZGwW8FvfbaH7AXSh2cL+3j5fMGzUMCxWBJ3dV3a7Wz8y2f/uQ0e3B6WmodD3oS54jTQ9HVTIIg== + fast-deep-equal@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz#7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49" @@ -9230,7 +9312,14 @@ fast-levenshtein@^2.0.6, fast-levenshtein@~2.0.6: resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917" integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc= -fast-url-parser@1.1.3: +fast-querystring@^1.1.1: + version "1.1.2" + resolved "https://registry.yarnpkg.com/fast-querystring/-/fast-querystring-1.1.2.tgz#a6d24937b4fc6f791b4ee31dcb6f53aeafb89f53" + integrity sha512-g6KuKWmFXc0fID8WWH0jit4g0AGBoJhCkJMb1RmbsSEUNvQ+ZC8D6CUZ+GtF8nMzSPXnhiePyyqqipzNNEnHjg== + dependencies: + fast-decode-uri-component "^1.0.1" + +fast-url-parser@1.1.3, fast-url-parser@^1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/fast-url-parser/-/fast-url-parser-1.1.3.tgz#f4af3ea9f34d8a271cf58ad2b3759f431f0b318d" integrity sha1-9K8+qfNNiicc9YrSs3WfQx8LMY0= @@ -10148,22 +10237,22 @@ graphiql-explorer@^0.9.0: resolved "https://registry.yarnpkg.com/graphiql-explorer/-/graphiql-explorer-0.9.0.tgz#25f6b990bfc3e04e88c0cf419e28d12abe2c4fbe" integrity sha512-fZC/wsuatqiQDO2otchxriFO0LaWIo/ovF/CQJ1yOudmY0P7pzDiP+l9CEHUiWbizk3e99x6DQG4XG1VxA+d6A== -graphql-config@4.3.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/graphql-config/-/graphql-config-4.3.0.tgz#b9bb7bf9c892a90e66ea937e8d7ed170eb1fd5e2" - integrity sha512-Uiu3X7+s5c056WyrvdZVz2vG1fhAipMlYmtiCU/4Z2mX79OXDr1SqIon2MprC/pExIWJfAQZCcjYDY76fPBUQg== - dependencies: - "@endemolshinegroup/cosmiconfig-typescript-loader" "3.0.2" - "@graphql-tools/graphql-file-loader" "^7.3.7" - "@graphql-tools/json-file-loader" "^7.3.7" - "@graphql-tools/load" "^7.5.5" - "@graphql-tools/merge" "^8.2.6" - "@graphql-tools/url-loader" "^7.9.7" - "@graphql-tools/utils" "^8.6.5" - cosmiconfig "7.0.1" - cosmiconfig-toml-loader "1.0.0" - minimatch "4.2.1" - string-env-interpolation "1.0.1" +graphql-config@5.0.2: + version "5.0.2" + resolved "https://registry.yarnpkg.com/graphql-config/-/graphql-config-5.0.2.tgz#7e962f94ccddcc2ee0aa71d75cf4491ec5092bdb" + integrity sha512-7TPxOrlbiG0JplSZYCyxn2XQtqVhXomEjXUmWJVSS5ET1nPhOJSsIb/WTwqWhcYX6G0RlHXSj9PLtGTKmxLNGg== + dependencies: + "@graphql-tools/graphql-file-loader" "^8.0.0" + "@graphql-tools/json-file-loader" "^8.0.0" + "@graphql-tools/load" "^8.0.0" + "@graphql-tools/merge" "^9.0.0" + "@graphql-tools/url-loader" "^8.0.0" + "@graphql-tools/utils" "^10.0.0" + cosmiconfig "^8.1.0" + jiti "^1.18.2" + minimatch "^4.2.3" + string-env-interpolation "^1.0.1" + tslib "^2.4.0" graphql-subscriptions@^2.0.0: version "2.0.0" @@ -10184,7 +10273,12 @@ graphql-ws@5.10.0: resolved "https://registry.yarnpkg.com/graphql-ws/-/graphql-ws-5.10.0.tgz#3fb47a4e809e0d2e7c197f1bca754fa9f31b940e" integrity sha512-ewbPzHQdRZgNCPDH9Yr6xccSeZfk3fmpO/AGGGg4KkM5gc6oAOJQ10Oui1EqprhVOyRbOll9bw2qAkOiOwfTag== -graphql-ws@^5.4.1, graphql-ws@^5.5.5: +graphql-ws@5.14.0: + version "5.14.0" + resolved "https://registry.yarnpkg.com/graphql-ws/-/graphql-ws-5.14.0.tgz#766f249f3974fc2c48fae0d1fb20c2c4c79cd591" + integrity sha512-itrUTQZP/TgswR4GSSYuwWUzrE/w5GhbwM2GX3ic2U7aw33jgEsayfIlvaj7/GcIvZgNMzsPTrE5hqPuFUiE5g== + +graphql-ws@^5.5.5: version "5.5.5" resolved "https://registry.yarnpkg.com/graphql-ws/-/graphql-ws-5.5.5.tgz#f375486d3f196e2a2527b503644693ae3a8670a9" integrity sha512-hvyIS71vs4Tu/yUYHPvGXsTgo0t3arU820+lT5VjZS2go0ewp2LqyCgxEN56CzOG7Iys52eRhHBiD1gGRdiQtw== @@ -11126,6 +11220,13 @@ is-promise@^2.1.0: resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.2.2.tgz#39ab959ccbf9a774cf079f7b40c7a26f763135f1" integrity sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ== +is-reference@^3.0.0, is-reference@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/is-reference/-/is-reference-3.0.1.tgz#d400f4260f7e55733955e60d361d827eb4d3b831" + integrity sha512-baJJdQLiYaJdvFbJqXrcGv3WU3QCzBlUcI5QhbesIm6/xPsvmO+2CDoi/GMOFBQEQm+PXkwOPrp9KK5ozZsp2w== + dependencies: + "@types/estree" "*" + is-regex@^1.1.4: version "1.1.4" resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.4.tgz#eef5663cd59fa4c0ae339505323df6854bb15958" @@ -11314,7 +11415,7 @@ isomorphic-fetch@^3.0.0: node-fetch "^2.6.1" whatwg-fetch "^3.4.1" -isomorphic-ws@^5.0.0: +isomorphic-ws@5.0.0, isomorphic-ws@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/isomorphic-ws/-/isomorphic-ws-5.0.0.tgz#e5529148912ecb9b451b46ed44d53dae1ce04bbf" integrity sha512-muId7Zzn9ywDsyXgTIafTry2sV3nySZeUDe6YedVd1Hvuuep5AsIlqK+XefWpYTyJG5e503F2xIuT2lcU6rCSw== @@ -11923,6 +12024,11 @@ jest@^27.5.1: import-local "^3.0.2" jest-cli "^27.5.1" +jiti@^1.18.2: + version "1.18.2" + resolved "https://registry.yarnpkg.com/jiti/-/jiti-1.18.2.tgz#80c3ef3d486ebf2450d9335122b32d121f2a83cd" + integrity sha512-QAdOptna2NYiSSpv0O/BwoHBSmz4YhpzJHyi+fnMRTXFjp7B8i/YG5Z8IfusxB1ufjcD2Sre1F3R+nX3fvy7gg== + joi@^17.3.0: version "17.4.0" resolved "https://registry.yarnpkg.com/joi/-/joi-17.4.0.tgz#b5c2277c8519e016316e49ababd41a1908d9ef20" @@ -12378,6 +12484,11 @@ loader-utils@^2.0.2: emojis-list "^3.0.0" json5 "^2.1.2" +locate-character@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/locate-character/-/locate-character-3.0.0.tgz#0305c5b8744f61028ef5d01f444009e00779f974" + integrity sha512-SW13ws7BjaeJ6p7Q6CO2nchbYEc3X3J6WrmTTDto7yMPqVSZTUyY5Tjbid+Ab8gLnATtygYtiDIJGQRRn2ZOiA== + locate-path@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-3.0.0.tgz#dbec3b3ab759758071b58fe59fc41871af21400e" @@ -12405,11 +12516,6 @@ lodash.debounce@^4.0.8: resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af" integrity sha1-gteb/zCmfEAF/9XiUVMArZyk168= -lodash.get@^4: - version "4.4.2" - resolved "https://registry.yarnpkg.com/lodash.get/-/lodash.get-4.4.2.tgz#2d177f652fa31e939b4438d5341499dfa3825e99" - integrity sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ== - lodash.memoize@4.x, lodash.memoize@^4.1.2: version "4.1.2" resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe" @@ -12569,6 +12675,13 @@ magic-string@^0.26.1: dependencies: sourcemap-codec "^1.4.8" +magic-string@^0.30.0: + version "0.30.0" + resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.30.0.tgz#fd58a4748c5c4547338a424e90fa5dd17f4de529" + integrity sha512-LA+31JYDJLs82r2ScLrlz1GjSgu66ZV518eyWT+S8VhyQn/JL0u9MeBOvQMGYiPk1DBiSN9DDMOcXvigJZaViQ== + dependencies: + "@jridgewell/sourcemap-codec" "^1.4.13" + make-dir@^2.0.0, make-dir@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-2.1.0.tgz#5f0310e18b8be898cc07009295a30ae41e91e6f5" @@ -12584,7 +12697,7 @@ make-dir@^3.0.0, make-dir@^3.0.2: dependencies: semver "^6.0.0" -make-error@1.x, make-error@^1, make-error@^1.1.1: +make-error@1.x, make-error@^1.1.1: version "1.3.6" resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.6.tgz#2eb2e37ea9b67c4891f684a1394799af484cf7a2" integrity sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw== @@ -12791,6 +12904,11 @@ mdn-data@2.0.14: resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.14.tgz#7113fc4281917d63ce29b43446f701e68c25ba50" integrity sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow== +mdn-data@2.0.30: + version "2.0.30" + resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.30.tgz#ce4df6f80af6cfbe218ecd5c552ba13c4dfa08cc" + integrity sha512-GaqWWShW4kv/G9IEucWScBx9G1/vsFZZJUO+tD26M8J8z3Kw5RDQjaoZe03YAClgeS/SWPOcb4nkFBTEi5DUEA== + mdurl@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/mdurl/-/mdurl-1.0.1.tgz#fe85b2ec75a59037f2adfec100fd6c601761152e" @@ -12868,6 +12986,11 @@ meros@^1.1.4: resolved "https://registry.yarnpkg.com/meros/-/meros-1.1.4.tgz#c17994d3133db8b23807f62bec7f0cb276cfd948" integrity sha512-E9ZXfK9iQfG9s73ars9qvvvbSIkJZF5yOo9j4tcwM5tN8mUKfj/EKN5PzOr3ZH0y5wL7dLAHw3RVEfpQV9Q7VQ== +meros@^1.2.1: + version "1.3.0" + resolved "https://registry.yarnpkg.com/meros/-/meros-1.3.0.tgz#c617d2092739d55286bf618129280f362e6242f2" + integrity sha512-2BNGOimxEz5hmjUG2FwoxCt5HN7BXdaWyFqEwxPTrJzVdABtrL4TiHTcsWSFAxPQ/tOnEaQEJh3qWq71QRMY+w== + methods@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee" @@ -13291,13 +13414,6 @@ minimatch@3.0.4, minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.4: dependencies: brace-expansion "^1.1.7" -minimatch@4.2.1: - version "4.2.1" - resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-4.2.1.tgz#40d9d511a46bdc4e563c22c3080cde9c0d8299b4" - integrity sha512-9Uq1ChtSZO+Mxa/CL1eGizn2vRn3MlLgzhT0Iz8zaY8NdvxvB0d5QdPFmCKf7JKA9Lerx5vRrnwO03jsSfGG9g== - dependencies: - brace-expansion "^1.1.7" - minimatch@5.0.1: version "5.0.1" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.0.1.tgz#fb9022f7528125187c92bd9e9b6366be1cf3415b" @@ -13312,6 +13428,13 @@ minimatch@^3.0.3, minimatch@^3.0.5, minimatch@^3.1.1, minimatch@^3.1.2: dependencies: brace-expansion "^1.1.7" +minimatch@^4.2.3: + version "4.2.3" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-4.2.3.tgz#b4dcece1d674dee104bb0fb833ebb85a78cbbca6" + integrity sha512-lIUdtK5hdofgCTu3aT0sOaHsYR37viUuIc0rwnnDXImbwFRcumyLMeZaM0t0I/fgxS6s6JMfu0rLD1Wz9pv1ng== + dependencies: + brace-expansion "^1.1.7" + minimatch@^5.0.1: version "5.1.6" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.1.6.tgz#1cfcb8cf5522ea69952cd2af95ae09477f122a96" @@ -14123,7 +14246,7 @@ parseurl@~1.3.2, parseurl@~1.3.3: resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4" integrity sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ== -pascal-case@^3.1.2: +pascal-case@^3.1.1, pascal-case@^3.1.2: version "3.1.2" resolved "https://registry.yarnpkg.com/pascal-case/-/pascal-case-3.1.2.tgz#b48e0ef2b98e205e7c1dae747d0b1508237660eb" integrity sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g== @@ -14216,6 +14339,15 @@ performance-now@^2.1.0: resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b" integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns= +periscopic@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/periscopic/-/periscopic-3.1.0.tgz#7e9037bf51c5855bd33b48928828db4afa79d97a" + integrity sha512-vKiQ8RRtkl9P+r/+oefh25C3fhybptkHKCZSPlcXiJux2tJF55GnEj3BVn4A5gKfq9NWWXXrxkHBwVPUfH0opw== + dependencies: + "@types/estree" "^1.0.0" + estree-walker "^3.0.0" + is-reference "^3.0.0" + picocolors@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c" @@ -16358,7 +16490,7 @@ sockjs@^0.3.24: uuid "^8.3.2" websocket-driver "^0.7.4" -source-map-js@^1.0.2: +source-map-js@^1.0.1, source-map-js@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.2.tgz#adbc361d9c62df380125e7f161f71c826f1e490c" integrity sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw== @@ -16569,7 +16701,7 @@ string-argv@0.3.1: resolved "https://registry.yarnpkg.com/string-argv/-/string-argv-0.3.1.tgz#95e2fbec0427ae19184935f816d74aaa4c5c19da" integrity sha512-a1uQGz7IyVy9YwhqjZIZu1c8JO8dNIe20xBmSS6qu9kv++k3JGzCVmprbNN5Kn+BgzD5E7YYwg1CcjuJMRNsvg== -string-env-interpolation@1.0.1: +string-env-interpolation@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/string-env-interpolation/-/string-env-interpolation-1.0.1.tgz#ad4397ae4ac53fe6c91d1402ad6f6a52862c7152" integrity sha512-78lwMoCcn0nNu8LszbP1UA7g55OeE4v7rCeWnM5B453rnNr4aq+5it3FEYtZrSEiMvHZOZ9Jlqb0OD0M2VInqg== @@ -16908,6 +17040,33 @@ supports-preserve-symlinks-flag@^1.0.0: resolved "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz#6eda4bd344a3c94aea376d4cc31bc77311039e09" integrity sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w== +svelte2tsx@^0.6.16: + version "0.6.16" + resolved "https://registry.yarnpkg.com/svelte2tsx/-/svelte2tsx-0.6.16.tgz#c21a5db0a3ef4885d87c0f037a5284f68e39ada2" + integrity sha512-AX2iYEvQdd4tq5BokRdOOA0N/nD37ZnhXAomrAG9EEGl2cjkvoQUwe1Aluo6FSzA684WJjhxW+1ZXmveCmvDrA== + dependencies: + dedent-js "^1.0.1" + pascal-case "^3.1.1" + +svelte@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/svelte/-/svelte-4.0.0.tgz#ecb79e4d6abe1658ddf7422227a731bc835a1484" + integrity sha512-+yCYu3AEUu9n91dnQNGIbnVp8EmNQtuF/YImW4+FTXRHard7NMo+yTsWzggPAbj3fUEJ1FBJLkql/jkp6YB5pg== + dependencies: + "@ampproject/remapping" "^2.2.1" + "@jridgewell/sourcemap-codec" "^1.4.15" + "@jridgewell/trace-mapping" "^0.3.18" + acorn "^8.8.2" + aria-query "^5.2.1" + axobject-query "^3.2.1" + code-red "^1.0.3" + css-tree "^2.3.1" + estree-walker "^3.0.3" + is-reference "^3.0.1" + locate-character "^3.0.0" + magic-string "^0.30.0" + periscopic "^3.1.0" + svg-parser@^2.0.4: version "2.0.4" resolved "https://registry.yarnpkg.com/svg-parser/-/svg-parser-2.0.4.tgz#fdc2e29e13951736140b76cb122c8ee6630eb6b5" @@ -17238,18 +17397,6 @@ ts-node@^8.10.2: source-map-support "^0.5.17" yn "3.1.1" -ts-node@^9: - version "9.1.1" - resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-9.1.1.tgz#51a9a450a3e959401bda5f004a72d54b936d376d" - integrity sha512-hPlt7ZACERQGf03M253ytLY3dHbGNGrAq9qIHWUY9XHYl1z7wYngSr3OQ5xmui8o2AaxsONxIzjafLUiWBo1Fg== - dependencies: - arg "^4.1.0" - create-require "^1.1.0" - diff "^4.0.1" - make-error "^1.1.1" - source-map-support "^0.5.17" - yn "3.1.1" - tsconfig-paths@^3.14.1: version "3.14.1" resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz#ba0734599e8ea36c862798e920bcf163277b137a" @@ -17270,7 +17417,7 @@ tslib@^1.9.0: resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00" integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg== -tslib@^2, tslib@^2.0.0, tslib@^2.1.0, tslib@^2.3.1, tslib@^2.4.0, tslib@~2.4.0: +tslib@^2.0.0, tslib@^2.1.0, tslib@^2.3.1, tslib@^2.4.0: version "2.4.0" resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.4.0.tgz#7cecaa7f073ce680a05847aa77be941098f36dc3" integrity sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ== @@ -17280,7 +17427,7 @@ tslib@^2.0.3: resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.1.0.tgz#da60860f1c2ecaa5703ab7d39bc05b6bf988b97a" integrity sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A== -tslib@^2.2.0, tslib@~2.3.0: +tslib@^2.2.0: version "2.3.1" resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.1.tgz#e8a335add5ceae51aa261d32a490158ef042ef01" integrity sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw== @@ -17736,6 +17883,11 @@ url-parse@^1.5.3: querystringify "^2.1.1" requires-port "^1.0.0" +urlpattern-polyfill@^9.0.0: + version "9.0.0" + resolved "https://registry.yarnpkg.com/urlpattern-polyfill/-/urlpattern-polyfill-9.0.0.tgz#bc7e386bb12fd7898b58d1509df21d3c29ab3460" + integrity sha512-WHN8KDQblxd32odxeIgo83rdVDE2bvdkb86it7bMhYZwWKJz0+O0RK/eZiHYnM+zgt/U7hAHOlCQGfjjvSkw2g== + use-callback-ref@^1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/use-callback-ref/-/use-callback-ref-1.3.0.tgz#772199899b9c9a50526fedc4993fc7fa1f7e32d5" @@ -17805,11 +17957,16 @@ validate-npm-package-name@^3.0.0: dependencies: builtins "^1.0.3" -value-or-promise@1.0.11, value-or-promise@^1.0.11: +value-or-promise@^1.0.11: version "1.0.11" resolved "https://registry.yarnpkg.com/value-or-promise/-/value-or-promise-1.0.11.tgz#3e90299af31dd014fe843fe309cefa7c1d94b140" integrity sha512-41BrgH+dIbCFXClcSapVs5M6GkENd3gQOJpEfPDNa71LsUGMXDL0jMWpI/Rh7WhX+Aalfz2TTS3Zt5pUsbnhLg== +value-or-promise@^1.0.12: + version "1.0.12" + resolved "https://registry.yarnpkg.com/value-or-promise/-/value-or-promise-1.0.12.tgz#0e5abfeec70148c78460a849f6b003ea7986f15c" + integrity sha512-Z6Uz+TYwEqE7ZN50gwn+1LCVo9ZVrpxRPOhOLnncYkY1ZzOYtrX8Fwf/rFktZ8R5mJms6EZf5TqNOMeZmnPq9Q== + vary@^1, vary@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc" @@ -18481,6 +18638,11 @@ write-file-atomic@^4.0.2: imurmurhash "^0.1.4" signal-exit "^3.0.7" +ws@8.13.0, ws@^8.12.0: + version "8.13.0" + resolved "https://registry.yarnpkg.com/ws/-/ws-8.13.0.tgz#9a9fb92f93cf41512a0735c8f4dd09b8a1211cd0" + integrity sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA== + ws@8.8.1, ws@>=8.7.0: version "8.8.1" resolved "https://registry.yarnpkg.com/ws/-/ws-8.8.1.tgz#5dbad0feb7ade8ecc99b830c1d77c913d4955ff0"