Skip to content
This repository was archived by the owner on Apr 11, 2019. It is now read-only.

Commit b763d1c

Browse files
authored
Merge pull request #35 from RyanCCollins/feat_rc_add_css_chunking
Feat: add production bundle with the new chunking css setup
2 parents 579e67b + a44f576 commit b763d1c

File tree

5 files changed

+9244
-17
lines changed

5 files changed

+9244
-17
lines changed

package.json

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@
1414
"test": {
1515
"plugins": [
1616
[
17-
"babel-plugin-webpack-loaders",
18-
{
17+
"babel-plugin-webpack-loaders", {
1918
"config": "./config/testing/webpack.test.config.js",
2019
"verbose": false
2120
}
@@ -43,14 +42,14 @@
4342
"t": "npm run test",
4443
"test:watch": "npm test -- --watch",
4544
"test": "BABEL_DISABLE_CACHE=1 NODE_ENV=test node --harmony_proxies node_modules/.bin/jest",
46-
"build": "webpack",
47-
"dev": "webpack-dev-server",
45+
"build": "./node_modules/.bin/webpack",
46+
"dev": "./node_modules/.bin/webpack-dev-server",
4847
"generate": "plop --plopfile config/generators/index.js",
4948
"generate:component": "plop --plopfile config/generators/index.js component",
5049
"generate:container": "plop --plopfile config/generators/index.js container",
5150
"generate:page": "plop --plopfile config/generators/index.js page",
5251
"lint": "eslint . --ext .js --ext .jsx; exit 0",
53-
"deploy": "cross-env NODE_ENV=production webpack",
52+
"deploy": "cross-env NODE_ENV=production ./node_modules/.bin/webpack",
5453
"start": "npm run dev",
5554
"clean": "rm -rf app/dist app/build",
5655
"setup": "npm install",
@@ -91,7 +90,7 @@
9190
"expect": "^1.20.2",
9291
"expect-jsx": "^2.6.0",
9392
"express": "^4.14.0",
94-
"extract-text-webpack-plugin": "^1.0.1",
93+
"extract-text-webpack-plugin": "^v2.0.0-beta.3",
9594
"file-loader": "^0.9.0",
9695
"foundation-sites": "^6.2.3",
9796
"grommet": "^0.6.10",
@@ -122,7 +121,7 @@
122121
"sass-loader": "^3.1.2",
123122
"style-loader": "^0.13.0",
124123
"svg-react-loader": "^0.3.6",
125-
"webpack": "^1.12.9"
124+
"webpack": "v2.1.0-beta.19"
126125
},
127126
"devDependencies": {
128127
"babel-eslint": "^5.0.0-beta4",
@@ -144,7 +143,7 @@
144143
"redux-devtools": "^3.0.1",
145144
"redux-mock-store": "^1.1.4",
146145
"sinon": "2.0.0-pre",
147-
"webpack-dev-server": "^1.14.0",
146+
"webpack-dev-server": "2.1.0-beta.3",
148147
"webpack-visualizer-plugin": "^0.1.5"
149148
}
150149
}

server/public/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<!DOCTYPE html><html lang="en"><head><meta charset="UTF-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><title>Scalable React Boilerplate</title><link href="https://fonts.googleapis.com/css?family=Open+Sans:400,300,700|Raleway:400,300,700|Lato:400,300,700" rel="stylesheet"></head><body><div id="app"></div><script type="text/javascript" src="/vendor.26f395b8adac3b23a24c.js"></script><script type="text/javascript" src="/main.deb9d58e7f79a293f5d5.js"></script></body></html>
1+
<!DOCTYPE html><html lang="en"><head><meta charset="UTF-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><title>Scalable React Boilerplate</title><link href="https://fonts.googleapis.com/css?family=Open+Sans:400,300,700|Raleway:400,300,700|Lato:400,300,700" rel="stylesheet"><link href="/main.5dfcfa0f7b4abd50cb0f213ef910df6f.css" rel="stylesheet"></head><body><div id="app"></div><script type="text/javascript" src="/main.473c1b91f0faa13ce556.js"></script></body></html>

server/public/main.473c1b91f0faa13ce556.js

Lines changed: 32 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)