Merge branch 'frontend-next' into 'frontend-next'

Revert "Rename npm script"

See merge request !3
This commit is contained in:
Yukai Huang 2017-01-04 12:12:15 +00:00
commit e2a19b3b0a
3 changed files with 4 additions and 4 deletions

View File

@ -59,7 +59,7 @@ Get started
2. Enter the directory and type `bin/setup`, which will install npm dependencies and create configs. The setup script is written in Bash, you would need bash as a prerequisite.
3. Setup the configs, see more below
4. Setup environment variables which will overwrite the configs
5. Build front-end bundle by `npm run build:prod` (use `npm run build:dev` if you are in development)
5. Build front-end bundle by `npm run build` (use `npm run dev` if you are in development)
6. Run the server as you like (node, forever, pm2)
Upgrade guide

View File

@ -31,5 +31,5 @@ EOF
cp public/js/config.js.example public/js/config.js
# build app
npm run build:prod
npm run build
fi

View File

@ -5,8 +5,8 @@
"main": "app.js",
"license": "MIT",
"scripts": {
"build:dev": "webpack --config webpack.config.js --progress --colors --watch",
"build:prod": "webpack --config webpack.production.js --progress --colors",
"dev": "webpack --config webpack.config.js --progress --colors --watch",
"build": "webpack --config webpack.production.js --progress --colors",
"postinstall": "bin/heroku",
"start": "node app.js"
},