ff-stream-web

commit fa7b6fd4670df2343aab4c0a2cff5999d7ee15da
parent 7a64c010ad1c0b67f002a0cc38edfe3e9d61fdf0
Author: Konstantin Tarkus <hello@tarkus.me>
Date:   Sat, 19 Dec 2015 10:23:43 +0300

Read assets.json file with fs.readFile instead of require()

Diffstat:
M
src/server.js
 | 
2
+-
M
tools/webpack.config.js
 | 
5
+++--

2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/server.js b/src/server.js
@@ -7,7 +7,7 @@ import React from 'react';
 import ReactDOM from 'react-dom/server';
 import Router from './routes';
 import Html from './components/Html';
-import assets from './assets.json';
+import assets from './assets';
 import { port } from './config';
 
 const server = global.server = express();
diff --git a/tools/webpack.config.js b/tools/webpack.config.js
@@ -123,7 +123,8 @@ const clientConfig = merge({}, config, {
     new webpack.DefinePlugin(GLOBALS),
     new AssetsPlugin({
       path: path.join(__dirname, '../build'),
-      filename: 'assets.json',
+      filename: 'assets.js',
+      processOutput: x => `module.exports = ${JSON.stringify(x)};`,
     }),
     ...(!DEBUG ? [
       new webpack.optimize.DedupePlugin(),
@@ -151,7 +152,7 @@ const serverConfig = merge({}, config, {
   },
   target: 'node',
   externals: [
-    /^\.\/assets\.json$/,
+    /^\.\/assets$/,
     function filter(context, request, cb) {
       const isExternal =
         request.match(/^[@a-z][a-z\/\.\-0-9]*$/i) &&