From 5b8ccdc25922780ee8af252dc13a5cc4d143a3c3 Mon Sep 17 00:00:00 2001
From: Damian Cyntler <damian@cyntler.com>
Date: Fri, 15 Apr 2022 17:02:09 +0200
Subject: [PATCH] Refactor tsconfig.json

---
 package.json      | 126 +++++++++++++++++++++++-----------------------
 tsconfig-npm.json |  28 -----------
 tsconfig.json     |   5 +-
 3 files changed, 65 insertions(+), 94 deletions(-)
 delete mode 100644 tsconfig-npm.json

diff --git a/package.json b/package.json
index 156e9b49..e33426d8 100644
--- a/package.json
+++ b/package.json
@@ -1,65 +1,65 @@
 {
- "name": "@cyntler/react-doc-viewer",
- "version": "0.1.5",
- "description": "Document viewer for react. Renders online/local documents.",
- "author": "Matthew Mogford",
- "license": "ISC",
- "repository": {
-  "url": "https://github.com/cyntler/react-doc-viewer"
- },
- "main": "build/index.js",
- "types": "build/index.d.ts",
- "scripts": {
-  "start": "react-scripts start",
-  "build": "rm -rf build && tsc -p tsconfig-npm.json",
-  "test": "react-scripts test",
-  "eject": "react-scripts eject",
-  "version:patch": "npm run version:pre && npm run version:changelog && npm version patch && npm run version:post",
-  "version:minor": "npm run version:pre && npm run version:changelog && npm version minor && npm run version:post",
-  "version:major": "npm run version:pre && npm run version:changelog && npm version major && npm run version:post",
-  "version:pre": "if [ $(git rev-parse --abbrev-ref HEAD) != 'master' ]; then echo \"\\033[1m\\033[31mCurrently on $(git rev-parse --abbrev-ref HEAD) branch. Please checkout master.\\033[0m\"; exit 1; else exit 0; fi",
-  "version:changelog": "changelog -p && git add CHANGELOG.md && git commit -m 'updated CHANGELOG.md'",
-  "version:post": "git push origin master && git push origin master --tags",
-  "build-release:patch": "react-scripts test --watchAll=false && npm run build && npm run version:patch",
-  "build-release:minor": "react-scripts test --watchAll=false && npm run build && npm run version:minor",
-  "build-release:major": "react-scripts test --watchAll=false && npm run build && npm run version:major"
- },
- "dependencies": {
-  "pdfjs-dist": "2.4.456",
-  "react-pdf": "5.0.0",
-  "styled-components": "^5.1.1",
-  "wl-msg-reader": "^0.2.0"
- },
- "devDependencies": {
-  "@testing-library/jest-dom": "^4.2.4",
-  "@testing-library/react": "^9.3.2",
-  "@testing-library/user-event": "^7.1.2",
-  "@types/jest": "^24.0.0",
-  "@types/node": "^12.0.0",
-  "@types/pdfjs-dist": "2.1.5",
-  "@types/react": "^16.9.46",
-  "@types/react-dom": "^16.9.8",
-  "@types/react-pdf": "4.0.5",
-  "@types/styled-components": "^5.1.2",
-  "generate-changelog": "^1.8.0",
-  "react": "^16.13.1",
-  "react-dom": "^16.13.1",
-  "react-scripts": "3.4.3",
-  "typescript": "^3.9.7"
- },
- "eslintConfig": {
-  "extends": "react-app"
- },
- "browserslist": {
-  "production": [
-   ">0.2%",
-   "not dead",
-   "not op_mini all"
-  ],
-  "development": [
-   "last 1 chrome version",
-   "last 1 firefox version",
-   "last 1 safari version"
-  ]
- }
+  "name": "@cyntler/react-doc-viewer",
+  "version": "0.1.5",
+  "description": "Document viewer for react. Renders online/local documents.",
+  "author": "Matthew Mogford",
+  "license": "ISC",
+  "repository": {
+    "url": "https://github.com/cyntler/react-doc-viewer"
+  },
+  "main": "build/index.js",
+  "types": "build/index.d.ts",
+  "scripts": {
+    "start": "react-scripts start",
+    "build": "rm -rf build && tsc",
+    "test": "react-scripts test",
+    "eject": "react-scripts eject",
+    "version:patch": "npm run version:pre && npm run version:changelog && npm version patch && npm run version:post",
+    "version:minor": "npm run version:pre && npm run version:changelog && npm version minor && npm run version:post",
+    "version:major": "npm run version:pre && npm run version:changelog && npm version major && npm run version:post",
+    "version:pre": "if [ $(git rev-parse --abbrev-ref HEAD) != 'master' ]; then echo \"\\033[1m\\033[31mCurrently on $(git rev-parse --abbrev-ref HEAD) branch. Please checkout master.\\033[0m\"; exit 1; else exit 0; fi",
+    "version:changelog": "changelog -p && git add CHANGELOG.md && git commit -m 'updated CHANGELOG.md'",
+    "version:post": "git push origin master && git push origin master --tags",
+    "build-release:patch": "react-scripts test --watchAll=false && npm run build && npm run version:patch",
+    "build-release:minor": "react-scripts test --watchAll=false && npm run build && npm run version:minor",
+    "build-release:major": "react-scripts test --watchAll=false && npm run build && npm run version:major"
+  },
+  "dependencies": {
+    "pdfjs-dist": "2.4.456",
+    "react-pdf": "5.0.0",
+    "styled-components": "^5.1.1",
+    "wl-msg-reader": "^0.2.0"
+  },
+  "devDependencies": {
+    "@testing-library/jest-dom": "^4.2.4",
+    "@testing-library/react": "^9.3.2",
+    "@testing-library/user-event": "^7.1.2",
+    "@types/jest": "^24.0.0",
+    "@types/node": "^12.0.0",
+    "@types/pdfjs-dist": "2.1.5",
+    "@types/react": "^16.9.46",
+    "@types/react-dom": "^16.9.8",
+    "@types/react-pdf": "4.0.5",
+    "@types/styled-components": "^5.1.2",
+    "generate-changelog": "^1.8.0",
+    "react": "^16.13.1",
+    "react-dom": "^16.13.1",
+    "react-scripts": "3.4.3",
+    "typescript": "^3.9.7"
+  },
+  "eslintConfig": {
+    "extends": "react-app"
+  },
+  "browserslist": {
+    "production": [
+      ">0.2%",
+      "not dead",
+      "not op_mini all"
+    ],
+    "development": [
+      "last 1 chrome version",
+      "last 1 firefox version",
+      "last 1 safari version"
+    ]
+  }
 }
