Merge pull request #2 from seivan/feature/webpack_2

Feature/webpack 2
basarat · Feb 13, 2017 · 1fc8985 · 1fc8985
2 parents 32daa95 + f161d24
commit 1fc8985
Show file tree

Hide file tree

Showing 10 changed files with 16 additions and 5,120 deletions.
diff --git a/package.json b/package.json
@@ -5,18 +5,23 @@
   "main": "index.js",
   "repository": "https://github.com/basarat/react-typescript.git",
   "scripts": {
-    "prepublish": "typings install",
     "start": "webpack --watch"
   },
   "keywords": [],
   "author": "",
   "license": "ISC",
+
+  "dependencies": {
+    "@types/react": "^15.0.9",
+    "@types/react-dom": "^0.14.23",
+    "react": "^15.4.2",
+    "react-dom": "^15.4.2"
+  },
+
   "devDependencies": {
-    "react": "^15.1.0",
-    "react-dom": "^15.1.0",
-    "ts-loader": "^0.8.2",
-    "typescript": "^1.9.0-dev.20160328",
-    "typings": "^0.7.9",
-    "webpack": "^1.12.14"
+    "source-map-loader": "^0.1.6",
+    "ts-loader": "^2.0.0",
+    "typescript": "^2.1.6",
+    "webpack": "^2.2.1"
   }
 }
diff --git a/tsconfig.json b/tsconfig.json
@@ -1,14 +1,12 @@
 {
   "compilerOptions": {
-      "target": "es5",
+      "target": "es6",
       "module": "commonjs",
       "sourceMap": true,
       "jsx": "react"
   },
   "exclude": [
-      "node_modules",
-      "typings/browser",
-      "typings/browser.d.ts"
+      "node_modules"
   ],
   "compileOnSave": false
 }
diff --git a/typings.json b/typings.json
diff --git a/typings/browser.d.ts b/typings/browser.d.ts
diff --git a/typings/browser/ambient/react-dom/index.d.ts b/typings/browser/ambient/react-dom/index.d.ts