honeymoose
/
angular-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(benchmarks): update react and polymer benchmarks and get tree update numbers for all of the benchmarks as well. 

Closes #4709
This commit is contained in:
Tobias Bosch 2015-10-13 15:10:20 -07:00
parent 5c48236f61
commit bc10dc3ed0
13 changed files with 169 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bower.json
View File

@ -1,6 +1,6 @@
{ {
"name": "angular2", "name": "angular2",
"dependencies": { "dependencies": {
"polymer": "dart-lang/polymer_js#0.8.0-preview" "polymer": "Polymer/polymer"
} }
} }

4
modules/benchmarks/e2e_test/static_tree_perf.ts
View File

@ -37,7 +37,7 @@ describe('ng2 static tree benchmark', function() {
runClickBenchmark({ runClickBenchmark({
url: URL, url: URL,
buttons: ['#baselineDestroyDom', '#baselineCreateDom'], buttons: ['#baselineDestroyDom', '#baselineCreateDom'],
id: 'baseline.tree.create', id: 'baseline.static.tree.create',
params: [{name: 'depth', value: 9, scale: 'log2'}] params: [{name: 'depth', value: 9, scale: 'log2'}]
}).then(done, done.fail); }).then(done, done.fail);
}); });
@ -46,7 +46,7 @@ describe('ng2 static tree benchmark', function() {
runClickBenchmark({ runClickBenchmark({
url: URL, url: URL,
buttons: ['#baselineCreateDom'], buttons: ['#baselineCreateDom'],
id: 'baseline.tree.update', id: 'baseline.static.tree.update',
params: [{name: 'depth', value: 9, scale: 'log2'}] params: [{name: 'depth', value: 9, scale: 'log2'}]
}).then(done, done.fail); }).then(done, done.fail);
}); });

14
modules/benchmarks_external/e2e_test/polymer_tree_perf.ts
View File

