Skip to content

Commit dfa011f

Browse files
committed
Reorganize top level directories into client, server, and common.
Fixes reduxjs#643
1 parent 6d349be commit dfa011f

File tree

13 files changed

+14
-11
lines changed

13 files changed

+14
-11
lines changed

examples/universal/bin/server.js

Lines changed: 0 additions & 2 deletions
This file was deleted.

examples/universal/client.js renamed to examples/universal/client/index.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
import 'babel-core/polyfill';
2+
23
import React from 'react';
3-
import configureStore from './store/configureStore';
44
import { Provider } from 'react-redux';
5-
import App from './containers/App';
5+
6+
import configureStore from '../common/store/configureStore';
7+
import App from '../common/containers/App';
68

79
const initialState = window.__INITIAL_STATE__;
810

examples/universal/index.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
require('./client.js');
1+
require('babel/register');
2+
require('./server');

examples/universal/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"description": "An example of a universally-rendered Redux application",
55
"scripts": {
66
"start": "npm run server & npm run client",
7-
"server": "node bin/server.js",
7+
"server": "node index.js",
88
"client": "webpack && node webpack.server.js"
99
},
1010
"repository": {

examples/universal/server.js renamed to examples/universal/server/index.js

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,19 @@
11
import path from 'path';
22
import Express from 'express';
33
import qs from 'qs';
4+
45
import React from 'react';
5-
import configureStore from './store/configureStore';
66
import { Provider } from 'react-redux';
7-
import App from './containers/App';
8-
import { fetchCounter } from './api/counter';
7+
8+
import configureStore from '../common/store/configureStore';
9+
import App from '../common/containers/App';
10+
import { fetchCounter } from '../common/api/counter';
911

1012
const app = Express();
1113
const port = 3000;
1214

1315
// Use this middleware to server up static files built into dist
14-
app.use(require('serve-static')(path.join(__dirname, 'dist')));
16+
app.use(require('serve-static')(path.join(__dirname, '../dist')));
1517

1618
// This is fired every time the server side receives a request
1719
app.use(handleRender);

examples/universal/webpack.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ module.exports = {
99
entry: [
1010
'webpack-dev-server/client?http://' + host + ':' + port,
1111
'webpack/hot/only-dev-server',
12-
'./client.js'
12+
'./client/index.js'
1313
],
1414
output: {
1515
path: path.join(__dirname, 'dist'),

0 commit comments

Comments
 (0)