Switch Library Type from CommonJs2 => UMD (#134)

CHANGELOG.md

@@ -5,18 +5,6 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [[7.1.0](https://github.com/Mastermindzh/react-cookie-consent/releases/tag/7.1.0)]
-
-- Added custom attribute props for content and container
-
-## [[7.0.1](https://github.com/Mastermindzh/react-cookie-consent/releases/tag/7.0.1)]
-
-- Configured webpack to remove self from build artefact. Should now work in Nextjs and Gatsby (only tested those..)
-
-## [[7.0.0](https://github.com/Mastermindzh/react-cookie-consent/releases/tag/7.0.0)]
-
-- Switched from CommonJS to UMD module
-
 ## [[6.4.1](https://github.com/Mastermindzh/react-cookie-consent/releases/tag/6.4.1))]
 
 - Added missing typing

README.md

@@ -137,10 +137,10 @@ That option would be interesting if you want to allow user to change their conse
 
 ## Props
 
-| Prop                     |                    Type                     | Default value                        | Description                                                                                                                             |
+| Prop                     |               Type                | Default value                        | Description                                                                                                                             |
 | ------------------------ | :-----------------------------------------: | ------------------------------------ | --------------------------------------------------------------------------------------------------------------------------------------- |
 | location                 |      string, "top", "bottom" or "none"      | "bottom"                             | Syntactic sugar to easily enable you to place the bar at the top or the bottom of the browser window. Use "none" to disable.            |
-| visible                  | string, "show", "hidden" or "byCookieValue" | "byCookieValue"                      | Force the consent bar visibility. If "byCookieValue", visibility are defined by cookie consent existence.                               |
+| visible                  | string, "show", "hidden" or "byCookieValue" | "byCookieValue"                      | Force the consent bar visibility. If "byCookieValue", visibility are defined by cookie consent existence.                            |
 | children                 |          string or React component          |                                      | Content to appear inside the bar                                                                                                        |
 | disableStyles            |                   boolean                   | false                                | If enabled the component will have no default style. (you can still supply style through props)                                         |
 | hideOnAccept             |                   boolean                   | true                                 | If disabled the component will not hide it self after the accept button has been clicked. You will need to hide yourself (see onAccept) |
@@ -150,8 +150,8 @@ That option would be interesting if you want to allow user to change their conse
 | cookieValue              |         string or boolean or number         | true                                 | Value to be saved under the cookieName.                                                                                                 |
 | declineCookieValue       |         string or boolean or number         | false                                | Value to be saved under the cookieName when declined.                                                                                   |
 | setDeclineCookie         |                   boolean                   | true                                 | Whether to set a cookie when the user clicks "decline"                                                                                  |
-| onAccept                 |                  function                   | `() => {}`                           | Function to be called after the accept button has been clicked.                                                                         |
+| onAccept                 |                   function                  | `() => {}`                           | Function to be called after the accept button has been clicked.                                                                         |
-| onDecline                |                  function                   | `() => {}`                           | Function to be called after the decline button has been clicked.                                                                        |
+| onDecline                |                   function                  | `() => {}`                           | Function to be called after the decline button has been clicked.                                                                        |
 | debug                    |                   boolean                   | undefined                            | Bar will be drawn regardless of cookie for debugging purposes.                                                                          |
 | expires                  |                   number                    | 365                                  | Number of days before the cookie expires.                                                                                               |
 | extraCookieOptions       |                   object                    | `{}`                                 | Extra info (apart from expiry date) to add to the cookie                                                                                |
@@ -173,17 +173,13 @@ That option would be interesting if you want to allow user to change their conse
 | enableDeclineButton      |                   boolean                   | false                                | If enabled the decline button will be rendered                                                                                          |
 | flipButtons              |                   boolean                   | false                                | If enabled the accept and decline buttons will be flipped                                                                               |
 | ButtonComponent          |               React component               | button                               | React Component to render as a button.                                                                                                  |
-| sameSite                 |      string, "strict", "lax" or "none"      | none                                 | Cookies sameSite attribute value                                                                                                        |
+| sameSite                 | string, "strict", "lax" or "none" | none                                 | Cookies sameSite attribute value                                                                                                        |
-| cookieSecurity           |                  boolean ¡                  | undefined                            | Cookie security level. Defaults to true unless running on http.                                                                         |
+| cookieSecurity           |                   boolean                    ¡| undefined                            | Cookie security level. Defaults to true unless running on http.                                                                         |
 | ariaAcceptLabel          |                   string                    | Accept cookies                       | Aria label to set on the accept button                                                                                                  |
 | ariaDeclineLabel         |                   string                    | Decline cookies                      | Aria label to set on the decline button                                                                                                 |
 | acceptOnScroll           |                   boolean                   | false                                | Defines whether "accept" should be fired after the user scrolls a certain distance (see acceptOnScrollPercentage)                       |
 | acceptOnScrollPercentage |                   number                    | 25                                   | Percentage of the page height the user has to scroll to trigger the accept function if acceptOnScroll is enabled                        |
 
-| customContentAttributes
-| object | {} | Allows you to set custom (data) attributes on the content div |
-| customContainerAttributes | object | {} | Allows you to set custom (data) attributes on the container div |
-
 ## Debugging it
 
 Because the cookie consent bar will be hidden once accepted, you will have to set the prop `debug={true}` to evaluate styling changes:

package-lock.json

@@ -1,11 +1,11 @@
 {
   "name": "react-cookie-consent",
-  "version": "7.0.1",
+  "version": "6.4.1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
-      "version": "7.0.1",
+      "version": "6.4.1",
       "license": "MIT",
       "dependencies": {
         "js-cookie": "^2.2.1",

package.json

@@ -4,7 +4,7 @@
     "name": "Rick van Lieshout",
     "email": "info@rickvanlieshout.com"
   },
-  "version": "7.0.1",
+  "version": "6.4.1",
   "description": "A small, simple and customizable cookie consent bar for use in React applications.",
   "main": "build/index.js",
   "types": "build/index.d.ts",

src/index.d.ts

@@ -42,8 +42,6 @@ export interface CookieConsentProps {
   ariaDeclineLabel?: string;
   acceptOnScroll?: boolean;
   acceptOnScrollPercentage?: number;
-  customContentAttributes: object;
-  customContainerAttributes: object;
 }
 
 export default class CookieConsent extends React.Component<CookieConsentProps, {}> {}

src/index.js

@@ -15,10 +15,10 @@ export const SAME_SITE_OPTIONS = {
 };
 
 export const VISIBLE_OPTIONS = {
-  HIDDEN: "hidden",
+  HIDDEN: 'hidden',
-  SHOW: "show",
+  SHOW: 'show',
-  BY_COOKIE_VALUE: "byCookieValue",
+  BY_COOKIE_VALUE: 'byCookieValue'
-};
+}
 
 /**
  * Returns the value of the consent cookie
@@ -279,8 +279,6 @@ class CookieConsent extends Component {
       overlayStyle,
       ariaAcceptLabel,
       ariaDeclineLabel,
-      customContainerAttributes,
-      customContentAttributes,
     } = this.props;
 
     let myStyle = {};
@@ -374,8 +372,8 @@ class CookieConsent extends Component {
           </div>
         )}
       >
-        <div className={`${containerClasses}`} style={myStyle} {...customContainerAttributes}>
+        <div className={`${containerClasses}`} style={myStyle}>
-          <div style={myContentStyle} className={contentClasses} {...customContentAttributes}>
+          <div style={myContentStyle} className={contentClasses}>
             {this.props.children}
           </div>
           <div className={`${buttonWrapperClasses}`}>
@@ -431,8 +429,6 @@ CookieConsent.propTypes = {
   ariaDeclineLabel: PropTypes.string,
   acceptOnScroll: PropTypes.bool,
   acceptOnScrollPercentage: PropTypes.number,
-  customContentAttributes: PropTypes.object,
-  customContainerAttributes: PropTypes.object,
 };
 
 CookieConsent.defaultProps = {
@@ -470,8 +466,6 @@ CookieConsent.defaultProps = {
   ariaDeclineLabel: "Decline cookies",
   acceptOnScroll: false,
   acceptOnScrollPercentage: 25,
-  customContentAttributes: {},
-  customContainerAttributes: {},
 };
 
 export default CookieConsent;

webpack.config.js

@@ -13,7 +13,6 @@ module.exports = {
     environment: {
       arrowFunction: false, // the generated runtime-code should not use arrow functions
     },
-    globalObject: `typeof self !== 'undefined' ? self : this`,
   },
   module: {
     rules: [