Skip to content

Commit dd66bd9

Browse files
committed
Properly link dev/prod assets (styles and bundles)
1 parent a1be85e commit dd66bd9

File tree

1 file changed

+9
-8
lines changed

1 file changed

+9
-8
lines changed

server/render.js

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,21 +10,22 @@ require.extensions['.html'] = (module, filename) => {
1010
};
1111

1212
const compile = template(require('../common/layouts/server.html'));
13+
const env = process.env.NODE_ENV || 'development';
1314

1415
export default function render(component, initialState) {
15-
// TODO: Replace this.
16-
if (process.env.NODE_ENV == 'development') {
16+
if (env === 'development') {
1717
global.ISOTools.refresh();
1818
}
1919

20-
const assets = global.ISOTools.assets().assets;
21-
const assetHost = config.assetHost;
20+
const assets = global.ISOTools.assets();
2221
const title = config.name;
23-
const favicon = assets['./common/images/favicon.png'];
24-
const stylesheet = assetHost + 'styles.css';
25-
const vendorJs = assetHost + 'vendor.js';
26-
const appJs = assetHost + 'app.js';
22+
const favicon = assets.assets['./common/images/favicon.png'];
23+
const vendorJs = assets.javascript.vendor;
24+
const appJs = assets.javascript.app;
2725
const html = renderToString(component);
26+
const stylesheet = env === 'development'
27+
? config.assetHost + 'styles.css'
28+
: assets.styles.app;
2829

2930
return compile({ html, title, favicon, stylesheet, vendorJs, appJs, initialState });
3031
}

0 commit comments

Comments
 (0)