fix underscore deps

Gruntfile.js

@@ -184,10 +184,19 @@ module.exports = function (grunt) {
             }
         },
         less: cssConfig.less,
-        clean: [
-            'build/production/',
-            'build/development/'
-        ],
+        clean: {
+            build: {
+                src: [
+                    'build/production/',
+                    'build/development/'
+                ]
+            },
+            npmpublish: {
+                src: [
+                    'build/'
+                ]
+            }
+        },
         watch: {
             js: {
                 files: ['<%= jshint.all.src %>'],
@@ -274,7 +283,7 @@ module.exports = function (grunt) {
     grunt.registerTask('build', buildWithoutPublish);
     grunt.registerTask('publish', buildWithoutPublish.concat([
         'copy:copybuild',
-        'clean'
+        'clean:build'
     ]));
     grunt.registerTask('travis', [
         'jshint',

config/webpack.config.js

@@ -1,7 +1,7 @@
 var webpack = require('webpack');
 var path = require('path');
 var cachePath = path.join(require('os').tmpdir(), './webpackCache');
-
+var transformUMDExternal = require('webpack-umd-external');
 var ensureDir = function (absolutePath) {
     var fs = require('fs-extra');
     fs.mkdirsSync(absolutePath);
@@ -124,10 +124,10 @@ var webpackConf = {
         path: 'build/development',
         filename: 'tauCharts.js'
     },
-    externals: {
+    externals:  transformUMDExternal({
         d3: 'd3',
         underscore: '_'
-    },
+    }),
     module: {
         loaders: [babelConfig]
     },

examples/amd.html

@@ -101,18 +101,11 @@
         baseUrl: location.pathname.replace(/(.+)(examples\/\w+\.html)/, '$1'),
         paths: {
             'd3': '//cdnjs.cloudflare.com/ajax/libs/d3/3.4.11/d3',
-            'underscore': '//cdnjs.cloudflare.com/ajax/libs/underscore.js/1.8.2/underscore-min',
-            'canvgModule': 'bower_components/canvg/canvg'
+            'underscore': '//cdnjs.cloudflare.com/ajax/libs/underscore.js/1.8.2/underscore-min'
         },
         map: {
             '*': {
-                'tauCharts': 'http://localhost:9000/tauCharts.js',
-                'print.style.css': 'node_modules/requirejs-text/text!plugins/print.style.css',
-                'rgbcolor': '../bower_components/canvg/rgbcolor.js',
-                'stackblur': '../bower_components/canvg/StackBlur.js',
-                'FileSaver': 'bower_components/FileSaver.js/FileSaver',
-                'fetch': 'bower_components/fetch/fetch',
-                'promise': 'bower_components/es6-promise/promise'
+                'tauCharts': 'http://localhost:9000/tauCharts.js'
             }
         }
     });
@@ -122,7 +115,7 @@
         'src/addons/color-brewer',
         'plugins/legend',
         'plugins/trendline',
-        'plugins/export',
+        'build/development/plugins/tauCharts.export',
         'plugins/tooltip',
         'underscore'], function (tauCharts, brewer, legend, trendline, exportTo, tooltip) {
         /** @class Tooltip

package.json

@@ -1,6 +1,6 @@
 {
   "name": "taucharts",
-  "version": "0.7.3-alpha.1",
+  "version": "0.7.3-alpha.7",
   "homepage": "https://github.com/TargetProcess/tauCharts",
   "description": "D3 based data-focused charting library",
   "author": {
@@ -10,7 +10,7 @@
     "d3",
     "charts"
   ],
-  "main": "build/devlopment/tauCharts.js",
+  "main": "build/development/tauCharts.js",
   "license": "Apache-2.0",
   "licenses": [
     {
@@ -81,19 +81,20 @@
     "requirejs-text": "^2.0.12",
     "tau-tooltip": "1.1.2",
     "webpack": "1.12.9",
-    "webpack-dev-server": "1.14.0"
+    "webpack-dev-server": "1.14.0",
+    "webpack-umd-external": "^1.0.2"
   },
   "scripts": {
-    "postinstall": "bower install",
-    "devserver": "grunt webpack-dev-server:start",
+    "devserver": "bower install && grunt webpack-dev-server:start",
     "less2css": "grunt less",
     "watch-less": "grunt watch:less",
-    "build": "grunt build",
+    "build": "bower install && grunt build",
     "webpackbuild": "grunt webpack:build",
     "test": "npm run travis && karma start config/karma.conf.js",
-    "travis": "grunt travis",
+    "travis": "bower install && grunt travis",
     "release": "npm run bower && grunt publish && grunt gh-pages",
-    "devtest": "grunt karma:dev",
-    "buildExporTo": "grunt webpack:buildExportTo"
+    "devtest": "bower install && grunt karma:dev",
+    "buildExporTo": "grunt webpack:buildExportTo",
+    "prepublish": "grunt clean:npmpublish && npm run build"
   }
 }

src/api/chart-map.js

@@ -1,3 +1,4 @@
+import {default as _} from 'underscore';
 var ChartMap = (config) => {
 
     var guide = _.extend(

src/api/chart-parallel.js

@@ -1,3 +1,4 @@
+import {default as _} from 'underscore';
 var ChartParallel = (config) => {
 
     var guide = _.extend(

src/api/converter-helpers.js

@@ -1,6 +1,6 @@
 import {default as d3} from 'd3';
 import {utils} from '../utils/utils';
-
+import {default as _} from 'underscore';
 var convertAxis = (data) => (!data) ? null : data;
 
 var normalizeSettings = (axis, defaultValue = null) => {

src/chart-alias-registry.js

@@ -2,6 +2,7 @@ import {default as d3} from 'd3';
 import {utils} from './utils/utils';
 import {DataProcessor} from './data-processor';
 import {TauChartError as Error, errorCodes} from './error';
+import {default as _} from 'underscore';
 var chartTypes = {};
 var chartRules = {};
 

src/charts/tau.chart.js

@@ -1,6 +1,6 @@
 import {Plot} from './tau.plot';
 import {chartTypesRegistry} from '../chart-alias-registry';
-
+import {default as _} from 'underscore';
 class Chart extends Plot {
 
     constructor(config) {

src/charts/tau.gpl.js

@@ -4,7 +4,7 @@ import {utilsDom} from '../utils/utils-dom';
 import {CSS_PREFIX} from '../const';
 import {FramesAlgebra} from '../algebra';
 import {DataFrame} from '../data-frame';
-
+import {default as _} from 'underscore';
 var cast = (v) => (_.isDate(v) ? v.getTime() : v);
 
 export class GPL extends Emitter {

src/charts/tau.plot.js

@@ -18,7 +18,7 @@ import {SpecTransformApplyRatio} from '../spec-transform-apply-ratio';
 import {SpecTransformExtractAxes} from '../spec-transform-extract-axes';
 
 import {GPL} from './tau.gpl';
-
+import {default as _} from 'underscore';
 export class Plot extends Emitter {
     constructor(config) {
         super();

src/data-processor.js

@@ -1,5 +1,5 @@
 import {utils} from './utils/utils';
-
+import {default as _} from 'underscore';
 var isObject = (obj) => obj === Object(obj);
 
 var DataProcessor = {

src/elements/element.interval.js

@@ -1,6 +1,6 @@
 import {CSS_PREFIX} from '../const';
 import {Element} from './element';
-
+import {default as _} from 'underscore';
 export class Interval extends Element {
 
     constructor(config) {

src/elements/element.line.js

@@ -3,7 +3,7 @@ import {Element} from './element';
 import {elementDecoratorShowText} from './decorators/show-text';
 import {elementDecoratorShowAnchors} from './decorators/show-anchors';
 import {getLineClassesByWidth, getLineClassesByCount} from '../utils/css-class-map';
-
+import {default as _} from 'underscore';
 export class Line extends Element {
 
     constructor(config) {

src/elements/element.parallel.line.js

@@ -1,6 +1,6 @@
 import {CSS_PREFIX} from '../const';
 import {Element} from './element';
-
+import {default as _} from 'underscore';
 export class ParallelLine extends Element {
 
     constructor(config) {

src/elements/element.path.js

@@ -1,4 +1,5 @@
 import {CSS_PREFIX} from '../const';
+import {default as _} from 'underscore';
 import {Element} from './element';
 import {elementDecoratorShowText} from './decorators/show-text';
 import {elementDecoratorShowAnchors} from './decorators/show-anchors';

src/elements/element.point.js

@@ -1,6 +1,6 @@
 import {CSS_PREFIX} from '../const';
 import {Element} from './element';
-
+import {default as _} from 'underscore';
 export class Point extends Element {
 
     constructor(config) {

src/formatter-registry.js

@@ -1,5 +1,6 @@
 /* jshint ignore:start */
 import {default as d3} from 'd3';
+import {default as _} from 'underscore';
 /* jshint ignore:end */
 var FORMATS_MAP = {
 

src/tau.charts.js

@@ -40,12 +40,15 @@ import {ChartParallel}          from './api/chart-parallel';
 import {errorCodes} from './error';
 import {PluginsSDK} from './plugins-sdk';
 
+import {default as _} from 'underscore';
+import {default as d3} from 'd3';
 var colorBrewers = {};
 var plugins = {};
 
 var __api__ = {
     UnitDomainPeriodGenerator: UnitDomainPeriodGenerator
 };
+
 var api = {
     errorCodes,
     unitsRegistry: unitsRegistry,
@@ -77,8 +80,8 @@ var api = {
         },
         get: function (name) {
             return plugins[name] || ((x) => {
-                throw new Error(`${x} plugin is not defined`);
-            });
+                    throw new Error(`${x} plugin is not defined`);
+                });
         }
     },
     globalSettings: {

src/utils/utils-dom.js

@@ -2,7 +2,7 @@
  * Internal method to return CSS value for given element and property
  */
 var tempDiv = document.createElement('div');
-
+import {default as _} from 'underscore';
 var utilsDom = {
     appendTo: function (el, container) {
         var node;

src/utils/utils.js

@@ -2,7 +2,7 @@ import {Point}      from '../elements/element.point';
 import {Line}       from '../elements/element.line';
 import {Interval}   from '../elements/element.interval';
 import {StackedInterval} from '../elements/element.interval.stacked';
-
+import {default as _} from 'underscore';
 var traverseJSON = (srcObject, byProperty, fnSelectorPredicates, funcTransformRules) => {
 
     var rootRef = funcTransformRules(fnSelectorPredicates(srcObject), srcObject);