summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYukai Huang2017-01-04 12:12:15 +0000
committerYukai Huang2017-01-04 12:12:15 +0000
commite2a19b3b0adfaaa438b5b5cec9f75f8327cb6e29 (patch)
treeba046338dca2aa1c26b8b4a0ec33d6b532581b47
parent65acaea8cf47629c7e5710e444973a04526b047d (diff)
parent78c51e5e88bcd4a3d53a87a53f8dc85d9a5a2df4 (diff)
Merge branch 'frontend-next' into 'frontend-next'
Revert "Rename npm script" See merge request !3
-rw-r--r--README.md2
-rwxr-xr-xbin/heroku2
-rw-r--r--package.json4
3 files changed, 4 insertions, 4 deletions
diff --git a/README.md b/README.md
index a2980ee4..cc05872d 100644
--- a/README.md
+++ b/README.md
@@ -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
diff --git a/bin/heroku b/bin/heroku
index 6ee7fa41..e8010038 100755
--- a/bin/heroku
+++ b/bin/heroku
@@ -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
diff --git a/package.json b/package.json
index edf03649..dde6328b 100644
--- a/package.json
+++ b/package.json
@@ -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"
},