Merge branch 'dev'

gondzo · gondzo · commit 4a802d4a83c5 · 2016-12-23T02:12:52.000+01:00
diff --git a/Procfile b/Procfile
@@ -0,0 +1 @@
+web: npm run start
diff --git a/README.md b/README.md
@@ -34,3 +34,24 @@ See Guild https://github.com/lorenwest/node-config/wiki/Configuration-Files
 |`lint:fix`|Lint and fix all `.js` files. [Read more on this](http://eslint.org/docs/user-guide/command-line-interface.html#fix).|
 |`test`|Run tests using [mocha-webpack](https://github.com/webpack/mocha-loader) for all `*.spec.(js|jsx)` files in the `src` dir.|
 
+## Local deploy
+    NODE_ENV=production npm run build
+    NODE_ENV=production npm run start
+
+## Heroku deploy
+
+### Prerequisites
+  - Heroku CLI
+
+### set up
+    npm run heroku:[ENV]:init
+    npm run heroku:[ENV]:deploy
+
+### update
+    npm run heroku:[ENV]:deploy
+
+`npm run heroku:[ENV]:init` will create a new git remote in current git repository and a new app in remote server.
+
+`npm run heroku:[ENV]:deploy` line will push current branch to corresponding remote environment.
+
+`ENV` can be 'prod', 'dev', 'staging', 'test'.
diff --git a/config/development.js b/config/development.js
@@ -0,0 +1,12 @@
+/* eslint-disable import/no-commonjs */
+/**
+ * Main config file
+ */
+module.exports = {
+  // below env variables are NOT visible in frontend
+  PORT: process.env.PORT || 3000,
+
+  // below env variables are visible in frontend
+  GOOGLE_API_KEY: process.env.GOOGLE_API_KEY || 'AIzaSyCrL-O319wNJK8kk8J_JAYsWgu6yo5YsDI',
+  API_BASE_PATH: process.env.API_BASE_PATH || 'https://kb-dsp-server-dev.herokuapp.com',
+};
diff --git a/config/production.js b/config/production.js
@@ -0,0 +1,12 @@
+/* eslint-disable import/no-commonjs */
+/**
+ * config file for production environment
+ */
+module.exports = {
+  // below env variables are NOT visible in frontend
+  PORT: process.env.PORT || 3000,
+
+  // below env variables are visible in frontend
+  GOOGLE_API_KEY: process.env.GOOGLE_API_KEY || 'AIzaSyCrL-O319wNJK8kk8J_JAYsWgu6yo5YsDI',
+  API_BASE_PATH: process.env.API_BASE_PATH || 'https://kb-dsp-server-dev.herokuapp.com',
+};
diff --git a/config/staging.js b/config/staging.js
@@ -0,0 +1,12 @@
+/* eslint-disable import/no-commonjs */
+/**
+ * Main config file
+ */
+module.exports = {
+  // below env variables are NOT visible in frontend
+  PORT: process.env.PORT || 3000,
+
+  // below env variables are visible in frontend
+  GOOGLE_API_KEY: process.env.GOOGLE_API_KEY || 'AIzaSyCrL-O319wNJK8kk8J_JAYsWgu6yo5YsDI',
+  API_BASE_PATH: process.env.API_BASE_PATH || 'https://kb-dsp-server-dev.herokuapp.com',
+};
diff --git a/config/test.js b/config/test.js
@@ -0,0 +1,12 @@
+/* eslint-disable import/no-commonjs */
+/**
+ * Main config file
+ */
+module.exports = {
+  // below env variables are NOT visible in frontend
+  PORT: process.env.PORT || 3000,
+
+  // below env variables are visible in frontend
+  GOOGLE_API_KEY: process.env.GOOGLE_API_KEY || 'AIzaSyCrL-O319wNJK8kk8J_JAYsWgu6yo5YsDI',
+  API_BASE_PATH: process.env.API_BASE_PATH || 'https://kb-dsp-server-dev.herokuapp.com',
+};
diff --git a/package.json b/package.json
@@ -5,11 +5,20 @@
   "main": "index.js",
   "scripts": {
     "dev": "cross-env NODE_ENV=development nodemon server",
-    "start": "cross-env NODE_ENV=production node server",
-    "build": "cross-env NODE_ENV=production webpack --bail --progress --build --tc",
+    "start": "node --max-old-space-size=512 server",
+    "build": "node --max-old-space-size=512 ./node_modules/webpack/bin/webpack --bail --progress --build --tc",
     "lint": "eslint --ext jsx --ext js .",
     "lint:fix": "npm run lint -- --fix",
-    "test": "mocha-webpack --require setup-test.js --webpack-config webpack.config-test.js \"src/**/*.spec.(jsx|js)\""
+    "test": "mocha-webpack --require setup-test.js --webpack-config webpack.config-test.js \"src/**/*.spec.(jsx|js)\"",
+    "postinstall":"npm run build",
+    "heroku:prod:init":"git remote remove production && heroku create --remote production && heroku config:set NODE_ENV=production --remote production",
+    "heroku:dev:init": "git remote remove dev && heroku create --remote dev && heroku config:set NODE_ENV=development NPM_CONFIG_PRODUCTION=false --remote dev",
+    "heroku:staging:init":  "git remote remove staging && heroku create --remote staging && heroku config:set NODE_ENV=staging --remote staging",
+    "heroku:test:init": "git remote remove test && heroku create --remote test && heroku config:set NODE_ENV=test --remote test",
+    "heroku:prod:deploy":"git push production master",
+    "heroku:dev:deploy":"git push dev master",
+    "heroku:staging:deploy":"git push staging master",
+    "heroku:test:deploy":"git push test master"
   },
   "author": "",
   "license": "MIT",
diff --git a/server.js b/server.js
@@ -40,4 +40,4 @@ if (process.env.NODE_ENV === 'development') {
 }
 const port = config.PORT;
 app.listen(port);
-console.log(`Server is now running at http://localhost:${port}.`); // eslint-disable-line no-console
+console.log(`Server is now running on port: ${port}.`); // eslint-disable-line no-console
diff --git a/webpack.config.js b/webpack.config.js
@@ -92,7 +92,7 @@ module.exports = {
   output: {
     filename: '[name].[hash].js',
     path: path.join(__dirname, './dist'),
-    publicPath: __DEV__ ? `http://${ip.address()}:${process.env.PORT || 3000}/` : '/',
+    publicPath: '/',
   },
   plugins: [
     new webpack.DefinePlugin({

Original file line number	Diff line number	Diff line change
`@@ -40,4 +40,4 @@ if (process.env.NODE_ENV === 'development') {`
`40`	`40`	`}`
`41`	`41`	`const port = config.PORT;`
`42`	`42`	`app.listen(port);`
`43`		-console.log(`Server is now running at http://localhost:${port}.`); // eslint-disable-line no-console
	`43`	+console.log(`Server is now running on port: ${port}.`); // eslint-disable-line no-console