fix: fix cspell-types (#3067)

streetsidesoftware · Jun 14, 2022 · 71a9fc7 · 71a9fc7
1 parent 257bdd7
commit 71a9fc7
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 11 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -76,7 +76,7 @@
   "homepage": "https://streetsidesoftware.github.io/cspell/",
   "devDependencies": {
     "@cspell/eslint-plugin": "^6.1.2",
-    "@tsconfig/node12": "^1.0.10",
+    "@tsconfig/node14": "^1.0.2",
     "@types/jest": "^28.1.1",
     "@types/node": "^17.0.42",
     "@typescript-eslint/eslint-plugin": "^5.28.0",

diff --git a/packages/cspell-lib/src/Settings/CSpellSettingsServer.ts b/packages/cspell-lib/src/Settings/CSpellSettingsServer.ts
@@ -173,6 +173,7 @@ function merge(
         description: undefined,
         globRoot: undefined,
         import: undefined,
+        plugins: mergeList(_left.plugins, _right.plugins),
         __imports: mergeImportRefs(_left, _right),
         __importRef: undefined,
     });

diff --git a/packages/cspell-types/package.json b/packages/cspell-types/package.json
@@ -5,12 +5,19 @@
   },
   "version": "6.1.2",
   "description": "Types for cspell and cspell-lib",
+  "type": "commonjs",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
   "typesVersions": {
     "*": {
       "*": [
         "dist/*"
+      ],
+      "dist/index.d.ts": [
+        "dist/index.d.ts"
+      ],
+      "index.d.ts": [
+        "dist/index.d.ts"
       ]
     }
   },

diff --git a/tsconfig-base.json b/tsconfig-base.json
@@ -1,7 +1,7 @@
 {
     "$schema": "https://json.schemastore.org/tsconfig",
     "display": "CSpell Monorepo Base Config",
-    "extends": "@tsconfig/node12/tsconfig.json",
+    "extends": "@tsconfig/node14/tsconfig.json",
     "compilerOptions": {
         "alwaysStrict": true,
         "declaration": true,