From 34888a7d3e6561c824faa7d75760f788041896e1 Mon Sep 17 00:00:00 2001 From: Henning Dieterichs Date: Fri, 16 Jul 2021 10:59:20 +0200 Subject: [PATCH] Downgrades monaco-json to 3.5.0 to fix #2578. --- package-lock.json | 6 +++--- package.json | 2 +- typedoc/monaco.d.ts | 17 ++--------------- website/playground/monaco.d.ts.txt | 17 ++--------------- 4 files changed, 8 insertions(+), 34 deletions(-) diff --git a/package-lock.json b/package-lock.json index d5dafe40..054d1ea8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2380,9 +2380,9 @@ "dev": true }, "monaco-json": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/monaco-json/-/monaco-json-3.6.0.tgz", - "integrity": "sha512-kiw4iGozD0O99cjbA/xnbTrh/F+nnmOncdWO0kK6xXRncjDrQs9yrlRXi4evwUWdFtXpeU7P+0xvYZAFaFwwiA==", + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/monaco-json/-/monaco-json-3.5.0.tgz", + "integrity": "sha512-owokWyGTYdnRi5zdFmLY0sqEYuwzeKy6hwb2bRBjvoNW7WuIfDDraEXtiE6AJ8wwdrykknPu0G+kNSZ4vmHiTQ==", "dev": true }, "monaco-languages": { diff --git a/package.json b/package.json index 06b448c5..648884e3 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,7 @@ "monaco-css": "3.6.0", "monaco-editor-core": "0.26.0", "monaco-html": "3.6.0", - "monaco-json": "3.6.0", + "monaco-json": "3.5.0", "monaco-languages": "2.6.0", "monaco-typescript": "4.6.0", "rimraf": "^3.0.2", diff --git a/typedoc/monaco.d.ts b/typedoc/monaco.d.ts index 7490189c..e0098d2e 100644 --- a/typedoc/monaco.d.ts +++ b/typedoc/monaco.d.ts @@ -7413,13 +7413,11 @@ declare namespace monaco.languages.css { declare namespace monaco.languages.json { export interface DiagnosticsOptions { /** - * If set, the validator will be enabled and perform syntax and schema based validation, - * unless `DiagnosticsOptions.schemaValidation` is set to `ignore`. + * If set, the validator will be enabled and perform syntax validation as well as schema based validation. */ readonly validate?: boolean; /** * If set, comments are tolerated. If set to false, syntax errors will be emitted for comments. - * `DiagnosticsOptions.allowComments` will override this setting. */ readonly allowComments?: boolean; /** @@ -7431,10 +7429,7 @@ declare namespace monaco.languages.json { */ readonly uri: string; /** - * A list of glob patterns that describe for which file URIs the JSON schema will be used. - * '*' and '**' wildcards are supported. Exclusion patterns start with '!'. - * For example '*.schema.json', 'package.json', '!foo*.schema.json', 'foo/**\/BADRESP.json'. - * A match succeeds when there is at least one pattern matching and last matching pattern does not start with '!'. + * A list of file names that are associated to the schema. The '*' wildcard can be used. For example '*.schema.json', 'package.json' */ readonly fileMatch?: string[]; /** @@ -7454,14 +7449,6 @@ declare namespace monaco.languages.json { * The severity of problems that occurred when resolving and loading schemas. If set to 'ignore', schema resolving problems are not reported. If not set, 'warning' is used. */ readonly schemaRequest?: SeverityLevel; - /** - * The severity of reported trailing commas. If not set, trailing commas will be reported as errors. - */ - readonly trailingCommas?: SeverityLevel; - /** - * The severity of reported comments. If not set, 'DiagnosticsOptions.allowComments' defines whether comments are ignored or reported as errors. - */ - readonly comments?: SeverityLevel; } export type SeverityLevel = 'error' | 'warning' | 'ignore'; export interface ModeConfiguration { diff --git a/website/playground/monaco.d.ts.txt b/website/playground/monaco.d.ts.txt index 7490189c..e0098d2e 100644 --- a/website/playground/monaco.d.ts.txt +++ b/website/playground/monaco.d.ts.txt @@ -7413,13 +7413,11 @@ declare namespace monaco.languages.css { declare namespace monaco.languages.json { export interface DiagnosticsOptions { /** - * If set, the validator will be enabled and perform syntax and schema based validation, - * unless `DiagnosticsOptions.schemaValidation` is set to `ignore`. + * If set, the validator will be enabled and perform syntax validation as well as schema based validation. */ readonly validate?: boolean; /** * If set, comments are tolerated. If set to false, syntax errors will be emitted for comments. - * `DiagnosticsOptions.allowComments` will override this setting. */ readonly allowComments?: boolean; /** @@ -7431,10 +7429,7 @@ declare namespace monaco.languages.json { */ readonly uri: string; /** - * A list of glob patterns that describe for which file URIs the JSON schema will be used. - * '*' and '**' wildcards are supported. Exclusion patterns start with '!'. - * For example '*.schema.json', 'package.json', '!foo*.schema.json', 'foo/**\/BADRESP.json'. - * A match succeeds when there is at least one pattern matching and last matching pattern does not start with '!'. + * A list of file names that are associated to the schema. The '*' wildcard can be used. For example '*.schema.json', 'package.json' */ readonly fileMatch?: string[]; /** @@ -7454,14 +7449,6 @@ declare namespace monaco.languages.json { * The severity of problems that occurred when resolving and loading schemas. If set to 'ignore', schema resolving problems are not reported. If not set, 'warning' is used. */ readonly schemaRequest?: SeverityLevel; - /** - * The severity of reported trailing commas. If not set, trailing commas will be reported as errors. - */ - readonly trailingCommas?: SeverityLevel; - /** - * The severity of reported comments. If not set, 'DiagnosticsOptions.allowComments' defines whether comments are ignored or reported as errors. - */ - readonly comments?: SeverityLevel; } export type SeverityLevel = 'error' | 'warning' | 'ignore'; export interface ModeConfiguration {