NDS-36 teamcity reporters added in build script

.grunt-tasks/mochaTest.js

@@ -9,7 +9,7 @@ module.exports = {
 	teamcity: {
 		src: ["src/**/*.test.js", "test/**/*.test.js"],
 		options: {
-			reporter: 'mocha-teamcity-reporter',
+			reporter: "mocha-teamcity-reporter",
 			require: ["mocha-teamcity-reporter", "babel-core/register", "mocha-clean", "./test/_setup.js" ]
 		}
 	}

Gruntfile.js

@@ -43,12 +43,11 @@ module.exports = grunt => {
 
 	r("test:teamcity", ["mochaTest:teamcity"]);
 
-	r("prebuild:dist", ["env:dist", "clean:dist", "lint"]);
-
-	r("build:dist", ["sass:dist", "postcss:dist", "cssmin:dist", "docs", "webpack"]);
-
 	// For building before publishing to NPM etc
-	r("dist", ["env:dist", "clean:dist", "lint", "test", "css:dist", "docs", "webpack"]);
+	r("dist", ["env:dist", "clean:dist", "lint", "test", "sass:dist", "postcss:dist", "cssmin:dist", "docs", "webpack"]);
+
+	r("dist:teamcity", ["env:dist", "clean:dist", "lint", "test:teamcity", "sass:dist", "postcss:dist", "cssmin:dist", "docs", "webpack"]);
 
+	//For building locally
 	r("default", ["env:dev", "clean:temp", "lint", "test", "sass:temp", "postcss:temp", "cssmin:temp", "watch"]);
 };

package.json

@@ -22,15 +22,14 @@
   "scripts": {
     "start": "grunt --color --timing",
     "dist": "grunt dist --color",
-    "prebuild": "grunt prebuild:dist --color",
-    "build": "grunt build:dist --color",
-    "test:teamcity": "grunt test:teamcity",
+    "dist:teamcity": "grunt dist:teamcity --color",
     "// JAVASCRIPT": "",
     "webpack": "SET \"NODE_ENV=production\" && webpack --progress --colors --display-error-details",
     "// TESTS": "",
+    "test:teamcity": "grunt test:mocha-teamcity-reporter --color",
     "test": "mocha src/**/*.test.js test/**/*.test.js --require babel-core/register --require mocha-clean --require test/_setup.js --color",
     "test:watch": "mocha src/**/*.test.js test/**/*.test.js --require babel-core/register --require mocha-clean --require test/_setup.js --reporter min --watch --color",
-    "test:coverage": "node ./node_modules/istanbul/lib/cli cover node_modules/mocha/bin/_mocha -- --compilers js:babel-register --require mocha-clean --require test/_setup.js src/**/*.test.js test/**/*.test.js --color",
+    "test:coverage": "nyc --reporter=html npm run test --color",
     "test:coverage:teamcity": "nyc --reporter=teamcity --reporter=html npm run test:teamcity --color",
     "// LINTING": "",
     "lint": "grunt lint --color",
@@ -112,13 +111,13 @@
     "time-grunt": "^1.4.0",
     "webpack": "^3.8.1",
     "webpack-dev-middleware": "^1.10.2",
-    "webpack-dev-server": "^2.9.3"
+    "webpack-dev-server": "^2.9.3",
+    "mocha-teamcity-reporter": "^1.1.1",
+    "nyc": "^11.3.0"
   },
   "dependencies": {
     "@nice-digital/icons": "^1.1.0",
-    "keycode": "^2.1.7",
-    "mocha-teamcity-reporter": "^1.1.1",
-    "nyc": "^11.3.0"
+    "keycode": "^2.1.7"
   },
   "engines": {
     "node": ">=4"