@folklore/ads 0.0.80 → 0.0.81

package/dist/cjs.js

@@ -1,7 +1,5 @@
 'use strict';
 
-Object.defineProperty(exports, '__esModule', { value: true });
-
 var PropTypes = require('prop-types');
 var classNames = require('classnames');
 var isFunction = require('lodash/isFunction');
@@ -18,31 +16,17 @@ var utils = require('@folklore/utils');
 var hooks = require('@folklore/hooks');
 var tracking = require('@folklore/tracking');
 
-function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
-
-var PropTypes__default = /*#__PURE__*/_interopDefaultLegacy(PropTypes);
-var classNames__default = /*#__PURE__*/_interopDefaultLegacy(classNames);
-var isFunction__default = /*#__PURE__*/_interopDefaultLegacy(isFunction);
-var isObject__default = /*#__PURE__*/_interopDefaultLegacy(isObject);
-var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
-var isArray__default = /*#__PURE__*/_interopDefaultLegacy(isArray);
-var sortBy__default = /*#__PURE__*/_interopDefaultLegacy(sortBy);
-var uniqBy__default = /*#__PURE__*/_interopDefaultLegacy(uniqBy);
-var debounce__default = /*#__PURE__*/_interopDefaultLegacy(debounce);
-var createDebug__default = /*#__PURE__*/_interopDefaultLegacy(createDebug);
-var EventEmitter__default = /*#__PURE__*/_interopDefaultLegacy(EventEmitter);
-
-const adPath = PropTypes__default["default"].string;
-const adSize = PropTypes__default["default"].oneOfType([PropTypes__default["default"].arrayOf(PropTypes__default["default"].number), PropTypes__default["default"].arrayOf(PropTypes__default["default"].string), PropTypes__default["default"].string, PropTypes__default["default"].arrayOf(PropTypes__default["default"].oneOfType([PropTypes__default["default"].arrayOf(PropTypes__default["default"].number), PropTypes__default["default"].arrayOf(PropTypes__default["default"].string), PropTypes__default["default"].string]))]);
-const adSizeMapping = PropTypes__default["default"].arrayOf(PropTypes__default["default"].arrayOf(PropTypes__default["default"].oneOfType([PropTypes__default["default"].arrayOf(PropTypes__default["default"].number), adSize])));
-const adViewports = PropTypes__default["default"].objectOf(PropTypes__default["default"].arrayOf(PropTypes__default["default"].number));
-const adSlot = PropTypes__default["default"].shape({
+const adPath = PropTypes.string;
+const adSize = PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.number), PropTypes.arrayOf(PropTypes.string), PropTypes.string, PropTypes.arrayOf(PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.number), PropTypes.arrayOf(PropTypes.string), PropTypes.string]))]);
+const adSizeMapping = PropTypes.arrayOf(PropTypes.arrayOf(PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.number), adSize])));
+const adViewports = PropTypes.objectOf(PropTypes.arrayOf(PropTypes.number));
+const adSlot = PropTypes.shape({
   size: adSize,
-  sizeMapping: PropTypes__default["default"].objectOf(adSize)
+  sizeMapping: PropTypes.objectOf(adSize)
 });