@ -6,11 +6,21 @@ describe('polymer tree benchmark', function() {
afterEach(verifyNoBrowserErrors); afterEach(verifyNoBrowserErrors);
it('should log the stats', function(done) { it('should log the stats (create)', function(done) {
runClickBenchmark({ runClickBenchmark({
url: URL, url: URL,
buttons: ['#destroyDom', '#createDom'], buttons: ['#destroyDom', '#createDom'],
id: 'polymer.tree', id: 'polymer.tree.create',
params: [{name: 'depth', value: 9, scale: 'log2'}],
waitForAngular2: false
}).then(done, done.fail);
});
it('should log the stats (update)', function(done) {
runClickBenchmark({
url: URL,
buttons: ['#createDom'],
id: 'polymer.tree.update',
params: [{name: 'depth', value: 9, scale: 'log2'}], params: [{name: 'depth', value: 9, scale: 'log2'}],
waitForAngular2: false waitForAngular2: false
}).then(done, done.fail); }).then(done, done.fail);

14
modules/benchmarks_external/e2e_test/static_tree_perf.ts
View File

@ -6,11 +6,21 @@ describe('ng1.x tree benchmark', function() {
afterEach(verifyNoBrowserErrors); afterEach(verifyNoBrowserErrors);
it('should log the stats', function(done) { it('should log the stats (create)', function(done) {
runClickBenchmark({ runClickBenchmark({
url: URL, url: URL,
buttons: ['#destroyDom', '#createDom'], buttons: ['#destroyDom', '#createDom'],
id: 'ng1.static.tree', id: 'ng1.static.tree.create',
params: [],
waitForAngular2: false
}).then(done, done.fail);
});
it('should log the stats (update)', function(done) {
runClickBenchmark({
url: URL,
buttons: ['#createDom'],
id: 'ng1.static.tree.update',
params: [], params: [],
waitForAngular2: false waitForAngular2: false
}).then(done, done.fail); }).then(done, done.fail);

14
modules/benchmarks_external/e2e_test/tree_perf.ts
View File

@ -6,11 +6,21 @@ describe('ng1.x tree benchmark', function() {
afterEach(verifyNoBrowserErrors); afterEach(verifyNoBrowserErrors);
it('should log the stats', function(done) { it('should log the stats (create)', function(done) {
runClickBenchmark({ runClickBenchmark({
url: URL, url: URL,
buttons: ['#destroyDom', '#createDom'], buttons: ['#destroyDom', '#createDom'],
id: 'ng1.tree', id: 'ng1.tree.create',
params: [{name: 'depth', value: 9, scale: 'log2'}],
waitForAngular2: false
}).then(done, done.fail);
});
it('should log the stats (update)', function(done) {
runClickBenchmark({
url: URL,
buttons: ['#createDom'],
id: 'ng1.tree.update',
params: [{name: 'depth', value: 9, scale: 'log2'}], params: [{name: 'depth', value: 9, scale: 'log2'}],
waitForAngular2: false waitForAngular2: false
}).then(done, done.fail); }).then(done, done.fail);

47
modules/benchmarks_external/src/tree/polymer/binary_tree.html
View File

@ -3,41 +3,22 @@
<template> <template>
<span> <span>
<span>{{data.value}}</span> <span>{{data.value}}</span>
<!-- TODO(tbosch): use the builtin conditional template when it is available in Polymer 0.8 --> <template is="dom-if" if="[[data.left]]">
<span id="leftTree"></span> <binary-tree data="[[data.left]]"></binary-tree>
<span id="rightTree"></span> </template>
<template is="dom-if" if="[[data.right]]">
<binary-tree data="[[data.right]]"></binary-tree>
</template>
</span> </span>
</template> </template>
</dom-module> </dom-module>
<script> <script>
(function() { Polymer({
Polymer({ is: 'binary-tree',
is: 'binary-tree', properties: {
properties: { data: Object
data: Object },
}, leftTree: null,
leftTree: null, rightTree: null
rightTree: null, });
dataChanged: function() {
var data = this.data || {};
this._updateTree(data.left, 'leftTree');
this._updateTree(data.right, 'rightTree');
},
_updateTree: function(data, treeName) {
if (data) {
if (!this[treeName]) {
this[treeName] = document.createElement('binary-tree');
}
this[treeName].data = data;
this.$[treeName].appendChild(this[treeName]);
} else {
if (this[treeName]) this[treeName].remove();
this[treeName] = null;
}
},
properties: {
data: 'dataChanged'
}
});
})();
</script> </script>

9
modules/benchmarks_external/src/tree/polymer/index.html
View File

@ -5,12 +5,6 @@
</head> </head>
<body> <body>
<h2>TODO</h2>
<ul>
<li>TODO: Does not use shadow DOM</li>
<li>TODO: Does not yet use builtin `if` construct as it uses a preview version of Polymer</li>
</ul
<h2>Params</h2> <h2>Params</h2>
<form> <form>
Depth: Depth:
@ -19,10 +13,9 @@
<button>Apply</button> <button>Apply</button>
</form> </form>
<h2>Polymer JS 0.8-preview tree benchmark</h2> <h2>Polymer JS 1.x tree benchmark</h2>
<root-tree></root-tree> <root-tree></root-tree>
<script src="url_params_to_form.js" type="text/javascript"></script> <script src="url_params_to_form.js" type="text/javascript"></script>
</body> </body>

2
modules/benchmarks_external/src/tree/tree_benchmark.ts
View File

@ -27,7 +27,7 @@ angular.module('app', [])
var transcludeFn; var transcludeFn;
return { return {
compile: function(element, attrs) { compile: function(element, attrs) {
var expr = $parse(attrs.treeIf); var expr = $parse('!!' + attrs.treeIf);
var template = '<tree data="' + attrs.treeIf + '"></tree>'; var template = '<tree data="' + attrs.treeIf + '"></tree>';
var transclude; var transclude;
return function($scope, $element, $attrs) { return function($scope, $element, $attrs) {

2
modules/upgrade/test/integration_spec.ts
View File

@ -404,6 +404,7 @@ export function main() {
bindToController: true, bindToController: true,
template: '{{ctl.status}}', template: '{{ctl.status}}',
require: 'ng1', require: 'ng1',
controllerAs: 'ctrl',
controller: Class({constructor: function() { this.status = 'WORKS'; }}), controller: Class({constructor: function() { this.status = 'WORKS'; }}),
link: function(scope, element, attrs, linkController) { link: function(scope, element, attrs, linkController) {
expect(scope.$root).toEqual($rootScope); expect(scope.$root).toEqual($rootScope);
@ -442,6 +443,7 @@ export function main() {
bindToController: true, bindToController: true,
template: '{{parent.parent}}:{{ng1.status}}', template: '{{parent.parent}}:{{ng1.status}}',
require: ['ng1', '^parent', '?^^notFound'], require: ['ng1', '^parent', '?^^notFound'],
controllerAs: 'ctrl',
controller: Class({constructor: function() { this.status = 'WORKS'; }}), controller: Class({constructor: function() { this.status = 'WORKS'; }}),
link: function(scope, element, attrs, linkControllers) { link: function(scope, element, attrs, linkControllers) {
expect(linkControllers[0].status).toEqual('WORKS'); expect(linkControllers[0].status).toEqual('WORKS');

42
npm-shrinkwrap.clean.json
View File

@ -4,13 +4,13 @@
"version": "5.0.0-alpha.4" "version": "5.0.0-alpha.4"
}, },
"angular": { "angular": {
"version": "1.3.5" "version": "1.4.7"
}, },
"angular-animate": { "angular-animate": {
"version": "1.3.5" "version": "1.4.7"
}, },
"angular-mocks": { "angular-mocks": {
"version": "1.3.5" "version": "1.4.7"
}, },
"base64-js": { "base64-js": {
"version": "0.0.8" "version": "0.0.8"
@ -10723,13 +10723,13 @@
"version": "1.3.0" "version": "1.3.0"
}, },
"react": { "react": {
"version": "0.13.2", "version": "0.14.0",
"dependencies": { "dependencies": {
"envify": { "envify": {
"version": "3.4.0", "version": "3.4.0",
"dependencies": { "dependencies": {
"through": { "through": {
"version": "2.3.7" "version": "2.3.8"
}, },
"jstransform": { "jstransform": {
"version": "10.1.0", "version": "10.1.0",
@ -10744,13 +10744,43 @@
"version": "0.1.31", "version": "0.1.31",
"dependencies": { "dependencies": {
"amdefine": { "amdefine": {
"version": "0.1.0" "version": "1.0.0"
} }
} }
} }
} }
} }
} }
},
"fbjs": {
"version": "0.3.2",
"dependencies": {
"core-js": {
"version": "1.2.3"
},
"loose-envify": {
"version": "1.1.0",
"dependencies": {
"js-tokens": {
"version": "1.0.2"
}
}
},
"promise": {
"version": "7.0.4",
"dependencies": {
"asap": {
"version": "2.0.3"
}
}
},
"ua-parser-js": {
"version": "0.7.9"
},
"whatwg-fetch": {
"version": "0.9.0"
}
}
} }
} }
}, },

92
npm-shrinkwrap.json generated
View File

@ -8,19 +8,19 @@
"resolved": "https://registry.npmjs.org/@reactivex/rxjs/-/rxjs-5.0.0-alpha.4.tgz" "resolved": "https://registry.npmjs.org/@reactivex/rxjs/-/rxjs-5.0.0-alpha.4.tgz"
}, },
"angular": { "angular": {
"version": "1.3.5", "version": "1.4.7",
"from": "https://registry.npmjs.org/angular/-/angular-1.3.5.tgz", "from": "angular@1.4.7",
"resolved": "https://registry.npmjs.org/angular/-/angular-1.3.5.tgz" "resolved": "https://registry.npmjs.org/angular/-/angular-1.4.7.tgz"
}, },
"angular-animate": { "angular-animate": {
"version": "1.3.5", "version": "1.4.7",
"from": "https://registry.npmjs.org/angular-animate/-/angular-animate-1.3.5.tgz", "from": "angular-animate@1.4.7",
"resolved": "https://registry.npmjs.org/angular-animate/-/angular-animate-1.3.5.tgz" "resolved": "https://registry.npmjs.org/angular-animate/-/angular-animate-1.4.7.tgz"
}, },
"angular-mocks": { "angular-mocks": {
"version": "1.3.5", "version": "1.4.7",
"from": "https://registry.npmjs.org/angular-mocks/-/angular-mocks-1.3.5.tgz", "from": "angular-mocks@1.4.7",
"resolved": "https://registry.npmjs.org/angular-mocks/-/angular-mocks-1.3.5.tgz" "resolved": "https://registry.npmjs.org/angular-mocks/-/angular-mocks-1.4.7.tgz"
}, },
"base64-js": { "base64-js": {
"version": "0.0.8", "version": "0.0.8",
@ -16551,50 +16551,96 @@
"resolved": "https://registry.npmjs.org/q/-/q-1.3.0.tgz" "resolved": "https://registry.npmjs.org/q/-/q-1.3.0.tgz"
}, },
"react": { "react": {
"version": "0.13.2", "version": "0.14.0",
"from": "https://registry.npmjs.org/react/-/react-0.13.2.tgz", "from": "react@0.14.0",
"resolved": "https://registry.npmjs.org/react/-/react-0.13.2.tgz", "resolved": "https://registry.npmjs.org/react/-/react-0.14.0.tgz",
"dependencies": { "dependencies": {
"envify": { "envify": {
"version": "3.4.0", "version": "3.4.0",
"from": "https://registry.npmjs.org/envify/-/envify-3.4.0.tgz", "from": "envify@>=3.0.0 <4.0.0",
"resolved": "https://registry.npmjs.org/envify/-/envify-3.4.0.tgz", "resolved": "https://registry.npmjs.org/envify/-/envify-3.4.0.tgz",
"dependencies": { "dependencies": {
"through": { "through": {
"version": "2.3.7", "version": "2.3.8",
"from": "https://registry.npmjs.org/through/-/through-2.3.7.tgz", "from": "through@>=2.3.4 <2.4.0",
"resolved": "https://registry.npmjs.org/through/-/through-2.3.7.tgz" "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz"
}, },
"jstransform": { "jstransform": {
"version": "10.1.0", "version": "10.1.0",
"from": "https://registry.npmjs.org/jstransform/-/jstransform-10.1.0.tgz", "from": "jstransform@>=10.0.1 <11.0.0",
"resolved": "https://registry.npmjs.org/jstransform/-/jstransform-10.1.0.tgz", "resolved": "https://registry.npmjs.org/jstransform/-/jstransform-10.1.0.tgz",
"dependencies": { "dependencies": {
"base62": { "base62": {
"version": "0.1.1", "version": "0.1.1",
"from": "https://registry.npmjs.org/base62/-/base62-0.1.1.tgz", "from": "base62@0.1.1",
"resolved": "https://registry.npmjs.org/base62/-/base62-0.1.1.tgz" "resolved": "https://registry.npmjs.org/base62/-/base62-0.1.1.tgz"
}, },
"esprima-fb": { "esprima-fb": {
"version": "13001.1001.0-dev-harmony-fb", "version": "13001.1001.0-dev-harmony-fb",
"from": "https://registry.npmjs.org/esprima-fb/-/esprima-fb-13001.1001.0-dev-harmony-fb.tgz", "from": "esprima-fb@13001.1001.0-dev-harmony-fb",
"resolved": "https://registry.npmjs.org/esprima-fb/-/esprima-fb-13001.1001.0-dev-harmony-fb.tgz" "resolved": "https://registry.npmjs.org/esprima-fb/-/esprima-fb-13001.1001.0-dev-harmony-fb.tgz"
}, },
"source-map": { "source-map": {
"version": "0.1.31", "version": "0.1.31",
"from": "https://registry.npmjs.org/source-map/-/source-map-0.1.31.tgz", "from": "source-map@0.1.31",
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.31.tgz", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.31.tgz",
"dependencies": { "dependencies": {
"amdefine": { "amdefine": {
"version": "0.1.0", "version": "1.0.0",
"from": "https://registry.npmjs.org/amdefine/-/amdefine-0.1.0.tgz", "from": "amdefine@>=0.0.4",
"resolved": "https://registry.npmjs.org/amdefine/-/amdefine-0.1.0.tgz" "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.0.tgz"
} }
} }
} }
} }
} }
} }
},
"fbjs": {
"version": "0.3.2",
"from": "fbjs@>=0.3.1 <0.4.0",
"resolved": "https://registry.npmjs.org/fbjs/-/fbjs-0.3.2.tgz",
"dependencies": {
"core-js": {
"version": "1.2.3",
"from": "core-js@>=1.0.0 <2.0.0",
"resolved": "https://registry.npmjs.org/core-js/-/core-js-1.2.3.tgz"
},
"loose-envify": {
"version": "1.1.0",
"from": "loose-envify@>=1.0.0 <2.0.0",
"resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.1.0.tgz",
"dependencies": {
"js-tokens": {
"version": "1.0.2",
"from": "js-tokens@>=1.0.1 <2.0.0",
"resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-1.0.2.tgz"
}
}
},
"promise": {
"version": "7.0.4",
"from": "promise@>=7.0.3 <8.0.0",
"resolved": "https://registry.npmjs.org/promise/-/promise-7.0.4.tgz",
"dependencies": {
"asap": {
"version": "2.0.3",
"from": "asap@>=2.0.3 <2.1.0",
"resolved": "https://registry.npmjs.org/asap/-/asap-2.0.3.tgz"
}
}
},
"ua-parser-js": {
"version": "0.7.9",
"from": "ua-parser-js@>=0.7.9 <0.8.0",
"resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.9.tgz"
},
"whatwg-fetch": {
"version": "0.9.0",
"from": "whatwg-fetch@>=0.9.0 <0.10.0",
"resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-0.9.0.tgz"
}
}
} }
} }
}, },

8
package.json
View File

@ -33,9 +33,9 @@
"zone.js": "0.5.8" "zone.js": "0.5.8"
}, },
"devDependencies": { "devDependencies": {
"angular": "1.3.5", "angular": "^1.4.7",
"angular-animate": "1.3.5", "angular-animate": "^1.4.7",
"angular-mocks": "1.3.5", "angular-mocks": "^1.4.7",
"base64-js": "^0.0.8", "base64-js": "^0.0.8",
"bower": "^1.3.12", "bower": "^1.3.12",
"broccoli": "^0.15.3", "broccoli": "^0.15.3",
@ -111,7 +111,7 @@
"protractor": "^2.5.0", "protractor": "^2.5.0",
"proxy-middleware": "^0.13.0", "proxy-middleware": "^0.13.0",
"q": "^1.0.1", "q": "^1.0.1",
"react": "^0.13.2", "react": "^0.14.0",
"rewire": "^2.3.3", "rewire": "^2.3.3",
"run-sequence": "^1.1.0", "run-sequence": "^1.1.0",
"selenium-webdriver": "^2.47.0", "selenium-webdriver": "^2.47.0",

4
tools/broccoli/trees/browser_tree.ts
View File

@ -219,7 +219,9 @@ module.exports = function makeBrowserTree(options, destinationPath) {
var scripts = mergeTrees(servingTrees); var scripts = mergeTrees(servingTrees);
var polymerFiles = new Funnel('.', { var polymerFiles = new Funnel('.', {
files: [ files: [
'bower_components/polymer/lib/polymer.html', 'bower_components/polymer/polymer.html',
'bower_components/polymer/polymer-micro.html',
'bower_components/polymer/polymer-mini.html',
'tools/build/snippets/url_params_to_form.js' 'tools/build/snippets/url_params_to_form.js'
] ]
}); });