From 7214fa326a29453664080166aa88e83a5035dded Mon Sep 17 00:00:00 2001
From: Zino Hofmann <zino@hofmann.amsterdam>
Date: Tue, 24 Apr 2018 14:29:18 +0200
Subject: [PATCH 1/4] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20Cleanup=20random=20key?=
 =?UTF-8?q?strokes=20in=20Home=20component?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 examples/with-typescript/src/Home.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/with-typescript/src/Home.tsx b/examples/with-typescript/src/Home.tsx
index bc43a2df7..0c619b709 100644
--- a/examples/with-typescript/src/Home.tsx
+++ b/examples/with-typescript/src/Home.tsx
@@ -13,7 +13,7 @@ class Home extends React.Component<{}, {}> {
         </div>
         <p className="Home-intro">
           To get started, edit <code>src/App.tsx</code> or{' '}
-          <code>src/Home.tsx</code> and save asdasdfto reload.
+          <code>src/Home.tsx</code> and save to reload.
         </p>
         <ul className="Home-resources">
           <li>

From a843afdd07d87d61803102e486918e1bd2d79de0 Mon Sep 17 00:00:00 2001
From: Zino Hofmann <zino@hofmann.amsterdam>
Date: Tue, 24 Apr 2018 14:34:30 +0200
Subject: [PATCH 2/4] =?UTF-8?q?=E2=9C=A8=20Upgrade=20deps=20and=20TypeScri?=
 =?UTF-8?q?pt.=20Now=20supports=20the=20new=20fragment=20syntax<></>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 examples/with-typescript/package.json     | 32 +++++++++++------------
 examples/with-typescript/razzle.config.js |  7 +++--
 2 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/examples/with-typescript/package.json b/examples/with-typescript/package.json
index f3c5aa45b..cd0d21f9c 100644
--- a/examples/with-typescript/package.json
+++ b/examples/with-typescript/package.json
@@ -9,27 +9,27 @@
     "start:prod": "NODE_ENV=production node build/server.js"
   },
   "dependencies": {
-    "express": "^4.15.3",
-    "react": "^16.0.0",
-    "react-dom": "^16.0.0",
+    "express": "^4.16.3",
+    "react": "^16.3.2",
+    "react-dom": "^16.3.2",
     "react-router-dom": "^4.2.2"
   },
   "devDependencies": {
-    "@types/express": "^4.0.35",
-    "@types/jest": "^20.0.1",
-    "@types/node": "8.0.53",
-    "@types/react": "^16.0.9",
-    "@types/react-dom": "^16.0.0",
-    "@types/react-router-dom": "^4.2.3",
-    "@types/webpack-env": "^1.13.2",
+    "@types/express": "^4.11.1",
+    "@types/jest": "^22.2.3",
+    "@types/node": "9.6.6",
+    "@types/react": "^16.3.12",
+    "@types/react-dom": "^16.0.5",
+    "@types/react-router-dom": "^4.2.6",
+    "@types/webpack-env": "^1.13.6",
     "raf": "^3.4.0",
     "razzle": "^2.0.0-alpha.12",
-    "ts-jest": "20.0.6",
-    "ts-loader": "^4.1.0",
-    "tslint": "5.9.1",
-    "tslint-loader": "wbuchwalter/tslint-loader",
-    "tslint-react": "^3.2.0",
-    "typescript": "2.5.1"
+    "ts-jest": "^22.4.4",
+    "ts-loader": "^4.2.0",
+    "tslint": "^5.9.1",
+    "tslint-loader": "^4.2.0",
+    "tslint-react": "^3.5.1",
+    "typescript": "^2.8.3"
   },
   "jest": {
     "transform": {
diff --git a/examples/with-typescript/razzle.config.js b/examples/with-typescript/razzle.config.js
index 63fd2322c..6b7d9d47a 100644
--- a/examples/with-typescript/razzle.config.js
+++ b/examples/with-typescript/razzle.config.js
@@ -35,14 +35,17 @@ module.exports = {
     const tsLoader = {
       include,
       test: /\.tsx?$/,
-      loader: require.resolve('ts-loader'),
+      loader: 'ts-loader',
+      options: {
+        transpileOnly: true,
+      },
     };
 
     const tslintLoader = {
       include,
       enforce: 'pre',
       test: /\.tsx?$/,
-      loader: require.resolve('tslint-loader'),
+      loader: 'tslint-loader',
       options: {
         emitErrors: true,
         configFile: './tslint.json',

From 0c3c23a3a6b2d404354fd39ddbec13f1ab57ea8d Mon Sep 17 00:00:00 2001
From: Zino Hofmann <zino@hofmann.amsterdam>
Date: Tue, 24 Apr 2018 14:35:21 +0200
Subject: [PATCH 3/4] =?UTF-8?q?=F0=9F=91=A8=F0=9F=8F=BC=E2=80=8D?=
 =?UTF-8?q?=F0=9F=8E=A8=20Add=20myself=20to=20the=20contributers=20list?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .all-contributorsrc | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/.all-contributorsrc b/.all-contributorsrc
index 80dcb914e..fca057fcc 100644
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@@ -56,6 +56,15 @@
         "code",
         "ideas"
       ]
+    },
+    {
+      "login": "HofmannZ",
+      "name": "Zino Hofmann",
+      "avatar_url": "https://avatars3.githubusercontent.com/u/17142193?v=4",
+      "profile": "https://www.linkedin.com/in/zinohofmann/",
+      "contributions": [
+        "example"
+      ]
     }
   ]
 }

From 854f01af77c8df376fb82eb76758effc192664a3 Mon Sep 17 00:00:00 2001
From: Zino Hofmann <zino@hofmann.amsterdam>
Date: Tue, 24 Apr 2018 14:40:57 +0200
Subject: [PATCH 4/4] =?UTF-8?q?=F0=9F=93=8F=20Prietier=20linting=20fixes?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                                     | 12 ++++++++----
 .../templates/default/src/server.js              | 16 ++++++++++------
 .../razzle-dev-utils/FriendlyErrorsPlugin.js     |  5 +++--
 packages/razzle-dev-utils/printErrors.js         |  2 +-
 4 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/package.json b/package.json
index f6ea509f5..2e0296354 100644
--- a/package.json
+++ b/package.json
@@ -18,12 +18,14 @@
     "e2e": "jest --config ./test/jest.config.json --verbose --no-cache ",
     "clean": "lerna clean --yes && node ./scripts/clean.js",
     "changelog": "lerna-changelog",
-    "format":
-      "prettier --trailing-comma es5 --single-quote --write 'packages/*/*.js' 'packages/*/!(node_modules)/**/*.js'",
+    "format": "prettier --trailing-comma es5 --single-quote --write 'packages/*/*.js' 'packages/*/!(node_modules)/**/*.js'",
     "precommit": "lint-staged"
   },
   "lint-staged": {
-    "*.js": ["prettier --trailing-comma es5 --single-quote --write", "git add"]
+    "*.js": [
+      "prettier --trailing-comma es5 --single-quote --write",
+      "git add"
+    ]
   },
   "resolutions": {
     "file-loader": "1.1.11"
@@ -35,7 +37,9 @@
       "<rootDir>/node_modules/",
       "<rootDir>/examples/"
     ],