-const adSlots = PropTypes__default["default"].objectOf(adSlot);
-const adTargeting = PropTypes__default["default"].shape({
-  domain: PropTypes__default["default"].string
+const adSlots = PropTypes.objectOf(adSlot);
+const adTargeting = PropTypes.shape({
+  domain: PropTypes.string
 });
 
 var propTypes$4 = /*#__PURE__*/Object.freeze({
@@ -50,15 +34,15 @@ var propTypes$4 = /*#__PURE__*/Object.freeze({
     adPath: adPath,
     adSize: adSize,
     adSizeMapping: adSizeMapping,
-    adViewports: adViewports,
     adSlot: adSlot,
     adSlots: adSlots,
-    adTargeting: adTargeting
+    adTargeting: adTargeting,
+    adViewports: adViewports
 });
 
 const getAdSizes = sizes => {
-  if (isArray__default["default"](sizes)) {
-    return uniqBy__default["default"](isArray__default["default"](sizes[0]) || sizes[0] === 'fluid' ? sizes.filter(size => size !== 'fluid').reduce((allSizes, size) => [...allSizes, ...getAdSizes(size)], []) : [sizes].filter(size => size !== 'fluid'), size => size.join('x'));
+  if (isArray(sizes)) {
+    return uniqBy(isArray(sizes[0]) || sizes[0] === 'fluid' ? sizes.filter(size => size !== 'fluid').reduce((allSizes, size) => [...allSizes, ...getAdSizes(size)], []) : [sizes].filter(size => size !== 'fluid'), size => size.join('x'));
   }
   return sizes.split('x').map(it => parseInt(it, 10));
 };
@@ -70,11 +54,11 @@ const getMinimumAdSize = sizes => getAdSizes(sizes).reduce((minimumSize, size) =
   height: Infinity
 });
 const sizeFitsInViewport = (size, viewport) => size === 'fluid' && viewport[0] > 600 || size !== 'fluid' && (viewport[0] === 0 || size[0] <= viewport[0]) && (viewport[1] === 0 || size[1] <= viewport[1]);
-const getSortedViewports = viewports => sortBy__default["default"](Object.keys(viewports).map(name => ({
+const getSortedViewports = viewports => sortBy(Object.keys(viewports).map(name => ({
   name,
   size: viewports[name]
 })), [viewport => viewport.size[0]]).reverse();
-const buildSizeMappingFromViewports = (sizeMapping, viewports) => isObject__default["default"](sizeMapping) && !isArray__default["default"](sizeMapping) ? getSortedViewports(viewports).reduce((newSizeMapping, _ref) => {
+const buildSizeMappingFromViewports = (sizeMapping, viewports) => isObject(sizeMapping) && !isArray(sizeMapping) ? getSortedViewports(viewports).reduce((newSizeMapping, _ref) => {
   let {
     name,
     size: viewPortSize
@@ -99,7 +83,7 @@ const getSizeMappingFromSlot = (_ref3, viewports) => {
   return sizeMapping !== null ? buildSizeMappingFromViewports(sizeMapping, viewports) : null;
 };
 
-class AdSlot extends EventEmitter__default["default"] {
+class AdSlot extends EventEmitter {
   constructor(id, path, size) {
     let opts = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
     super();
@@ -276,8 +260,8 @@ class AdSlot extends EventEmitter__default["default"] {
 }
 
 /* globals refreshDisabledLineItems: [] */
-const debug$1 = createDebug__default["default"]('folklore:ads');
-class AdsManager extends EventEmitter__default["default"] {
+const debug$1 = createDebug('folklore:ads');
+class AdsManager extends EventEmitter {
   // static index = 0;
 
   // static createAdId() {
@@ -444,7 +428,7 @@ class AdsManager extends EventEmitter__default["default"] {
       renderSlot.setRenderEvent(event);
     }
     const lineItems = typeof window !== 'undefined' ? window.refreshDisabledLineItems || [] : [];
-    if (isArray__default["default"](lineItems) && lineItems.indexOf(lineItemId) > -1) {
+    if (isArray(lineItems) && lineItems.indexOf(lineItemId) > -1) {
       renderSlot.setRefreshDisabled();
     }
     if (event.isEmpty) {
@@ -566,7 +550,7 @@ class AdsManager extends EventEmitter__default["default"] {
     const {
       googletag
     } = this;
-    const slot = isObject__default["default"](id) ? id : this.slots.find(it => it.getElementId() === id) || null;
+    const slot = isObject(id) ? id : this.slots.find(it => it.getElementId() === id) || null;
     if (slot === null || slot.isDestroyed()) {
       return;
     }
@@ -585,7 +569,7 @@ class AdsManager extends EventEmitter__default["default"] {
     const {
       googletag
     } = this;
-    const slot = isObject__default["default"](id) ? id : this.slots.find(it => it.getElementId() === id) || null;
+    const slot = isObject(id) ? id : this.slots.find(it => it.getElementId() === id) || null;
     if (slot === null || slot.isDestroyed() || slot.isRefreshDisabled()) {
       return;
     }
@@ -603,7 +587,7 @@ class AdsManager extends EventEmitter__default["default"] {
     const {
       googletag
     } = this;
-    const slots = ids.map(id => isObject__default["default"](id) ? id : this.slots.find(it => !it.isDestroyed() && it.getElementId() === id) || null).filter(it => it !== null).map(it => it.getAdSlot());
+    const slots = ids.map(id => isObject(id) ? id : this.slots.find(it => !it.isDestroyed() && it.getElementId() === id) || null).filter(it => it !== null).map(it => it.getAdSlot());
     if (slots.length === 0) {
       return;
     }
@@ -670,28 +654,28 @@ const slots = {
 };
 
 /* eslint-disable react/jsx-props-no-spreading */
-const AdsContext = /*#__PURE__*/React__default["default"].createContext({
+const AdsContext = /*#__PURE__*/React.createContext({
   ready: false
 });
 const useAdsContext = () => React.useContext(AdsContext);
 const propTypes$3 = {
-  children: PropTypes__default["default"].node.isRequired,
-  defaultSlotPath: PropTypes__default["default"].string,
-  slotsPath: PropTypes__default["default"].objectOf(PropTypes__default["default"].string),
-  disableSingleRequest: PropTypes__default["default"].bool,
-  disableVideoAds: PropTypes__default["default"].bool,
-  disableLazyLoad: PropTypes__default["default"].bool,
-  autoInit: PropTypes__default["default"].bool,
-  resizeDebounceDelay: PropTypes__default["default"].number,
-  refreshOnResize: PropTypes__default["default"].bool,
-  mobileScaling: PropTypes__default["default"].number,
-  renderMarginPercent: PropTypes__default["default"].number,
-  fetchMarginPercent: PropTypes__default["default"].number,
+  children: PropTypes.node.isRequired,
+  defaultSlotPath: PropTypes.string,
+  slotsPath: PropTypes.objectOf(PropTypes.string),
+  disableSingleRequest: PropTypes.bool,
+  disableVideoAds: PropTypes.bool,
+  disableLazyLoad: PropTypes.bool,
+  autoInit: PropTypes.bool,
+  resizeDebounceDelay: PropTypes.number,
+  refreshOnResize: PropTypes.bool,
+  mobileScaling: PropTypes.number,
+  renderMarginPercent: PropTypes.number,
+  fetchMarginPercent: PropTypes.number,
   slots: adSlots,
   viewports: adViewports,
-  richAdComponents: PropTypes__default["default"].objectOf(PropTypes__default["default"].elementType),
-  disabled: PropTypes__default["default"].bool,
-  disableTracking: PropTypes__default["default"].bool
+  richAdComponents: PropTypes.objectOf(PropTypes.elementType),
+  disabled: PropTypes.bool,
+  disableTracking: PropTypes.bool
 };
 const defaultProps$3 = {
   defaultSlotPath: null,
@@ -770,7 +754,7 @@ function AdsProvider(_ref) {
     }
   }, [ads, autoInit]);
   React.useEffect(() => {
-    const onResize = debounce__default["default"](() => ads.refreshAllSlots(), resizeDebounceDelay);
+    const onResize = debounce(() => ads.refreshAllSlots(), resizeDebounceDelay);
     if (refreshOnResize) {
       window.addEventListener('resize', onResize);
     }
@@ -811,13 +795,13 @@ function AdsProvider(_ref) {
 AdsProvider.propTypes = propTypes$3;
 AdsProvider.defaultProps = defaultProps$3;
 
-const AdsTargetingContext = /*#__PURE__*/React__default["default"].createContext(null);
+const AdsTargetingContext = /*#__PURE__*/React.createContext(null);
 const useAdsTargeting = () => React.useContext(AdsTargetingContext);
 const propTypes$2 = {
-  children: PropTypes__default["default"].node.isRequired,
+  children: PropTypes.node.isRequired,
   // eslint-disable-next-line react/forbid-prop-types
-  targeting: PropTypes__default["default"].object,
-  replace: PropTypes__default["default"].bool
+  targeting: PropTypes.object,
+  replace: PropTypes.bool
 };
 const defaultProps$2 = {
   targeting: {
@@ -846,8 +830,8 @@ AdsTargetingProvider.defaultProps = defaultProps$2;
 
 /* eslint-disable react/jsx-props-no-spreading */
 const propTypes$1 = {
-  richAd: PropTypes__default["default"].shape({
-    type: PropTypes__default["default"].string.isRequired
+  richAd: PropTypes.shape({
+    type: PropTypes.string.isRequired
   }).isRequired
 };
 const defaultProps$1 = {};
@@ -1065,7 +1049,7 @@ function useAd(path, size) {
   };
 }
 
-const debug = createDebug__default["default"]('folklore:ads');
+const debug = createDebug('folklore:ads');
 function parseRichAd(data) {
   let richAd = null;
   try {
@@ -1112,27 +1096,27 @@ function useRichAd(containerRef, id, opts) {
 }
 
 const propTypes = {
-  slot: PropTypes__default["default"].string.isRequired,
+  slot: PropTypes.string.isRequired,
   path: adPath,
   size: adSize,
   sizeMapping: adSizeMapping,
   targeting: adTargeting,
-  refreshInterval: PropTypes__default["default"].number,
-  alwaysRender: PropTypes__default["default"].bool,
-  disabled: PropTypes__default["default"].bool,
-  disableTracking: PropTypes__default["default"].bool,
-  shouldKeepSize: PropTypes__default["default"].bool,
-  withoutStyle: PropTypes__default["default"].bool,
-  withoutMinimumSize: PropTypes__default["default"].bool,
-  className: PropTypes__default["default"].string,
-  emptyClassName: PropTypes__default["default"].string,
-  adClassName: PropTypes__default["default"].string,
-  richAdClassName: PropTypes__default["default"].string,
-  richAdIframeClassName: PropTypes__default["default"].string,
-  onRender: PropTypes__default["default"].func,
-  onDestroy: PropTypes__default["default"].func,
-  onRichAd: PropTypes__default["default"].func,
-  slotRef: PropTypes__default["default"].oneOfType([PropTypes__default["default"].func, PropTypes__default["default"].object])
+  refreshInterval: PropTypes.number,
+  alwaysRender: PropTypes.bool,
+  disabled: PropTypes.bool,
+  disableTracking: PropTypes.bool,
+  shouldKeepSize: PropTypes.bool,
+  withoutStyle: PropTypes.bool,
+  withoutMinimumSize: PropTypes.bool,
+  className: PropTypes.string,
+  emptyClassName: PropTypes.string,
+  adClassName: PropTypes.string,
+  richAdClassName: PropTypes.string,
+  richAdIframeClassName: PropTypes.string,
+  onRender: PropTypes.func,
+  onDestroy: PropTypes.func,
+  onRichAd: PropTypes.func,
+  slotRef: PropTypes.oneOfType([PropTypes.func, PropTypes.object])
 };
 const defaultProps = {
   path: null,
@@ -1279,9 +1263,9 @@ function Ad(_ref) {
   const richAd = useRichAd(adContainerRef, id, {
     onRichAd
   });
-  if (slotRef !== null && isFunction__default["default"](slotRef)) {
+  if (slotRef !== null && isFunction(slotRef)) {
     slotRef(slotObject);
-  } else if (slotRef !== null && isObject__default["default"](slotRef)) {
+  } else if (slotRef !== null && isObject(slotRef)) {
     // eslint-disable-next-line no-param-reassign
     slotRef.current = slotObject;
   }
@@ -1322,7 +1306,7 @@ function Ad(_ref) {
   }
   return /*#__PURE__*/jsxRuntime.jsx("div", {
     id: id !== null ? `${id}-container` : null,
-    className: classNames__default["default"]([className, {
+    className: classNames([className, {
       [emptyClassName]: emptyClassName !== null && isEmpty
     }]),
     style: !withoutStyle ? containerStyle : null,
@@ -1336,7 +1320,7 @@ function Ad(_ref) {
       ref: adContainerRef,
       children: [/*#__PURE__*/jsxRuntime.jsx("div", {
         id: id,
-        className: classNames__default["default"]([{
+        className: classNames([{
           [richAdIframeClassName]: richAdIframeClassName !== null && isRendered && richAd !== null
         }])
       }), isRendered && richAd !== null ? /*#__PURE__*/jsxRuntime.jsx(RichAd, {

package/dist/es.js

@@ -32,10 +32,10 @@ var propTypes$4 = /*#__PURE__*/Object.freeze({
     adPath: adPath,
     adSize: adSize,
     adSizeMapping: adSizeMapping,
-    adViewports: adViewports,
     adSlot: adSlot,
     adSlots: adSlots,
-    adTargeting: adTargeting
+    adTargeting: adTargeting,
+    adViewports: adViewports
 });
 
 const getAdSizes = sizes => {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@folklore/ads",
-    "version": "0.0.80",
+    "version": "0.0.81",
     "description": "Ads library",
     "keywords": [
         "javascript",
@@ -34,7 +34,7 @@
     ],
     "scripts": {
         "clean": "rm -rf dist",
-        "build": "rollup --config ../../rollup.config.js",
+        "build": "rollup --bundleConfigAsCjs --config ../../rollup.config.js",
         "prepare": "npm run clean && npm run build"
     },
     "devDependencies": {
@@ -50,11 +50,11 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "336b221bfe2d1bc6a39c79e0d9cedc3621a7c9d6",
+    "gitHead": "c13ef70b8126b3182b3e3365f34f9231fa9b1535",
     "dependencies": {
-        "@folklore/hooks": "^0.0.65",
-        "@folklore/tracking": "^0.0.25",
-        "@folklore/utils": "^0.1.1",
+        "@folklore/hooks": "^0.0.66",
+        "@folklore/tracking": "^0.0.26",
+        "@folklore/utils": "^0.1.2",
         "classnames": "^2.5.1",
         "debug": "^4.3.4",
         "lodash": "^4.17.21",