Fix regressions

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "grapesjs",
-  "version": "0.12.39",
+  "version": "0.12.40",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package.json

@@ -1,7 +1,7 @@
 {
   "name": "grapesjs",
   "description": "Free and Open Source Web Builder Framework",
-  "version": "0.12.39",
+  "version": "0.12.40",
   "author": "Artur Arseniev",
   "license": "BSD-3-Clause",
   "homepage": "http://grapesjs.com",
@@ -74,11 +74,11 @@
   },
   "scripts": {
     "lint": "eslint src",
-    "build": "cross-env WEBPACK_ENV=prod && npm run lint && npm run test && npm run v:patch && webpack && npm run build:css",
-    "build-n": "cross-env WEBPACK_ENV=prod && npm run lint && npm run test && webpack && npm run build:css",
+    "build": "npm run lint && npm run test && npm run v:patch && webpack --env.prod && npm run build:css",
+    "build-n": "npm run lint && npm run test && webpack --env.prod && npm run build:css",
     "build:css": "node-sass src/styles/scss/main.scss dist/css/grapes.min.css --output-style compressed",
     "v:patch": "npm version --no-git-tag-version patch",
-    "start": "cross-env WEBPACK_ENV=dev webpack-dev-server --progress --colors & npm run build:css -- -w",
+    "start": "webpack-dev-server --open --progress --colors & npm run build:css -- -w",
     "test": "cross-env NODE_PATH=./src mocha --compilers js:babel-core/register --require test/helper.js --timeout 10000 --recursive test/main.js",
     "test:dev": "npm test -- -R min -w"
   }

test/specs/panels/view/ButtonView.js

@@ -44,7 +44,7 @@ module.exports = {
         it('Check enable active', () => {
           model.set('active', true, {silent: true});
           view.checkActive();
-          expect(view.el.getAttribute('class')).toEqual(btnClass + ' active');
+          expect(view.el.getAttribute('class')).toContain(btnClass + ' active');
         });
 
         it('Check disable active', () => {
@@ -60,7 +60,7 @@ module.exports = {
           view.updateDisable();
           expect(view.el.getAttribute('class')).toEqual(btnClass + ' active');
         });
-        
+
         it('Enable the disabled button', () => {
           model.set('disable', true, {silent: true});
           view.updateDisable();

test/specs/panels/view/PanelView.js

@@ -25,7 +25,8 @@ module.exports = {
         });
 
         it('Panel empty', () => {
-          expect(fixtures.innerHTML).toEqual('<div class="panel"></div>');
+          fixtures.firstChild.className = "";
+          expect(fixtures.innerHTML).toEqual('<div class=""></div>');
         });
 
         it('Append content', () => {

webpack.config.js

@@ -1,55 +1,56 @@
-var HtmlWebpackPlugin = require('html-webpack-plugin');
-var pkg = require('./package.json');
-var webpack = require('webpack');
-var fs = require('fs');
-var plugins = [];
+const HtmlWebpackPlugin = require('html-webpack-plugin');
+const pkg = require('./package.json');
+const webpack = require('webpack');
+const fs = require('fs');
+let plugins = [];
 
-if (process.env.WEBPACK_ENV !== 'dev') {
-  plugins = [
-    new webpack.optimize.ModuleConcatenationPlugin(),
-    new webpack.optimize.UglifyJsPlugin({ minimize:true, compressor: {warnings:false}}),
-    new webpack.BannerPlugin(pkg.name + ' - ' + pkg.version),
-  ]
-} else {
-  var index = 'index.html';
-  var indexDev = '_' + index;
-  plugins.push(new HtmlWebpackPlugin({
-    template: fs.existsSync(indexDev) ? indexDev : index
-  }));
-}
+module.exports = (env = {}) => {
+  if (env.prod) {
+    plugins = [
+      new webpack.optimize.ModuleConcatenationPlugin(),
+      new webpack.optimize.UglifyJsPlugin({ minimize:true, compressor: {warnings:false}}),
+      new webpack.BannerPlugin(`${pkg.name} - ${pkg.version}`),
+    ]
+  } else {
+    const index = 'index.html';
+    const indexDev = `_${index}`;
+    plugins.push(new HtmlWebpackPlugin({
+      template: fs.existsSync(indexDev) ? indexDev : index
+    }));
+  }
 
-plugins.push(new webpack.ProvidePlugin({
-  _: 'underscore',
-  Backbone: 'backbone'
-}));
+  plugins.push(new webpack.ProvidePlugin({
+    _: 'underscore',
+    Backbone: 'backbone'
+  }));
 
-module.exports = {
-  entry: './src',
-  output: {
-      filename: './dist/grapes.min.js',
-      library: 'grapesjs',
-      libraryTarget: 'umd',
-  },
-  plugins: plugins,
-  module: {
-    loaders: [{
-        test: /grapesjs\/index\.js$/,
-        loader: 'string-replace-loader',
-        query: {
-          search: '<# VERSION #>',
-          replace: pkg.version
-        }
-      },{
-        test: /\.js$/,
-        loader: 'babel-loader',
-        include: /src/,
-        exclude: /node_modules/
-    }],
-  },
-  resolve: {
-    modules: ['src', 'node_modules'],
-    alias: {
-      jquery: 'cash-dom'
-    }
-  },
+  return {
+    entry: './src',
+    output: {
+        filename: './dist/grapes.min.js',
+        library: 'grapesjs',
+        libraryTarget: 'umd',
+    },
+    plugins: plugins,
+    module: {
+      loaders: [{
+          test: /grapesjs\/index\.js$/,
+          loader: 'string-replace-loader',
+          query: {
+            search: '<# VERSION #>',
+            replace: pkg.version
+          }
+        },{
+          test: /\.js$/,
+          loader: 'babel-loader',
+          include: /src/
+      }],
+    },
+    resolve: {
+      modules: ['src', 'node_modules'],
+      alias: {
+        jquery: 'cash-dom'
+      }
+    },
+  };
 }