From efb381eb97bc52eb37691203224a51b619537944 Mon Sep 17 00:00:00 2001
From: coderaiser <coderaiser@cloudcmd.io>
Date: Tue, 14 Feb 2017 16:13:29 +0200
Subject: [PATCH] feature(cloudcmd) NODE_ENV: debug -> development

---
 .gitignore         |  2 +-
 package.json       | 12 ++++++------
 server/cloudcmd.js |  6 +++---
 webpack.config.js  | 10 +++++-----
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/.gitignore b/.gitignore
index ad83d7ab..f7204070 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,5 +20,5 @@ server_
 *.swp
 
 dist
-dist-debug
+dist-dev
 
diff --git a/package.json b/package.json
index 05fb80af..08856efa 100644
--- a/package.json
+++ b/package.json
@@ -44,8 +44,7 @@
   },
   "scripts": {
     "start": "node bin/cloudcmd.js",
-    "start:debug": "NODE_ENV=debug node bin/cloudcmd.js",
-    "start:dev": "nodemon bin/cloudcmd.js",
+    "start:dev": "NODE_ENV=debug node bin/cloudcmd.js",
     "security": "nsp check",
     "codestyle": "redrun lint spell",
     "lint": "redrun lint:*",
@@ -60,7 +59,6 @@
     "eslint:client": "eslint --rule 'no-console:0' --env browser client",
     "fix:eslint": "redrun eslint:client -- --fix",
     "test": "tape 'test/**/*.js'",
-    "watch:test": "nodemon -w server -w test -w common -x \"npm run test\"",
     "spell": "yaspeller .",
     "wisdom": "npm run build; npm run docker:rm-old; bin/release.js",
     "postpublish": "redrun docker",
@@ -84,11 +82,13 @@
     "6to5:bin": "babel bin -d legacy/bin",
     "6to5:server": "babel server -d server_",
     "6to5:client": "webpack --progress",
-    "6to5:client:debug": "NODE_ENV=debug redrun 6to5:client",
+    "6to5:client:dev": "NODE_ENV=development redrun 6to5:client",
     "watch:client": "redrun 6to5:client -- --watch",
+    "watch:server": "nodemon bin/cloudcmd.js",
+    "watch:test": "nodemon -w server -w test -w common -x \"npm run test\"",
     "w:c": "redrun watch:client",
-    "watch:client:debug": "redrun 6to5:client:debug -- --watch",
-    "w:c:d": "redrun watch:client:debug",
+    "watch:client:dev": "redrun 6to5:client:dev -- --watch",
+    "w:c:d": "redrun watch:client:dev",
     "build": "redrun rm:* 6to5:* mkdir:* legacy:*",
     "legacy:package": "echo \"module.exports = require('../package');\" > legacy/package.js",
     "mkdir:server": "mkdirp legacy/server",
diff --git a/server/cloudcmd.js b/server/cloudcmd.js
index fad93203..36ec7fda 100644
--- a/server/cloudcmd.js
+++ b/server/cloudcmd.js
@@ -35,7 +35,7 @@ const root = () => config('root');
 const emptyFunc = (req, res, next) => next();
 emptyFunc.middle = () => emptyFunc;
 
-const isDebug = process.env.NODE_ENV === 'debug';
+const isDev = process.env.NODE_ENV === 'development';
 
 function getPrefix(prefix) {
     if (typeof prefix === 'function')
@@ -302,8 +302,8 @@ function setUrl(pref) {
         if (/^\/cloudcmd\.js(\.map)?$/.test(req.url))
             req.url = `/dist${req.url}`;
         
-        if (isDebug)
-            req.url = req.url.replace(/^\/dist\//, '/dist-debug/');
+        if (isDev)
+            req.url = req.url.replace(/^\/dist\//, '/dist-dev/');
         
         next();
     };
diff --git a/webpack.config.js b/webpack.config.js
index f2cf0c1a..112aa9d4 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -7,16 +7,16 @@ const dir = './client';
 const dirExternal = './node_modules';
 
 const {env} = process;
-const isDebug = env.NODE_ENV === 'debug';
+const isDev = env.NODE_ENV === 'development';
 
 const dist = path.resolve(__dirname, 'dist');
-const distDebug = path.resolve(__dirname, 'dist-debug');
-const devtool = isDebug ? 'eval' : 'source-map';
+const distDev = path.resolve(__dirname, 'dist-dev');
+const devtool = isDev ? 'eval' : 'source-map';
 const notEmpty = (a) => a;
 const clean = (array) => array.filter(notEmpty);
 
 const plugins = clean([
-    !isDebug && new UglifyJsPlugin({
+    !isDev && new UglifyJsPlugin({
         sourceMap: true
     }),
     new webpack.optimize.CommonsChunkPlugin({
@@ -47,7 +47,7 @@ module.exports = {
     },
     output: {
         filename: '[name].js',
-        path: isDebug ? distDebug : dist,
+        path: isDev ? distDev : dist,
         libraryTarget: 'umd'
     },
     plugins,