fix: get the latest cspell library and schema (#440)

* fix: get the latest cspell library and schema * Update documentSettings.ts * Update cspell library
streetsidesoftware · Feb 23, 2020 · 4bcff60 · 4bcff60
1 parent 74c19bb
commit 4bcff60
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 24 deletions.
diff --git a/packages/_server/npm-shrinkwrap.json b/packages/_server/npm-shrinkwrap.json
diff --git a/packages/_server/package.json b/packages/_server/package.json
@@ -30,7 +30,7 @@
   "dependencies": {
     "comment-json": "^1.1.3",
     "cspell-glob": "^0.1.17",
-    "cspell-lib": "^4.1.18",
+    "cspell-lib": "^4.1.21",
     "fs-extra": "^8.1.0",
     "gensequence": "^3.0.3",
     "iconv-lite": "^0.4.24",

diff --git a/packages/_server/src/documentSettings.ts b/packages/_server/src/documentSettings.ts
@@ -8,7 +8,7 @@ import {
     Pattern,
     Settings,
     CSpellSettings,
-    BaseSetting
+    BaseSetting,
 } from 'cspell-lib';
 import * as path from 'path';
 import * as fs from 'fs-extra';
@@ -481,15 +481,8 @@ function resolveDictionaryDefinitions(
 ): CSpellUserSettings['dictionaryDefinitions'] {
     if (!dictDefs) return dictDefs;
 
-    function resolve(path: string) {
-        if (!path) return path;
-        return resolver.resolveFile(path);
-    }
-
-    return dictDefs.map(def => {
-        const path = resolve(def.path!);
-        return {...def, path};
-    });
+    return dictDefs
+    .map(def => def.path ? {...def, path: resolver.resolveFile(def.path)} : def);
 }
 
 function resolveLanguageSettings(

diff --git a/packages/client/package.json b/packages/client/package.json
@@ -146,11 +146,11 @@
         "jsonValidation": [
             {
                 "fileMatch": "cSpell.json",
-                "url": "https://raw.githubusercontent.com/streetsidesoftware/cspell/cspell%404.0.50/cspell.schema.json"
+                "url": "https://raw.githubusercontent.com/streetsidesoftware/cspell/cspell%404.0.53/cspell.schema.json"
             },
             {
                 "fileMatch": "cspell*.json",
-                "url": "https://raw.githubusercontent.com/streetsidesoftware/cspell/cspell%404.0.50/cspell.schema.json"
+                "url": "https://raw.githubusercontent.com/streetsidesoftware/cspell/cspell%404.0.53/cspell.schema.json"
             }
         ],
         "configuration": {
@@ -387,7 +387,7 @@
                     "scope": "resource",
                     "description": "Define settings on a per programming language basis.",
                     "items": {
-                        "$ref": "https://raw.githubusercontent.com/streetsidesoftware/cspell/cspell%404.0.50/cspell.schema.json#/definitions/LanguageSetting"
+                        "$ref": "https://raw.githubusercontent.com/streetsidesoftware/cspell/cspell%404.0.53/cspell.schema.json#/definitions/LanguageSetting"
                     }
                 },
                 "cSpell.dictionaries": {
@@ -404,7 +404,7 @@
                     "scope": "resource",
                     "description": "A List of Dictionary Definitions.",
                     "items": {
-                        "$ref": "https://raw.githubusercontent.com/streetsidesoftware/cspell/cspell%404.0.50/cspell.schema.json#/definitions/DictionaryDefinition"
+                        "$ref": "https://raw.githubusercontent.com/streetsidesoftware/cspell/cspell%404.0.53/cspell.schema.json#/definitions/DictionaryDefinition"
                     }
                 },
                 "cSpell.showCommandsInEditorContextMenu": {
@@ -448,7 +448,7 @@
                     "type": "array",
                     "description": "Overrides to apply based upon the file path.",
                     "items": {
-                        "$ref": "https://raw.githubusercontent.com/streetsidesoftware/cspell/cspell%404.0.50/cspell.schema.json#/definitions/OverrideSettings"
+                        "$ref": "https://raw.githubusercontent.com/streetsidesoftware/cspell/cspell%404.0.53/cspell.schema.json#/definitions/OverrideSettings"
                     }
                 }
             }