Upgrade dependencies

Gerrit0 · Gerrit0 · commit e021751e5fb5 · 2023-02-11T08:57:06.000-07:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -15,6 +15,7 @@
 ### Bug Fixes
 
 -   Entry points under `node_modules` will no longer be ignored, #2151.
+-   Added `package.json` to exports declaration.
 
 ### Thanks!
 
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -6,7 +6,8 @@
   "main": "./dist/index.js",
   "exports": {
     ".": "./dist/index.js",
-    "./tsdoc.json": "./tsdoc.json"
+    "./tsdoc.json": "./tsdoc.json",
+    "./package.json": "./package.json"
   },
   "types": "./dist/index.d.ts",
   "bin": {
@@ -25,30 +26,29 @@
   },
   "dependencies": {
     "lunr": "^2.3.9",
-    "marked": "^4.2.5",
-    "minimatch": "^5.1.2",
-    "shiki": "^0.12.1"
+    "marked": "^4.2.12",
+    "minimatch": "^6.1.6",
+    "shiki": "^0.14.1"
   },
   "peerDependencies": {
     "typescript": "4.6.x || 4.7.x || 4.8.x || 4.9.x"
   },
   "devDependencies": {
     "@types/lunr": "^2.3.4",
     "@types/marked": "^4.0.8",
-    "@types/minimatch": "5.1.2",
     "@types/mocha": "^10.0.1",
     "@types/node": "14",
-    "@typescript-eslint/eslint-plugin": "^5.48.0",
-    "@typescript-eslint/parser": "^5.48.0",
+    "@typescript-eslint/eslint-plugin": "^5.51.0",
+    "@typescript-eslint/parser": "^5.51.0",
     "@typestrong/fs-fixture-builder": "github:TypeStrong/fs-fixture-builder#5a9486bc66f6e36988106685768396281f6cbc10",
     "c8": "^7.12.0",
-    "esbuild": "^0.16.15",
-    "eslint": "^8.31.0",
+    "esbuild": "^0.17.7",
+    "eslint": "^8.34.0",
     "mocha": "^10.2.0",
-    "prettier": "2.8.2",
+    "prettier": "2.8.4",
     "puppeteer": "^13.5.2",
     "ts-node": "^10.9.1",
-    "typescript": "4.9.4"
+    "typescript": "4.9.5"
   },
   "files": [
     "/bin",
diff --git a/src/index.ts b/src/index.ts
@@ -79,5 +79,5 @@ export {
 } from "./lib/serialization";
 export type { SerializeEventData } from "./lib/serialization";
 
-import * as TypeScript from "typescript";
+import TypeScript from "typescript";
 export { TypeScript };
diff --git a/src/lib/application.ts b/src/lib/application.ts
@@ -1,5 +1,5 @@
 import * as Path from "path";
-import * as ts from "typescript";
+import ts from "typescript";
 
 import { Converter } from "./converter/index";
 import { Renderer } from "./output/renderer";
diff --git a/src/lib/converter/comments/discovery.ts b/src/lib/converter/comments/discovery.ts
@@ -1,4 +1,4 @@
-import * as ts from "typescript";
+import ts from "typescript";
 import { ReflectionKind } from "../../models";
 import { assertNever, Logger } from "../../utils";
 import { CommentStyle } from "../../utils/options/declaration";
diff --git a/src/lib/converter/comments/index.ts b/src/lib/converter/comments/index.ts
@@ -1,4 +1,4 @@
-import * as ts from "typescript";
+import ts from "typescript";
 import { Comment, ReflectionKind } from "../../models";
 import { assertNever, Logger } from "../../utils";
 import type { CommentStyle } from "../../utils/options/declaration";
diff --git a/src/lib/converter/comments/linkResolver.ts b/src/lib/converter/comments/linkResolver.ts
@@ -1,4 +1,4 @@
-import * as ts from "typescript";
+import ts from "typescript";
 import {
     Comment,
     CommentDisplayPart,
diff --git a/src/lib/converter/context.ts b/src/lib/converter/context.ts
@@ -1,5 +1,5 @@
 import { ok as assert } from "assert";
-import * as ts from "typescript";
+import ts from "typescript";
 
 import {
     Reflection,
diff --git a/src/lib/converter/convert-expression.ts b/src/lib/converter/convert-expression.ts
@@ -1,4 +1,4 @@
-import * as ts from "typescript";
+import ts from "typescript";
 
 /**
  * Return the default value of the given node.
diff --git a/src/lib/converter/converter.ts b/src/lib/converter/converter.ts
@@ -1,4 +1,4 @@
-import * as ts from "typescript";
+import ts from "typescript";
 
 import type { Application } from "../application";
 import {
@@ -45,8 +45,8 @@ export class Converter extends ChildableComponent<
     /** @internal */
     @BindOption("externalPattern")
     externalPattern!: string[];
-    private externalPatternCache?: Minimatch[];
-    private excludeCache?: Minimatch[];
+    private externalPatternCache?: InstanceType<typeof Minimatch>[];
+    private excludeCache?: InstanceType<typeof Minimatch>[];
 
     /** @internal */
     @BindOption("excludeExternals")
diff --git a/src/lib/converter/factories/index-signature.ts b/src/lib/converter/factories/index-signature.ts
@@ -1,5 +1,5 @@
-import * as assert from "assert";
-import * as ts from "typescript";
+import assert from "assert";
+import ts from "typescript";
 import {
     DeclarationReflection,
     ParameterReflection,
diff --git a/src/lib/converter/factories/signature.ts b/src/lib/converter/factories/signature.ts
@@ -1,5 +1,5 @@
-import * as ts from "typescript";
-import * as assert from "assert";
+import ts from "typescript";
+import assert from "assert";
 import {
     ConversionFlags,
     DeclarationReflection,
diff --git a/src/lib/converter/jsdoc.ts b/src/lib/converter/jsdoc.ts
@@ -3,7 +3,7 @@
 // @callback
 
 import { ok } from "assert";
-import * as ts from "typescript";
+import ts from "typescript";
 import {
     DeclarationReflection,
     IntrinsicType,
diff --git a/src/lib/converter/plugins/ImplementsPlugin.ts b/src/lib/converter/plugins/ImplementsPlugin.ts
@@ -1,4 +1,4 @@
-import * as ts from "typescript";
+import ts from "typescript";
 import {
     ContainerReflection,
     DeclarationReflection,
diff --git a/src/lib/converter/plugins/SourcePlugin.ts b/src/lib/converter/plugins/SourcePlugin.ts
@@ -1,4 +1,4 @@
-import * as ts from "typescript";
+import ts from "typescript";
 
 import type { Reflection } from "../../models/reflections/index";
 import { Component, ConverterComponent } from "../components";
diff --git a/src/lib/converter/symbols.ts b/src/lib/converter/symbols.ts
@@ -1,5 +1,5 @@
-import * as assert from "assert";
-import * as ts from "typescript";
+import assert from "assert";
+import ts from "typescript";
 import {
     DeclarationReflection,
     IntrinsicType,
diff --git a/src/lib/converter/types.ts b/src/lib/converter/types.ts
@@ -1,5 +1,5 @@
-import * as assert from "assert";
-import * as ts from "typescript";
+import assert from "assert";
+import ts from "typescript";
 import {
     ArrayType,
     ConditionalType,
diff --git a/src/lib/converter/utils/nodes.ts b/src/lib/converter/utils/nodes.ts
@@ -1,4 +1,4 @@
-import * as ts from "typescript";
+import ts from "typescript";
 
 export function isNamedNode(node: ts.Node): node is ts.Node & {
     name: ts.Identifier | ts.PrivateIdentifier | ts.ComputedPropertyName;
diff --git a/src/lib/converter/utils/symbols.ts b/src/lib/converter/utils/symbols.ts
@@ -1,4 +1,4 @@
-import * as ts from "typescript";
+import ts from "typescript";
 
 export function resolveAliasedSymbol(
     symbol: ts.Symbol,
diff --git a/src/lib/utils/entry-point.ts b/src/lib/utils/entry-point.ts
@@ -1,5 +1,5 @@
 import { join, relative, resolve } from "path";
-import * as ts from "typescript";
+import ts from "typescript";
 import * as FS from "fs";
 import * as Path from "path";
 import {
diff --git a/src/lib/utils/loggers.ts b/src/lib/utils/loggers.ts
@@ -1,4 +1,4 @@
-import * as ts from "typescript";
+import ts from "typescript";
 import { url } from "inspector";
 import { resolve } from "path";
 import { nicePath } from "./paths";
diff --git a/src/lib/utils/options/readers/tsconfig.ts b/src/lib/utils/options/readers/tsconfig.ts
@@ -1,7 +1,7 @@
 import { resolve, join, dirname } from "path";
 import { existsSync, statSync } from "fs";
 
-import * as ts from "typescript";
+import ts from "typescript";
 
 import type { Options, OptionsReader } from "../options";
 import type { Logger } from "../../loggers";
diff --git a/src/lib/utils/options/readers/typedoc.ts b/src/lib/utils/options/readers/typedoc.ts
@@ -1,6 +1,6 @@
 import { join, dirname, resolve } from "path";
 import * as FS from "fs";
-import * as ts from "typescript";
+import ts from "typescript";
 
 import type { OptionsReader } from "..";
 import type { Logger } from "../../loggers";
diff --git a/src/lib/utils/package-manifest.ts b/src/lib/utils/package-manifest.ts
@@ -117,7 +117,7 @@ export function expandPackages(
     logger: Logger,
     packageJsonDir: string,
     workspaces: string[],
-    exclude: Minimatch[]
+    exclude: InstanceType<typeof Minimatch>[]
 ): string[] {
     // Technically npm and Yarn workspaces don't support recursive nesting,
     // however we support the passing of paths to either packages or
diff --git a/src/lib/utils/paths.ts b/src/lib/utils/paths.ts
@@ -7,7 +7,9 @@ import { normalizePath } from "./fs";
  *
  * Handle a few Windows-Unix path gotchas.
  */
-export function createMinimatch(patterns: string[]): Minimatch[] {
+export function createMinimatch(
+    patterns: string[]
+): InstanceType<typeof Minimatch>[] {
     return patterns.map(
         (pattern) =>
             new Minimatch(normalizePath(pattern).replace(/^\w:\//, ""), {
@@ -16,7 +18,10 @@ export function createMinimatch(patterns: string[]): Minimatch[] {
     );
 }
 
-export function matchesAny(patterns: readonly Minimatch[], path: string) {
+export function matchesAny(
+    patterns: readonly InstanceType<typeof Minimatch>[],
+    path: string
+) {
     const normPath = normalizePath(path).replace(/^\w:\//, "");
     return patterns.some((pat) => pat.match(normPath));
 }
diff --git a/src/lib/validation/exports.ts b/src/lib/validation/exports.ts
@@ -1,4 +1,4 @@
-import * as ts from "typescript";
+import ts from "typescript";
 import type { ProjectReflection } from "../models";
 import type { Logger } from "../utils";
 import { discoverAllReferenceTypes } from "../utils/reflections";
diff --git a/src/test/TestLogger.ts b/src/test/TestLogger.ts
@@ -1,6 +1,6 @@
 import { Logger, LogLevel, removeIf } from "../lib/utils";
 import { fail, ok } from "assert";
-import * as ts from "typescript";
+import ts from "typescript";
 import { resolve } from "path";
 
 const levelMap: Record<LogLevel, string> = {
diff --git a/src/test/comments.test.ts b/src/test/comments.test.ts
@@ -1,5 +1,5 @@
 import { deepStrictEqual as equal } from "assert";
-import * as ts from "typescript";
+import ts from "typescript";
 import type { CommentParserConfig } from "../lib/converter/comments";
 
 import { lexBlockComment } from "../lib/converter/comments/blockLexer";
diff --git a/src/test/converter/declaration/external.d.ts b/src/test/converter/declaration/external.d.ts
@@ -1,3 +1,3 @@
-import * as ts from "typescript";
+import ts from "typescript";
 
 export const ActionSet: ts.server.ActionSet;
diff --git a/src/test/programs.ts b/src/test/programs.ts
@@ -1,6 +1,6 @@
 import { deepStrictEqual as equal } from "assert";
 import { join } from "path";
-import * as ts from "typescript";
+import ts from "typescript";
 import {
     Application,
     EntryPointStrategy,
diff --git a/tsconfig.json b/tsconfig.json
@@ -1,6 +1,6 @@
 {
     "compilerOptions": {
-        "module": "CommonJS",
+        "module": "Node16",
         "lib": ["es2020"],
         "target": "es2020",
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import * as ts from "typescript";`
	`1`	`+import ts from "typescript";`
`2`	`2`	`import { ReflectionKind } from "../../models";`
`3`	`3`	`import { assertNever, Logger } from "../../utils";`
`4`	`4`	`import { CommentStyle } from "../../utils/options/declaration";`