Merge pull request #20 from hipstersmoothie/deps

update deps

Author: hipstersmoothie

.gitignore

@@ -1,4 +1,3 @@
 node_modules
-yarn.lock
 dist
 .env

readme.md README.mdreadme.md renamed to README.md

@@ -27,7 +27,7 @@
     "debug": "^4.1.1",
     "endent": "^2.0.1",
     "micromatch": "^4.0.2",
-    "react-docgen-typescript": "^1.20.1",
+    "react-docgen-typescript": "^1.20.5",
     "tslib": "^2.0.0"
   },
   "devDependencies": {
@@ -37,18 +37,18 @@
     "@types/node": "^14.0.12",
     "@types/react": "^17.0.0",
     "@types/webpack": "^4.41.17",
-    "@typescript-eslint/eslint-plugin": "2.31.0",
-    "@typescript-eslint/parser": "2.31.0",
+    "@typescript-eslint/eslint-plugin": "^4.9.0",
+    "@typescript-eslint/parser": "^4.9.0",
     "auto": "^10.2.3",
     "auto-config-hipstersmoothie": "^4.0.0",
-    "eslint": "7.0.0",
-    "eslint-config-airbnb-base": "14.1.0",
+    "eslint": "^7.14.0",
+    "eslint-config-airbnb-base": "^14.2.1",
     "eslint-config-prettier": "6.11.0",
     "eslint-config-xo": "0.29.1",
-    "eslint-plugin-import": "2.20.2",
+    "eslint-plugin-import": "^2.22.1",
     "eslint-plugin-jest": "^24.1.3",
     "eslint-plugin-jsdoc": "25.2.0",
-    "eslint-plugin-jsx-a11y": "6.2.3",
+    "eslint-plugin-jsx-a11y": "^6.4.1",
     "eslint-plugin-prettier": "3.1.3",
     "jest": "^26.6.3",
     "prettier": "^2.0.5",

package.json

@@ -2,6 +2,15 @@ import path from "path";
 import ts from "typescript";
 import { ComponentDoc, PropItem } from "react-docgen-typescript";
 
+export interface GeneratorOptions {
+  filename: string;
+  source: string;
+  componentDocs: ComponentDoc[];
+  docgenCollectionName: string | null;
+  setDisplayName: boolean;
+  typePropName: string;
+}
+
 /**
  * Inserts a ts-ignore comment above the supplied statement.
  *
@@ -312,15 +321,6 @@ function setComponentDocGen(
   );
 }
 
-export interface GeneratorOptions {
-  filename: string;
-  source: string;
-  componentDocs: ComponentDoc[];
-  docgenCollectionName: string | null;
-  setDisplayName: boolean;
-  typePropName: string;
-}
-
 export function generateDocgenCodeBlock(options: GeneratorOptions): string {
   const sourceFile = ts.createSourceFile(
     options.filename,

src/generateDocgenCodeBlock.ts

@@ -146,7 +146,7 @@ export default class DocgenPlugin {
     this.options = options;
   }
 
-  apply(compiler: webpack.Compiler) {
+  apply(compiler: webpack.Compiler): void {
     const {
       tsconfigPath = "./tsconfig.json",
       docgenCollectionName = "STORYBOOK_REACT_CLASSES",
@@ -168,7 +168,10 @@ export default class DocgenPlugin {
     };
 
     if (userCompilerOptions) {
-      compilerOptions = { ...compilerOptions, ...userCompilerOptions };
+      compilerOptions = {
+        ...compilerOptions,
+        ...userCompilerOptions,
+      };
     } else {
       const { options } = getTSConfigFile(tsconfigPath);
       compilerOptions = { ...compilerOptions, ...options };