Merge pull request #2 from oslabs-beta/dev

update react and react-konva versioning

Author: SevereCodes

.babelrc

@@ -8,7 +8,6 @@
     ],
     "react",
     "stage-0"
-    // "@babel/preset-typescript"
   ],
   "plugins": ["transform-es2015-modules-commonjs"]
 }

package.json

@@ -94,7 +94,7 @@
     "d3": "^5.9.2",
     "electron-reload": "^1.4.0",
     "enzyme": "^3.4.1",
-    "konva": "^2.1.7",
+    "konva": "^4.1.4",
     "localforage": "^1.7.2",
     "lodash.throttle": "^4.1.1",
     "prettier": "^1.14.2",
@@ -103,15 +103,17 @@
     "react-d3-tree": "^1.12.3",
     "react-dom": "^16.4.1",
     "react-draggable": "^3.0.5",
-    "react-konva": "^1.7.12",
+    "react-konva": "^16.12.0-0",
     "react-redux": "^5.0.7",
     "react-sortable-tree": "^2.2.0",
     "react-syntax-highlighter": "^10.2.1",
     "redux": "^4.0.0",
     "redux-devtools-extension": "^2.13.5",
     "redux-logger": "^3.0.6",
     "redux-thunk": "^2.3.0",
-    "ts-loader": "^6.2.1"
+    "ts-loader": "^6.2.1",
+    "webpack": "^4.41.6",
+    "webpack-cli": "^3.3.11"
   },
   "devDependencies": {
     "@babel/preset-typescript": "^7.3.3",
@@ -146,8 +148,6 @@
     "postcss-loader": "^2.1.6",
     "sass-loader": "^7.0.3",
     "style-loader": "^0.20.3",
-    "typescript": "^3.4.4",
-    "webpack": "^4.4.0",
-    "webpack-cli": "^2.0.13"
+    "typescript": "^3.4.4"
   }
 }

tsconfig.json

@@ -3,11 +3,14 @@
     "outDir": "./build/",
     "sourceMap": true,
     "noImplicitAny": true,
-    "module": "commonjs",
-    "target": "es6",
     "jsx": "react",
-    "lib": ["es6", "dom", "es2017"],
+    "lib": ["dom", "esnext"],
+    "module": "esnext",
+    "esModuleInterop": true,
     "allowSyntheticDefaultImports": true
   },
-  "include": ["./src/**/*"]
+  "include": ["./src/**/*"],
+  "exclude": ["node_modules"]
 }
+
+