Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Consolidate HTML + JS Servers #808

Closed
wants to merge 10 commits into from
Closed

Consolidate HTML + JS Servers #808

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
84d9fe0
Basic changes to remove jsPort from documentation, tests, and options…
drewpc Jan 7, 2017
bc3e0e8
Implemented webpack-dev-middleware into the server startup process. …
drewpc Jan 7, 2017
e613e2c
Make ESLint happy by moving functions around and converting 'var' to …
drewpc Jan 7, 2017
401cda7
Refactored the code to use webpack-dev-server again but still have a …
drewpc Jan 7, 2017
760a477
Merge branch 'master' into patch-consolidate-webservers
drewpc Jan 9, 2017
7718f80
Merge branch 'master' into patch-consolidate-webservers
drewpc Jan 11, 2017
72d4b47
Merged from master to resolve conflicts. Fixed a minor merge goof. …
drewpc Jan 11, 2017
9acbcb1
Merge branch 'master' into patch-consolidate-webservers
drewpc Jan 11, 2017
559875a
Merge branch 'master' into patch-consolidate-webservers
drewpc Jan 15, 2017
7aecc67
Fixed merge issues.
drewpc Jan 15, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion docs/guides/production.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ It helps to setup your project with per-environment settings that are appropriat
"routesFile": "./routes.json",
"host": "localhost",
"port": 3000,
"jsPort": 3001,
"hot": false,
"minify": false,
"longTermCaching": true,
Expand Down
10 changes: 2 additions & 8 deletions docs/guides/react-server-cli.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,8 +242,8 @@ a good idea to only do this in production mode.
### Options

The following options are available. Note that options on the command-line
are dash-separated (e.g. `--js-port`), but options in config files are
camel-cased (e.g. `jsPort`). (TODO: Support dash-separated options in config)
are dash-separated (e.g. `--webpack-config`), but options in config files are
camel-cased (e.g. `webpackConfig`). (TODO: Support dash-separated options in config)

#### --routes
The routes file to load.
Expand All @@ -261,11 +261,6 @@ The port to start up the main server, which will serve the pre-rendered HTML fil

Defaults to **3000**.

#### --js-port
The port to use when `react-server-cli` is serving up the client JavaScript.

Defaults to **3001**.

#### --hot, -h
Use hot reloading of client JavaScript. Modules that export React components
will reload without refreshing the browser. This option is incompatible with
Expand Down Expand Up @@ -373,7 +368,6 @@ run({
command : "start",
routes : "./routes.json",
port : 3000,
jsPort : 3001,
hot : true,
minify : false,
compileOnly : false,
Expand Down
1 change: 0 additions & 1 deletion packages/generator-react-server/generators/app/templates/_reactserverrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
"routesFile": "./routes.json",
"host": "localhost",
"port": 3000,
"jsPort": 3001,
"hot": false,
"minify": false,
"longTermCaching": false,
Expand Down
2 changes: 1 addition & 1 deletion packages/react-server-cli/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
"style-loader": "^0.13.1",
"webpack": "^1.13.1",
"webpack-dev-server": "^1.16.2",
"webpack-stats-plugin": "^0.1.3",
"webpack-stats-plugin": "^0.1.4",
"yargs": "^3.32.0"
},
"devDependencies": {
Expand Down
Loading