Bug fixes

birdofpreyru · birdofpreyru · commit 06360542f3ac · 2018-01-15T00:18:56.000+01:00
diff --git a/README.md b/README.md
@@ -11,25 +11,13 @@ $ npm install --save topcoder-react-utils
 
 You are done if you will use only components and utilities provided by this
 package. If you are to use configurations, you must also install peer
-dependencies. If you like to explicitly add them to the `package.json` of your
-project do
+dependencies:
 ```
 $ npm install -g install-peerdeps
 $ install-peerdeps topcoder-react-utils
 ```
 
-Alternatively, you can do
-```
-$ npm install --save install-peerdeps
-```
-
-then add to your `package.json` the following script:
-```json
-"postinstall": "install-peerdeps -S topcoder-react-utils"
-```
-
-Now, in both cases, `$ npm install` will install all necessary dependencies, but
-in the second case they won't be stored into your `package.json`.
+Peer dependencies will be also stored into `package.json` of your project, thus future invokations of `npm install` will automatically install them, and you won't need to use `install-peerdeps` as long as you don't update `topcoder-react-utils` version.
 
 ### Configurations
 - [**Babel Configurations**](docs/babel-config.md) &mdash; Standard configurations
diff --git a/config/babel/node-ssr.js b/config/babel/node-ssr.js
@@ -17,13 +17,17 @@ config.plugins = config.plugins.concat([
   ['css-modules-transform', cssModulesTransformPluginOps],
 ]);
 
+const envPresetsOps
+  = config.presets.find(x => x[0] === 'env')[1];
+
 const moduleResolverPluginOps
   = config.plugins.find(x => x[0] === 'module-resolver')[1];
 
 moduleResolverPluginOps.transformFunctions = ['resolveWeak'];
 
 switch (process.env.BABEL_ENV) {
   case 'development':
+    envPresetsOps.modules = 'commonjs';
     _.pull(config.plugins, 'react-hot-loader/babel');
     cssModulesTransformPluginOps.generateScopedName = '[path][name]___[local]';
     break;
diff --git a/config/babel/webpack.js b/config/babel/webpack.js
@@ -32,6 +32,7 @@ const config = {
 
 switch (process.env.BABEL_ENV) {
   case 'development':
+    envPresetOps.modules = false;
     reactCssModulesPluginOps.generateScopedName = '[path][name]___[local]';
     config.plugins.push('react-hot-loader/babel');
     break;
diff --git a/package.json b/package.json
@@ -1,8 +1,8 @@
 {
   "name": "topcoder-react-utils",
-  "version": "0.0.19",
+  "version": "0.0.21",
   "description": "Topcoder collection of generic ReactJS components and utils",
-  "main": "index.js",
+  "main": "dist/index.js",
   "engines": {
     "node": "~8.9.4",
     "npm": "~5.6.0"
diff --git a/src/GenericLink.jsx b/src/GenericLink.jsx
@@ -8,26 +8,20 @@
 
 /* global document, window */
 
+import _ from 'lodash';
 import PT from 'prop-types';
 import React from 'react';
 import Url from 'url-parse';
 
 export default function GenericLink(props) {
   const {
-    activeClassName,
-    activeStyle,
     children,
     className,
     enforceA,
-    exact,
-    isActive,
-    location,
     onClick,
     onMouseDown,
     openNewTab,
-    replace,
     routerLinkType,
-    strict,
     to,
   } = props;
   /* Renders the link as <a> element if either opted explicitely, or the link
@@ -45,15 +39,17 @@ export default function GenericLink(props) {
     );
   }
 
+  const linkProps = _.omit(props, [
+    'children',
+    'enforceA',
+    'openNewTab',
+    'routerLinkType',
+  ]);
+
   /* Otherwise we render the link as React Router's Link or NavLink element. */
   return React.createElement(
     routerLinkType, {
-      activeClassName,
-      activeStyle,
-      className,
-      exact,
-      isActive,
-      location,
+      ...linkProps,
       onClick: (e) => {
         /* If a custom onClick(..) handler was provided we execute it. */
         if (onClick) onClick(e);
@@ -69,45 +65,28 @@ export default function GenericLink(props) {
          * references the same page we are already in. */
         } else window.scroll(0, 0);
       },
-      onMouseDown,
-      replace,
-      strict,
-      to,
-    },
+    }, children,
   );
 }
 
 GenericLink.defaultProps = {
-  activeClassName: null,
-  activeStyle: null,
   children: null,
   className: null,
   enforceA: false,
-  exact: false,
-  isActive: null,
-  location: null,
   onClick: null,
   onMouseDown: null,
   openNewTab: false,
   replace: false,
-  strict: false,
   to: '',
 };
 
 GenericLink.propTypes = {
-  activeClassName: PT.string,
-  activeStyle: PT.string,
   children: PT.node,
   className: PT.string,
   enforceA: PT.bool,
-  exact: PT.bool,
-  isActive: PT.func,
-  location: PT.shape(),
   onClick: PT.func,
   onMouseDown: PT.func,
   openNewTab: PT.bool,
-  replace: PT.bool,
-  routerLinkType: PT.element.isRequired,
-  strict: PT.bool,
+  routerLinkType: PT.func.isRequired,
   to: PT.oneOfType([PT.object, PT.string]),
 };
