Release 2.6.1

HISTORY.md

@@ -1,3 +1,9 @@
+## v2.6.1, 2022-April-XX
+
+* [#370](https://github.com/meteor/blaze/pull/370) `[email protected]`, returned the `Template.__define__` with warning message
+* [#366](https://github.com/meteor/blaze/pull/366) Prevent firing callbacks until members are destroyed
+  * fix destroying child templates when parent is destroyed; prevents memory leak and DOMRange "not attached" error
+
 ## v2.6.0, 2022-April-13
 
 * [#330](https://github.com/meteor/blaze/pull/330) Removed deprecated APIs from before Meteor 1.0

packages/blaze/.versions

@@ -1,64 +1,64 @@
-[email protected].0
-babel-compiler@7.6.1
+[email protected].1
+babel-compiler@7.9.0
 [email protected]
 [email protected]
 [email protected]
-blaze@2.5.0
-[email protected].2
+blaze@2.6.1-rc.1
+[email protected].3
 [email protected]
 [email protected]
 [email protected]
-callback-hook@1.3.0
+callback-hook@1.4.0
 [email protected]
 [email protected]
-ddp-client@2.4.0
+ddp-client@2.5.0
 [email protected]
-ddp-server@2.3.2
+ddp-server@2.5.0
 [email protected]
-dynamic-import@0.6.0
-ecmascript@0.15.1
-ecmascript-runtime@0.7.0
-ecmascript-runtime-client@0.11.0
-ecmascript-runtime-server@0.10.0
-[email protected].1
+dynamic-import@0.7.2
+ecmascript@0.16.2
+ecmascript-runtime@0.8.0
+ecmascript-runtime-client@0.12.1
+ecmascript-runtime-server@0.11.0
+[email protected].2
 [email protected]
 [email protected]
-[email protected].0
-[email protected].0
-[email protected].0
+[email protected].3
+[email protected].1
+[email protected].1
 [email protected]
 [email protected]
-local-test:blaze@2.5.0
-logging@1.2.0
-meteor@1.9.3
-minimongo@1.6.2
-[email protected].5
-modules@0.16.0
-modules-runtime@0.12.0
-mongo@1.11.0
+local-test:blaze@2.6.1-rc.1
+logging@1.3.1
+meteor@1.10.0
+minimongo@1.8.0
+[email protected].7
+modules@0.18.0
+modules-runtime@0.13.0
+mongo@1.14.6
 [email protected]
 [email protected]
-[email protected].7
-npm-mongo@3.9.0
+[email protected].8
+npm-mongo@4.3.1
 [email protected]
 [email protected]
-promise@0.11.2
+promise@0.12.0
 [email protected]
-react-fast-refresh@0.1.0
+react-fast-refresh@0.2.3
 [email protected]
 [email protected]
 [email protected]
-[email protected].0
-socket-stream-client@0.3.1
+[email protected].1
+socket-stream-client@0.4.0
 [email protected]
 [email protected]
 [email protected]
 [email protected]
 [email protected]
 [email protected]
-test-helpers@1.2.0
-tinytest@1.1.0
+test-helpers@1.3.0
+tinytest@1.2.1
 [email protected]
 [email protected]
-webapp@1.10.1
+webapp@1.13.1
 [email protected]

packages/blaze/builtins.js

@@ -295,7 +295,7 @@ Blaze._TemplateWith = function (arg, contentFunc) {
   // parent Views in the current template.  However, when there's an argument
   // (`{{> Template.contentBlock arg}}`), the argument needs to be evaluated
   // in the original scope.  There's no good order to nest
-  // Blaze._InOuterTemplateScope and Spacebars.TemplateWith to achieve this,
+  // Blaze._InOuterTemplateScope and Blaze._TemplateWith to achieve this,
   // so we wrap argFunc to run it in the "original parentView" of the
   // Blaze._InOuterTemplateScope.
   //

packages/blaze/domrange.js

@@ -332,9 +332,13 @@ DOMRange.prototype.destroy = function (_skipNodes) {
   DOMRange._destroy(this, _skipNodes);
 };
 
-DOMRange.prototype.containsElement = function (elem) {
+DOMRange.prototype.containsElement = function (elem, selector, event) {
+  const templateName = this.view?.name
+  ? this.view.name.split('.')[1]
+  : 'unknown template';
   if (! this.attached)
-    throw new Error("Must be attached");
+    throw new Error(`${event} event triggerd with ${selector} on ${templateName} but associated view is not be found.
+    Make sure the event doesn't destroy the view.`);
 
   // An element is contained in this DOMRange if it's possible to
   // reach it by walking parent pointers, first through the DOM and

packages/blaze/package.js

@@ -1,15 +1,15 @@
 Package.describe({
   name: 'blaze',
   summary: "Meteor Reactive Templating library",
-  version: '2.6.0',
+  version: '2.6.1-rc.2',
   git: 'https://github.com/meteor/blaze.git'
 });
 
 Npm.depends({
   'lodash.has': '4.5.2',
   'lodash.isfunction': '3.0.9',
   'lodash.isempty': '4.4.0',
-  'lodash.isobject': '3.0.2' 
+  'lodash.isobject': '3.0.2'
 });
 
 Package.onUse(function (api) {

packages/blaze/view.js

@@ -489,14 +489,19 @@ Blaze._destroyView = function (view, _skipNodes) {
     return;
   view.isDestroyed = true;
 
-  Blaze._fireCallbacks(view, 'destroyed');
 
   // Destroy views and elements recursively.  If _skipNodes,
   // only recurse up to views, not elements, for the case where
   // the backend (jQuery) is recursing over the elements already.
 
-  if (view._domrange)
-    view._domrange.destroyMembers(_skipNodes);
+  if (view._domrange) view._domrange.destroyMembers(_skipNodes);
+
+  // XXX: fire callbacks after potential members are destroyed
+  // otherwise it's tracker.flush will cause the above line will
+  // not be called and their views won't be destroyed
+  // Involved issues: DOMRange "Must be attached" error, mem leak
+
+  Blaze._fireCallbacks(view, 'destroyed');
 };
 
 Blaze._destroyNode = function (node) {
@@ -692,9 +697,11 @@ Blaze.remove = function (view) {
   while (view) {
     if (! view.isDestroyed) {
       var range = view._domrange;
-      if (range.attached && ! range.parentRange)
-        range.detach();
       range.destroy();
+
+      if (range.attached && ! range.parentRange) {
+        range.detach();
+      }
     }
 
     view = view._hasGeneratedParent && view.parentView;
@@ -888,7 +895,7 @@ Blaze._addEventMap = function (view, eventMap, thisInHandler) {
         handles.push(Blaze._EventSupport.listen(
           element, newEvents, selector,
           function (evt) {
-            if (! range.containsElement(evt.currentTarget))
+            if (! range.containsElement(evt.currentTarget, selector, newEvents))
               return null;
             var handlerThis = thisInHandler || this;
             var handlerArgs = arguments;

packages/blaze/view_tests.js

@@ -56,4 +56,24 @@ if (Meteor.isClient) {
     test.equal(buf, "");
   });
 
+  // this checks, whether a DOMRange is correctly marked as
+  // desroyed after Blaze.remove has destroyed 
+  // the corresponding view
+  Tinytest.add("blaze - view - destroy", function (test) {
+    var v = {
+      _domrange: Blaze._DOMRange([])
+    };
+    v._domrange.view = Blaze.View();
+    test.equal(v._domrange.view.isDestroyed, false);
+    Blaze.remove(v);
+    test.equal(v._domrange.view.isDestroyed, true);
+  });
+
+  // this checks, whether an unattached DOMRange notifies
+  // correctly about it's root cause, when throwing due to an event
+  Tinytest.add("blaze - view - attached", function (test) {
+    test.throws(() => Blaze._DOMRange.prototype.containsElement.call({attached: false, view: {name: 'Template.foo'}}, undefined, '.class', 'click'), 
+    `click event triggerd with .class on foo but associated view is not be found.
+    Make sure the event doesn't destroy the view.`);
+  });
 }

packages/spacebars-tests/.versions

@@ -1,69 +1,69 @@
-[email protected].0
-babel-compiler@7.6.1
-[email protected].0
+[email protected].1
+babel-compiler@7.9.0
+[email protected].1
 [email protected]
 [email protected]
 [email protected]
 [email protected]
 [email protected]
 [email protected]
 [email protected]
-callback-hook@1.3.0
+callback-hook@1.4.0
 [email protected]
 [email protected]
-ddp-client@2.4.0
+ddp-client@2.5.0
 [email protected]
-ddp-server@2.3.2
+ddp-server@2.5.0
 [email protected]
-dynamic-import@0.6.0
-ecmascript@0.15.1
-ecmascript-runtime@0.7.0
-ecmascript-runtime-client@0.11.0
-ecmascript-runtime-server@0.10.0
-[email protected].1
+dynamic-import@0.7.2
+ecmascript@0.16.2
+ecmascript-runtime@0.8.0
+ecmascript-runtime-client@0.12.1
+ecmascript-runtime-server@0.11.0
+[email protected].2
 [email protected]
 [email protected]
 [email protected]
 [email protected]
 [email protected]
-[email protected].0
+[email protected].1
 [email protected]
 [email protected]
-local-test:[email protected].0
-logging@1.2.0
+local-test:[email protected].1-rc.2
+logging@1.3.1
 [email protected]
-meteor@1.9.3
-minimongo@1.6.2
-[email protected].5
-modules@0.16.0
-modules-runtime@0.12.0
-mongo@1.11.1
-[email protected].2
+meteor@1.10.0
+minimongo@1.8.0
+[email protected].8
+modules@0.18.0
+modules-runtime@0.13.0
+mongo@1.15.0
+[email protected].3
 [email protected]
-[email protected].7
-npm-mongo@3.9.0
+[email protected].8
+npm-mongo@4.3.1
 [email protected]
 [email protected]
-promise@0.11.2
+promise@0.12.0
 [email protected]
-react-fast-refresh@0.1.0
+react-fast-refresh@0.2.3
 [email protected]
 [email protected]
 [email protected]
 [email protected]
-[email protected].0
+[email protected].1
 [email protected]
-socket-stream-client@0.3.1
+socket-stream-client@0.5.0
 [email protected]
 [email protected]
-[email protected].0
+[email protected].1-rc.2
 [email protected]
 [email protected]
 [email protected]
 [email protected]
-test-helpers@1.2.0
-tinytest@1.1.0
+test-helpers@1.3.0
+tinytest@1.2.1
 [email protected]
 [email protected]
-webapp@1.10.1
+webapp@1.13.1
 [email protected]