feat: update packages

Author: csvenke

jest.config.js

@@ -17,7 +17,8 @@ module.exports = {
   collectCoverageFrom: ['src/@(components|utils)/**/*.@(ts|tsx)'],
   globals: {
     'ts-jest': {
-      'tsConfigFile': './tsconfig.jest.json',
+      'tsConfig': './tsconfig.jest.json',
+      'isolatedModules': 'true'
     },
   },
 };

package-lock.json

@@ -34,48 +34,49 @@
     "tslib": "^1.9.3"
   },
   "peerDependencies": {
-    "react": "^16.4.1"
+    "react-dom": "^16.5.2",
+    "react": "^16.5.2"
   },
   "devDependencies": {
-    "@commitlint/cli": "^7.0.0",
-    "@commitlint/config-conventional": "^7.0.1",
-    "@commitlint/travis-cli": "^7.0.0",
-    "@types/enzyme-adapter-react-16": "^1.0.2",
-    "@types/enzyme": "^3.1.12",
-    "@types/jest": "^23.3.0",
-    "@types/node": "^10.5.4",
-    "@types/prop-types": "^15.5.3",
-    "@types/react-dom": "^16.0.6",
-    "@types/react": "^16.4.6",
-    "all-contributors-cli": "^5.3.0",
+    "@commitlint/cli": "^7.1.2",
+    "@commitlint/config-conventional": "^7.1.2",
+    "@commitlint/travis-cli": "^7.1.2",
+    "@types/enzyme-adapter-react-16": "^1.0.3",
+    "@types/enzyme": "^3.1.14",
+    "@types/jest": "^23.3.2",
+    "@types/node": "^10.11.2",
+    "@types/prop-types": "^15.5.6",
+    "@types/react-dom": "^16.0.8",
+    "@types/react": "^16.4.14",
+    "all-contributors-cli": "^5.4.0",
     "coveralls": "^3.0.2",
-    "enzyme-adapter-react-16": "^1.4.0",
+    "enzyme-adapter-react-16": "^1.5.0",
     "enzyme": "^3.6.0",
     "faker": "^4.1.0",
-    "husky": "^1.0.0-rc.13",
-    "jest": "^23.4.1",
-    "lint-staged": "^7.2.0",
-    "prettier": "^1.13.7",
-    "react-docgen-typescript": "^1.6.2",
-    "react-dom": "^16.4.1",
-    "react-styleguidist": "^7.1.3",
-    "react": "^16.4.1",
+    "husky": "^1.0.1",
+    "jest": "^23.6.0",
+    "lint-staged": "^7.3.0",
+    "prettier": "^1.14.3",
+    "react-docgen-typescript": "^1.9.1",
+    "react-dom": "^16.5.2",
+    "react-styleguidist": "^7.3.8",
+    "react": "^16.5.2",
     "rimraf": "^2.6.2",
-    "rollup-plugin-commonjs": "^9.1.4",
+    "rollup-plugin-commonjs": "^9.1.8",
     "rollup-plugin-filesize": "^4.0.1",
-    "rollup-plugin-node-resolve": "^3.3.0",
+    "rollup-plugin-node-resolve": "^3.4.0",
     "rollup-plugin-terser": "^3.0.0",
     "rollup-plugin-typescript2": "^0.17.0",
-    "rollup-plugin-uglify": "^5.0.2",
-    "rollup": "^0.66.0",
-    "ts-jest": "^23.0.1",
-    "ts-loader": "^4.4.2",
-    "tslint-config-prettier": "^1.14.0",
+    "rollup-plugin-uglify": "^6.0.0",
+    "rollup": "^0.66.2",
+    "ts-jest": "^23.10.1",
+    "ts-loader": "^5.2.0",
+    "tslint-config-prettier": "^1.15.0",
     "tslint-plugin-prettier": "^2.0.0",
     "tslint-react": "^3.6.0",
     "tslint": "^5.11.0",
-    "typescript": "^3.0.1",
-    "webpack": "^4.16.2"
+    "typescript": "^3.1.1",
+    "webpack": "^4.20.1"
   },
   "scripts": {
     "build": "npm run clean:build && rollup -c && npm run copy:build",

package.json

@@ -9,7 +9,7 @@ import pkg from './package.json';
 const createConfig = ({ output, plugins, ...restConfig } = {}) => ({
   input: 'src/index.ts',
   output,
-  external: ['react', 'prop-types', 'tslib'],
+  external: ['react', 'react-dom', 'prop-types', 'tslib'],
   plugins: [
     typescript({
       tsconfig: './tsconfig.json',

rollup.config.js

@@ -1,21 +1,23 @@
 import * as PropTypes from 'prop-types';
 import * as React from 'react';
 
+import { Map } from '../../types';
+
 export interface IListProps {
   /** Array to map. */
   items: any[];
 
   /** Shorthand for primary content. */
-  render?: (item?: any, index?: number, array?: any[]) => React.ReactNode;
+  render?: Map;
 
   /** Primary content. */
-  children?: any;
+  children?: Map;
 }
 
 /**
  * Renders content from specified callback function from either `render` or `children` on each element of `items`.
  */
-export const List: React.SFC<IListProps> = ({ items, render, children }) => {
+export const List: React.SFC<IListProps> = ({ items, children, render }) => {
   const itemRender = children ? children : render;
 
   if (!itemRender) {

src/components/List/List.tsx

@@ -1,23 +1,23 @@
 import * as PropTypes from 'prop-types';
-import * as React from 'react';
 
-import { corePropTypes, getChildrenOrRender, ICoreProps } from '../../utils';
+import { IRenderProps, renderPropsPropTypes } from '../../types';
+import { getChildrenOrRender, renderIf } from '../../utils';
 
-export interface IShowProps extends ICoreProps {
+export interface IShowProps extends IRenderProps {
   /** Conditional statement.  */
   when: boolean;
 }
 
 /**
  * Renders content if `when` equals true.
  */
-export const Show: React.SFC<IShowProps> = ({ when, render, children }) => {
-  return when ? getChildrenOrRender(children, render) : null;
+export const Show: React.SFC<IShowProps> = ({ when, children, render }) => {
+  return renderIf(when)(getChildrenOrRender(children, render));
 };
 
 Show.propTypes = {
   when: PropTypes.bool.isRequired,
-  ...corePropTypes,
+  ...renderPropsPropTypes,
 };
 
 export default Show;

src/components/Show/Show.tsx

@@ -1,6 +1,7 @@
 import * as PropTypes from 'prop-types';
 import * as React from 'react';
 
+import { renderIf } from '../../utils';
 import SwitchCase, { ISwitchCaseProps } from './SwitchCase';
 import SwitchDefault from './SwitchDefault';
 
@@ -33,7 +34,7 @@ const isValidSwitchChild = (child: any): child is SwitchElement => {
 /**
  * Renders content from first `Switch.Case` that matches `value`, else `Switch.Default` if it exists.
  */
-export const Switch: SwitchComponent = ({ value, children }) => {
+export const Switch: SwitchComponent = ({ children, value }) => {
   const switchValue = value;
   let match = false;
   let child: any;
@@ -52,11 +53,10 @@ export const Switch: SwitchComponent = ({ value, children }) => {
   }
 
   // Return case if its a match.
-  return match ? React.cloneElement(child) : null;
+  return renderIf(match)(React.cloneElement(child));
 };
 
 Switch.Case = SwitchCase;
-
 Switch.Default = SwitchDefault;
 
 Switch.propTypes = {

src/components/Switch/Switch.tsx

@@ -1,24 +1,23 @@
 import * as PropTypes from 'prop-types';
-import * as React from 'react';
 
-import { corePropTypes, getChildrenOrRender, ICoreProps } from '../../utils/';
+import { IRenderProps, renderPropsPropTypes } from '../../types';
+import { getChildrenOrRender } from '../../utils/';
 
-export interface ISwitchCaseProps extends ICoreProps {
+export interface ISwitchCaseProps extends IRenderProps {
   /** Conditional statement. */
   value: any;
 }
 
 /**
  * Helper component that is accessed from `Switch` component.
  */
-// @ts-ignore `value` prop is used by parent component Switch.
-export const SwitchCase: React.SFC<ISwitchCaseProps> = ({ value, render, children }) => {
+export const SwitchCase: React.SFC<ISwitchCaseProps> = ({ children, render }) => {
   return getChildrenOrRender(children, render);
 };
 
 SwitchCase.propTypes = {
   value: PropTypes.any.isRequired,
-  ...corePropTypes,
+  ...renderPropsPropTypes,
 };
 
 export default SwitchCase;

src/components/Switch/SwitchCase.tsx

@@ -1,18 +1,13 @@
-import * as React from 'react';
-
-import {
-  corePropTypes,
-  getChildrenOrRender,
-  ICoreProps as ISwitchDefaultProps,
-} from '../../utils';
+import { IRenderProps, renderPropsPropTypes } from '../../types';
+import { getChildrenOrRender } from '../../utils/';
 
 /**
  * Helper component that is accessed from `Switch` component.
  */
-export const SwitchDefault: React.SFC<ISwitchDefaultProps> = ({ render, children }) => {
+export const SwitchDefault: React.SFC<IRenderProps> = ({ render, children }) => {
   return getChildrenOrRender(children, render);
 };
 
-SwitchDefault.propTypes = corePropTypes;
+SwitchDefault.propTypes = renderPropsPropTypes;
 
 export default SwitchDefault;

src/components/Switch/SwitchDefault.tsx

@@ -1,21 +1,28 @@
 /// <reference types="react" />
 
-interface ICoreProps {
-  /** Shorthand for primary content. */
-  render?: () => React.ReactNode;
+type Render = (() => React.ReactNode) | null;
+
+type Children = React.ReactNode | (() => React.ReactNode) | null;
 
+interface IRenderProps {
+  /** Shorthand for primary content. */
+  render?: Render;
   /** Primary content. */
-  children?: any;
+  children?: Children;
 }
 
+type MapCallback =
+  | ((item?: any, index?: number, array?: any[]) => React.ReactNode)
+  | null;
+
 declare module 'react-semantic-render/List' {
   interface IListProps {
     /** Array to map. */
     items: any[];
     /** Shorthand for primary content. */
-    render?: (item?: any, index?: number, array?: any[]) => React.ReactNode;
+    render?: MapCallback;
     /** Primary content. */
-    children?: any;
+    children?: MapCallback;
   }
 
   /**
@@ -27,7 +34,7 @@ declare module 'react-semantic-render/List' {
 }
 
 declare module 'react-semantic-render/Show' {
-  interface IShowProps extends ICoreProps {
+  interface IShowProps extends IRenderProps {
     /** Conditional statement.  */
     when: boolean;
   }
@@ -76,7 +83,7 @@ declare module 'react-semantic-render/Switch' {
     children: React.ReactNode;
   }
 
-  interface ISwitchCaseProps extends ICoreProps {
+  interface ISwitchCaseProps extends IRenderProps {
     /** Conditional statement. */
     value: any;
   }
@@ -89,7 +96,7 @@ declare module 'react-semantic-render/Switch' {
   /**
    * Helper component that is accessed from `Switch` component.
    */
-  const SwitchDefault: React.SFC<ICoreProps>;
+  const SwitchDefault: React.SFC<IRenderProps>;
 
   type SwitchComponent = React.SFC<ISwitchProps> & {
     Case?: typeof SwitchCase;