Merge branch 'dojo-fix-non-keyed-version-update' of https://github.com/agubler/js-framework-benchmark into agubler-dojo-fix-non-keyed-version-update

Author: krausest

frameworks/keyed/dojo/package.json

@@ -4,17 +4,19 @@
   "js-framework-benchmark": {
     "frameworkVersionFromPackage": "@dojo/framework",
     "customURL": "/output/dist",
-    "issues": [694]
+    "issues": [
+      694
+    ]
   },
   "scripts": {
     "build-prod": "./node_modules/.bin/dojo build"
   },
   "dependencies": {
-    "@dojo/framework": "^6.0.0"
+    "@dojo/framework": "^7.0.0"
   },
   "devDependencies": {
-    "@dojo/cli": "^6.0.0",
-    "@dojo/cli-build-app": "^6.0.0",
+    "@dojo/cli": "^7.0.0",
+    "@dojo/cli-build-app": "^7.0.0",
     "typescript": "3.5.2"
   }
 }

frameworks/keyed/dojo/src/Buttons.ts

@@ -1,4 +1,4 @@
-import { create, w, v } from '@dojo/framework/core/vdom'
+import { create, w, v, diffProperty } from '@dojo/framework/core/vdom'
 import Button from './Button';
 
 export interface ButtonConfig {
@@ -11,14 +11,15 @@ export interface ButtonsProperties {
 	buttonConfigs: ButtonConfig[];
 }
 
-const factory = create().properties<ButtonsProperties>();
+const factory = create({ diffProperty }).properties<ButtonsProperties>();
 
-export default factory(function Buttons({ properties }) {
+export default factory(function Buttons({ properties, middleware: { diffProperty } }) {
+	diffProperty('buttonConfigs', properties, () => {});
 	const { buttonConfigs } = properties();
 	return v('div', { classes: [ 'jumbotron' ] }, [
 		v('div', { classes: [ 'row' ] }, [
 			v('div', { classes: [ 'col-md-6' ] }, [
-				v('h1', ['Dojo v6.0.0'])
+				v('h1', ['Dojo v7'])
 			]),
 			v('div', { classes: [ 'col-md-6' ] }, buttonConfigs.map(({ id, label, onClick }) => {
 				return w(Button, { key: id, id, label, onClick });

frameworks/non-keyed/dojo/package.json

@@ -9,11 +9,11 @@
     "build-prod": "./node_modules/.bin/dojo build"
   },
   "dependencies": {
-    "@dojo/framework": "^6.0.0"
+    "@dojo/framework": "^7.0.0"
   },
   "devDependencies": {
-    "@dojo/cli": "^6.0.0",
-    "@dojo/cli-build-app": "^6.0.0",
+    "@dojo/cli": "^7.0.0",
+    "@dojo/cli-build-app": "^7.0.0",
     "typescript": "3.5.2"
   }
 }

frameworks/non-keyed/dojo/src/App.ts

@@ -22,7 +22,7 @@ export default factory(function App({ middleware: { store }}) {
 			return null;
 		}
 		return w(Row, {
-			key,
+			key: item.id,
 			id: item.id,
 			label: item.label,
 			onSelect: store.select

frameworks/non-keyed/dojo/src/Buttons.ts

@@ -1,4 +1,4 @@
-import { create, w, v } from '@dojo/framework/core/vdom'
+import { create, w, v, diffProperty } from '@dojo/framework/core/vdom'
 import Button from './Button';
 
 export interface ButtonConfig {
@@ -11,14 +11,15 @@ export interface ButtonsProperties {
 	buttonConfigs: ButtonConfig[];
 }
 
-const factory = create().properties<ButtonsProperties>();
+const factory = create({ diffProperty }).properties<ButtonsProperties>();
 
-export default factory(function Buttons({ properties }) {
+export default factory(function Buttons({ properties, middleware: { diffProperty } }) {
+	diffProperty('buttonConfigs', properties, () =>{});
 	const { buttonConfigs } = properties();
 	return v('div', { classes: [ 'jumbotron' ] }, [
 		v('div', { classes: [ 'row' ] }, [
 			v('div', { classes: [ 'col-md-6' ] }, [
-				v('h1', ['Dojo v6.0.0'])
+				v('h1', ['Dojo v7'])
 			]),
 			v('div', { classes: [ 'col-md-6' ] }, buttonConfigs.map(({ id, label, onClick }) => {
 				return w(Button, { key: id, id, label, onClick });