Skip to content

Commit

Permalink
Merge e136cad into bdad532
Browse files Browse the repository at this point in the history
  • Loading branch information
oneut committed Sep 17, 2018
2 parents bdad532 + e136cad commit 98fd997
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 11 deletions.
8 changes: 4 additions & 4 deletions examples/ssr-with-redux/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion examples/ssr-with-redux/package.json
Expand Up @@ -3,7 +3,7 @@
"version": "2.0.0",
"private": true,
"dependencies": {
"async-react-router": "^2.0.0-rc.3",
"async-react-router": "^2.1.0",
"bootstrap": "^3.3.7",
"ejs": "^2.6.1",
"express": "^4.16.3",
Expand Down
6 changes: 3 additions & 3 deletions examples/ssr-with-redux/src/app/index.js
@@ -1,13 +1,13 @@
import React from "react";
import { hydrate } from "react-dom";
import { createRouter } from "async-react-router/ssr";
import { SSR } from "async-react-router";
import setRoute from "./routes";
import "bootstrap/dist/css/bootstrap.css";
import "font-awesome/css/font-awesome.min.css";
import "nprogress/nprogress.css";

// Create route object.
const router = createRouter();
const router = SSR.createRouter();

// Set data from server
router.setInitialProps(
Expand All @@ -26,7 +26,7 @@ if (module.hot) {
module.hot.accept("./routes", () => {
const setRoute = require("./routes").default;

const router = createRouter();
const router = SSR.createRouter();

// Set route.
setRoute(router);
Expand Down
4 changes: 2 additions & 2 deletions examples/ssr-with-redux/src/server.js
@@ -1,7 +1,7 @@
import ejs from "ejs";
import path from "path";
import React from "react";
import { createServerRouter } from "async-react-router/ssr";
import { SSR } from "async-react-router";
import ReactDOMServer from "react-dom/server";
import compress from "compression";
import http from "http";
Expand Down Expand Up @@ -77,7 +77,7 @@ app.use("/static", express.static(path.join(__dirname, "static")));

app.get("*", function(req, res) {
const setRoute = require("./app/routes").default;
const serverRouter = createServerRouter();
const serverRouter = SSR.createServerRouter();
setRoute(serverRouter);

serverRouter.runUsingPathname(req.url, (Root, data) => {
Expand Down
5 changes: 4 additions & 1 deletion examples/ssr-with-redux/webpack.config.common.js
Expand Up @@ -19,7 +19,10 @@ module.exports = {
optimization: {
splitChunks: {
chunks: "all",
name: "vendors"
name: "vendors",
minChunks: 2,
maxSize: 244000,
minSize: 200000,
},
runtimeChunk: true,
minimizer: [
Expand Down

0 comments on commit 98fd997

Please sign in to comment.