@kineticdata/react 5.1.2 → 6.0.0

package/lib/store.js

@@ -1,24 +1,56 @@
-import _regeneratorRuntime from "@babel/runtime/regenerator";
-import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
-import { createContext } from 'react';
-import { applyMiddleware, compose, createStore } from 'redux';
-import { connect as originalConnect } from 'react-redux';
-import { select, take } from 'redux-saga/effects';
-import { Map, setIn } from 'immutable';
-import { reducer, regHandlers } from './reducer';
-import { commitSagas, regSaga, runSaga, sagaMiddleware } from './saga';
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault")["default"];
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.dispatcher = exports.dispatch = exports.context = exports.connect = exports.commitStore = exports.action = void 0;
+Object.defineProperty(exports, "reducer", {
+  enumerable: true,
+  get: function get() {
+    return _reducer.reducer;
+  }
+});
+Object.defineProperty(exports, "regHandlers", {
+  enumerable: true,
+  get: function get() {
+    return _reducer.regHandlers;
+  }
+});
+Object.defineProperty(exports, "regSaga", {
+  enumerable: true,
+  get: function get() {
+    return _saga.regSaga;
+  }
+});
+Object.defineProperty(exports, "runSaga", {
+  enumerable: true,
+  get: function get() {
+    return _saga.runSaga;
+  }
+});
+exports.store = exports.selectWaiting = void 0;
+var _regeneratorRuntime2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/regeneratorRuntime"));
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/toConsumableArray"));
+var _react = require("react");
+var _redux = require("redux");
+var _reactRedux = require("react-redux");
+var _effects = require("redux-saga/effects");
+var _immutable = require("immutable");
+var _reducer = require("./reducer");
+var _saga = require("./saga");
 var composeEnhancers = typeof window !== "undefined" && window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__ ? window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__({
   name: '@kineticdata/react'
-}) : compose;
-var store = createStore(reducer, Map(), composeEnhancers(applyMiddleware(sagaMiddleware)));
-
+}) : _redux.compose;
+var store = (0, _redux.createStore)(_reducer.reducer, (0, _immutable.Map)(), composeEnhancers((0, _redux.applyMiddleware)(_saga.sagaMiddleware)));
+exports.store = store;
 var dispatch = function dispatch(type, payload) {
   return store.dispatch({
     type: type,
     payload: payload
   });
 };
-
+exports.dispatch = dispatch;
 var dispatcher = function dispatcher(type) {
   return function (payload) {
     return store.dispatch({
@@ -27,32 +59,30 @@ var dispatcher = function dispatcher(type) {
     });
   };
 };
-
+exports.dispatcher = dispatcher;
 var action = function action(type, payload) {
   return {
     type: type,
     payload: payload
   };
 };
-
+exports.action = action;
 var commitStore = function commitStore() {
-  commitSagas();
+  (0, _saga.commitSagas)();
 };
-
-var context = createContext();
-
+exports.commitStore = commitStore;
+var context = /*#__PURE__*/(0, _react.createContext)();
+exports.context = context;
 var connect = function connect() {
   for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
     args[_key] = arguments[_key];
   }
-
-  return originalConnect.apply(void 0, _toConsumableArray(setIn(args, [3, 'context'], context)));
+  return _reactRedux.connect.apply(void 0, (0, _toConsumableArray2["default"])((0, _immutable.setIn)(args, [3, 'context'], context)));
 };