diff --git a/tsconfig-npm.json b/tsconfig-npm.json
deleted file mode 100644
index 11837c6a..00000000
--- a/tsconfig-npm.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-  "compilerOptions": {
-    "outDir": "./build",
-    "target": "es5",
-    "module": "commonjs",
-    "lib": ["dom", "dom.iterable", "esnext"],
-    "declaration": true,
-    "allowJs": true,
-    "skipLibCheck": true,
-    "esModuleInterop": true,
-    "allowSyntheticDefaultImports": true,
-    "strict": true,
-    "forceConsistentCasingInFileNames": true,
-    "moduleResolution": "node",
-    "resolveJsonModule": true,
-    "isolatedModules": true,
-    // "noEmit": true,
-    "jsx": "react"
-  },
-  "include": ["src"],
-  "exclude": [
-    "src/__tests__",
-    "src/_example-files_",
-    "src/serviceWorker.ts",
-    "src/setupTests.ts",
-    "src/index.tsx"
-  ]
-}
diff --git a/tsconfig.json b/tsconfig.json
index aeb917f8..8279f3da 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -2,7 +2,7 @@
   "compilerOptions": {
     "outDir": "./build",
     "target": "es5",
-    "module": "esnext",
+    "module": "commonjs",
     "lib": ["dom", "dom.iterable", "esnext"],
     "declaration": true,
     "allowJs": true,
@@ -14,8 +14,7 @@
     "moduleResolution": "node",
     "resolveJsonModule": true,
     "isolatedModules": true,
-    "jsx": "react",
-    "noEmit": true
+    "jsx": "react"
   },
   "include": ["src"],
   "exclude": [