Add file-loader support for static assets in subdirectories. Log serv…

…er-side Transmit errors.
RickWong · Feb 22, 2016 · 42b50f2 · 42b50f2
1 parent aa09cf5
commit 42b50f2
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/configs/webpack.client.js b/configs/webpack.client.js
@@ -23,7 +23,7 @@ module.exports = {
 	module:  {
 		loaders: [
 			{test: /\.json$/, loaders: ["json"]},
-			{test: /\.(ico|gif|png|jpg|jpeg|svg|webp|ttf|eot|woff|woff2)$/, loaders: ["file?name=/[name].[ext]"]}
+			{test: /\.(ico|gif|png|jpg|jpeg|svg|webp)$/, loaders: ["file?context=static&name=/[path][name].[ext]"]}
 		],
 		postLoaders: [
 			{test: /\.js$/, loaders: ["babel?presets[]=es2015&presets[]=stage-0&presets[]=react"], exclude: /node_modules/}

diff --git a/configs/webpack.server.js b/configs/webpack.server.js
@@ -21,7 +21,7 @@ module.exports = {
 	module:  {
 		loaders: [
 			{test: /\.json$/, loaders: ["json"]},
-			{test: /\.(ico|gif|png|jpg|jpeg|svg|webp|ttf|eot|woff|woff2)$/, loaders: ["file?name=/[name].[ext]"]}
+			{test: /\.(ico|gif|png|jpg|jpeg|svg|webp)$/, loaders: ["file?context=static&name=/[path][name].[ext]"]}
 		],
 		postLoaders: [
 			{test: /\.js$/, loaders: ["babel?presets[]=es2015&presets[]=stage-0&presets[]=react"], exclude: /node_modules/}

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "react-isomorphic-starterkit",
   "description": "Isomorphic starterkit with server-side React rendering.",
-  "version": "5.3.0",
+  "version": "5.3.1",
   "license": "BSD-3-Clause",
   "repository": {
     "type": "git",

diff --git a/src/server.js b/src/server.js
@@ -60,6 +60,8 @@ try {
 					this.body = Transmit.injectIntoMarkup(template, reactData, [`${webserver}/dist/client.js`]);
 
 					callback(null);
+				}).catch(e => {
+					callback(e);
 				});
 			});
 		});