fix: move getProjectRootNamesAndCompilerOptions to core and fix glob …

…and minimatch usage error #79
plantain-00 · Feb 17, 2021 · 2ae2cbc · 2ae2cbc
1 parent 2db60ab
commit 2ae2cbc
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 7 deletions.
diff --git a/package.json b/package.json
@@ -35,6 +35,6 @@
   ],
   "private": true,
   "typeCoverage": {
-    "atLeast": 98.91
+    "atLeast": 96.92
   }
 }
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -8,8 +8,8 @@
   "author": "york yao <yaoao12306@outlook.com>",
   "license": "MIT",
   "dependencies": {
+    "glob": "7",
     "minimatch": "3",
-    "ts-lib-utils": "^2.15.0",
     "tslib": "1 || 2",
     "tsutils": "3"
   },

diff --git a/packages/core/src/core.ts b/packages/core/src/core.ts
@@ -1,7 +1,7 @@
 import * as ts from 'typescript'
 import * as path from 'path'
-import minimatch from 'minimatch'
-import { getProjectRootNamesAndCompilerOptions } from 'ts-lib-utils'
+import minimatch = require('minimatch')
+import { getProjectRootNamesAndCompilerOptions } from './tsconfig'
 
 import {
   FileContext,

diff --git a/packages/core/src/tsconfig.json b/packages/core/src/tsconfig.json
@@ -4,6 +4,7 @@
     "outDir": "../dist",
     "module": "commonjs",
     "esModuleInterop": false,
+    "target": "ES2018",
     "declaration": true
   },
   "files": [

diff --git a/packages/utils/src/tsconfig.ts → packages/core/src/tsconfig.ts b/packages/utils/src/tsconfig.ts → packages/core/src/tsconfig.ts
@@ -1,7 +1,7 @@
 import * as ts from 'typescript'
 import * as fs from 'fs'
 import * as path from 'path'
-import glob from 'glob'
+import glob = require('glob')
 
 /**
  * @public

diff --git a/packages/utils/package.json b/packages/utils/package.json
@@ -9,7 +9,6 @@
   "author": "york yao <yaoao12306@outlook.com>",
   "license": "MIT",
   "dependencies": {
-    "glob": "7",
     "tslib": "1 || 2"
   },
   "publishConfig": {

diff --git a/packages/utils/src/index.ts b/packages/utils/src/index.ts
@@ -1,3 +1,2 @@
-export * from './tsconfig'
 export * from './language-service'
 export * from './js-doc'