diff --git a/.babelrc b/.babelrc
index 9b7d435..9921a45 100644
--- a/.babelrc
+++ b/.babelrc
@@ -1,3 +1,8 @@
{
- "presets": ["es2015", "stage-0", "react"]
+ "presets": ["es2015", "stage-0", "react"],
+ "env": {
+ "development": {
+ "presets": ["react-hmre"]
+ }
+ }
}
diff --git a/example.deploy.sh b/example.deploy.sh
index 68a8fcd..cccd046 100644
--- a/example.deploy.sh
+++ b/example.deploy.sh
@@ -1,5 +1,7 @@
+#!/bin/sh
+
npm run build:backend
-NODE_ENV=production webpack
+npm run build:frontend
REMOTE=user@ip
DEST=/home/pi/the-feed
diff --git a/frontend/index.html b/frontend/index.html
index d80bd54..e2138c5 100644
--- a/frontend/index.html
+++ b/frontend/index.html
@@ -1,7 +1,10 @@
+
the-feed
+
+
+
Loading...
-
diff --git a/package.json b/package.json
index e7fe6dd..c7b06e8 100644
--- a/package.json
+++ b/package.json
@@ -5,15 +5,16 @@
"main": "index.js",
"scripts": {
"start": "npm-run-all --parallel start:frontend start:backend",
- "start:frontend": "webpack-dev-server",
+ "start:frontend": "wserve --x-entry frontend/app.js --x-html frontend/index.html --x-dist public",
"start:backend": "CONFIG=config-dev.yml npm-run-all --parallel build:backend:watch start:nodemon",
"start:nodemon": "nodemon --watch lib app.js",
"test": "ava",
"test:watch": "nodemon test/*.js --exec ava -- --serial --verbose",
"build:backend": "babel -s -d lib src",
- "build:backend:watch": "babel --watch -s -d lib src"
+ "build:backend:watch": "babel --watch -s -d lib src",
+ "build:frontend": "rm -rf public/* && NODE_ENV=production wbuild --x-entry frontend/app.js --x-html frontend/index.html --x-dist public"
},
- "preferGlobal": "false",
+ "private": "true",
"repository": {
"type": "git",
"url": "git+https://github.com/ewnd9/the-feed.git"
@@ -53,13 +54,11 @@
"ava": "^0.9.1",
"babel-cli": "^6.4.0",
"babel-core": "^6.4.0",
- "babel-loader": "^6.2.1",
"babel-preset-es2015": "^6.3.13",
"babel-preset-react": "^6.3.13",
+ "babel-preset-react-hmre": "^1.1.0",
"babel-preset-stage-0": "^6.3.13",
"classnames": "^2.2.1",
- "css-loader": "^0.23.0",
- "file-loader": "^0.8.5",
"isomorphic-fetch": "^2.2.0",
"nock": "^3.4.0",
"nodemon": "^1.4.1",
@@ -74,8 +73,6 @@
"redux": "^3.0.5",
"redux-logger": "^2.3.1",
"redux-thunk": "^1.0.3",
- "style-loader": "^0.13.0",
- "webpack": "^1.12.9",
- "webpack-dev-server": "^1.14.0"
+ "webpackman": "^0.1.0"
}
}