-
-export { action, context, commitStore, connect, dispatch, dispatcher, reducer, regHandlers, regSaga, runSaga, store };
-export var selectWaiting = /*#__PURE__*/_regeneratorRuntime.mark(function selectWaiting(selector) {
+exports.connect = connect;
+var selectWaiting = /*#__PURE__*/(0, _regeneratorRuntime2["default"])().mark(function selectWaiting(selector) {
   var value;
-  return _regeneratorRuntime.wrap(function selectWaiting$(_context) {
+  return (0, _regeneratorRuntime2["default"])().wrap(function selectWaiting$(_context) {
     while (1) {
       switch (_context.prev = _context.next) {
         case 0:
@@ -60,32 +90,26 @@ export var selectWaiting = /*#__PURE__*/_regeneratorRuntime.mark(function select
             _context.next = 12;
             break;
           }
-
           _context.next = 3;
-          return select(selector);
-
+          return (0, _effects.select)(selector);
         case 3:
           value = _context.sent;
-
           if (!value) {
             _context.next = 8;
             break;
           }
-
           return _context.abrupt("return", value);
-
         case 8:
           _context.next = 10;
-          return take();
-
+          return (0, _effects.take)();
         case 10:
           _context.next = 0;
           break;
-
         case 12:
         case "end":
           return _context.stop();
       }
     }
   }, selectWaiting);
-});
+});
+exports.selectWaiting = selectWaiting;

package/package.json

@@ -1,9 +1,8 @@
 {
   "name": "@kineticdata/react",
-  "version": "5.1.2",
+  "version": "6.0.0",
   "description": "A React library for the Kinetic Platform",
   "main": "lib/index.js",
-  "main:src": "src/index.js",
   "files": [
     "assets",
     "lib",
@@ -14,7 +13,7 @@
     "test": "jest",
     "test:watch": "jest --watch",
     "test:coverage": "jest --coverage",
-    "lint": "eslint src --ext .js",
+    "lint": "cross-env NODE_ENV=production eslint src --ext .js",
     "preversion": "yarn lint",
     "prepublishOnly": "yarn build"
   },
@@ -25,7 +24,6 @@
     "draft-js": "^0.11.0",
     "history": "^4.9.0",
     "immutable": "4.0.0-rc.9",
-    "jest-immutable-matchers": "^2.0.1",
     "kld-intersections": "^0.7.0",
     "lodash": "^4.17.15",
     "lodash-es": "^4.17.15",
@@ -36,8 +34,6 @@
     "prismjs": "1.23.0",
     "prop-types": "^15.7.2",
     "react-autosuggest": "^9.4.3",
-    "react-avatar": "^3.5.0",
-    "react-dropzone": "^4.2.3",
     "react-markdown": "^4.0.6",
     "react-popper": "^1.3.4",
     "react-redux": "^7.2.0",
@@ -49,24 +45,6 @@
   "peerDependencies": {
     "react": "16.x"
   },
-  "devDependencies": {
-    "@babel/cli": "^7.2.3",
-    "@react-workspaces/react-scripts": "^3.4.0-alpha-01",
-    "@types/jest": "^25.2.1",
-    "babel-polyfill": "^6.26.0",
-    "cross-env": "^5.2.0",
-    "enzyme": "^3.9.0",
-    "enzyme-adapter-react-16": "^1.9.1",
-    "enzyme-to-json": "^3.3.5",
-    "faker": "^4.1.0",
-    "jest-websocket-mock": "^2.0.2",
-    "mock-socket": "^9.0.3",
-    "react-addons-test-utils": "^15.6.2",
-    "stylelint": "^10.1.0",
-    "stylelint-config-rational-order": "^0.1.2",
-    "stylelint-order": "^3.0.1",
-    "wait-for-expect": "^3.0.2"
-  },
   "author": "Kinetic Data, Inc",
   "homepage": "https://kineticdata.github.io/react-kinetic-lib",
   "license": "MIT",
@@ -89,8 +67,5 @@
       ]
     ]
   },
-  "eslintConfig": {
-    "extends": "react-app"
-  },
-  "gitHead": "08d318b36f6e8922fdbfe2875a1d1d1a0b2552b4"
+  "gitHead": "d88e4fbcc3e0bd8ce3a403bc9c72e6c4ffafeaeb"
 }

package/proxyhelper.js

@@ -1,3 +1,4 @@
+const { createProxyMiddleware: proxy } = require('http-proxy-middleware');
 const removeSecure = cookie => cookie.replace(/;\s*Secure/i, '');
 const removeSameSiteNone = cookie => cookie.replace(/;\s*SameSite=None/i, '');
 
@@ -59,53 +60,111 @@ const defaultProxyLogger = ({
   }
 };
 
