From c36504a804d8cc54a5136340152999b4a1a2c69f Mon Sep 17 00:00:00 2001 From: Rikki Schulte Date: Mon, 11 Apr 2022 15:03:10 +0200 Subject: [PATCH] release `vscode-graphql@0.4.2` from the monorepo (#2288) - fix esbuild bundling issues with vscode-graphql [#2269](https://github.com/graphql/graphiql/issues/2269) by fixing esbuild version - remove `graphql-language-service` dependency on `graphql-config`, which is only for types - remove direct `vscode-graphql` dependency on `graphql-config`, which previously existed for op exec client - resolve `graphql-config` to `4.3.0` in `graphql-language-server` --- .changeset/old-mugs-buy.md | 8 + .vscode/tasks.json | 5 +- package.json | 6 +- .../graphql-language-service-cli/README.md | 30 +- .../graphql-language-service-server/README.md | 12 +- .../package.json | 2 +- .../graphql-language-service/package.json | 2 +- packages/monaco-graphql/README.md | 33 +- packages/vscode-graphql/.vscodeignore | 3 +- packages/vscode-graphql/esbuild.js | 30 ++ packages/vscode-graphql/package.json | 37 +- packages/vscode-graphql/src/extension.ts | 2 +- packages/vscode-graphql/src/server/index.ts | 1 - packages/vscode-graphql/tsconfig.json | 1 + packages/vscode-graphql/yarn.lock | 2 - scripts/canary-release.js | 49 +- yarn.lock | 436 +++++++++++------- 17 files changed, 408 insertions(+), 251 deletions(-) create mode 100644 .changeset/old-mugs-buy.md create mode 100644 packages/vscode-graphql/esbuild.js delete mode 100644 packages/vscode-graphql/yarn.lock diff --git a/.changeset/old-mugs-buy.md b/.changeset/old-mugs-buy.md new file mode 100644 index 00000000000..e7c43de824e --- /dev/null +++ b/.changeset/old-mugs-buy.md @@ -0,0 +1,8 @@ +--- +'graphql-language-service': patch +'graphql-language-service-server': patch +'vscode-graphql': patch +--- +- upgrade `graphql-config` to latest in server +- remove `graphql-config` dependency from `vscode-graphql` and `graphql-language-service` +- fix `vscode-graphql` esbuild bundling bug in `vscode-graphql` [#2269](https://github.com/graphql/graphiql/issues/2269) by fixing `esbuild` version diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 2dcb67a23a6..7afee3e1a51 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -3,8 +3,9 @@ "tasks": [ { "label": "watch-vscode", - "type": "shell", - "command": "source ~/.zshrc; yarn run watch-vscode", + "type": "npm", + "script": "watch-vscode", + "problemMatcher": ["$tsc-watch"], "isBackground": true, "presentation": { "reveal": "always" diff --git a/package.json b/package.json index 7a05d7196d5..a955d47dbd9 100644 --- a/package.json +++ b/package.json @@ -39,9 +39,7 @@ "build:clean": "yarn tsc --clean", "build:watch": "yarn tsc --watch", "watch": "yarn build:watch", - "watch-vscode:prebuild": "yarn build && yarn workspace vscode-graphql run build-bundles", - "watch-vscode:bundle": "chokidar 'packages/*/dist/**/*.{js,ts}' -c 'yarn workspace vscode-graphql run build-bundles'", - "watch-vscode": "yarn watch-vscode:prebuild && concurrently 'yarn tsc --watch' 'yarn watch-vscode:bundle'", + "watch-vscode": "concurrently --raw 'yarn tsc --watch' 'yarn workspace vscode-graphql run compile --watch'", "check": "yarn tsc --dry", "cypress-open": "yarn workspace graphiql cypress-open", "dev-graphiql": "yarn workspace graphiql dev", @@ -59,7 +57,7 @@ "prepublishOnly": "./scripts/prepublish.sh", "pretty": "node scripts/pretty.js", "pretty-check": "node scripts/pretty.js --check", - "release": "yarn build && yarn build-bundles && yarn changeset publish && wsrun release", + "release": "yarn build && yarn build-bundles && yarn changeset publish", "release:canary": "(node scripts/canary-release.js && yarn build && yarn build-bundles && yarn changeset publish --tag canary) || echo Skipping Canary...", "repo:lint": "manypkg check", "repo:fix": "manypkg fix", diff --git a/packages/graphql-language-service-cli/README.md b/packages/graphql-language-service-cli/README.md index 4a4a202745c..d03bbd79d53 100644 --- a/packages/graphql-language-service-cli/README.md +++ b/packages/graphql-language-service-cli/README.md @@ -58,15 +58,39 @@ The custom graphql language configurations are: - `customDirectives` - `['@myExampleDirective']` - `customValidationRules` - returns rules array with parameter `ValidationContext` from `graphql/validation` +### LSP Workspace Configuration + +When running `server`, your LSP-compatible client can [provide additional workspace configuration](https://npmjs.com/graphql-language-service-server#workspace-configuration). + +For example, `coc.nvim` allows for providing custom `settings` + +```json +"languageserver": { + "graphql": { + "command": "graphql-lsp", + "args": ["server", "-m", "stream"], + // customize filetypes to your needs + "filetypes": ["typescript", "typescriptreact", "graphql"], + "settings": { + "graphql-config.load.legacy": true + } + } +} +``` + +this would allow for legacy `graphql-config` file formats like `.graphqlconfig`, useful on projects maintaining compatibility with the intellij plugin + ### Using the command-line interface -`graphql-lsp server --schema=localhost:3000` +```sh +graphql-lsp server --schema=localhost:3000 +``` The node executable contains several commands: `server` and the command-line language service methods (`validate`, `autocomplete`, `outline`). -```text -GraphQL Language Service Command-Line Interface. +### CLI Options +``` Usage: graphql-lsp [-h | --help][-c | --configdir] {configDir} diff --git a/packages/graphql-language-service-server/README.md b/packages/graphql-language-service-server/README.md index 8f90d8b64b8..a559f5c70af 100644 --- a/packages/graphql-language-service-server/README.md +++ b/packages/graphql-language-service-server/README.md @@ -132,20 +132,22 @@ The graphql-config features we support are: module.exports = { extensions: { // add customDirectives *legacy*. you can now provide multiple schema pointers to config.schema/project.schema, including inline strings - customDirectives: ["@myExampleDirective"], + customDirectives: ['@myExampleDirective'], // a function that returns rules array with parameter `ValidationContext` from `graphql/validation` customValidationRules: require('./config/customValidationRules'), languageService: { // should the language service read schema for lookups from a cached file based on graphql config output? - cacheSchemaFileForLookup: true + cacheSchemaFileForLookup: true, // NOTE: this will disable all definition lookup for local SDL files - } - } -} + }, + }, +}; ``` we also load `require('dotenv').config()`, so you can use process.env variables from local `.env` files! + + ### Workspace Configuration The LSP Server reads config by sending `workspace/configuration` method when it initializes. diff --git a/packages/graphql-language-service-server/package.json b/packages/graphql-language-service-server/package.json index 1fd4380e0dc..3236fada75f 100644 --- a/packages/graphql-language-service-server/package.json +++ b/packages/graphql-language-service-server/package.json @@ -33,7 +33,7 @@ "@babel/types": "^7.17.0", "@babel/parser": "^7.17.3", "dotenv": "8.2.0", - "graphql-config": "^4.1.0", + "graphql-config": "^4.3.0", "graphql-language-service": "^5.0.1", "mkdirp": "^1.0.4", "node-fetch": "^2.6.1", diff --git a/packages/graphql-language-service/package.json b/packages/graphql-language-service/package.json index 816c45159c1..64364a40521 100644 --- a/packages/graphql-language-service/package.json +++ b/packages/graphql-language-service/package.json @@ -31,7 +31,6 @@ "graphql": "^15.5.0 || ^16.0.0" }, "dependencies": { - "graphql-config": "^4.1.0", "vscode-languageserver-types": "^3.15.1", "nullthrows": "^1.0.0" }, @@ -41,6 +40,7 @@ "@types/json-schema": "7.0.9", "benchmark": "^2.1.4", "graphql": "16.0.0-experimental-stream-defer.5", + "graphql-config": "^4.3.0", "lodash": "^4.17.15", "platform": "^1.3.5", "ts-node": "^8.10.2", diff --git a/packages/monaco-graphql/README.md b/packages/monaco-graphql/README.md index b94862d75ff..41773542d27 100644 --- a/packages/monaco-graphql/README.md +++ b/packages/monaco-graphql/README.md @@ -149,18 +149,19 @@ window.MonacoEnvironment = { // the language service will be instantiated once the schema is available const MonacoGraphQLAPI = initializeMode({ - schemas: [{ - // anything that monaco.URI.from() is compatible with - uri: 'https://myschema.com', - // match the monaco file uris for this schema. - // accepts specific filenames and anything `picomatch` supports. - fileMatch: ["**/*.graphql"], - schema: myGraphqlSchema as GraphQLSchema - }], -}) - + schemas: [ + { + // anything that monaco.URI.from() is compatible with + uri: 'https://myschema.com', + // match the monaco file uris for this schema. + // accepts specific filenames and anything `picomatch` supports. + fileMatch: ['**/*.graphql'], + schema: myGraphqlSchema as GraphQLSchema, + }, + ], +}); -const operationModel = monaco.editor.createModel( +const operationModel = monaco.editor.createModel( 'query {}', 'graphql', '/operation.graphql', @@ -201,12 +202,12 @@ MonacoGraphQLAPI.setDiagnosticSettings({ // and compute the json schema using the GraphQLWorker. // This is in the main process is applied to the global monaco json settings // for validation, completion and more using monaco-json's built-in JSON Schema support. - [operationModel.uri.toString()]: [variablesModel.uri.toString()] + [operationModel.uri.toString()]: [variablesModel.uri.toString()], }, jsonDiagnosticSettings: { allowComments: true, // allow json, parse with a jsonc parser to make requests - } -}) + }, +}); // TODO: document manual alternative approach ``` @@ -266,13 +267,13 @@ or you can load the language features only when you have your schema ```ts import { initializeMode } from 'monaco-graphql/esm/initializeMode'; -const schemas = [ +const schemas = [ { schema: GraphQLSchema, fileMatch: ['operations/*.graphql'], uri: 'myschema.graphql', }, -] +]; const api = intializeMode({ schemas }); // add another schema. this will cause language workers and features to reset diff --git a/packages/vscode-graphql/.vscodeignore b/packages/vscode-graphql/.vscodeignore index d95985e23b2..eca9e77f654 100644 --- a/packages/vscode-graphql/.vscodeignore +++ b/packages/vscode-graphql/.vscodeignore @@ -1,12 +1,11 @@ .vscode/** .vscode-test/** out/test/** -out/**/*.map src/** .gitignore +node_modules tsconfig.json vsc-extension-quickstart.md tslint.json -node_modules .github renovate.json diff --git a/packages/vscode-graphql/esbuild.js b/packages/vscode-graphql/esbuild.js new file mode 100644 index 00000000000..003c87c1871 --- /dev/null +++ b/packages/vscode-graphql/esbuild.js @@ -0,0 +1,30 @@ +const { build } = require('esbuild'); +const [, , arg] = process.argv; + +const logger = console.log; + +build({ + entryPoints: ['src/extension.ts', 'src/server/index.ts'], + bundle: true, + minify: arg === '--minify', + platform: 'node', + outdir: 'out/', + external: ['vscode'], + format: 'cjs', + sourcemap: true, + watch: arg === '--watch', +}) + .then(({ errors, warnings }) => { + if (warnings.length) { + logger.warn(...warnings); + } + if (errors.length) { + logger.error(...errors); + } + logger.log('successfully bundled vscode-graphql 🚀'); + process.exit(); + }) + .catch(err => { + logger.error(err); + process.exit(1); + }); diff --git a/packages/vscode-graphql/package.json b/packages/vscode-graphql/package.json index 7ed0ae2eb0e..77293dbf7b8 100644 --- a/packages/vscode-graphql/package.json +++ b/packages/vscode-graphql/package.json @@ -1,6 +1,6 @@ { "name": "vscode-graphql", - "version": "0.4.0", + "version": "0.4.1", "preview": true, "private": true, "license": "MIT", @@ -152,20 +152,6 @@ "default": false, "description": "Enable debug logs" }, - "vscode-graphql.trace.server": { - "type": [ - "string" - ], - "default": "off", - "description": "Enable tracing for language server" - }, - "vscode-graphql.showExecCodelens": { - "type": [ - "boolean" - ], - "description": "Show codelens to execute operations inline", - "default": true - }, "vscode-graphql.cacheSchemaFileForLookup": { "type": [ "boolean" @@ -216,10 +202,6 @@ } }, "commands": [ - { - "command": "vscode-graphql.isDebugging", - "title": "VSCode GraphQL: Is Debugging?" - }, { "command": "vscode-graphql.restart", "title": "VSCode GraphQL: Manual Restart" @@ -227,38 +209,29 @@ { "command": "vscode-graphql.showOutputChannel", "title": "VSCode GraphQL: Show output channel" - }, - { - "command": "vscode-graphql.contentProvider", - "title": "VSCode GraphQL: Execute GraphQL Operations" } ] }, "scripts": { "vscode:prepublish": "npm run compile -- --minify", - "compile": "npm run compile:server && esbuild ./dist/extension.js --bundle --outfile=out/extension.js --external:vscode --format=cjs --platform=node", - "compile:server": "esbuild ./dist/server/index.js --bundle --outfile=out/server/server.js --external:vscode --format=cjs --platform=node", + "compile": "node esbuild", "build-bundles": "npm run compile -- --sourcemap", "vsce:package": "vsce package --yarn", "env:source": "export $(cat .envrc | xargs)", "vsce:publish": "vsce publish --yarn --pat \"$PAT_TOKEN\"", "open-vsx:publish": "ovsx publish --pat \"$OPEN_VSX_ACCESS_TOKEN\"", - "release": "npm run vsce:publish && npm run open-vsx:publish" + "postpublish": "npm run vsce:publish && npm run open-vsx:publish" }, "devDependencies": { "@types/capitalize": "2.0.0", "@types/vscode": "1.62.0", - "esbuild": "0.13.15", + "esbuild": "0.12.15", "ovsx": "0.3.0", - "vsce-yarn-patch": "^1.66.2" + "vsce": "^2.7.0" }, "dependencies": { "graphql": "16.0.0-experimental-stream-defer.5", - "graphql-config": "^4.1.0", "graphql-language-service-server": "^2.7.18", "vscode-languageclient": "5.2.1" - }, - "resolutions": { - "graphql-config": "4.1.0" } } diff --git a/packages/vscode-graphql/src/extension.ts b/packages/vscode-graphql/src/extension.ts index b5f214f074e..a1e05bf5c34 100644 --- a/packages/vscode-graphql/src/extension.ts +++ b/packages/vscode-graphql/src/extension.ts @@ -28,7 +28,7 @@ export function activate(context: ExtensionContext) { console.log('Extension "vscode-graphql" is now active!'); } - const serverPath = path.join('out/server', 'server.js'); + const serverPath = path.join('out', 'server', 'index.js'); const serverModule = context.asAbsolutePath(serverPath); const debugOptions = { diff --git a/packages/vscode-graphql/src/server/index.ts b/packages/vscode-graphql/src/server/index.ts index af348974cd6..153026cbbf4 100644 --- a/packages/vscode-graphql/src/server/index.ts +++ b/packages/vscode-graphql/src/server/index.ts @@ -1,4 +1,3 @@ -import 'babel-polyfill'; import { startServer } from 'graphql-language-service-server'; // The npm scripts are configured to only build this once before diff --git a/packages/vscode-graphql/tsconfig.json b/packages/vscode-graphql/tsconfig.json index 666652184ba..f82d3c85e13 100644 --- a/packages/vscode-graphql/tsconfig.json +++ b/packages/vscode-graphql/tsconfig.json @@ -2,6 +2,7 @@ "extends": "../../resources/tsconfig.base.esm.json", "compilerOptions": { "target": "ES2018", + "module": "CommonJS", "composite": true, "rootDir": "./src", "outDir": "./dist" diff --git a/packages/vscode-graphql/yarn.lock b/packages/vscode-graphql/yarn.lock deleted file mode 100644 index bee26d8c93d..00000000000 --- a/packages/vscode-graphql/yarn.lock +++ /dev/null @@ -1,2 +0,0 @@ -// EMPTY ON PURPOSE, see -// https://github.com/microsoft/vscode-vsce/issues/300 diff --git a/scripts/canary-release.js b/scripts/canary-release.js index a1c88d3dee4..a73d5292ced 100644 --- a/scripts/canary-release.js +++ b/scripts/canary-release.js @@ -1,5 +1,6 @@ /* eslint-disable */ const semver = require('semver'); +const { execa } = import('execa'); const cp = require('child_process'); const { basename } = require('path'); @@ -19,22 +20,29 @@ function getNewVersion(version, type) { return semver.inc(version, `pre${type}`, true, 'canary-' + gitHash); } -function getRelevantChangesets(baseBranch) { - const comparePoint = cp - .spawnSync('git', ['merge-base', `origin/${baseBranch}`, 'HEAD']) - .stdout.toString() - .trim(); - const listModifiedFiles = cp - .spawnSync('git', ['diff', '--name-only', comparePoint]) - .stdout.toString() - .trim() - .split('\n'); +const execOpts = { stderr: 'inherit', stdout: 'inherit' }; - const items = listModifiedFiles - .filter(f => f.startsWith('.changeset')) - .map(f => basename(f, '.md')); +const git = async (...commands) => execa('git', commands, execOpts); - return items; +async function preReleaseVSCode(version) { + try { + await execa( + 'yarn', + ['workspace', `vscode-graphql`, 'run', 'release', '--pre'], + execOpts, + ); + } catch (err) { + console.error('vscode-graphql pre-release failed on publish:', err); + process.exit(1); + } + try { + await git('add', `packages/vscode-graphql/package.json`); + await git('commit', `-m`, `pre-release \`vscode-graphql@${version}\``); + await git('push'); + } catch (err) { + console.error('vscode-graphql pre-release failed on git command:', err); + process.exit(1); + } } async function updateVersions() { @@ -45,6 +53,9 @@ async function updateVersions() { const changesets = (await readChangesets(cwd)).filter(change => modifiedChangesets.includes(change.id), ); + const isMain = process.env.GITHUB_REF_NAME?.includes('main'); + + let vscodeRelease = false; if (changesets.length === 0) { console.warn( @@ -67,6 +78,13 @@ async function updateVersions() { process.exit(1); } else { for (const release of releasePlan.releases) { + if ( + release.name.includes('vscode-graphql') && + release.changesets?.type !== 'none' + ) { + // vsce pre-release only accept x.y.z versions + release.newVersion = vscodeRelease = semver.patch(release.oldVersion); + } if (release.type !== 'none') { release.newVersion = getNewVersion(release.oldVersion, release.type); } @@ -82,6 +100,9 @@ async function updateVersions() { false, true, ); + // if(vscodeRelease) { + // await preReleaseVSCode(vscodeRelease) + // } } } } diff --git a/yarn.lock b/yarn.lock index 8d4fe7ecce5..9a687ac6e61 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4221,73 +4221,64 @@ tslib "^2" "@graphiql/toolkit@file:packages/graphiql-toolkit": - version "0.4.2" + version "0.4.3" dependencies: "@n1ru4l/push-pull-async-iterable-iterator" "^3.1.0" meros "^1.1.4" -"@graphql-tools/batch-execute@^8.3.1": - version "8.3.1" - resolved "https://registry.yarnpkg.com/@graphql-tools/batch-execute/-/batch-execute-8.3.1.tgz#0b74c54db5ac1c5b9a273baefc034c2343ebbb74" - integrity sha512-63kHY8ZdoO5FoeDXYHnAak1R3ysMViMPwWC2XUblFckuVLMUPmB2ONje8rjr2CvzWBHAW8c1Zsex+U3xhKtGIA== +"@graphql-tools/batch-execute@8.4.2": + version "8.4.2" + resolved "https://registry.yarnpkg.com/@graphql-tools/batch-execute/-/batch-execute-8.4.2.tgz#9cd05c9bcb0eb29435547ea5fae202d4c6f2ecb7" + integrity sha512-5/el640oG/jfjQCjCRDdtIALyUib8YPONM2NSmckp2g1nOrPTAx/isz3Uptp9y5OI1UXXhONiKy5euTbgsGoXw== dependencies: - "@graphql-tools/utils" "^8.5.1" + "@graphql-tools/utils" "8.6.6" dataloader "2.0.0" tslib "~2.3.0" value-or-promise "1.0.11" -"@graphql-tools/delegate@^8.4.1", "@graphql-tools/delegate@^8.4.2": - version "8.4.2" - resolved "https://registry.yarnpkg.com/@graphql-tools/delegate/-/delegate-8.4.2.tgz#a61d45719855720304e3656800342cfa17d82558" - integrity sha512-CjggOhiL4WtyG2I3kux+1/p8lQxSFHBj0gwa0NxnQ6Vsnpw7Ig5VP1ovPnitFuBv2k4QdC37Nj2xv2n7DRn8fw== +"@graphql-tools/delegate@8.7.2": + version "8.7.2" + resolved "https://registry.yarnpkg.com/@graphql-tools/delegate/-/delegate-8.7.2.tgz#1db19ef4fded58615b4d5f3678950eda860f5aff" + integrity sha512-SSmx5N6Cq23KRT0YepdmcYugey7MDZSXxtJ8KHHdc5eW9IAHXZWsJWdVnI9woU9omsnE6svnxblZb1UUBl7AUg== dependencies: - "@graphql-tools/batch-execute" "^8.3.1" - "@graphql-tools/schema" "^8.3.1" - "@graphql-tools/utils" "^8.5.3" + "@graphql-tools/batch-execute" "8.4.2" + "@graphql-tools/schema" "8.3.7" + "@graphql-tools/utils" "8.6.6" dataloader "2.0.0" + graphql-executor "0.0.22" tslib "~2.3.0" value-or-promise "1.0.11" -"@graphql-tools/graphql-file-loader@^7.3.2": - version "7.3.3" - resolved "https://registry.yarnpkg.com/@graphql-tools/graphql-file-loader/-/graphql-file-loader-7.3.3.tgz#7cee2f84f08dc13fa756820b510248b857583d36" - integrity sha512-6kUJZiNpYKVhum9E5wfl5PyLLupEDYdH7c8l6oMrk6c7EPEVs6iSUyB7yQoWrtJccJLULBW2CRQ5IHp5JYK0mA== +"@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== dependencies: - "@graphql-tools/import" "^6.5.7" - "@graphql-tools/utils" "^8.5.1" + "@graphql-tools/import" "6.6.10" + "@graphql-tools/utils" "8.6.6" globby "^11.0.3" tslib "~2.3.0" unixify "^1.0.0" -"@graphql-tools/import@^6.5.7": - version "6.6.1" - resolved "https://registry.yarnpkg.com/@graphql-tools/import/-/import-6.6.1.tgz#2a7e1ceda10103ffeb8652a48ddc47150b035485" - integrity sha512-i9WA6k+erJMci822o9w9DoX+uncVBK60LGGYW8mdbhX0l7wEubUpA000thJ1aarCusYh0u+ZT9qX0HyVPXu25Q== +"@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== dependencies: - "@graphql-tools/utils" "8.5.3" + "@graphql-tools/utils" "8.6.6" resolve-from "5.0.0" tslib "~2.3.0" -"@graphql-tools/json-file-loader@^7.3.2": - version "7.3.3" - resolved "https://registry.yarnpkg.com/@graphql-tools/json-file-loader/-/json-file-loader-7.3.3.tgz#45cfde77b9dc4ab6c21575305ae537d2814d237f" - integrity sha512-CN2Qk9rt+Gepa3rb3X/mpxYA5MIYLwZBPj2Njw6lbZ6AaxG+O1ArDCL5ACoiWiBimn1FCOM778uhRM9znd0b3Q== +"@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== dependencies: - "@graphql-tools/utils" "^8.5.1" + "@graphql-tools/utils" "8.6.6" globby "^11.0.3" tslib "~2.3.0" unixify "^1.0.0" -"@graphql-tools/load@^7.4.1": - version "7.4.1" - resolved "https://registry.yarnpkg.com/@graphql-tools/load/-/load-7.4.1.tgz#aa572fcef11d6028097b6ef39c13fa9d62e5a441" - integrity sha512-UvBodW5hRHpgBUBVz5K5VIhJDOTFIbRRAGD6sQ2l9J5FDKBEs3u/6JjZDzbdL96br94D5cEd2Tk6auaHpTn7mQ== - dependencies: - "@graphql-tools/schema" "8.3.1" - "@graphql-tools/utils" "^8.5.1" - p-limit "3.1.0" - tslib "~2.3.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" @@ -4298,6 +4289,16 @@ p-limit "3.1.0" tslib "~2.3.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== + dependencies: + "@graphql-tools/schema" "8.3.7" + "@graphql-tools/utils" "8.6.6" + p-limit "3.1.0" + tslib "~2.3.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" @@ -4306,24 +4307,14 @@ "@graphql-tools/utils" "8.6.3" tslib "~2.3.0" -"@graphql-tools/merge@^8.2.1": - version "8.2.1" - resolved "https://registry.yarnpkg.com/@graphql-tools/merge/-/merge-8.2.1.tgz#bf83aa06a0cfc6a839e52a58057a84498d0d51ff" - integrity sha512-Q240kcUszhXiAYudjuJgNuLgy9CryDP3wp83NOZQezfA6h3ByYKU7xI6DiKrdjyVaGpYN3ppUmdj0uf5GaXzMA== +"@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== dependencies: - "@graphql-tools/utils" "^8.5.1" + "@graphql-tools/utils" "8.6.6" tslib "~2.3.0" -"@graphql-tools/schema@8.3.1", "@graphql-tools/schema@^8.3.1": - version "8.3.1" - resolved "https://registry.yarnpkg.com/@graphql-tools/schema/-/schema-8.3.1.tgz#1ee9da494d2da457643b3c93502b94c3c4b68c74" - integrity sha512-3R0AJFe715p4GwF067G5i0KCr/XIdvSfDLvTLEiTDQ8V/hwbOHEKHKWlEBHGRQwkG5lwFQlW1aOn7VnlPERnWQ== - dependencies: - "@graphql-tools/merge" "^8.2.1" - "@graphql-tools/utils" "^8.5.1" - tslib "~2.3.0" - value-or-promise "1.0.11" - "@graphql-tools/schema@8.3.3": version "8.3.3" resolved "https://registry.yarnpkg.com/@graphql-tools/schema/-/schema-8.3.3.tgz#b69ea495026976f16e697253f08aa7905e7f6265" @@ -4334,37 +4325,39 @@ tslib "~2.3.0" value-or-promise "1.0.11" -"@graphql-tools/url-loader@^7.4.2": - version "7.5.2" - resolved "https://registry.yarnpkg.com/@graphql-tools/url-loader/-/url-loader-7.5.2.tgz#fb3737fd1269ab61b195b63052179b6049d90ce1" - integrity sha512-EilHqbhUY/qg55SSEdklDhPXgSz9+9a63SX3mcD8J2qwZHJD/wOLcyKs8m6BXfuGwUiuB0j3fmDSEVmva2onBg== +"@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/delegate" "^8.4.1" - "@graphql-tools/utils" "^8.5.1" - "@graphql-tools/wrap" "^8.3.1" - "@n1ru4l/graphql-live-query" "0.9.0" - "@types/websocket" "1.0.4" + "@graphql-tools/merge" "8.2.7" + "@graphql-tools/utils" "8.6.6" + tslib "~2.3.0" + value-or-promise "1.0.11" + +"@graphql-tools/url-loader@^7.9.7": + version "7.9.9" + resolved "https://registry.yarnpkg.com/@graphql-tools/url-loader/-/url-loader-7.9.9.tgz#9c002e4babf6ba70b74b809bd7c7669572998109" + integrity sha512-qhjBJ3oCXZrzvJchVwtrahr48TXOHPYZ4YXklGrbJVoJs3LP0a7CYUwuXeiNuN+dpgaxkb175sIEN9m0FadGRw== + dependencies: + "@graphql-tools/delegate" "8.7.2" + "@graphql-tools/utils" "8.6.6" + "@graphql-tools/wrap" "8.4.11" + "@n1ru4l/graphql-live-query" "^0.9.0" + "@types/websocket" "^1.0.4" "@types/ws" "^8.0.0" - cross-undici-fetch "^0.0.20" + cross-undici-fetch "^0.1.19" dset "^3.1.0" - extract-files "11.0.0" + extract-files "^11.0.0" graphql-sse "^1.0.1" graphql-ws "^5.4.1" - isomorphic-ws "4.0.1" - meros "1.1.4" + isomorphic-ws "^4.0.1" + meros "^1.1.4" subscriptions-transport-ws "^0.11.0" - sync-fetch "0.3.1" - tslib "~2.3.0" - valid-url "1.0.9" - value-or-promise "1.0.11" - ws "8.2.3" - -"@graphql-tools/utils@8.5.3", "@graphql-tools/utils@^8.5.1", "@graphql-tools/utils@^8.5.3": - version "8.5.3" - resolved "https://registry.yarnpkg.com/@graphql-tools/utils/-/utils-8.5.3.tgz#404062e62cae9453501197039687749c4885356e" - integrity sha512-HDNGWFVa8QQkoQB0H1lftvaO1X5xUaUDk1zr1qDe0xN1NL0E/CrQdJ5UKLqOvH4hkqVUPxQsyOoAZFkaH6rLHg== - dependencies: - tslib "~2.3.0" + sync-fetch "^0.3.1" + tslib "^2.3.0" + value-or-promise "^1.0.11" + ws "^8.3.0" "@graphql-tools/utils@8.6.3": version "8.6.3" @@ -4373,14 +4366,21 @@ dependencies: tslib "~2.3.0" -"@graphql-tools/wrap@^8.3.1": - version "8.3.2" - resolved "https://registry.yarnpkg.com/@graphql-tools/wrap/-/wrap-8.3.2.tgz#d3bcecb7529d071e4ecc4dfc75b9566e3da79d4f" - integrity sha512-7DcOBFB+Dd84x9dxSm7qS4iJONMyfLnCJb8A19vGPffpu4SMJ3sFcgwibKFu5l6mMUiigKgXna2RRgWI+02bKQ== +"@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/wrap@8.4.11": + version "8.4.11" + resolved "https://registry.yarnpkg.com/@graphql-tools/wrap/-/wrap-8.4.11.tgz#3898a589f74a3250de96d52ade2e2e89bfed3d9a" + integrity sha512-bif9yNZCoG1fFTGuIV4UblsJI95VSufl0RReXdr6f2yNbnqjSzgoDMB17WQlLrNOBrXa7r8N5aWBr5hBGhtGig== dependencies: - "@graphql-tools/delegate" "^8.4.2" - "@graphql-tools/schema" "^8.3.1" - "@graphql-tools/utils" "^8.5.3" + "@graphql-tools/delegate" "8.7.2" + "@graphql-tools/schema" "8.3.7" + "@graphql-tools/utils" "8.6.6" tslib "~2.3.0" value-or-promise "1.0.11" @@ -4995,7 +4995,7 @@ call-me-maybe "^1.0.1" glob-to-regexp "^0.3.0" -"@n1ru4l/graphql-live-query@0.9.0": +"@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== @@ -6497,10 +6497,10 @@ "@types/webpack-sources" "*" source-map "^0.6.0" -"@types/websocket@1.0.4": - version "1.0.4" - resolved "https://registry.yarnpkg.com/@types/websocket/-/websocket-1.0.4.tgz#1dc497280d8049a5450854dd698ee7e6ea9e60b8" - integrity sha512-qn1LkcFEKK8RPp459jkjzsfpbsx36BBt3oC3pITYtkoBw/aVX+EZFa5j3ThCRTNpLFvIMr5dSTD4RaMdilIOpA== +"@types/websocket@^1.0.4": + version "1.0.5" + resolved "https://registry.yarnpkg.com/@types/websocket/-/websocket-1.0.5.tgz#3fb80ed8e07f88e51961211cd3682a3a4a81569c" + integrity sha512-NbsqiNX9CnEfC1Z0Vf4mE1SgAJ07JnRYcNex7AJ9zAVzmiGHmjKFEk7O4TJIsgv2B1sLEb6owKFZrACwdYngsQ== dependencies: "@types/node" "*" @@ -7439,6 +7439,16 @@ azure-devops-node-api@^11.0.1: tunnel "0.0.6" typed-rest-client "^1.8.4" +azure-devops-node-api@^7.2.0: + version "7.2.0" + resolved "https://registry.yarnpkg.com/azure-devops-node-api/-/azure-devops-node-api-7.2.0.tgz#131d4e01cf12ebc6e45569b5e0c5c249e4114d6d" + integrity sha512-pMfGJ6gAQ7LRKTHgiRF+8iaUUeGAI0c8puLaqHLc7B8AR7W6GJLozK9RFeUHFjEGybC9/EB3r67WPd7e46zQ8w== + dependencies: + os "0.1.1" + tunnel "0.0.4" + typed-rest-client "1.2.0" + underscore "1.8.3" + babel-code-frame@^6.22.0: version "6.26.0" resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b" @@ -8716,7 +8726,7 @@ cheerio-select@^1.5.0: domhandler "^4.2.0" domutils "^2.7.0" -cheerio@^1.0.0-rc.9: +cheerio@^1.0.0-rc.1, cheerio@^1.0.0-rc.9: version "1.0.0-rc.10" resolved "https://registry.yarnpkg.com/cheerio/-/cheerio-1.0.0-rc.10.tgz#2ba3dcdfcc26e7956fc1f440e61d51c643379f3e" integrity sha512-g0J0q/O6mW8z5zxQ3A8E8J1hUgp4SMOvEoW/x84OwyHKe/Zccz83PVT4y5Crcr530FV6NgmKI1qvGTKVl9XXVw== @@ -9099,7 +9109,7 @@ comma-separated-tokens@^1.0.0: resolved "https://registry.yarnpkg.com/comma-separated-tokens/-/comma-separated-tokens-1.0.8.tgz#632b80b6117867a158f1080ad498b2fbe7e3f5ea" integrity sha512-GHuDRO12Sypu2cV70d1dkA2EUmXHgntrzbpvOB+Qy+49ypNfGgFQIC2fhhXbnyrJRynDCAARsT7Ou0M6hirpfw== -commander@^2.18.0, commander@^2.19.0, commander@^2.20.0, commander@~2.20.3: +commander@^2.18.0, commander@^2.19.0, commander@^2.20.0, commander@^2.8.1, commander@~2.20.3: version "2.20.3" resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== @@ -9512,15 +9522,17 @@ cross-spawn@^5.0.1, cross-spawn@^5.1.0: shebang-command "^1.2.0" which "^1.2.9" -cross-undici-fetch@^0.0.20: - version "0.0.20" - resolved "https://registry.yarnpkg.com/cross-undici-fetch/-/cross-undici-fetch-0.0.20.tgz#6b7c5ac82a3601edd439f37275ac0319d77a120a" - integrity sha512-5d3WBC4VRHpFndECK9bx4TngXrw0OUXdhX561Ty1ZoqMASz9uf55BblhTC1CO6GhMWnvk9SOqYEXQliq6D2P4A== +cross-undici-fetch@^0.1.19: + version "0.1.28" + resolved "https://registry.yarnpkg.com/cross-undici-fetch/-/cross-undici-fetch-0.1.28.tgz#40b7071b9ab2d1d6aff889836205e1972092e8d1" + integrity sha512-/nLMyVE5IC9PQdBtmgjpGZfK0wo8UupomAPx+7HlbEgVDkZOa9xCiZP9goo5aLYofP0gHXgovjXdXrE2obANag== dependencies: abort-controller "^3.0.0" - form-data "^4.0.0" - node-fetch "^2.6.5" - undici "^4.9.3" + form-data-encoder "^1.7.1" + formdata-node "^4.3.1" + node-fetch "^2.6.7" + undici "^5.0.0" + web-streams-polyfill "^3.2.0" crypto-browserify@^3.11.0: version "3.12.0" @@ -10080,6 +10092,11 @@ delegates@^1.0.0: resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a" integrity sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o= +denodeify@^1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/denodeify/-/denodeify-1.2.1.tgz#3a36287f5034e699e7577901052c2e6c94251631" + integrity sha1-OjYof1A05pnnV3kBBSwubJQlFjE= + depd@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9" @@ -10149,6 +10166,11 @@ detect-port@^1.3.0: address "^1.0.1" debug "^2.6.0" +didyoumean@^1.2.1: + version "1.2.2" + resolved "https://registry.yarnpkg.com/didyoumean/-/didyoumean-1.2.2.tgz#989346ffe9e839b4555ecf5666edea0d3e8ad037" + integrity sha512-gxtyfqMg7GKyhQmb056K7M3xszy/myH8w+B4RT+QXBQsvAOdc3XymqDDPHx1BgPgsdAA5SIifona89YtRATDzw== + diff-sequences@^24.9.0: version "24.9.0" resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-24.9.0.tgz#5715d6244e2aa65f48bba0bc972db0b0b11e95b5" @@ -10559,7 +10581,7 @@ enquirer@^2.3.0: dependencies: ansi-colors "^4.1.1" -entities@^1.1.1, entities@^1.1.2: +entities@^1.1.1, entities@^1.1.2, entities@~1.1.1: version "1.1.2" resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.2.tgz#bdfa735299664dfafd34529ed4f8522a275fea56" integrity sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w== @@ -10788,7 +10810,12 @@ esbuild-windows-arm64@0.13.15: resolved "https://registry.yarnpkg.com/esbuild-windows-arm64/-/esbuild-windows-arm64-0.13.15.tgz#482173070810df22a752c686509c370c3be3b3c3" integrity sha512-zzvyCVVpbwQQATaf3IG8mu1IwGEiDxKkYUdA4FpoCHi1KtPa13jeScYDjlW0Qh+ebWzpKfR2ZwvqAQkSWNcKjA== -esbuild@0.13.15, esbuild@^0.13.12: +esbuild@0.12.15: + version "0.12.15" + resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.12.15.tgz#9d99cf39aeb2188265c5983e983e236829f08af0" + integrity sha512-72V4JNd2+48eOVCXx49xoSWHgC3/cCy96e7mbXKY+WOWghN00cCmlGnwVLRhRHorvv0dgCyuMYBZlM2xDM5OQw== + +esbuild@^0.13.12: version "0.13.15" resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.13.15.tgz#db56a88166ee373f87dbb2d8798ff449e0450cdf" integrity sha512-raCxt02HBKv8RJxE8vkTSCXGIyKHdEdGfUmiYb8wnabnaEmHzyW7DCHb5tEN0xU8ryqg5xw54mcwnYkC4x3AIw== @@ -11446,7 +11473,7 @@ extglob@^2.0.4: snapdragon "^0.8.1" to-regex "^3.0.1" -extract-files@11.0.0: +extract-files@^11.0.0: version "11.0.0" resolved "https://registry.yarnpkg.com/extract-files/-/extract-files-11.0.0.tgz#b72d428712f787eef1f5193aff8ab5351ca8469a" integrity sha512-FuoE1qtbJ4bBVvv94CC7s0oTnKUGvQs+Rjf1L2SJFfS+HTVVjhPFtehPdQ0JiGPqVNfSSZvL5yzHHQq2Z4WNhQ== @@ -11929,6 +11956,11 @@ fork-ts-checker-webpack-plugin@4.1.6: tapable "^1.0.0" worker-rpc "^0.1.0" +form-data-encoder@^1.7.1: + version "1.7.2" + resolved "https://registry.yarnpkg.com/form-data-encoder/-/form-data-encoder-1.7.2.tgz#1f1ae3dccf58ed4690b86d87e4f57c654fbab040" + integrity sha512-qfqtYan3rxrnCk1VYaA4H+Ms9xdpPqvLZa6xmMgFvhO32x7/3J/ExcTd6qpxM0vH2GdMI+poehyBZvqfMTto8A== + form-data@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/form-data/-/form-data-3.0.1.tgz#ebd53791b78356a99af9a300d4282c4d5eb9755f" @@ -11938,15 +11970,6 @@ form-data@^3.0.0: combined-stream "^1.0.8" mime-types "^2.1.12" -form-data@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.0.tgz#93919daeaf361ee529584b9b31664dc12c9fa452" - integrity sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww== - dependencies: - asynckit "^0.4.0" - combined-stream "^1.0.8" - mime-types "^2.1.12" - form-data@~2.3.2: version "2.3.3" resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6" @@ -11961,6 +11984,14 @@ format@^0.2.0: resolved "https://registry.yarnpkg.com/format/-/format-0.2.2.tgz#d6170107e9efdc4ed30c9dc39016df942b5cb58b" integrity sha1-1hcBB+nv3E7TDJ3DkBbflCtctYs= +formdata-node@^4.3.1: + version "4.3.2" + resolved "https://registry.yarnpkg.com/formdata-node/-/formdata-node-4.3.2.tgz#0262e94931e36db7239c2b08bdb6aaf18ec47d21" + integrity sha512-k7lYJyzDOSL6h917favP8j1L0/wNyylzU+x+1w4p5haGVHNlP58dbpdJhiCUsDbWsa9HwEtLp89obQgXl2e0qg== + dependencies: + node-domexception "1.0.0" + web-streams-polyfill "4.0.0-beta.1" + forwarded@~0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.1.2.tgz#98c23dab1175657b8c0573e8ceccd91b0ff18c84" @@ -12526,11 +12557,11 @@ grapheme-splitter@^1.0.4: integrity sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ== "graphiql@file:packages/graphiql": - version "1.8.0" + version "1.8.4" dependencies: - "@graphiql/toolkit" "^0.4.2" + "@graphiql/toolkit" "^0.4.3" codemirror "^5.58.2" - codemirror-graphql "^1.2.14" + codemirror-graphql "^1.2.15" copy-to-clipboard "^3.2.0" entities "^2.0.0" escape-html "^1.0.3" @@ -12538,23 +12569,28 @@ grapheme-splitter@^1.0.4: markdown-it "^12.2.0" set-value "^4.1.0" -graphql-config@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/graphql-config/-/graphql-config-4.1.0.tgz#a3b28d3fb537952ebeb69c75e4430605a10695e3" - integrity sha512-Myqay6pmdcmX3KqoH+bMbeKZ1cTODpHS2CxF1ZzNnfTE+YUpGTcp01bOw6LpzamRb0T/WTYtGFbZeXGo9Hab2Q== +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.2" - "@graphql-tools/json-file-loader" "^7.3.2" - "@graphql-tools/load" "^7.4.1" - "@graphql-tools/merge" "^8.2.1" - "@graphql-tools/url-loader" "^7.4.2" - "@graphql-tools/utils" "^8.5.1" + "@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 "3.0.4" + minimatch "4.2.1" string-env-interpolation "1.0.1" +graphql-executor@0.0.22: + version "0.0.22" + resolved "https://registry.yarnpkg.com/graphql-executor/-/graphql-executor-0.0.22.tgz#14bc466bb27ab38346998e0b375cba55685eed94" + integrity sha512-WbKSnSHFn6REKKH4T6UAwDM3mLUnYMQlQLNG0Fw+Lkb3ilCnL3m5lkJ7411LAI9sF7BvPbthovVZhsEUh9Xfag== + graphql-sse@^1.0.1: version "1.0.6" resolved "https://registry.yarnpkg.com/graphql-sse/-/graphql-sse-1.0.6.tgz#4f98e0a06f2020542ed054399116108491263224" @@ -13947,7 +13983,7 @@ isomorphic-fetch@^3.0.0: node-fetch "^2.6.1" whatwg-fetch "^3.4.1" -isomorphic-ws@4.0.1: +isomorphic-ws@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/isomorphic-ws/-/isomorphic-ws-4.0.1.tgz#55fd4cd6c5e6491e76dc125938dd863f5cd4f2dc" integrity sha512-BhBvN2MBpWTaSHdWRb/bwdZJ1WaehQ2L1KngkCkfLUGF0mAWAT1sQUQacEmQ0jXkFw/czDXPNQSL5u2/Krsz1w== @@ -15693,7 +15729,7 @@ lodash.uniq@^4.5.0: resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773" integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M= -lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.21, lodash@^4.7.0: +lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.21, lodash@^4.7.0: version "4.17.21" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== @@ -15897,6 +15933,17 @@ markdown-it@^12.3.2: mdurl "^1.0.1" uc.micro "^1.0.5" +markdown-it@^8.3.1: + version "8.4.2" + resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-8.4.2.tgz#386f98998dc15a37722aa7722084f4020bdd9b54" + integrity sha512-GcRz3AWTqSUphY3vsUqQSFMbgR38a4Lh3GWlHRh/7MRwz8mcu9n2IO7HOh+bXHrR9kOPDl5RNCaEsrneb+xhHQ== + dependencies: + argparse "^1.0.7" + entities "~1.1.1" + linkify-it "^2.0.0" + mdurl "^1.0.1" + uc.micro "^1.0.5" + markdown-to-jsx@^6.11.4: version "6.11.4" resolved "https://registry.yarnpkg.com/markdown-to-jsx/-/markdown-to-jsx-6.11.4.tgz#b4528b1ab668aef7fe61c1535c27e837819392c5" @@ -16051,7 +16098,7 @@ merge@^1.2.0: resolved "https://registry.yarnpkg.com/merge/-/merge-1.2.1.tgz#38bebf80c3220a8a487b6fcfb3941bb11720c145" integrity sha512-VjFo4P5Whtj4vsLzsYBu5ayHhoHJ0UqNm7ibvShmbmoz7tGi0vXaoJbGdB+GmDMLUdg8DpQXEIeVDAe8MaABvQ== -meros@1.1.4, meros@^1.1.4: +meros@^1.1.4: version "1.1.4" resolved "https://registry.yarnpkg.com/meros/-/meros-1.1.4.tgz#c17994d3133db8b23807f62bec7f0cb276cfd948" integrity sha512-E9ZXfK9iQfG9s73ars9qvvvbSIkJZF5yOo9j4tcwM5tN8mUKfj/EKN5PzOr3ZH0y5wL7dLAHw3RVEfpQV9Q7VQ== @@ -16236,6 +16283,13 @@ 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@^3.0.3: version "3.1.2" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b" @@ -16507,6 +16561,11 @@ node-dir@^0.1.10: dependencies: minimatch "^3.0.2" +node-domexception@1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/node-domexception/-/node-domexception-1.0.0.tgz#6888db46a1f71c0b76b3f7555016b63fe64766e5" + integrity sha512-/jKZoMpw0F8GRwl4/eLROPA3cfcXtLApP0QzLmUT/HuPCZWyB7IY9ZrMeKw2O/nFIqPQB3PVM9aYm0F312AXDQ== + node-environment-flags@^1.0.5: version "1.0.6" resolved "https://registry.yarnpkg.com/node-environment-flags/-/node-environment-flags-1.0.6.tgz#a30ac13621f6f7d674260a54dede048c3982c088" @@ -16520,10 +16579,10 @@ node-fetch@^2.3.0, node-fetch@^2.5.0, node-fetch@^2.6.0, node-fetch@^2.6.1: resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.1.tgz#045bd323631f76ed2e2b55573394416b639a0052" integrity sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw== -node-fetch@^2.6.5: - version "2.6.6" - resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.6.tgz#1751a7c01834e8e1697758732e9efb6eeadfaf89" - integrity sha512-Z8/6vRlTUChSdIgMa51jxQ4lrw/Jy5SOW10ObaA47/RElsAN2c5Pn8bTgFGWn/ibwzXTE8qwr1Yzx28vsecXEA== +node-fetch@^2.6.7: + version "2.6.7" + resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.7.tgz#24de9fba827e3b4ae44dc8b20256a379160052ad" + integrity sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ== dependencies: whatwg-url "^5.0.0" @@ -16997,16 +17056,29 @@ os-browserify@^0.3.0: resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.3.0.tgz#854373c7f5c2315914fc9bfc6bd8238fdda1ec27" integrity sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc= -os-homedir@^1.0.1: +os-homedir@^1.0.0, os-homedir@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3" integrity sha1-/7xJiDNuDoM94MFox+8VISGqf7M= -os-tmpdir@~1.0.2: +os-tmpdir@^1.0.0, os-tmpdir@~1.0.1, os-tmpdir@~1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274" integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ= +os@0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/os/-/os-0.1.1.tgz#208845e89e193ad4d971474b93947736a56d13f3" + integrity sha1-IIhF6J4ZOtTZcUdLk5R3NqVtE/M= + +osenv@^0.1.3: + version "0.1.5" + resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410" + integrity sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g== + dependencies: + os-homedir "^1.0.0" + os-tmpdir "^1.0.0" + ospath@^1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/ospath/-/ospath-1.2.2.tgz#1276639774a3f8ef2572f7fe4280e0ea4550c07b" @@ -20915,7 +20987,7 @@ symbol.prototype.description@^1.0.0: es-abstract "^1.17.0-next.1" has-symbols "^1.0.1" -sync-fetch@0.3.1: +sync-fetch@^0.3.1: version "0.3.1" resolved "https://registry.yarnpkg.com/sync-fetch/-/sync-fetch-0.3.1.tgz#62aa82c4b4d43afd6906bfd7b5f92056458509f0" integrity sha512-xj5qiCDap/03kpci5a+qc5wSJjc8ZSixgG2EUmH1B8Ea2sfWclQA7eH40hiHPCtkCn6MCk4Wb+dqcXdCy2PP3g== @@ -21128,6 +21200,13 @@ tiny-emitter@^2.0.0: resolved "https://registry.yarnpkg.com/tiny-emitter/-/tiny-emitter-2.1.0.tgz#1d1a56edfc51c43e863cbb5382a72330e3555423" integrity sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q== +tmp@0.0.29: + version "0.0.29" + resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.29.tgz#f25125ff0dd9da3ccb0c2dd371ee1288bb9128c0" + integrity sha1-8lEl/w3Z2jzLDC3Tce4SiLuRKMA= + dependencies: + os-tmpdir "~1.0.1" + tmp@^0.0.33: version "0.0.33" resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9" @@ -21360,7 +21439,7 @@ tslib@^1.9.3: resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.13.0.tgz#c881e13cc7015894ed914862d276436fa9a47043" integrity sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q== -tslib@^2, tslib@^2.2.0, tslib@~2.3.0: +tslib@^2, tslib@^2.2.0, tslib@^2.3.0, tslib@~2.3.0: version "2.3.1" resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.1.tgz#e8a335add5ceae51aa261d32a490158ef042ef01" integrity sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw== @@ -21406,6 +21485,11 @@ tunnel-agent@^0.6.0: dependencies: safe-buffer "^5.0.1" +tunnel@0.0.4: + version "0.0.4" + resolved "https://registry.yarnpkg.com/tunnel/-/tunnel-0.0.4.tgz#2d3785a158c174c9a16dc2c046ec5fc5f1742213" + integrity sha1-LTeFoVjBdMmhbcLARuxfxfF0IhM= + tunnel@0.0.6: version "0.0.6" resolved "https://registry.yarnpkg.com/tunnel/-/tunnel-0.0.6.tgz#72f1314b34a5b192db012324df2cc587ca47f92c" @@ -21461,6 +21545,14 @@ type-is@^1.6.16, type-is@~1.6.17, type-is@~1.6.18: media-typer "0.3.0" mime-types "~2.1.24" +typed-rest-client@1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/typed-rest-client/-/typed-rest-client-1.2.0.tgz#723085d203f38d7d147271e5ed3a75488eb44a02" + integrity sha512-FrUshzZ1yxH8YwGR29PWWnfksLEILbWJydU7zfIRkyH7kAEzB62uMAl2WY6EyolWpLpVHeJGgQm45/MaruaHpw== + dependencies: + tunnel "0.0.4" + underscore "1.8.3" + typed-rest-client@^1.8.4: version "1.8.6" resolved "https://registry.yarnpkg.com/typed-rest-client/-/typed-rest-client-1.8.6.tgz#d8facd6abd98cbd8ad14cccf056ca5cc306919d7" @@ -21542,15 +21634,20 @@ unc-path-regex@^0.1.0: resolved "https://registry.yarnpkg.com/unc-path-regex/-/unc-path-regex-0.1.2.tgz#e73dd3d7b0d7c5ed86fbac6b0ae7d8c6a69d50fa" integrity sha1-5z3T17DXxe2G+6xrCufYxqadUPo= +underscore@1.8.3: + version "1.8.3" + resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.8.3.tgz#4f3fb53b106e6097fcf9cb4109f2a5e9bdfa5022" + integrity sha1-Tz+1OxBuYJf8+ctBCfKl6b36UCI= + underscore@^1.12.1: version "1.13.2" resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.13.2.tgz#276cea1e8b9722a8dbed0100a407dda572125881" integrity sha512-ekY1NhRzq0B08g4bGuX4wd2jZx5GnKz6mKSqFL4nqBlfyMGiG10gDFhDTMEfYmDL6Jy0FUIZp7wiRB+0BP7J2g== -undici@^4.9.3: - version "4.10.2" - resolved "https://registry.yarnpkg.com/undici/-/undici-4.10.2.tgz#27e360f2d4202ef98dfc1c8e13dcd329660a6d7c" - integrity sha512-QoQH4PpV3dqJwr4h1HazggbB4f5CBknvYANjI9hxXCml+AAzLoh4HBkce0Jc0wW/pmVbrus8Gfeo8QounE+/9g== +undici@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/undici/-/undici-5.0.0.tgz#3c1e08c7f0df90c485d5d8dbb0517e11e34f2090" + integrity sha512-VhUpiZ3No1DOPPQVQnsDZyfcbTTcHdcgWej1PdFnSvOeJmOVDgiOHkunJmBLfmjt4CqgPQddPVjSWW0dsTs5Yg== unfetch@^4.1.0: version "4.1.0" @@ -21707,6 +21804,11 @@ urix@^0.1.0: resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72" integrity sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI= +url-join@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/url-join/-/url-join-1.1.0.tgz#741c6c2f4596c4830d6718460920d0c92202dc78" + integrity sha1-dBxsL0WWxIMNZxhGCSDQySIC3Hg= + url-join@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/url-join/-/url-join-4.0.1.tgz#b642e21a2646808ffa178c4c5fda39844e12cde7" @@ -21849,11 +21951,6 @@ v8flags@^3.1.1: dependencies: homedir-polyfill "^1.0.1" -valid-url@1.0.9: - version "1.0.9" - resolved "https://registry.yarnpkg.com/valid-url/-/valid-url-1.0.9.tgz#1c14479b40f1397a75782f115e4086447433a200" - integrity sha1-HBRHm0DxOXp1eC8RXkCGRHQzogA= - validate-npm-package-license@^3.0.1: version "3.0.4" resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a" @@ -21869,7 +21966,7 @@ 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== @@ -21929,29 +22026,29 @@ void-elements@^2.0.1: resolved "https://registry.yarnpkg.com/void-elements/-/void-elements-2.0.1.tgz#c066afb582bb1cb4128d60ea92392e94d5e9dbec" integrity sha1-wGavtYK7HLQSjWDqkjkulNXp2+w= -vsce@2.6.7: - version "2.6.7" - resolved "https://registry.yarnpkg.com/vsce/-/vsce-2.6.7.tgz#e590ff957d07910c471334857627c3e7f57e87bc" - integrity sha512-5dEtdi/yzWQbOU7JDUSOs8lmSzzkewBR5P122BUkmXE6A/DEdFsKNsg2773NGXJTwwF1MfsOgUR6QVF3cLLJNQ== +vsce-yarn-patch@^1.66.2: + version "1.66.2" + resolved "https://registry.yarnpkg.com/vsce-yarn-patch/-/vsce-yarn-patch-1.66.2.tgz#b217a9d73ee715ad41ec44393a5d78ed0955ab44" + integrity sha512-IJjBF/WQWQvEIikI93qDEhiugjVFDgibqsBa2roawp5abeovPZ9/bzLt0b9AylBtP60q2qSMWsGtf1hZBAs7fw== dependencies: - azure-devops-node-api "^11.0.1" + azure-devops-node-api "^7.2.0" chalk "^2.4.2" - cheerio "^1.0.0-rc.9" - commander "^6.1.0" + cheerio "^1.0.0-rc.1" + commander "^2.8.1" + denodeify "^1.2.1" + didyoumean "^1.2.1" glob "^7.0.6" - hosted-git-info "^4.0.2" - keytar "^7.7.0" - leven "^3.1.0" - markdown-it "^12.3.2" + lodash "^4.17.10" + markdown-it "^8.3.1" mime "^1.3.4" minimatch "^3.0.3" + osenv "^0.1.3" parse-semver "^1.1.1" read "^1.0.7" semver "^5.1.0" - tmp "^0.2.1" - typed-rest-client "^1.8.4" - url-join "^4.0.1" - xml2js "^0.4.23" + tmp "0.0.29" + typed-rest-client "1.2.0" + url-join "^1.1.0" yauzl "^2.3.1" yazl "^2.2.2" @@ -22132,6 +22229,16 @@ wcwidth@^1.0.1: dependencies: defaults "^1.0.3" +web-streams-polyfill@4.0.0-beta.1: + version "4.0.0-beta.1" + resolved "https://registry.yarnpkg.com/web-streams-polyfill/-/web-streams-polyfill-4.0.0-beta.1.tgz#3b19b9817374b7cee06d374ba7eeb3aeb80e8c95" + integrity sha512-3ux37gEX670UUphBF9AMCq8XM6iQ8Ac6A+DSRRjDoRBm1ufCkaCDdNVbaqq60PsEkdNlLKrGtv/YBP4EJXqNtQ== + +web-streams-polyfill@^3.2.0: + version "3.2.1" + resolved "https://registry.yarnpkg.com/web-streams-polyfill/-/web-streams-polyfill-3.2.1.tgz#71c2718c52b45fd49dbeee88634b3a60ceab42a6" + integrity sha512-e0MO3wdXWKrLbL0DgGnUV7WHVuw9OUvL4hjgnPkIeEvESk74gAITi5G606JtZPp39cd8HA9VQzCIvA49LpPN5Q== + webidl-conversions@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871" @@ -22605,11 +22712,6 @@ write@1.0.3: dependencies: mkdirp "^0.5.1" -ws@8.2.3: - version "8.2.3" - resolved "https://registry.yarnpkg.com/ws/-/ws-8.2.3.tgz#63a56456db1b04367d0b721a0b80cae6d8becbba" - integrity sha512-wBuoj1BDpC6ZQ1B7DWQBYVLphPWkm8i9Y0/3YdHjHKHiohOJ1ws+3OccDWtH+PoC9DZD5WOTrJvNbWvjS6JWaA== - "ws@^5.2.0 || ^6.0.0 || ^7.0.0", ws@^7.4.6: version "7.5.5" resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.5.tgz#8b4bc4af518cfabd0473ae4f99144287b33eb881"