Merge branch 'trunk' into update/rename-edit-fn-names

packages/js/product-editor/changelog/update-product-editor-remove-invalid-block-attrs

@@ -0,0 +1,4 @@
+Significance: patch
+Type: tweak
+
+[Product Block Editor]: remove unused block attributes

packages/js/product-editor/src/blocks/generic/tab/block.json

@@ -28,6 +28,5 @@
 		"isInSelectedTab": "isSelected"
 	},
 	"usesContext": [ "selectedTab" ],
-	"editorStyle": "file:./editor.css",
-	"templateLock": "contentOnly"
+	"editorStyle": "file:./editor.css"
 }

packages/js/product-editor/src/blocks/product-fields/notice-edit-single-variation/block.json

@@ -30,6 +30,5 @@
 		"lock": false,
 		"__experimentalToolbar": false
 	},
-	"editorStyle": "file:./editor.css",
-	"templateLock": "contentOnly"
+	"editorStyle": "file:./editor.css"
 }

packages/js/product-editor/src/blocks/product-fields/notice-has-variations/block.json

@@ -30,6 +30,5 @@
 		"lock": false,
 		"__experimentalToolbar": false
 	},
-	"editorStyle": "file:./editor.css",
-	"templateLock": "contentOnly"
+	"editorStyle": "file:./editor.css"
 }