Update case 15

michael-haddad · Nov 19, 2017 · baa3bba · baa3bba
1 parent d61487f
commit baa3bba
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 11 deletions.
diff --git a/15 LoginForm/.babelrc b/15 LoginForm/.babelrc
@@ -0,0 +1,10 @@
+{
+  "presets": [
+    [
+      "env",
+      {
+        "modules": false
+      }
+    ]
+  ]
+}
diff --git a/15 LoginForm/package.json b/15 LoginForm/package.json
@@ -11,25 +11,27 @@
   "license": "MIT",
   "dependencies": {
     "bootstrap": "~3.3.7",
-    "react": "~15.6.1",
-    "react-dom": "~15.6.1",
+    "react": "~16.1.1",
+    "react-dom": "~16.1.1",
     "react-router": "^4.2.0",
     "react-router-dom": "^4.2.2"
   },
   "devDependencies": {
     "@types/history": "^4.6.0",
     "@types/react-router-dom": "^4.0.7",
     "@types/react": "~16.0.5",
-    "@types/react-dom": "~15.5.4",
+    "@types/react-dom": "~16.0.3",
+    "babel-core": "^6.26.0",
+    "babel-preset-env": "^1.6.1",
     "awesome-typescript-loader": "^3.2.3",
     "css-loader": "~0.28.7",
     "extract-text-webpack-plugin": "^3.0.0",
-    "file-loader": "~0.11.2",
+    "file-loader": "~1.1.5",
     "html-webpack-plugin": "~2.30.1",
-    "style-loader": "~0.18.2",
-    "typescript": "~2.5.2",
-    "url-loader": "~0.5.9",
-    "webpack": "~3.6.0",
+    "style-loader": "~0.19.0",
+    "typescript": "~2.6.1",
+    "url-loader": "~0.6.2",
+    "webpack": "~3.8.1",
     "webpack-dev-server": "^2.8.2"
   }
 }
diff --git a/15 LoginForm/tsconfig.json b/15 LoginForm/tsconfig.json
@@ -1,7 +1,8 @@
 {
   "compilerOptions": {
-    "target": "es5",
-    "module": "commonjs",
+    "target": "es6",
+    "module": "es6",
+    "moduleResolution": "node",
     "declaration": false,
     "noImplicitAny": false,
     "jsx": "react",
@@ -13,4 +14,4 @@
   "exclude": [
     "node_modules"
   ]
-}
+}
diff --git a/15 LoginForm/webpack.config.js b/15 LoginForm/webpack.config.js
@@ -36,6 +36,9 @@ module.exports = {
         test: /\.(ts|tsx)$/,
         exclude: /node_modules/,
         loader: 'awesome-typescript-loader',
+        options: {
+          useBabel: true,
+        },
       },
       {
         test: /\.css$/,