فهرست منبع

Downgrades monaco-json to 3.5.0 to fix #2578.

Henning Dieterichs 4 سال پیش
والد
کامیت
34888a7d3e
4فایلهای تغییر یافته به همراه8 افزوده شده و 34 حذف شده
  1. 3 3
      package-lock.json
  2. 1 1
      package.json
  3. 2 15
      typedoc/monaco.d.ts
  4. 2 15
      website/playground/monaco.d.ts.txt

+ 3 - 3
package-lock.json

@@ -2380,9 +2380,9 @@
       "dev": true
       "dev": true
     },
     },
     "monaco-json": {
     "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
       "dev": true
     },
     },
     "monaco-languages": {
     "monaco-languages": {

+ 1 - 1
package.json

@@ -25,7 +25,7 @@
     "monaco-css": "3.6.0",
     "monaco-css": "3.6.0",
     "monaco-editor-core": "0.26.0",
     "monaco-editor-core": "0.26.0",
     "monaco-html": "3.6.0",
     "monaco-html": "3.6.0",
-    "monaco-json": "3.6.0",
+    "monaco-json": "3.5.0",
     "monaco-languages": "2.6.0",
     "monaco-languages": "2.6.0",
     "monaco-typescript": "4.6.0",
     "monaco-typescript": "4.6.0",
     "rimraf": "^3.0.2",
     "rimraf": "^3.0.2",

+ 2 - 15
typedoc/monaco.d.ts

@@ -7413,13 +7413,11 @@ declare namespace monaco.languages.css {
 declare namespace monaco.languages.json {
 declare namespace monaco.languages.json {
     export interface DiagnosticsOptions {
     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;
         readonly validate?: boolean;
         /**
         /**
          * If set, comments are tolerated. If set to false, syntax errors will be emitted for comments.
          * 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;
         readonly allowComments?: boolean;
         /**
         /**
@@ -7431,10 +7429,7 @@ declare namespace monaco.languages.json {
              */
              */
             readonly uri: string;
             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[];
             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.
          * 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;
         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 type SeverityLevel = 'error' | 'warning' | 'ignore';
     export interface ModeConfiguration {
     export interface ModeConfiguration {

+ 2 - 15
website/playground/monaco.d.ts.txt

@@ -7413,13 +7413,11 @@ declare namespace monaco.languages.css {
 declare namespace monaco.languages.json {
 declare namespace monaco.languages.json {
     export interface DiagnosticsOptions {
     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;
         readonly validate?: boolean;
         /**
         /**
          * If set, comments are tolerated. If set to false, syntax errors will be emitted for comments.
          * 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;
         readonly allowComments?: boolean;
         /**
         /**
@@ -7431,10 +7429,7 @@ declare namespace monaco.languages.json {
              */
              */
             readonly uri: string;
             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[];
             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.
          * 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;
         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 type SeverityLevel = 'error' | 'warning' | 'ignore';
     export interface ModeConfiguration {
     export interface ModeConfiguration {