jss-preset-default - npm Package Compare versions

Comparing version 0.5.0 to 0.6.0

changelog.md

@@ -0,1 +1,6 @@
+## 0.6.0 / 2016-10-31
+
+- update dev deps
+- update jss-nested to 2.5.0
+
 ## 0.5.0 / 2016-09-27
@@ -2,0 +7,0 @@

dist/jss-preset-default.js

@@ -67,23 +67,23 @@ (function webpackUniversalModuleDefinition(root, factory) {
 
-	var _jssNested = __webpack_require__(2);
+	var _jssNested = __webpack_require__(3);
 
 	var _jssNested2 = _interopRequireDefault(_jssNested);
 
-	var _jssCamelCase = __webpack_require__(3);
+	var _jssCamelCase = __webpack_require__(4);
 
 	var _jssCamelCase2 = _interopRequireDefault(_jssCamelCase);
 
-	var _jssDefaultUnit = __webpack_require__(4);
+	var _jssDefaultUnit = __webpack_require__(5);
 
 	var _jssDefaultUnit2 = _interopRequireDefault(_jssDefaultUnit);
 
-	var _jssVendorPrefixer = __webpack_require__(6);
+	var _jssVendorPrefixer = __webpack_require__(7);
 
 	var _jssVendorPrefixer2 = _interopRequireDefault(_jssVendorPrefixer);
 
-	var _jssPropsSort = __webpack_require__(12);
+	var _jssPropsSort = __webpack_require__(14);
 
 	var _jssPropsSort2 = _interopRequireDefault(_jssPropsSort);
 
-	var _jssCompose = __webpack_require__(13);
+	var _jssCompose = __webpack_require__(15);
 
@@ -95,3 +95,3 @@ var _jssCompose2 = _interopRequireDefault(_jssCompose);
 	exports.default = function () {
-	  var options = arguments.length <= 0 || arguments[0] === undefined ? {} : arguments[0];
+	  var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
 	  return {
@@ -104,3 +104,3 @@ plugins: [(0, _jssExtend2.default)(options.extend), (0, _jssNested2.default)(options.nested), (0, _jssCamelCase2.default)(options.camelCase), (0, _jssDefaultUnit2.default)(options.defaultUnit), (0, _jssVendorPrefixer2.default)(options.vendorPrefixer), (0, _jssPropsSort2.default)(options.propsSort), (0, _jssCompose2.default)(options.compose)]
 /* 1 */
-/***/ function(module, exports) {
+/***/ function(module, exports, __webpack_require__) {
 
@@ -112,4 +112,15 @@ 'use strict';
 	});
-	var warn = console.warn.bind(console); // eslint-disable-line no-console
 
+	var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
+
+	var _warning = __webpack_require__(2);
+
+	var _warning2 = _interopRequireDefault(_warning);
+
+	function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+	function isObject(obj) {
+	  return obj && (typeof obj === 'undefined' ? 'undefined' : _typeof(obj)) === 'object' && !Array.isArray(obj);
+	}
+
 	/**
@@ -123,3 +134,3 @@ * Recursively extend styles.
 	      if (refRule) {
-	        if (refRule === rule) warn('A rule tries to extend itself \r\n' + rule.toString());else extend(rule, newStyle, refRule.originalStyle);
+	        if (refRule === rule) (0, _warning2.default)(false, '[JSS] A rule tries to extend itself \r\n%s', rule);else extend(rule, newStyle, refRule.originalStyle);
 	      }
@@ -133,9 +144,20 @@ }
 	    for (var prop in style.extend) {
-	      if (prop === 'extend') extend(rule, newStyle, style.extend.extend);else newStyle[prop] = style.extend[prop];
+	      if (prop === 'extend') {
+	        extend(rule, newStyle, style.extend.extend);
+	      } else if (isObject(style.extend[prop])) {
+	        if (!newStyle[prop]) newStyle[prop] = {};
+	        extend(rule, newStyle[prop], style.extend[prop]);
+	      } else {
+	        newStyle[prop] = style.extend[prop];
+	      }
 	    }
 	  }
-
 	  // Copy base style.
 	  for (var _prop in style) {
-	    if (_prop !== 'extend') newStyle[_prop] = style[_prop];
+	    if (_prop === 'extend') continue;
+	    if (isObject(newStyle[_prop]) && isObject(style[_prop])) {
+	      extend(rule, newStyle[_prop], style[_prop]);
+	    } else {
+	      newStyle[_prop] = style[_prop];
+	    }
 	  }
@@ -162,6 +184,72 @@
 /* 2 */
-/***/ function(module, exports) {
+/***/ function(module, exports, __webpack_require__) {
 
+	/**
+	 * Copyright 2014-2015, Facebook, Inc.
+	 * All rights reserved.
+	 *
+	 * This source code is licensed under the BSD-style license found in the
+	 * LICENSE file in the root directory of this source tree. An additional grant
+	 * of patent rights can be found in the PATENTS file in the same directory.
+	 */
+
 	'use strict';
 
+	/**
+	 * Similar to invariant but only logs a warning if the condition is not met.
+	 * This can be used to log issues in development environments in critical
+	 * paths. Removing the logging code for production environments will keep the
+	 * same logic and follow the same code paths.
+	 */
+
+	var warning = function() {};
+
+	if (true) {
+	  warning = function(condition, format, args) {
+	    var len = arguments.length;
+	    args = new Array(len > 2 ? len - 2 : 0);
+	    for (var key = 2; key < len; key++) {
+	      args[key - 2] = arguments[key];
+	    }
+	    if (format === undefined) {
+	      throw new Error(
+	        '`warning(condition, format, ...args)` requires a warning ' +
+	        'message argument'
+	      );
+	    }
+
+	    if (format.length < 10 || (/^[s\W]*$/).test(format)) {
+	      throw new Error(
+	        'The warning format should be able to uniquely identify this ' +
+	        'warning. Please, use a more descriptive format than: ' + format
+	      );
+	    }
+
+	    if (!condition) {
+	      var argIndex = 0;
+	      var message = 'Warning: ' +
+	        format.replace(/%s/g, function() {
+	          return args[argIndex++];
+	        });
+	      if (typeof console !== 'undefined') {
+	        console.error(message);
+	      }
+	      try {
+	        // This error was thrown as a convenience so that you can use this stack
+	        // to find the callsite that caused this warning to fire.
+	        throw new Error(message);
+	      } catch(x) {}
+	    }
+	  };
+	}
+
+	module.exports = warning;
+
+
+/***/ },
+/* 3 */
+/***/ function(module, exports, __webpack_require__) {
+
+	'use strict';
+
 	Object.defineProperty(exports, "__esModule", {
@@ -174,19 +262,16 @@ value: true
 	exports.default = jssNested;
-	var warn = console.warn.bind(console); // eslint-disable-line no-console
+
+	var _warning = __webpack_require__(2);
+
+	var _warning2 = _interopRequireDefault(_warning);
+
+	function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+	function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
+	var separatorRegExp = /\s*,\s*/g;
 	var parentRegExp = /&/g;
-	var refRegExp = /\$(\w+)/g;
+	var refRegExp = /\$([\w-]+)/g;
 
 	/**
-	 * Get a function to be used for $ref replacement.
-	 */
-	function getReplaceRef(sheet) {
-	  return function (match, name) {
-	    var rule = sheet.getRule(name);
-	    if (rule) return rule.selector;
-	    warn('JSS: could not find the referenced rule ' + name + '.');
-	    return name;
-	  };
-	}
-
-	/**
 	 * Convert nested rules to separate, remove them from original styles.
@@ -198,33 +283,101 @@ *
 	function jssNested() {
+	  // Get a function to be used for $ref replacement.
+	  function getReplaceRef(container) {
+	    return function (match, name) {
+	      var rule = container.getRule(name);
+	      if (rule) return rule.selector;
+	      (0, _warning2.default)(false, '[JSS] Could not find the referenced rule %s. \r\n%s', name, rule);
+	      return name;
+	    };
+	  }
+
+	  function addConditional(name, rule, container) {
+	    var conditionalContainer = container.getRule(name);
+
+	    if (!conditionalContainer) {
+	      // Add conditional to container because it does not exist yet.
+	      container.addRule(name, _defineProperty({}, rule.name, rule.style[name]));
+	      return;
+	    }
+
+	    // It exists, so now check if we have already defined styles
+	    // for example @media print { .some-style { display: none; } } .
+	    var ruleToExtend = conditionalContainer.getRule(rule.name);
+
+	    if (ruleToExtend) {
+	      ruleToExtend.style = _extends({}, ruleToExtend.style, rule.style[name]);
+	      return;
+	    }
+
+	    // Conditional rule in container has no rule so create it.
+	    conditionalContainer.addRule(rule.name, rule.style[name]);
+	  }
+
+	  var hasAnd = function hasAnd(str) {
+	    return str.indexOf('&') !== -1;
+	  };
+
+	  function replaceParentRefs(nestedProp, parentProp) {
+	    var parentSelectors = parentProp.split(separatorRegExp);
+	    var nestedSelectors = nestedProp.split(separatorRegExp);
+
+	    var result = '';
+
+	    for (var i = 0; i < parentSelectors.length; i++) {
+	      var parent = parentSelectors[i];
+
+	      for (var j = 0; j < nestedSelectors.length; j++) {
+	        var nested = nestedSelectors[j];
+	        if (result) result += ', ';
+	        // Replace all & by the parent or prefix & with the parent.
+	        result += hasAnd(nested) ? nested.replace(parentRegExp, parent) : parent + ' ' + nested;
+	      }
+	    }
+
+	    return result;
+	  }
+
+	  function getOptions(rule, container, options) {
+	    // Options has been already created, now we only increase index.
+	    if (options) return _extends({}, options, { index: options.index + 1 });
+
+	    var nestingLevel = rule.options.nestingLevel;
+
+	    nestingLevel = nestingLevel === undefined ? 1 : nestingLevel + 1;
+
+	    return _extends({}, rule.options, {
+	      named: false,
+	      nestingLevel: nestingLevel,
+	      index: container.indexOf(rule) + 1
+	    });
+	  }
+
 	  return function (rule) {
 	    if (rule.type !== 'regular') return;
-	    var _rule$options = rule.options;
-	    var sheet = _rule$options.sheet;
-	    var jss = _rule$options.jss;
-	    var parent = _rule$options.parent;
-
-	    var container = sheet || jss;
+	    var container = rule.options.parent;
 	    var options = void 0;
 	    var replaceRef = void 0;
 
-	    if (parent && parent.type === 'conditional') {
-	      container = parent;
-	    }
+	    for (var prop in rule.style) {
+	      var isNested = hasAnd(prop);
+	      var isNestedConditional = prop[0] === '@';
 
-	    for (var prop in rule.style) {
-	      if (prop[0] === '&') {
-	        if (!options) options = _extends({}, rule.options, { named: false });
-	        // Lazily create the ref replacer function just once for all nested rules within
-	        // the sheet.
+	      if (!isNested && !isNestedConditional) continue;
+
+	      if (isNested) {
+	        options = getOptions(rule, container, options);
+
+	        var selector = replaceParentRefs(prop, rule.selector);
+	        // Lazily create the ref replacer function just once for
+	        // all nested rules within the sheet.
 	        if (!replaceRef) replaceRef = getReplaceRef(container);
+	        // Replace all $refs.
+	        selector = selector.replace(refRegExp, replaceRef);
 
-	        var name = prop
-	        // Replace all & by the parent selector.
-	        .replace(parentRegExp, rule.selector)
-	        // Replace all $ref.
-	        .replace(refRegExp, replaceRef);
+	        container.addRule(selector, rule.style[prop], options);
+	      } else if (isNestedConditional) {
+	        addConditional(prop, rule, container);
+	      }
 
-	        container.createRule(name, rule.style[prop], options);
-	        delete rule.style[prop];
-	      }
+	      delete rule.style[prop];
 	    }
@@ -235,3 +388,3 @@ };
 /***/ },
-/* 3 */
+/* 4 */
 /***/ function(module, exports) {
@@ -256,15 +409,21 @@
 	/**
-	 * Convert camel cased properties of a single style to dasherized.
+	 * Convert camel cased property names to dash separated.
 	 *
 	 * @param {Object} style
-	 * @return {Object} convertedStyle
+	 * @return {Object}
 	 */
 	function convertCase(style) {
-	  var convertedStyle = {};
+	  var converted = {};
+
 	  for (var prop in style) {
 	    var value = style[prop];
 	    prop = prop.replace(regExp, replace);
-	    convertedStyle[prop] = value;
+	    converted[prop] = value;
 	  }
-	  return convertedStyle;
+
+	  if (style.fallbacks) {
+	    if (Array.isArray(style.fallbacks)) converted.fallbacks = style.fallbacks.map(convertCase);else converted.fallbacks = convertCase(style.fallbacks);
+	  }
+
+	  return converted;
 	}
@@ -288,3 +447,3 @@
 	      }
-	    } else {
+	    } else if (style) {
 	      rule.style = convertCase(style);
@@ -296,3 +455,3 @@ }
 /***/ },
-/* 4 */
+/* 5 */
 /***/ function(module, exports, __webpack_require__) {
@@ -307,3 +466,3 @@
 
-	var _defaultUnits = __webpack_require__(5);
+	var _defaultUnits = __webpack_require__(6);
 
@@ -323,2 +482,4 @@ var _defaultUnits2 = _interopRequireDefault(_defaultUnits);
 	function iterate(prop, value, options) {
+	  if (!value) return value;
+
 	  var convertedValue = value;
@@ -342,2 +503,3 @@ switch (value.constructor) {
 	  }
+
 	  return convertedValue;
@@ -382,3 +544,3 @@ }
 /***/ },
-/* 5 */
+/* 6 */
 /***/ function(module, exports) {
@@ -492,3 +654,3 @@
 /***/ },
-/* 6 */
+/* 7 */
 /***/ function(module, exports, __webpack_require__) {
@@ -503,3 +665,3 @@
 
-	var _cssVendor = __webpack_require__(7);
+	var _cssVendor = __webpack_require__(8);
 
@@ -545,3 +707,3 @@ var vendor = _interopRequireWildcard(_cssVendor);
 /***/ },
-/* 7 */
+/* 8 */
 /***/ function(module, exports, __webpack_require__) {
@@ -556,11 +718,11 @@
 
-	var _prefix = __webpack_require__(8);
+	var _prefix = __webpack_require__(9);
 
 	var _prefix2 = _interopRequireDefault(_prefix);
 
-	var _supportedProperty = __webpack_require__(9);
+	var _supportedProperty = __webpack_require__(11);
 
 	var _supportedProperty2 = _interopRequireDefault(_supportedProperty);
 
-	var _supportedValue = __webpack_require__(11);
+	var _supportedValue = __webpack_require__(13);
 
@@ -588,4 +750,4 @@ var _supportedValue2 = _interopRequireDefault(_supportedValue);
 /***/ },
-/* 8 */
-/***/ function(module, exports) {
+/* 9 */
+/***/ function(module, exports, __webpack_require__) {
 
@@ -597,18 +759,26 @@ 'use strict';
 	});
-	/**
-	 * Export javascript style and css style vendor prefixes.
-	 * Based on "transform" support test.
-	 */
 
-	var js = '';
+	var _isBrowser = __webpack_require__(10);
+
+	var _isBrowser2 = _interopRequireDefault(_isBrowser);
+
+	function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+	var js = ''; /**
+	              * Export javascript style and css style vendor prefixes.
+	              * Based on "transform" support test.
+	              */
+
 	var css = '';
 
 	// We should not do anything if required serverside.
-	if (typeof document != 'undefined') {
+	if (_isBrowser2.default) {
+	  // Order matters. We need to check Webkit the last one because
+	  // other vendors use to add Webkit prefixes to some properties
 	  var jsCssMap = {
-	    Webkit: '-webkit-',
 	    Moz: '-moz-',
 	    // IE did it wrong again ...
 	    ms: '-ms-',
-	    O: '-o-'
+	    O: '-o-',
+	    Webkit: '-webkit-'
 	  };
@@ -636,3 +806,9 @@ var style = document.createElement('p').style;
 /***/ },
-/* 9 */
+/* 10 */
+/***/ function(module, exports) {
+
+	module.exports = true;
+
+/***/ },
+/* 11 */
 /***/ function(module, exports, __webpack_require__) {
@@ -647,7 +823,11 @@
 
-	var _prefix = __webpack_require__(8);
+	var _isBrowser = __webpack_require__(10);
 
+	var _isBrowser2 = _interopRequireDefault(_isBrowser);
+
+	var _prefix = __webpack_require__(9);
+
 	var _prefix2 = _interopRequireDefault(_prefix);
 
-	var _camelize = __webpack_require__(10);
+	var _camelize = __webpack_require__(12);
 
@@ -661,4 +841,3 @@ var _camelize2 = _interopRequireDefault(_camelize);
 
-	// For server-side rendering.
-	if (typeof document != 'undefined') {
+	if (_isBrowser2.default) {
 	  el = document.createElement('p');
@@ -713,3 +892,3 @@
 /***/ },
-/* 10 */
+/* 12 */
 /***/ function(module, exports) {
@@ -740,3 +919,3 @@
 /***/ },
-/* 11 */
+/* 13 */
 /***/ function(module, exports, __webpack_require__) {
@@ -751,4 +930,8 @@
 
-	var _prefix = __webpack_require__(8);
+	var _isBrowser = __webpack_require__(10);
 
+	var _isBrowser2 = _interopRequireDefault(_isBrowser);
+
+	var _prefix = __webpack_require__(9);
+
 	var _prefix2 = _interopRequireDefault(_prefix);
@@ -761,4 +944,3 @@
 
-	// For server-side rendering.
-	if (typeof document != 'undefined') el = document.createElement('p');
+	if (_isBrowser2.default) el = document.createElement('p');
 
@@ -816,3 +998,3 @@ /**
 /***/ },
-/* 12 */
+/* 14 */
 /***/ function(module, exports) {
@@ -852,3 +1034,3 @@
 /***/ },
-/* 13 */
+/* 15 */
 /***/ function(module, exports, __webpack_require__) {
@@ -863,3 +1045,3 @@
 
-	var _warning = __webpack_require__(14);
+	var _warning = __webpack_require__(2);
 
@@ -925,68 +1107,2 @@ var _warning2 = _interopRequireDefault(_warning);
 
-/***/ },
-/* 14 */
-/***/ function(module, exports, __webpack_require__) {
-
-	/**
-	 * Copyright 2014-2015, Facebook, Inc.
-	 * All rights reserved.
-	 *
-	 * This source code is licensed under the BSD-style license found in the
-	 * LICENSE file in the root directory of this source tree. An additional grant
-	 * of patent rights can be found in the PATENTS file in the same directory.
-	 */
-
-	'use strict';
-
-	/**
-	 * Similar to invariant but only logs a warning if the condition is not met.
-	 * This can be used to log issues in development environments in critical
-	 * paths. Removing the logging code for production environments will keep the
-	 * same logic and follow the same code paths.
-	 */
-
-	var warning = function() {};
-
-	if (true) {
-	  warning = function(condition, format, args) {
-	    var len = arguments.length;
-	    args = new Array(len > 2 ? len - 2 : 0);
-	    for (var key = 2; key < len; key++) {
-	      args[key - 2] = arguments[key];
-	    }
-	    if (format === undefined) {
-	      throw new Error(
-	        '`warning(condition, format, ...args)` requires a warning ' +
-	        'message argument'
-	      );
-	    }
-
-	    if (format.length < 10 || (/^[s\W]*$/).test(format)) {
-	      throw new Error(
-	        'The warning format should be able to uniquely identify this ' +
-	        'warning. Please, use a more descriptive format than: ' + format
-	      );
-	    }
-
-	    if (!condition) {
-	      var argIndex = 0;
-	      var message = 'Warning: ' +
-	        format.replace(/%s/g, function() {
-	          return args[argIndex++];
-	        });
-	      if (typeof console !== 'undefined') {
-	        console.error(message);
-	      }
-	      try {
-	        // This error was thrown as a convenience so that you can use this stack
-	        // to find the callsite that caused this warning to fire.
-	        throw new Error(message);
-	      } catch(x) {}
-	    }
-	  };
-	}
-
-	module.exports = warning;
-
-
 /***/ }
@@ -993,0 +1109,0 @@ /******/ ])

dist/jss-preset-default.min.js

@@ -1,2 +0,2 @@
-!function(e,t){"object"==typeof exports&&"object"==typeof module?module.exports=t():"function"==typeof define&&define.amd?define([],t):"object"==typeof exports?exports.jssPreset=t():e.jssPreset=t()}(this,function(){return function(e){function t(n){if(r[n])return r[n].exports;var o=r[n]={exports:{},id:n,loaded:!1};return e[n].call(o.exports,o,o.exports,t),o.loaded=!0,o.exports}var r={};return t.m=e,t.c=r,t.p="",t(0)}([function(e,t,r){"use strict";function n(e){return e&&e.__esModule?e:{"default":e}}Object.defineProperty(t,"__esModule",{value:!0});var o=r(1),i=n(o),u=r(2),a=n(u),s=r(3),d=n(s),p=r(4),l=n(p),f=r(6),c=n(f),x=r(12),m=n(x),v=r(13),g=n(v);t["default"]=function(){var e=arguments.length<=0||void 0===arguments[0]?{}:arguments[0];return{plugins:[(0,i["default"])(e.extend),(0,a["default"])(e.nested),(0,d["default"])(e.camelCase),(0,l["default"])(e.defaultUnit),(0,c["default"])(e.vendorPrefixer),(0,m["default"])(e.propsSort),(0,g["default"])(e.compose)]}}},function(e,t){"use strict";function r(e,t,o){if("string"==typeof o.extend){if(e.options&&e.options.sheet){var i=e.options.sheet.getRule(o.extend);i&&(i===e?n("A rule tries to extend itself \r\n"+e.toString()):r(e,t,i.originalStyle))}}else if(Array.isArray(o.extend))for(var u=0;u<o.extend.length;u++)r(e,t,o.extend[u]);else for(var a in o.extend)"extend"===a?r(e,t,o.extend.extend):t[a]=o.extend[a];for(var s in o)"extend"!==s&&(t[s]=o[s]);return t}Object.defineProperty(t,"__esModule",{value:!0});var n=console.warn.bind(console);t["default"]=function(){return function(e){e.style&&e.style.extend&&(e.style=r(e,{},e.style))}}},function(e,t){"use strict";function r(e){return function(t,r){var n=e.getRule(r);return n?n.selector:(i("JSS: could not find the referenced rule "+r+"."),r)}}function n(){return function(e){if("regular"===e.type){var t=e.options,n=t.sheet,i=t.jss,s=t.parent,d=n||i,p=void 0,l=void 0;s&&"conditional"===s.type&&(d=s);for(var f in e.style)if("&"===f[0]){p||(p=o({},e.options,{named:!1})),l||(l=r(d));var c=f.replace(u,e.selector).replace(a,l);d.createRule(c,e.style[f],p),delete e.style[f]}}}}Object.defineProperty(t,"__esModule",{value:!0});var o=Object.assign||function(e){for(var t=1;t<arguments.length;t++){var r=arguments[t];for(var n in r)Object.prototype.hasOwnProperty.call(r,n)&&(e[n]=r[n])}return e};t["default"]=n;var i=console.warn.bind(console),u=/&/g,a=/\$(\w+)/g},function(e,t){"use strict";function r(e){return"-"+e.toLowerCase()}function n(e){var t={};for(var n in e){var i=e[n];n=n.replace(o,r),t[n]=i}return t}Object.defineProperty(t,"__esModule",{value:!0});var o=/([A-Z])/g;t["default"]=function(){return function(e){var t=e.style;if(t)if(Array.isArray(t))for(var r=0;r<t.length;r++)t[r]=n(t[r]);else e.style=n(t)}}},function(e,t,r){"use strict";function n(e){return e&&e.__esModule?e:{"default":e}}function o(e,t,r){var n=t;switch(t.constructor){case Object:for(var u in t)t[u]=o(u,t[u],r);break;case Array:for(var a=0;a<t.length;a++)t[a]=o(e,t[a],r);break;case Number:n=i(e,t,r)}return n}function i(e,t,r){return"number"==typeof t&&0!==t&&(t+=r[e]||s["default"][e]||""),t}function u(){var e=arguments.length<=0||void 0===arguments[0]?{}:arguments[0];return function(t){var r=t.style,n=t.type;if(r&&"regular"===n)for(var i in r)r[i]=o(i,r[i],e)}}Object.defineProperty(t,"__esModule",{value:!0}),t["default"]=u;var a=r(5),s=n(a)},function(e,t){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t["default"]={"animation-delay":"ms","animation-duration":"ms","background-position-x":"px","background-position-y":"px","background-size":"px",border:"px","border-bottom":"px","border-bottom-left-radius":"px","border-bottom-right-radius":"px","border-bottom-width":"px","border-left":"px","border-left-width":"px","border-radius":"px","border-right":"px","border-right-width":"px","border-spacing":"px","border-top":"px","border-top-left-radius":"px","border-top-right-radius":"px","border-top-width":"px","border-width":"px","border-after-width":"px","border-before-width":"px","border-end-width":"px","border-horizontal-spacing":"px","border-start-width":"px","border-vertical-spacing":"px",bottom:"px","column-gap":"px","column-rule":"px","column-rule-width":"px","column-width":"px","flex-basis":"px","font-size":"px","font-size-delta":"px",height:"px",left:"px","letter-spacing":"px","logical-height":"px","logical-width":"px",margin:"px","margin-after":"px","margin-before":"px","margin-bottom":"px","margin-left":"px","margin-right":"px","margin-top":"px","max-height":"px","max-width":"px","margin-end":"px","margin-start":"px","mask-position-x":"px","mask-position-y":"px","mask-size":"px","max-logical-height":"px","max-logical-width":"px","min-height":"px","min-width":"px","min-logical-height":"px","min-logical-width":"px",motion:"px","motion-offset":"px",outline:"px","outline-offset":"px","outline-width":"px",padding:"px","padding-bottom":"px","padding-left":"px","padding-right":"px","padding-top":"px","padding-after":"px","padding-before":"px","padding-end":"px","padding-start":"px","perspective-origin-x":"%","perspective-origin-y":"%",perspective:"px",right:"px","shape-margin":"px",size:"px","text-indent":"px","text-stroke":"px","text-stroke-width":"px",top:"px","transform-origin":"%","transform-origin-x":"%","transform-origin-y":"%","transform-origin-z":"%","transition-delay":"ms","transition-duration":"ms","vertical-align":"px",width:"px","word-spacing":"px"}},function(e,t,r){"use strict";function n(e){if(e&&e.__esModule)return e;var t={};if(null!=e)for(var r in e)Object.prototype.hasOwnProperty.call(e,r)&&(t[r]=e[r]);return t["default"]=e,t}function o(){return function(e){if("keyframe"===e.type)return void(e.selector="@"+u.prefix.css+e.selector.substr(1));if("regular"===e.type)for(var t in e.style){var r=e.style[t],n=!1,o=u.supportedProperty(t);o&&o!==t&&(n=!0);var i=!1,a=u.supportedValue(o,r);a&&a!==r&&(i=!0),(n||i)&&(n&&delete e.style[t],e.style[o||t]=a||r)}}}Object.defineProperty(t,"__esModule",{value:!0}),t["default"]=o;var i=r(7),u=n(i)},function(e,t,r){"use strict";function n(e){return e&&e.__esModule?e:{"default":e}}Object.defineProperty(t,"__esModule",{value:!0}),t.supportedValue=t.supportedProperty=t.prefix=void 0;var o=r(8),i=n(o),u=r(9),a=n(u),s=r(11),d=n(s);t["default"]={prefix:i["default"],supportedProperty:a["default"],supportedValue:d["default"]},/**
+!function(e,t){"object"==typeof exports&&"object"==typeof module?module.exports=t():"function"==typeof define&&define.amd?define([],t):"object"==typeof exports?exports.jssPreset=t():e.jssPreset=t()}(this,function(){return function(e){function t(n){if(r[n])return r[n].exports;var o=r[n]={exports:{},id:n,loaded:!1};return e[n].call(o.exports,o,o.exports,t),o.loaded=!0,o.exports}var r={};return t.m=e,t.c=r,t.p="",t(0)}([function(e,t,r){"use strict";function n(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var o=r(1),i=n(o),u=r(3),a=n(u),s=r(4),l=n(s),d=r(5),f=n(d),p=r(7),c=n(p),x=r(14),y=n(x),v=r(15),m=n(v);t.default=function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{};return{plugins:[(0,i.default)(e.extend),(0,a.default)(e.nested),(0,l.default)(e.camelCase),(0,f.default)(e.defaultUnit),(0,c.default)(e.vendorPrefixer),(0,y.default)(e.propsSort),(0,m.default)(e.compose)]}}},function(e,t,r){"use strict";function n(e){return e&&e.__esModule?e:{default:e}}function o(e){return e&&"object"===("undefined"==typeof e?"undefined":u(e))&&!Array.isArray(e)}function i(e,t,r){if("string"==typeof r.extend){if(e.options&&e.options.sheet){var n=e.options.sheet.getRule(r.extend);n&&(n===e?(0,s.default)(!1,"[JSS] A rule tries to extend itself \r\n%s",e):i(e,t,n.originalStyle))}}else if(Array.isArray(r.extend))for(var u=0;u<r.extend.length;u++)i(e,t,r.extend[u]);else for(var a in r.extend)"extend"===a?i(e,t,r.extend.extend):o(r.extend[a])?(t[a]||(t[a]={}),i(e,t[a],r.extend[a])):t[a]=r.extend[a];for(var l in r)"extend"!==l&&(o(t[l])&&o(r[l])?i(e,t[l],r[l]):t[l]=r[l]);return t}Object.defineProperty(t,"__esModule",{value:!0});var u="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e},a=r(2),s=n(a);t.default=function(){return function(e){e.style&&e.style.extend&&(e.style=i(e,{},e.style))}}},function(e,t,r){"use strict";var n=function(){};e.exports=n},function(e,t,r){"use strict";function n(e){return e&&e.__esModule?e:{default:e}}function o(e,t,r){return t in e?Object.defineProperty(e,t,{value:r,enumerable:!0,configurable:!0,writable:!0}):e[t]=r,e}function i(){function e(e){return function(t,r){var n=e.getRule(r);return n?n.selector:((0,s.default)(!1,"[JSS] Could not find the referenced rule %s. \r\n%s",r,n),r)}}function t(e,t,r){var n=r.getRule(e);if(!n)return void r.addRule(e,o({},t.name,t.style[e]));var i=n.getRule(t.name);return i?void(i.style=u({},i.style,t.style[e])):void n.addRule(t.name,t.style[e])}function r(e,t){for(var r=t.split(l),n=e.split(l),o="",u=0;u<r.length;u++)for(var a=r[u],s=0;s<n.length;s++){var f=n[s];o&&(o+=", "),o+=i(f)?f.replace(d,a):a+" "+f}return o}function n(e,t,r){if(r)return u({},r,{index:r.index+1});var n=e.options.nestingLevel;return n=void 0===n?1:n+1,u({},e.options,{named:!1,nestingLevel:n,index:t.indexOf(e)+1})}var i=function(e){return e.indexOf("&")!==-1};return function(o){if("regular"===o.type){var u=o.options.parent,a=void 0,s=void 0;for(var l in o.style){var d=i(l),p="@"===l[0];if(d||p){if(d){a=n(o,u,a);var c=r(l,o.selector);s||(s=e(u)),c=c.replace(f,s),u.addRule(c,o.style[l],a)}else p&&t(l,o,u);delete o.style[l]}}}}}Object.defineProperty(t,"__esModule",{value:!0});var u=Object.assign||function(e){for(var t=1;t<arguments.length;t++){var r=arguments[t];for(var n in r)Object.prototype.hasOwnProperty.call(r,n)&&(e[n]=r[n])}return e};t.default=i;var a=r(2),s=n(a),l=/\s*,\s*/g,d=/&/g,f=/\$([\w-]+)/g},function(e,t){"use strict";function r(e){return"-"+e.toLowerCase()}function n(e){var t={};for(var i in e){var u=e[i];i=i.replace(o,r),t[i]=u}return e.fallbacks&&(Array.isArray(e.fallbacks)?t.fallbacks=e.fallbacks.map(n):t.fallbacks=n(e.fallbacks)),t}Object.defineProperty(t,"__esModule",{value:!0});var o=/([A-Z])/g;t.default=function(){return function(e){var t=e.style;if(t)if(Array.isArray(t))for(var r=0;r<t.length;r++)t[r]=n(t[r]);else t&&(e.style=n(t))}}},function(e,t,r){"use strict";function n(e){return e&&e.__esModule?e:{default:e}}function o(e,t,r){if(!t)return t;var n=t;switch(t.constructor){case Object:for(var u in t)t[u]=o(u,t[u],r);break;case Array:for(var a=0;a<t.length;a++)t[a]=o(e,t[a],r);break;case Number:n=i(e,t,r)}return n}function i(e,t,r){return"number"==typeof t&&0!==t&&(t+=r[e]||s.default[e]||""),t}function u(){var e=arguments.length<=0||void 0===arguments[0]?{}:arguments[0];return function(t){var r=t.style,n=t.type;if(r&&"regular"===n)for(var i in r)r[i]=o(i,r[i],e)}}Object.defineProperty(t,"__esModule",{value:!0}),t.default=u;var a=r(6),s=n(a)},function(e,t){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.default={"animation-delay":"ms","animation-duration":"ms","background-position-x":"px","background-position-y":"px","background-size":"px",border:"px","border-bottom":"px","border-bottom-left-radius":"px","border-bottom-right-radius":"px","border-bottom-width":"px","border-left":"px","border-left-width":"px","border-radius":"px","border-right":"px","border-right-width":"px","border-spacing":"px","border-top":"px","border-top-left-radius":"px","border-top-right-radius":"px","border-top-width":"px","border-width":"px","border-after-width":"px","border-before-width":"px","border-end-width":"px","border-horizontal-spacing":"px","border-start-width":"px","border-vertical-spacing":"px",bottom:"px","column-gap":"px","column-rule":"px","column-rule-width":"px","column-width":"px","flex-basis":"px","font-size":"px","font-size-delta":"px",height:"px",left:"px","letter-spacing":"px","logical-height":"px","logical-width":"px",margin:"px","margin-after":"px","margin-before":"px","margin-bottom":"px","margin-left":"px","margin-right":"px","margin-top":"px","max-height":"px","max-width":"px","margin-end":"px","margin-start":"px","mask-position-x":"px","mask-position-y":"px","mask-size":"px","max-logical-height":"px","max-logical-width":"px","min-height":"px","min-width":"px","min-logical-height":"px","min-logical-width":"px",motion:"px","motion-offset":"px",outline:"px","outline-offset":"px","outline-width":"px",padding:"px","padding-bottom":"px","padding-left":"px","padding-right":"px","padding-top":"px","padding-after":"px","padding-before":"px","padding-end":"px","padding-start":"px","perspective-origin-x":"%","perspective-origin-y":"%",perspective:"px",right:"px","shape-margin":"px",size:"px","text-indent":"px","text-stroke":"px","text-stroke-width":"px",top:"px","transform-origin":"%","transform-origin-x":"%","transform-origin-y":"%","transform-origin-z":"%","transition-delay":"ms","transition-duration":"ms","vertical-align":"px",width:"px","word-spacing":"px"}},function(e,t,r){"use strict";function n(e){if(e&&e.__esModule)return e;var t={};if(null!=e)for(var r in e)Object.prototype.hasOwnProperty.call(e,r)&&(t[r]=e[r]);return t.default=e,t}function o(){return function(e){if("keyframe"===e.type)return void(e.selector="@"+u.prefix.css+e.selector.substr(1));if("regular"===e.type)for(var t in e.style){var r=e.style[t],n=!1,o=u.supportedProperty(t);o&&o!==t&&(n=!0);var i=!1,a=u.supportedValue(o,r);a&&a!==r&&(i=!0),(n||i)&&(n&&delete e.style[t],e.style[o||t]=a||r)}}}Object.defineProperty(t,"__esModule",{value:!0}),t.default=o;var i=r(8),u=n(i)},function(e,t,r){"use strict";function n(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0}),t.supportedValue=t.supportedProperty=t.prefix=void 0;var o=r(9),i=n(o),u=r(11),a=n(u),s=r(13),l=n(s);t.default={prefix:i.default,supportedProperty:a.default,supportedValue:l.default},/**
 	    * CSS Vendor prefix detection and property feature testing.
@@ -8,2 +8,2 @@ *
 	    */
-t.prefix=i["default"],t.supportedProperty=a["default"],t.supportedValue=d["default"]},function(e,t){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var r="",n="";if("undefined"!=typeof document){var o={Webkit:"-webkit-",Moz:"-moz-",ms:"-ms-",O:"-o-"},i=document.createElement("p").style,u="Transform";for(var a in o)if(a+u in i){r=a,n=o[a];break}}t["default"]={js:r,css:n}},function(e,t,r){"use strict";function n(e){return e&&e.__esModule?e:{"default":e}}function o(e){return d?null!=p[e]?p[e]:((0,s["default"])(e)in d.style?p[e]=e:u["default"].js+(0,s["default"])("-"+e)in d.style?p[e]=u["default"].css+e:p[e]=!1,p[e]):e}Object.defineProperty(t,"__esModule",{value:!0}),t["default"]=o;var i=r(8),u=n(i),a=r(10),s=n(a),d=void 0,p={};if("undefined"!=typeof document){d=document.createElement("p");var l=window.getComputedStyle(document.documentElement,"");for(var f in l)p[l[f]]=l[f]}},function(e,t){"use strict";function r(e){return e.replace(o,n)}function n(e,t){return t?t.toUpperCase():""}Object.defineProperty(t,"__esModule",{value:!0}),t["default"]=r;var o=/[-\s]+(.)?/g},function(e,t,r){"use strict";function n(e){return e&&e.__esModule?e:{"default":e}}function o(e,t){if(!s)return t;if("string"!=typeof t||!isNaN(parseInt(t,10)))return t;var r=e+t;if(null!=a[r])return a[r];try{s.style[e]=t}catch(n){return a[r]=!1,!1}return s.style[e]===t?a[r]=t:(t=u["default"].css+t,"-ms-flex"===t&&(t="-ms-flexbox"),s.style[e]=t,s.style[e]===t&&(a[r]=t)),a[r]||(a[r]=!1),a[r]}Object.defineProperty(t,"__esModule",{value:!0}),t["default"]=o;var i=r(8),u=n(i),a={},s=void 0;"undefined"!=typeof document&&(s=document.createElement("p"))},function(e,t){"use strict";function r(){function e(e,t){return e.length>t.length}return function(t){var r=t.style,n=t.type;if(r&&"regular"===n){var o={},i=Object.keys(r).sort(e);for(var u in i)o[i[u]]=r[i[u]];t.style=o}}}Object.defineProperty(t,"__esModule",{value:!0}),t["default"]=r},function(e,t,r){"use strict";function n(e){return e&&e.__esModule?e:{"default":e}}function o(e,t){if("$"===t[0]){var r=e.options.sheet.getRule(t.substr(1));return r?r===e?((0,a["default"])(!1,"[JSS] Cyclic composition detected. \r\n%s",e),!1):(o(e,r.className),!0):((0,a["default"])(!1,"[JSS] Referenced rule is not defined. \r\n%s",e),!1)}var n=e.options.parent;return e.className+=" "+t,n.classes[e.name]=e.className,!0}function i(){return function(e){var t=e.style;if(t&&t.composes){if(e.options.named)if(Array.isArray(t.composes))for(var r=0;r<t.composes.length;r++)o(e,t.composes[r]);else o(e,t.composes);delete t.composes}}}Object.defineProperty(t,"__esModule",{value:!0}),t["default"]=i;var u=r(14),a=n(u)},function(e,t,r){"use strict";var n=function(){};e.exports=n}])});
+t.prefix=i.default,t.supportedProperty=a.default,t.supportedValue=l.default},function(e,t,r){"use strict";function n(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var o=r(10),i=n(o),u="",a="";if(i.default){var s={Moz:"-moz-",ms:"-ms-",O:"-o-",Webkit:"-webkit-"},l=document.createElement("p").style,d="Transform";for(var f in s)if(f+d in l){u=f,a=s[f];break}}t.default={js:u,css:a}},function(e,t){e.exports=!0},function(e,t,r){"use strict";function n(e){return e&&e.__esModule?e:{default:e}}function o(e){return f?null!=p[e]?p[e]:((0,d.default)(e)in f.style?p[e]=e:s.default.js+(0,d.default)("-"+e)in f.style?p[e]=s.default.css+e:p[e]=!1,p[e]):e}Object.defineProperty(t,"__esModule",{value:!0}),t.default=o;var i=r(10),u=n(i),a=r(9),s=n(a),l=r(12),d=n(l),f=void 0,p={};if(u.default){f=document.createElement("p");var c=window.getComputedStyle(document.documentElement,"");for(var x in c)p[c[x]]=c[x]}},function(e,t){"use strict";function r(e){return e.replace(o,n)}function n(e,t){return t?t.toUpperCase():""}Object.defineProperty(t,"__esModule",{value:!0}),t.default=r;var o=/[-\s]+(.)?/g},function(e,t,r){"use strict";function n(e){return e&&e.__esModule?e:{default:e}}function o(e,t){if(!d)return t;if("string"!=typeof t||!isNaN(parseInt(t,10)))return t;var r=e+t;if(null!=l[r])return l[r];try{d.style[e]=t}catch(e){return l[r]=!1,!1}return d.style[e]===t?l[r]=t:(t=s.default.css+t,"-ms-flex"===t&&(t="-ms-flexbox"),d.style[e]=t,d.style[e]===t&&(l[r]=t)),l[r]||(l[r]=!1),l[r]}Object.defineProperty(t,"__esModule",{value:!0}),t.default=o;var i=r(10),u=n(i),a=r(9),s=n(a),l={},d=void 0;u.default&&(d=document.createElement("p"))},function(e,t){"use strict";function r(){function e(e,t){return e.length>t.length}return function(t){var r=t.style,n=t.type;if(r&&"regular"===n){var o={},i=Object.keys(r).sort(e);for(var u in i)o[i[u]]=r[i[u]];t.style=o}}}Object.defineProperty(t,"__esModule",{value:!0}),t.default=r},function(e,t,r){"use strict";function n(e){return e&&e.__esModule?e:{default:e}}function o(e,t){if("$"===t[0]){var r=e.options.sheet.getRule(t.substr(1));return r?r===e?((0,a.default)(!1,"[JSS] Cyclic composition detected. \r\n%s",e),!1):(o(e,r.className),!0):((0,a.default)(!1,"[JSS] Referenced rule is not defined. \r\n%s",e),!1)}var n=e.options.parent;return e.className+=" "+t,n.classes[e.name]=e.className,!0}function i(){return function(e){var t=e.style;if(t&&t.composes){if(e.options.named)if(Array.isArray(t.composes))for(var r=0;r<t.composes.length;r++)o(e,t.composes[r]);else o(e,t.composes);delete t.composes}}}Object.defineProperty(t,"__esModule",{value:!0}),t.default=i;var u=r(2),a=n(u)}])});

lib/index.js

@@ -38,3 +38,3 @@ 'use strict';
 exports.default = function () {
-  var options = arguments.length <= 0 || arguments[0] === undefined ? {} : arguments[0];
+  var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
   return {
@@ -41,0 +41,0 @@ plugins: [(0, _jssExtend2.default)(options.extend), (0, _jssNested2.default)(options.nested), (0, _jssCamelCase2.default)(options.camelCase), (0, _jssDefaultUnit2.default)(options.defaultUnit), (0, _jssVendorPrefixer2.default)(options.vendorPrefixer), (0, _jssPropsSort2.default)(options.propsSort), (0, _jssCompose2.default)(options.compose)]

package.json

 {
   "name": "jss-preset-default",
   "description": "Default preset for JSS with selected plugins.",
-  "version": "0.5.0",
+  "version": "0.6.0",
   "author": {
@@ -33,12 +33,12 @@ "name": "Oleg Slobodskoi",
     "babel-core": "^6.5.1",
-    "babel-eslint": "^6.1.2",
+    "babel-eslint": "^7.1.0",
     "babel-loader": "^6.2.4",
     "babel-preset-es2015": "^6.9.0",
     "babel-preset-stage-0": "^6.5.0",
-    "eslint": "^2.8.0",
-    "eslint-config-airbnb": "^8.0.0",
-    "eslint-config-jss": "^1.1.0",
-    "eslint-plugin-import": "^1.12.0",
-    "eslint-plugin-jsx-a11y": "^1.5.5",
-    "eslint-plugin-react": "^5.0.1",
+    "eslint": "^3.9.0",
+    "eslint-config-airbnb": "^12.0.0",
+    "eslint-config-jss": "^2.4.0",
+    "eslint-plugin-import": "^2.0.1",
+    "eslint-plugin-jsx-a11y": "^2.2.3",
+    "eslint-plugin-react": "^6.4.1",
     "jss": "^5.5.0",
@@ -56,3 +56,3 @@ "rimraf": "^2.5.4",
     "jss-extend": "^2.0.1",
-    "jss-nested": "^2.4.0",
+    "jss-nested": "^2.5.0",
     "jss-props-sort": "^2.0.0",
@@ -59,0 +59,0 @@ "jss-vendor-prefixer": "^3.0.0"

readme.md

@@ -47,2 +47,12 @@ ![JSS logo](https://avatars1.githubusercontent.com/u/9503099?v=3&s=60)
 
+## Included plugins
+
+* [jss-extend](https://github.com/cssinjs/jss-extend) — enables inheritance
+* [jss-nested](https://github.com/cssinjs/jss-nested) — enables support for nested rules
+* [jss-camel-case](https://github.com/cssinjs/jss-camel-case) — allows to write camel cased rule properties
+* [jss-default-unit](https://github.com/cssinjs/jss-default-unit) — adds units to numeric values
+* [jss-vendor-prefixer](https://github.com/cssinjs/jss-vendor-prefixer) — handles vendor prefixes on the browser
+* [jss-props-sort](https://github.com/cssinjs/jss-props-sort) — ensures style properties extend each other instead of override
+* [jss-compose](https://github.com/cssinjs/jss-compose) — classes composition
+
 ## Issues
@@ -49,0 +59,0 @@

webpack.config.js

@@ -14,3 +14,7 @@ 'use strict'
 if (process.env.NODE_ENV === 'production') {
-  plugins.push(new webpack.optimize.UglifyJsPlugin())
+  plugins.push(new webpack.optimize.UglifyJsPlugin({
+    compress: {
+      warnings: false
+    }
+  }))
 }
@@ -17,0 +21,0 @@

No alert changes

Improved metrics

Total package byte prevSize

46809

increased by15.11%

Lines of code

959

increased by9.73%

Number of lines in readme file

64

increased by18.52%

Dependency changes

• Updatedjss-nested@^2.5.0