0.7.3 fix media query nested sel regression

- add section about tools to readme - update terser
fuzetsu · Sep 7, 2019 · 69ee06d · 69ee06d
1 parent c594549
commit 69ee06d
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Changelog
 
+## 0.7.3
+
+_2019-09-07_
+
+Fixed regression where nested selectors in media queries would be applied incorrectly.
+
+Added section about tools to readme.
+
 ## 0.7.2
 
 _2019-09-05_

diff --git a/README.md b/README.md
@@ -87,6 +87,11 @@ Or download the script and use it locally.
 
 [You can see all the options here.](https://unpkg.com/zaftig@latest/dist/)
 
+## Plugins and Tools
+
+- [Highlight CSS Lean Strings](https://marketplace.visualstudio.com/items?itemName=fuzetsu.highlight-css-lean-strings&ssr=false#overview): a vscode plugin that will add syntax highlighting for Zaftig style strings in your JS code
+- [Zaftig Tailwind](https://github.com/fuzetsu/zaftig-tailwind): a collection of helpers based on [Tailwind css](https://tailwindcss.com)
+
 ## API
 
 Quick links: [`z`](#css) ~~ [`z.setDebug`](#set-debug) ~~ [`z.global`](#global) ~~ [`z.style`](#style) ~~ [`z.anim`](#anim) ~~ [`z.helper`](#helper) ~~ [`z.new`](#new)

diff --git a/docs/index.js b/docs/index.js
@@ -24,7 +24,7 @@ const z = Object.assign((...args) => {
 const style = {
   sheet: {
     cssRules: [],
-    insertRule: function(rule, idx) {
+    insertRule(rule, idx) {
       this.cssRules[idx] = rule
     }
   }

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "zaftig",
-  "version": "0.7.2",
+  "version": "0.7.3",
   "description": "css for your js",
   "source": "src/index.js",
   "main": "dist/zaftig.es5.min.js",
@@ -26,6 +26,6 @@
   "homepage": "https://github.com/fuzetsu/zaftig#readme",
   "devDependencies": {
     "buble": "^0.19.8",
-    "terser": "^4.2.1"
+    "terser": "^4.3.0"
   }
 }
diff --git a/src/index.js b/src/index.js
@@ -164,14 +164,13 @@ const makeZ = (conf = {}) => {
 
   const appendSpecial = (sel, rules, psel = '', pctx = null) => {
     const media = sel.indexOf('@media') == 0
-    if (media) sel = sel.slice(sel.indexOf(' ') + 1)
     const ctx = {
-      sel,
+      sel: media ? sel.slice(sel.indexOf(' ') + 1) : sel,
       media,
       sub: [],
       rul: media ? wrap(psel, rules.rul) : ''
     }
-    rules.sub.forEach(n => appendRule(n.sel, n, psel == ':root' ? '' : sel, ctx))
+    rules.sub.forEach(n => appendRule(n.sel, n, psel == ':root' ? '' : psel, ctx))
     if (pctx) pctx.sub.push(ctx)
     else appendSpecialRule(ctx)
   }