Merge branch 'master' into major

Author: matthewp

can-component.js

@@ -502,9 +502,19 @@ var Component = Construct.extend(
 				} else if (componentTagData.viewModel) {
 					// Component is being instantiated with a viewModel
 					setupFn = getSetupFunctionForComponentVM(componentTagData.viewModel);
+
+					//!steal-remove-start
+					if (process.env.NODE_ENV !== 'production') {
+						setupFn = queues.runAsTask(setupFn, function(el, componentTagData) {
+							return ["Constructing", el, "with viewModel",componentTagData.viewModel];
+						});
+					}
+					//!steal-remove-end
 				} else {
 					setupFn = stacheBindings.behaviors.viewModel;
 				}
+
+
 				teardownBindings = setupFn(el, componentTagData, function(initialViewModelData) {
 
 					var ViewModel = component.constructor.ViewModel,

test/component-can-bind-test.js

@@ -5,6 +5,8 @@ var QUnit = require("steal-qunit");
 var SimpleMap = require("can-simple-map");
 var value = require("can-value");
 var domMutateNode = require("can-dom-mutate/node/node");
+var queues = require("can-queues");
+var testHelpers = require("can-test-helpers");
 
 QUnit.module("can-component integration with can-bind");
 
@@ -71,3 +73,23 @@ QUnit.test("Using can-bind in connectedCallback works as documented", function(a
 		done();
 	});
 });
+
+testHelpers.dev.devOnlyTest("logStack should include `new Component()` mutations", function(assert) {
+	var ComponentConstructor = Component.extend({
+		tag: "a-tag",
+		view: '{{foo}}',
+		ViewModel: {
+			setup: function () {
+				var expected = queues.stack().length > 0;
+				assert.ok(expected, "At least one task on the stack");
+			},
+			foo: 'string'
+		}
+	});
+
+	new ComponentConstructor({
+		viewModel : {
+			foo: "bar"
+		}
+	});
+});