-    "collectCoverageFrom": ["**/*.js"],
+    "collectCoverageFrom": [
+      "**/*.js"
+    ],
     "coveragePathIgnorePatterns": [
       "<rootDir>/node_modules/",
       "<rootDir>/packages/*/node_modules/",
diff --git a/packages/create-razzle-app/templates/default/src/server.js b/packages/create-razzle-app/templates/default/src/server.js
index e0b0da8f8..e85bfe51a 100644
--- a/packages/create-razzle-app/templates/default/src/server.js
+++ b/packages/create-razzle-app/templates/default/src/server.js
@@ -29,12 +29,16 @@ server
         <meta charset="utf-8" />
         <title>Welcome to Razzle</title>
         <meta name="viewport" content="width=device-width, initial-scale=1">
-        ${assets.client.css
-          ? `<link rel="stylesheet" href="${assets.client.css}">`
-          : ''}
-        ${process.env.NODE_ENV === 'production'
-          ? `<script src="${assets.client.js}" defer></script>`
-          : `<script src="${assets.client.js}" defer crossorigin></script>`}
+        ${
+          assets.client.css
+            ? `<link rel="stylesheet" href="${assets.client.css}">`
+            : ''
+        }
+        ${
+          process.env.NODE_ENV === 'production'
+            ? `<script src="${assets.client.js}" defer></script>`
+            : `<script src="${assets.client.js}" defer crossorigin></script>`
+        }
     </head>
     <body>
         <div id="root">${markup}</div>
diff --git a/packages/razzle-dev-utils/FriendlyErrorsPlugin.js b/packages/razzle-dev-utils/FriendlyErrorsPlugin.js
index 8fe7ba7b7..5ac2b4ddd 100644
--- a/packages/razzle-dev-utils/FriendlyErrorsPlugin.js
+++ b/packages/razzle-dev-utils/FriendlyErrorsPlugin.js
@@ -50,8 +50,9 @@ class WebpackErrorsPlugin {
       ) {
         messages.errors.forEach(e => {
           logger.error(
-            `Failed to compile ${this.target} with ${messages.errors
-              .length} errors`,
+            `Failed to compile ${this.target} with ${
+              messages.errors.length
+            } errors`,
             e
           );
         });
diff --git a/packages/razzle-dev-utils/printErrors.js b/packages/razzle-dev-utils/printErrors.js
index 936596f74..e63df66dd 100644
--- a/packages/razzle-dev-utils/printErrors.js
+++ b/packages/razzle-dev-utils/printErrors.js
@@ -4,7 +4,7 @@ const chalk = require('chalk');
 
 /**
  * Print an array of errors to console.
- * 
+ *
  * @param {string} summary Summary of error
  * @param {Array<Error>} errors Array of Errors
  */