align to latest csstree changes

css · Jan 29, 2017 · 717ba5b · 717ba5b
1 parent 6638b6e
commit 717ba5b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/lib/compressor/clean/Atrule.js b/lib/compressor/clean/Atrule.js
@@ -13,7 +13,7 @@ module.exports = function cleanAtrule(node, item, list) {
 
     switch (node.name) {
         case 'charset':
-            if (node.expression.children.isEmpty()) {
+            if (!node.expression || node.expression.children.isEmpty()) {
                 list.remove(item);
                 return;
             }

diff --git a/lib/compressor/restructure/2-mergeAtrule.js b/lib/compressor/restructure/2-mergeAtrule.js
@@ -16,7 +16,9 @@ function processAtrule(node, item, list) {
     }
 
     // merge @media with same query
-    if (node.expression.id === prev.expression.id) {
+    if (node.expression &&
+        prev.expression &&
+        node.expression.id === prev.expression.id) {
         prev.block.children.appendList(node.block.children);
         prev.loc = {
             primary: prev.loc,