Skip to content

Commit

Permalink
Merge pull request #1003 from SoprisApps/upgrade-webpack-babel
Browse files Browse the repository at this point in the history
Upgrade to Webpack 4 + Babel 7
  • Loading branch information
drewpc authored Apr 30, 2019
2 parents 80dca46 + 051615e commit 137c20e
Show file tree
Hide file tree
Showing 84 changed files with 28,272 additions and 24,006 deletions.
11 changes: 11 additions & 0 deletions babel.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
module.exports = function (api) {
api.cache(true);

const presets = [
'react-server'
];

return {
presets,
};
}
1 change: 0 additions & 1 deletion docs/guides/production.md
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
Original file line number Diff line number Diff line change
Expand Up @@ -250,8 +250,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 @@ -269,11 +269,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 @@ -389,7 +384,6 @@ run({
command : "start",
routes : "./routes.json",
port : 3000,
jsPort : 3001,
hot : true,
minify : false,
jsUrl : null,
Expand Down
Loading

0 comments on commit 137c20e

Please sign in to comment.