Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(deps): update all devdependencies #130

Merged
merged 3 commits into from
Dec 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
src/language-server/graphqlTypes.ts
src/language-server/__tests__/fixtures/documents/commentWithTemplate.ts
README.md
1,897 changes: 402 additions & 1,495 deletions package-lock.json

Large diffs are not rendered by default.

42 changes: 21 additions & 21 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -68,38 +68,38 @@
},
"devDependencies": {
"@apollo/rover": "0.27.0-preview.0",
"@changesets/changelog-github": "0.4.8",
"@changesets/cli": "2.26.2",
"@graphql-codegen/cli": "^5.0.2",
"@graphql-codegen/typescript-operations": "^4.2.3",
"@changesets/changelog-github": "0.5.0",
"@changesets/cli": "2.27.10",
"@graphql-codegen/cli": "5.0.2",
"@graphql-codegen/typescript-operations": "4.2.3",
"@types/jest": "29.5.14",
"@types/lodash.debounce": "4.0.9",
"@types/lodash.merge": "4.6.9",
"@types/lodash.throttle": "^4.1.9",
"@types/lodash.throttle": "4.1.9",
"@types/node": "20.14.10",
"@types/vscode": "1.90.0",
"@typescript-eslint/eslint-plugin": "6.9.1",
"@typescript-eslint/parser": "6.9.1",
"@vscode/test-cli": "^0.0.10",
"@vscode/test-electron": "^2.4.1",
"@wry/trie": "^0.5.0",
"esbuild": "^0.23.0",
"@vscode/test-cli": "0.0.10",
"@vscode/test-electron": "2.4.1",
"@wry/trie": "0.5.0",
"esbuild": "0.23.0",
"eslint": "8.52.0",
"eslint-config-prettier": "9.0.0",
"eslint-plugin-prettier": "5.0.1",
"graphql-http": "^1.22.1",
"import-fresh": "^3.3.0",
"eslint-config-prettier": "9.1.0",
"eslint-plugin-prettier": "5.2.1",
"graphql-http": "1.22.1",
"import-fresh": "3.3.0",
"jest": "29.7.0",
"jest-environment-node": "29.7.0",
"memfs": "4.11.2",
"npm-run-all": "^4.1.5",
"prettier": "3.0.3",
"memfs": "4.15.0",
"npm-run-all": "4.1.5",
"prettier": "3.4.2",
"rimraf": "6.0.1",
"ts-jest": "29.1.2",
"ts-node": "^10.9.2",
"typescript": "^5.5.3",
"vscode-tmgrammar-test": "^0.1.3",
"zod-to-json-schema": "^3.23.3"
"ts-jest": "29.2.5",
"ts-node": "10.9.2",
"typescript": "5.5.3",
"vscode-tmgrammar-test": "0.1.3",
"zod-to-json-schema": "3.23.3"
},
"publisher": "apollographql",
"categories": [
Expand Down
2 changes: 1 addition & 1 deletion sampleWorkspace/configFileTypes/cjsConfig/package.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"name": "test",
"type": "module"
}
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"name": "test",
"type": "module"
}
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"name": "test",
"type": "commonjs"
}
}
2 changes: 1 addition & 1 deletion sampleWorkspace/configFileTypes/mjsConfig/package.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"name": "test",
"type": "commonjs"
}
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"name": "test",
"type": "module"
}
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"name": "test",
"type": "commonjs"
}
}
2 changes: 1 addition & 1 deletion sampleWorkspace/localSchemaArray/apollo.config.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@
"localSchemaFile": ["./starwarsSchema.graphql", "./planets.graphql"]
}
}
}
}
22 changes: 11 additions & 11 deletions sampleWorkspace/sampleWorkspace.code-workspace
Original file line number Diff line number Diff line change
@@ -1,32 +1,32 @@
{
"folders": [
{
"path": "localSchema"
"path": "localSchema",
},
{
"path": "clientSchema"
"path": "clientSchema",
},
{
"path": "spotifyGraph"
"path": "spotifyGraph",
},
{
"path": "httpSchema"
"path": "httpSchema",
},
{
"path": "localSchemaArray"
"path": "localSchemaArray",
},
{
"path": "rover"
"path": "rover",
},
{
"path": "configFileTypes"
"path": "configFileTypes",
},
{
"path": "../src/language-server/__tests__/fixtures/documents"
}
"path": "../src/language-server/__tests__/fixtures/documents",
},
],
"settings": {
"apollographql.devTools.showPanel": "detect",
"apollographql.devTools.serverPort": 7095
}
"apollographql.devTools.serverPort": 7095,
},
}
32 changes: 8 additions & 24 deletions schemas/apollo.config.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,7 @@
"$ref": "#/definitions/clientConfig"
}
},
"required": [
"client"
],
"required": ["client"],
"additionalProperties": false
},
{
Expand All @@ -24,9 +22,7 @@
"$ref": "#/definitions/roverConfig"
}
},
"required": [
"rover"
],
"required": ["rover"],
"additionalProperties": false
}
]
Expand Down Expand Up @@ -67,9 +63,7 @@
"description": "Skip SSL validation. May be required for self-signed certificates."
}
},
"required": [
"url"
],
"required": ["url"],
"additionalProperties": false,
"description": "Configuration for using a local schema from a URL."
},
Expand Down Expand Up @@ -97,9 +91,7 @@
"description": "Path to a local schema file to use as GraphQL Schema for this project. Can be a string or an array of strings to merge multiple partial schemas into one."
}
},
"required": [
"localSchemaFile"
],
"required": ["localSchemaFile"],
"additionalProperties": false,
"description": "Configuration for using a local schema from a file."
}
Expand Down Expand Up @@ -127,10 +119,7 @@
"items": {
"type": "string"
},
"default": [
"**/node_modules",
"**/__tests__"
],
"default": ["**/node_modules", "**/__tests__"],
"description": "Files to exclude from this project. The Apollo GraphQL extension will not provide IntelliSense-like features in these files."
},
"tagName": {
Expand All @@ -157,9 +146,7 @@
"description": "This option is no longer supported, please remove it from your configuration file."
}
},
"required": [
"service"
],
"required": ["service"],
"additionalProperties": false,
"description": "Configuration for a Client project."
},
Expand All @@ -175,10 +162,7 @@
"description": "The name of the profile to use."
},
"supergraphConfig": {
"type": [
"string",
"null"
],
"type": ["string", "null"],
"description": "The path to your `supergraph.yaml` file. \nDefaults to a `supergraph.yaml` in the folder of your `apollo.config.json`, if there is one."
},
"extraArgs": {
Expand Down Expand Up @@ -231,4 +215,4 @@
}
},
"$schema": "http://json-schema.org/draft-07/schema#"
}
}
35 changes: 8 additions & 27 deletions schemas/supergraph_config_schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,7 @@
"title": "SupergraphConfig",
"description": "The configuration for a single supergraph composed of multiple subgraphs.",
"type": "object",
"required": [
"subgraphs"
],
"required": ["subgraphs"],
"properties": {
"federation_version": {
"anyOf": [
Expand Down Expand Up @@ -33,9 +31,7 @@
"anyOf": [
{
"type": "object",
"required": [
"file"
],
"required": ["file"],
"properties": {
"file": {
"type": "string"
Expand All @@ -44,15 +40,10 @@
},
{
"type": "object",
"required": [
"subgraph_url"
],
"required": ["subgraph_url"],
"properties": {
"introspection_headers": {
"type": [
"object",
"null"
],
"type": ["object", "null"],
"additionalProperties": {
"type": "string"
}
Expand All @@ -65,10 +56,7 @@
},
{
"type": "object",
"required": [
"graphref",
"subgraph"
],
"required": ["graphref", "subgraph"],
"properties": {
"graphref": {
"type": "string"
Expand All @@ -80,9 +68,7 @@
},
{
"type": "object",
"required": [
"sdl"
],
"required": ["sdl"],
"properties": {
"sdl": {
"type": "string"
Expand All @@ -94,16 +80,11 @@
"SubgraphConfig": {
"description": "Config for a single [subgraph](https://www.apollographql.com/docs/federation/subgraphs/)",
"type": "object",
"required": [
"schema"
],
"required": ["schema"],
"properties": {
"routing_url": {
"description": "The routing URL for the subgraph. This will appear in supergraph SDL and instructs the graph router to send all requests for this subgraph to this URL.",
"type": [
"string",
"null"
]
"type": ["string", "null"]
},
"schema": {
"description": "The location of the subgraph's SDL",
Expand Down
4 changes: 2 additions & 2 deletions src/language-server/project/internal.ts
Original file line number Diff line number Diff line change
Expand Up @@ -252,8 +252,8 @@ export abstract class GraphQLInternalProject
localSchemaFile === undefined
? []
: Array.isArray(localSchemaFile)
? localSchemaFile
: [localSchemaFile]
? localSchemaFile
: [localSchemaFile]
).map((filePath) =>
path.relative(this.rootURI.fsPath, path.join(process.cwd(), filePath)),
);
Expand Down
12 changes: 6 additions & 6 deletions src/language-server/providers/schema/file.ts
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ export class FileSchemaProvider implements GraphQLSchemaProvider {
const documents = path
? [this.loadFileAndGetDocument(path)]
: paths
? paths.map(this.loadFileAndGetDocument, this)
: undefined;
? paths.map(this.loadFileAndGetDocument, this)
: undefined;

if (!documents)
throw new Error(
Expand Down Expand Up @@ -73,8 +73,8 @@ export class FileSchemaProvider implements GraphQLSchemaProvider {
const __schema = parsed.data
? parsed.data.__schema
: parsed.__schema
? parsed.__schema
: parsed;
? parsed.__schema
: parsed;

const schema = buildClientSchema({ __schema });
return parse(printSchema(schema));
Expand Down Expand Up @@ -105,8 +105,8 @@ export class FileSchemaProvider implements GraphQLSchemaProvider {
const SDLs = path
? [this.loadFileAndGetSDL(path)]
: paths
? paths.map(this.loadFileAndGetSDL, this)
: undefined;
? paths.map(this.loadFileAndGetSDL, this)
: undefined;

if (!SDLs || SDLs.filter((s) => !Boolean(s)).length > 0)
return Debug.error(
Expand Down
Loading
Loading