0.5.26

bem-archive · Mar 6, 2013 · 01fd745 · 01fd745
2 parents d2f4e1c + af7ee5e
commit 01fd745
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 3 deletions.
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -1,5 +1,9 @@
 bem-tools changelog
 ===================
+06.03.2013, Version 0.5.26 (stable)
+- bem make: Magic nodes doesn't link the nodes it creates with parent magic nodes (Closes #306)
+- deps.js: don't swallow parsing errors (Closes #353)
+
 14.02.2013, Version 0.5.25 (stable)
 -----------------------------------
 

diff --git a/lib/nodes/bundle.js b/lib/nodes/bundle.js
@@ -10,6 +10,7 @@ var Q = require('q'),
     BemBuildNode = require('./build'),
     BemDeclNode = require('./decl'),
     BorschikNode = require('./borschik'),
+    MagicNode = require('./magic'),
 
     registry = require('../nodesregistry'),
     LOGGER = require('../logger'),
@@ -47,7 +48,9 @@ registry.decl(BundleNodeName, BlockNode, /** @lends BundleNode.prototype */ {
                     root: this.root,
                     path: this.path
                 });
-                arch.setNode(bundleNode, arch.getParents(this));
+                arch.setNode(bundleNode, arch.getParents(this).filter(function(p) {
+                    return !(arch.getNode(p) instanceof MagicNode.MagicNode);
+                }), this);
             }
 
             // generate targets for page files

diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "bem",
   "description": "BEM Tools",
-  "version": "0.5.25",
+  "version": "0.5.26",
   "homepage": "http://github.com/bem/bem-tools",
   "author": "Sergey Berezhnoy <veged@mail.ru> (http://github.com/veged)",
   "maintainers": [