Comparing version 3.0.4 to 3.1.0
@@ -6,3 +6,3 @@ 'use strict'; | ||
}); | ||
exports.addPx = exports.hyphenate = exports.combine = exports.clean = exports.reset = exports.setOptions = exports.getCss = exports.sheet = undefined; | ||
exports.addPx = exports.hyphenate = exports.combine = exports.clean = exports.reset = exports.setOptions = exports.getCss = exports.mediaSheet = exports.sheet = undefined; | ||
@@ -20,8 +20,10 @@ 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 sheet = exports.sheet = new _sheet.StyleSheet(); | ||
var mediaSheet = exports.mediaSheet = new _sheet.StyleSheet(); | ||
sheet.inject(); | ||
mediaSheet.inject(); | ||
var getCss = exports.getCss = function getCss() { | ||
var css = ''; | ||
var rules = sheet.rules(); | ||
var rules = sheet.rules().concat(mediaSheet.rules()); | ||
for (var i = 0; i < rules.length; i++) { | ||
@@ -46,2 +48,3 @@ css += rules[i].cssText; | ||
sheet.flush(); | ||
mediaSheet.flush(); | ||
}; | ||
@@ -82,3 +85,3 @@ | ||
if (/^@media/.test(key)) { | ||
if (/^@media/.test(key) || /^@supports/.test(key)) { | ||
parse(value, key, children).forEach(function (className) { | ||
@@ -119,5 +122,8 @@ classNames.push(className); | ||
var rule = selector + '{' + prop + ':' + val + '}'; | ||
var css = media ? media + '{' + rule + '}' : rule; | ||
sheet.insert(css); | ||
if (media) { | ||
mediaSheet.insert(media + '{' + rule + '}'); | ||
} else { | ||
sheet.insert(rule); | ||
} | ||
cxs.cache[id] = className; | ||
@@ -147,5 +153,6 @@ | ||
var DOT_REG = /\./g; | ||
var EXCL_REG = /!/g; | ||
var clean = exports.clean = function clean(str) { | ||
return ('' + str).replace(BLANK_REG, '').replace(P_REG, 'P').replace(SYMBOL_REG, '_').replace(AT_REG, '_').replace(DOT_REG, 'p'); | ||
return ('' + str).replace(BLANK_REG, '').replace(P_REG, 'P').replace(SYMBOL_REG, '_').replace(AT_REG, '_').replace(DOT_REG, 'p').replace(EXCL_REG, '_'); | ||
}; | ||
@@ -152,0 +159,0 @@ |
@@ -6,3 +6,3 @@ 'use strict'; | ||
}); | ||
exports.rehydrate = exports.addPx = exports.hyphenate = exports.alphaHash = exports.cxs = exports.reset = exports.setOptions = exports.getCss = exports.sheet = undefined; | ||
exports.rehydrate = exports.addPx = exports.hyphenate = exports.alphaHash = exports.cxs = exports.reset = exports.setOptions = exports.getCss = exports.mediaSheet = exports.sheet = undefined; | ||
@@ -14,8 +14,10 @@ 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 sheet = exports.sheet = new _sheet.StyleSheet(); | ||
var mediaSheet = exports.mediaSheet = new _sheet.StyleSheet(); | ||
sheet.inject(); | ||
mediaSheet.inject(); | ||
var getCss = exports.getCss = function getCss() { | ||
var css = ''; | ||
var rules = sheet.rules(); | ||
var rules = sheet.rules().concat(mediaSheet.rules()); | ||
for (var i = 0; i < rules.length; i++) { | ||
@@ -42,2 +44,3 @@ css += rules[i].cssText; | ||
sheet.flush(); | ||
mediaSheet.flush(); | ||
count = 0; | ||
@@ -102,5 +105,8 @@ }; | ||
var rule = selector + '{' + prop + ':' + val + '}'; | ||
var css = media ? media + '{' + rule + '}' : rule; | ||
sheet.insert(css); | ||
if (media) { | ||
mediaSheet.insert(media + '{' + rule + '}'); | ||
} else { | ||
sheet.insert(rule); | ||
} | ||
cxs.cache[id] = className; | ||
@@ -127,3 +133,3 @@ | ||
var alpha = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'.split(''); | ||
var alpha = 'abcdefghijklmnopqrstuvwxyz'.split(''); | ||
@@ -130,0 +136,0 @@ var hyphenate = exports.hyphenate = function hyphenate(str) { |
@@ -89,3 +89,3 @@ 'use strict'; | ||
return 'continue'; | ||
} else if (/^@media/.test(key)) { | ||
} else if (/^@media/.test(key) || /^@supports/.test(key)) { | ||
parse(selector, value, key).forEach(function (r) { | ||
@@ -92,0 +92,0 @@ return rules.push(r); |
{ | ||
"name": "cxs", | ||
"version": "3.0.4", | ||
"version": "3.1.0", | ||
"description": "A CSS-in-JS solution for functional CSS in functional UI components", | ||
@@ -23,6 +23,6 @@ "main": "atomic.js", | ||
"devDependencies": { | ||
"ava": "^0.17.0", | ||
"ava": "^0.21.0", | ||
"babel-cli": "^6.10.1", | ||
"babel-eslint": "^7.1.0", | ||
"babel-loader": "^6.2.4", | ||
"babel-loader": "^7.1.1", | ||
"babel-preset-es2015": "^6.9.0", | ||
@@ -34,9 +34,9 @@ "babel-preset-react": "^6.16.0", | ||
"enzyme": "^2.7.0", | ||
"gh-pages": "^0.11.0", | ||
"gh-pages": "^1.0.0", | ||
"html-loader": "^0.4.3", | ||
"inline-style-prefixer": "^2.0.0", | ||
"jsdom": "^9.3.0", | ||
"jsdom-global": "^2.0.0", | ||
"inline-style-prefixer": "^3.0.6", | ||
"jsdom": "^11.1.0", | ||
"jsdom-global": "^3.0.2", | ||
"json-loader": "^0.5.4", | ||
"markdown-loader": "^0.1.7", | ||
"markdown-loader": "^2.0.1", | ||
"pretty-bytes": "^4.0.2", | ||
@@ -46,5 +46,5 @@ "react": "^15.3.2", | ||
"react-dom": "^15.3.2", | ||
"standard": "^8.5.0", | ||
"webpack": "^1.13.1", | ||
"webpack-dev-server": "^1.14.1", | ||
"standard": "^10.0.2", | ||
"webpack": "^3.3.0", | ||
"webpack-dev-server": "^2.6.1", | ||
"yo-yo": "^1.2.1" | ||
@@ -51,0 +51,0 @@ }, |
Major refactor
Supply chain riskPackage has recently undergone a major refactor. It may be unstable or indicate significant internal changes. Use caution when updating to versions that include significant changes.
Found 1 instance in 1 package
44272
26
594
1