change build commands

Gruntfile.js

@@ -350,14 +350,14 @@ module.exports = function (grunt) {
 
   registerCmdTask('npm-dev', {cmd: 'npm', args: ['run', 'dev']});
   registerCmdTask('npm-start', {cmd: 'npm', args: ['run', 'start']});
-  registerCmdTask('npm-static', {cmd: 'npm', args: ['run', 'build:static']});
+  registerCmdTask('npm-carto-node', {cmd: 'npm', args: ['run', 'carto-node']});
 
   /**
    * `grunt dev`
    */
 
   grunt.registerTask('dev', [
-    'npm-static',
+    'npm-carto-node',
     'pre',
     'npm-start'
   ]);
@@ -384,7 +384,7 @@ module.exports = function (grunt) {
   registerCmdTask('npm-build-static', {cmd: 'npm', args: ['run', 'build:static']});
 
   grunt.registerTask('build', [
-    'npm-static',
+    'npm-carto-node',
     'pre',
     'copy:js',
     'exorcise',
@@ -420,7 +420,7 @@ module.exports = function (grunt) {
    * `grunt test`
    */
   grunt.registerTask('test', '(CI env) Re-build JS files and run all tests. For manual testing use `grunt jasmine` directly', [
-    'npm-static',
+    'npm-carto-node',
     'connect:test',
     'beforeDefault',
     'js_editor',

package.json

@@ -149,10 +149,11 @@
     "branch-files": "node lib/build/branchFiles/branchFiles.js",
     "affected_specs": "node lib/build/branchFiles/branchFiles.js | xargs node lib/build/affectedFiles/affectedFiles.js",
     "build": "NODE_ENV=production webpack --config webpack.prod.config.js",
-    "build:static": "webpack --config webpack/carto-node/webpack.config.js && webpack -p --config webpack/webpack.dev.config.js",
+    "build:static": "webpack -p --config webpack/webpack.dev.config.js",
     "build:stats": "webpack --env.stats --progress --config webpack.dev.config.js",
+    "carto-node": "webpack --config webpack/carto-node/webpack.config.js",
     "start": "grunt watch:css & webpack --progress --watch --config webpack.dev.config.js",
-    "start:static": "webpack --config webpack/carto-node/webpack.config.js && webpack --progress --watch --config webpack/webpack.dev.config.js",
+    "start:static": "npm carto-node && webpack --progress --watch --config webpack/webpack.dev.config.js",
     "dev": "webpack --progress --config webpack.dev.config.js",
     "fix-shrinkwrap-protocol": "node ./lib/build/fix-shrinkwrap.js"
   }