Fix website publishing and remove ImmutableJS dependency

config/webpack.common.config.js

@@ -38,7 +38,7 @@ const config = {
     },
     'react/addons': 'React',
     moment: 'moment',
-    immutable: 'immutable'
+    immutable: 'Immutable'
   },
   module: {
     loaders: [

package.json

@@ -61,7 +61,7 @@
     "eslint-loader": "^1.2.0",
     "eslint-plugin-react": "^3.15.0",
     "faker": "^3.0.1",
-    "gh-pages": "^0.2.0",
+    "gh-pages": "^2.0.1",
     "gulp": "^3.8.7",
     "gulp-concat": "^2.3.4",
     "gulp-util": "^3.0.0",

packages/common/utils/index.js

@@ -1,7 +1,7 @@
-import { List, Iterable, Map } from 'immutable';
+const isImmutableLoaded = () => typeof Immutable !== 'undefined';
 
 export const isColumnsImmutable = (columns) => {
-  return (typeof Immutable !== 'undefined' && (columns instanceof Immutable.List));
+  return isImmutableLoaded() && columns instanceof Immutable.List;
 };
 
 export const isEmptyArray = (obj) => {
@@ -18,33 +18,33 @@ export const isEmptyObject = (obj) => {
 };
 
 export const isImmutableCollection = objToVerify => {
-  return Iterable.isIterable(objToVerify);
+  return isImmutableLoaded() && Immutable.Iterable.isIterable(objToVerify);
 };
 
 export const getMixedTypeValueRetriever = (isImmutable) => {
   let retObj = {};
   const retriever = (item, key) => { return item[key]; };
-  const immutableRetriever =  (immutable, key) => { return immutable.get(key); };
+  const immutableRetriever = (immutable, key) => { return immutable.get(key); };
 
   retObj.getValue = isImmutable ? immutableRetriever : retriever;
 
   return retObj;
 };
 
-export const isImmutableMap = Map.isMap;
+export const isImmutableMap = isImmutableLoaded() ? Immutable.Map.isMap : () => false;
 
 export const last = arrayOrList => {
   if (arrayOrList == null) {
     throw new Error('arrayOrCollection is null');
   }
 
-  if (List.isList(arrayOrList)) {
+  if (isImmutableLoaded() && Immutable.List.isList(arrayOrList)) {
     return arrayOrList.last();
   }
 
   if (Array.isArray(arrayOrList)) {
     return arrayOrList[arrayOrList.length - 1];
   }
 
-  throw new Error('Cant get last of: ' + typeof(arrayOrList));
+  throw new Error('Cant get last of: ' + typeof (arrayOrList));
 };

test/FullTests.jsx

@@ -1,5 +1,6 @@
 const Enzyme = require('enzyme');
 const Adapter = require('enzyme-adapter-react-16');
+window.Immutable = require('immutable');
 
 Enzyme.configure({
   adapter: new Adapter(),