-module.exports = (
+const setupProxy = ({
   target = process.env.REACT_APP_PROXY_HOST,
-  { proxyLogger } = {},
-) => ({
-  target,
-  secure: true,
-  changeOrigin: true,
-  ws: true,
-  onProxyReq: (proxyRequest, originalRequest) => {
-    // Browsers may send Origin headers even with same-origin
-    // requests. To prevent CORS issues, we have to change
-    // the Origin to match the target URL.
-    if (proxyRequest.getHeader('origin')) {
-      proxyRequest.setHeader('origin', target);
-    }
+  proxyLogger,
+  pathRewrite,
+} = {}) => {
+  return {
+    target,
+    secure: false,
+    pathRewrite,
+    changeOrigin: true,
+    onProxyReq: (proxyRequest, originalRequest) => {
+      // Browsers may send Origin headers even with same-origin
+      // requests. To prevent CORS issues, we have to change
+      // the Origin to match the target URL.
+      if (proxyRequest.getHeader('origin')) {
+        proxyRequest.setHeader('origin', target);
+      }
 
-    if (
-      process.env.REACT_APP_PROXY_SUBDOMAIN &&
-      (!proxyRequest.path.endsWith('pack') &&
-        !proxyRequest.path.endsWith('favicon.ico'))
-    ) {
-      proxyRequest.setHeader(
-        'X-Kinetic-Subdomain',
-        process.env.REACT_APP_PROXY_SUBDOMAIN,
-      );
-      proxyRequest.path =
-        '/' + process.env.REACT_APP_PROXY_SUBDOMAIN + proxyRequest.path;
-    }
+      if (
+        process.env.REACT_APP_PROXY_SUBDOMAIN &&
+        !proxyRequest.path.endsWith('pack') &&
+        !proxyRequest.path.endsWith('favicon.ico')
+      ) {
+        proxyRequest.setHeader(
+          'X-Kinetic-Subdomain',
+          process.env.REACT_APP_PROXY_SUBDOMAIN,
+        );
+        proxyRequest.path =
+          '/' + process.env.REACT_APP_PROXY_SUBDOMAIN + proxyRequest.path;
+      }
 
-    if (process.env.PROXY_DEBUGGING)
-      (proxyLogger || defaultProxyLogger)({
-        proxyRequest,
-        originalRequest,
-      });
-  },
-  onProxyRes: (proxyResponse, originalRequest) => {
-    if (process.env.PROXY_DEBUGGING)
-      (proxyLogger || defaultProxyLogger)({
-        proxyResponse,
-        originalRequest,
-      });
+      if (process.env.PROXY_DEBUGGING)
+        (proxyLogger || defaultProxyLogger)({
+          proxyRequest,
+          originalRequest,
+        });
+    },
+    onProxyRes: (proxyResponse, originalRequest) => {
+      if (process.env.PROXY_DEBUGGING)
+        (proxyLogger || defaultProxyLogger)({
+          proxyResponse,
+          originalRequest,
+        });
 
-    const setCookie = proxyResponse.headers['set-cookie'];
-    if (setCookie && originalRequest.protocol === 'http') {
-      proxyResponse.headers['set-cookie'] = Array.isArray(setCookie)
-        ? setCookie.map(removeSecure).map(removeSameSiteNone)
-        : removeSameSiteNone(removeSecure(setCookie));
-    }
-  },
-});
+      const setCookie = proxyResponse.headers['set-cookie'];
+      if (setCookie && originalRequest.protocol === 'http') {
+        proxyResponse.headers['set-cookie'] = Array.isArray(setCookie)
+          ? setCookie.map(removeSecure).map(removeSameSiteNone)
+          : removeSameSiteNone(removeSecure(setCookie));
+      }
+    },
+  };
+};
+
+const getProxyConfig = (
+  app,
+  {
+    mainTarget = process.env.REACT_APP_PROXY_HOST,
+    loghubTarget = process.env.REACT_APP_LOGHUB_PROXY_HOST,
+    proxyLogger,
+  } = {},
+) => {
+  const mainPaths = [
+    '**',
+    '!/',
+    '!/favicon.ico',
+    '!/index.html',
+    '!/images/**',
+    '!/static/**',
+    '!/sockjs-node',
+    '!/manifest.json',
+    '!/*.hot-update.js*',
+  ];
+
+  const finalConfigs = [
+    {
+      paths: mainPaths,
+      options: setupProxy({ target: mainTarget, proxyLogger }),
+    },
+  ];
+
+  if (loghubTarget) {
+    // If we're overriding the underlying Loghub host, bypass it in the main.
+    mainPaths.push('!/app/loghub/**');
+    const options = setupProxy({
+      target: loghubTarget,
+      proxyLogger,
+      pathRewrite: {
+        '^/app/loghub': '/app',
+      },
+    });
+    finalConfigs.push({ paths: ['/app/loghub/**'], options });
+  }
+
+  return finalConfigs.map(config => {
+    config.proxy = ({
+      paths = config.paths,
+      options = config.options,
+    } = {}) => {
+      app.use(proxy(paths, options));
+    };
+    return config;
+  });
+};
+
+setupProxy.getProxyConfig = getProxyConfig;
+
+module.exports = setupProxy;