Merge branch 'master' into v11/20px-unit-new-colors

Gruntfile.js

@@ -486,15 +486,15 @@ module.exports = function(grunt) {
 		const out = [
 			'edbml', // edbml -> js
 			`tsless:dev`, // generate ts-runtime.less (needed for Docs!)
-			`copy:docs_dev`, // copy ts-runtime.less over to the docs (otherwise it will fail)
-			[
-				// generate ts.js
-				`tsless:${returnDevForJasmine(target)}`, // generate ts.less
-				`copy:docs_${returnDevForJasmine(target)}` // copy ts-runtime.less over to the docs
-			]
+			`copy:docs_dev` // copy ts-runtime.less over to the docs (otherwise it will fail)
 		];
 		if (target === 'cdn') {
 			out.push('copy:npm'); // copy LICENSE/README to npm folder
+			out.push([
+				// generate ts.js
+				`tsless:cdn`, // generate ts.less
+				`copy:docs_cdn` // copy ts-runtime.less over to the docs
+			]);
 		}
 		out.push('concat:spin'); // generate spin.js
 		out.push('guibundles'); // generate ts-runtime-{api,gui}.js
@@ -506,7 +506,7 @@ module.exports = function(grunt) {
 			`concat:${returnDevForJasmine(target)}` // concat all files generated above
 		];
 		if (target === 'cdn') {
-			out.push(`uglify:${returnDevForJasmine(target)}`); // uglify
+			out.push(`uglify:cdn`); // uglify
 		}
 		return out;
 	}
@@ -551,7 +551,7 @@ module.exports = function(grunt) {
 		let out = [];
 		if (target === 'cdn') {
 			out.push('size_report:cdn_gzip_vs_normal');
-			out.push(`size_report:${target}_loaded`);
+			out.push(`size_report:cdn_loaded`);
 		}
 		return out;
 	}

docs/Gruntfile.js

@@ -334,9 +334,11 @@ module.exports = function(grunt) {
 				inline: true,
 				beautify: true,
 				attribute: 'data-ts',
-				process: function(html, source, target) {
+				process: function(html, source) {
 					var tags = grunt.template.process('<%=' + tagset + '%>');
-					return processor.process(html, tags, source);
+					return processor
+						.process(html, tags, source)
+						.replace(/\${gTagCode}/g, tagset === 'publictags' ? 'UA-127106947-1' : '');
 				}
 			}
 		};
@@ -353,7 +355,7 @@ module.exports = function(grunt) {
 			src: 'src/xhtml/index.xhtml',
 			dest: './index.html',
 			options: {
-				process: function(content, srcpath) {
+				process: function(content) {
 					var tags = grunt.template.process('<%=' + tagset + '%>');
 					var menu = grunt.file.readJSON('menu.json');
 					var svgs = grunt.file.read('src/svg/icons.svg');