Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 3637ceb

Browse files
krausestkrausest
committed
Merge branch 'update-glimmer' of https://github.com/chadhietala/js-framework-benchmark into chadhietala-update-glimmer
2 parents 0e3e9f0 + b011665 commit 3637ceb

File tree

24 files changed

+43
-37
lines changed

24 files changed

+43
-37
lines changed

‎glimmer-v0.8.0-keyed/src/main.ts

Lines changed: 0 additions & 16 deletions
This file was deleted.

‎glimmer-v0.8.0-keyed/.editorconfig renamed to ‎glimmer-v0.9.1-keyed/.editorconfig

File renamed without changes.

‎glimmer-v0.8.0-keyed/.gitignore renamed to ‎glimmer-v0.9.1-keyed/.gitignore

File renamed without changes.

‎glimmer-v0.8.0-keyed/.watchmanconfig renamed to ‎glimmer-v0.9.1-keyed/.watchmanconfig

File renamed without changes.

‎glimmer-v0.8.0-keyed/README.md renamed to ‎glimmer-v0.9.1-keyed/README.md

File renamed without changes.

‎glimmer-v0.8.0-keyed/config/environment.js renamed to ‎glimmer-v0.9.1-keyed/config/environment.js

File renamed without changes.

‎glimmer-v0.8.0-keyed/config/module-map.d.ts renamed to ‎glimmer-v0.9.1-keyed/config/module-map.d.ts

File renamed without changes.

‎glimmer-v0.8.0-keyed/config/resolver-configuration.d.ts renamed to ‎glimmer-v0.9.1-keyed/config/resolver-configuration.d.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,4 @@
44
* `config/environment.js` (and supplemented with default settings as possible).
55
*/
66

7-
import { ResolverConfiguration } from '@glimmer/resolver';
8-
declare var _default: ResolverConfiguration;
9-
export default _default;
7+
declare var _default: any; export default _default;

‎glimmer-v0.8.0-keyed/config/targets.js renamed to ‎glimmer-v0.9.1-keyed/config/targets.js

File renamed without changes.

‎glimmer-v0.8.0-keyed/ember-cli-build.js renamed to ‎glimmer-v0.9.1-keyed/ember-cli-build.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ const GlimmerApp = require('@glimmer/application-pipeline').GlimmerApp;
44

55
module.exports = function(defaults) {
66
let app = new GlimmerApp(defaults, {
7+
templateFormat: 'bytecode',
78
// Add options here
89
fingerprint: {
910
enabled: false

‎glimmer-v0.8.0-keyed/package.json renamed to ‎glimmer-v0.9.1-keyed/package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@
1414
"build-prod": "ember build --environment=production"
1515
},
1616
"devDependencies": {
17-
"@glimmer/application": "^0.8.0",
18-
"@glimmer/application-pipeline": "^0.9.1",
19-
"@glimmer/blueprint": "^0.6.4",
20-
"@glimmer/component": "^0.8.0",
17+
"@glimmer/application": "^0.9.1",
18+
"@glimmer/application-pipeline": "^0.11.0",
19+
"@glimmer/blueprint": "^0.9.1",
20+
"@glimmer/component": "^0.9.1",
2121
"@glimmer/inline-precompile": "^1.0.1",
2222
"@glimmer/resolver": "^0.4.1",
23-
"@glimmer/test-helpers": "^0.30.1",
23+
"@glimmer/test-helpers": "^0.30.3",
2424
"@types/qunit": "^2.0.31",
2525
"broccoli-asset-rev": "^2.6.0",
2626
"ember-cli": "^2.16.2",
@@ -29,7 +29,7 @@
2929
"ember-cli-sass": "^7.0.0",
3030
"ember-cli-uglify": "^2.0.0",
3131
"qunitjs": "^2.4.1",
32-
"typescript": "^2.6.1"
32+
"typescript": "~2.6.0"
3333
},
3434
"engines": {
3535
"node": ">= 4.0"

‎glimmer-v0.8.0-keyed/public/robots.txt renamed to ‎glimmer-v0.9.1-keyed/public/robots.txt

File renamed without changes.

‎glimmer-v0.9.1-keyed/src/data-segment.d.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
declare var _default: any; export default _default;

‎glimmer-v0.8.0-keyed/src/index.ts renamed to ‎glimmer-v0.9.1-keyed/src/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@ app.registerInitializer({
1414
}
1515
});
1616

17-
app.renderComponent('my-table', containerElement, null);
17+
app.renderComponent('Table', containerElement, null);
1818

1919
app.boot();

‎glimmer-v0.9.1-keyed/src/main.ts

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
import Application, { DOMBuilder, BytecodeLoader, SyncRenderer } from '@glimmer/application';
2+
import Resolver, { BasicModuleRegistry } from '@glimmer/resolver';
3+
import resolverConfiguration from '../config/resolver-configuration';
4+
import data from './data-segment';
5+
6+
export default class App extends Application {
7+
constructor() {
8+
let moduleRegistry = new BasicModuleRegistry(data.meta);
9+
let resolver = new Resolver(resolverConfiguration, moduleRegistry);
10+
const element = document.body;
11+
const bytecode = fetch('./templates.gbx', { credentials: 'include' })
12+
.then((r) => r.arrayBuffer());
13+
14+
super({
15+
builder: new DOMBuilder({ element, nextSibling: null }),
16+
loader: new BytecodeLoader({ bytecode, data }),
17+
renderer: new SyncRenderer(),
18+
resolver,
19+
rootName: resolverConfiguration.app.rootName
20+
});
21+
}
22+
}

‎glimmer-v0.8.0-keyed/src/ui/components/my-table/component.ts renamed to ‎glimmer-v0.9.1-keyed/src/ui/components/Table/component.ts

File renamed without changes.

‎glimmer-v0.8.0-keyed/src/ui/components/my-table/template.hbs renamed to ‎glimmer-v0.9.1-keyed/src/ui/components/Table/template.hbs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,41 @@
11
<div class="jumbotron">
22
<div class="row">
33
<div class="col-md-6">
4-
<h1>Glimmer 0.8.0</h1>
4+
<h1>Glimmer 0.9.1</h1>
55
</div>
66
<div class="col-md-6">
77
<div class="row">
88
<div class="col-sm-6 smallpad">
9-
<button type="button" class="btn btn-primary btn-block" id="run" onclick={{action run}}>Create 1,000 rows</button>
9+
<button type="button" class="btn btn-primary btn-block" id="run" onclick={{action this.run}}>Create 1,000 rows</button>
1010
</div>
1111
<div class="col-sm-6 smallpad">
12-
<button type="button" class="btn btn-primary btn-block" id="runlots" onclick={{action runLots}}>Create 10,000 rows</button>
12+
<button type="button" class="btn btn-primary btn-block" id="runlots" onclick={{action this.runLots}}>Create 10,000 rows</button>
1313
</div>
1414
<div class="col-sm-6 smallpad">
15-
<button type="button" class="btn btn-primary btn-block" id="add" onclick={{action add}}>Append 1,000 rows</button>
15+
<button type="button" class="btn btn-primary btn-block" id="add" onclick={{action this.add}}>Append 1,000 rows</button>
1616
</div>
1717
<div class="col-sm-6 smallpad">
18-
<button type="button" class="btn btn-primary btn-block" id="update" onclick={{action update}}>Update every 10th row</button>
18+
<button type="button" class="btn btn-primary btn-block" id="update" onclick={{action this.update}}>Update every 10th row</button>
1919
</div>
2020
<div class="col-sm-6 smallpad">
21-
<button type="button" class="btn btn-primary btn-block" id="clear" onclick={{action clear}}>Clear</button>
21+
<button type="button" class="btn btn-primary btn-block" id="clear" onclick={{action this.clear}}>Clear</button>
2222
</div>
2323
<div class="col-sm-6 smallpad">
24-
<button type="button" class="btn btn-primary btn-block" id="swaprows" onclick={{action swapRows}}>Swap Rows</button>
24+
<button type="button" class="btn btn-primary btn-block" id="swaprows" onclick={{action this.swapRows}}>Swap Rows</button>
2525
</div>
2626
</div>
2727
</div>
2828
</div>
2929
</div>
3030
<table class="table table-hover table-striped test-data">
3131
<tbody>
32-
{{#each rows.data key="id" as |row|}}
32+
{{#each this.rows.data key="id" as |row|}}
3333
<tr class={{if-eq row.id rows.selected 'danger'}}>
3434
<td class="col-md-1">{{row.id}}</td>
3535
<td class="col-md-4">
36-
<a onclick={{action select row.id}}>{{row.label}}</a>
36+
<a onclick={{action this.select row.id}}>{{row.label}}</a>
3737
</td>
38-
<td class="col-md-1"><a onclick={{action delete row.id}}><span class="glyphicon glyphicon-remove" aria-hidden="true"></span></a></td>
38+
<td class="col-md-1"><a onclick={{action this.delete row.id}}><span class="glyphicon glyphicon-remove" aria-hidden="true"></span></a></td>
3939
<td class="col-md-6"></td>
4040
</tr>
4141
{{/each}}

‎glimmer-v0.8.0-keyed/src/ui/components/if-eq/helper.ts renamed to ‎glimmer-v0.9.1-keyed/src/ui/components/if-eq/helper.ts

File renamed without changes.

‎glimmer-v0.8.0-keyed/src/ui/index.html renamed to ‎glimmer-v0.9.1-keyed/src/ui/index.html

File renamed without changes.

‎glimmer-v0.8.0-keyed/src/ui/styles/app.scss renamed to ‎glimmer-v0.9.1-keyed/src/ui/styles/app.scss

File renamed without changes.

‎glimmer-v0.8.0-keyed/src/utils/test-helpers/test-helper.ts renamed to ‎glimmer-v0.9.1-keyed/src/utils/test-helpers/test-helper.ts

File renamed without changes.

‎glimmer-v0.8.0-keyed/testem.json renamed to ‎glimmer-v0.9.1-keyed/testem.json

File renamed without changes.

‎glimmer-v0.8.0-keyed/tsconfig.json renamed to ‎glimmer-v0.9.1-keyed/tsconfig.json

File renamed without changes.

‎webdriver-ts/src/common.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ export let frameworks = [
6060
f("ember-v3.0.0-keyed", true, {uri: "ember-v3.0.0-keyed/dist"}),
6161
f("etch-v0.12.5-keyed", true),
6262
f("etch-v0.12.5-non-keyed", false),
63-
f("glimmer-v0.8.0-keyed", true, {uri: "glimmer-v0.8.0-keyed/dist"}),
63+
f("glimmer-v0.9.1-keyed", true, {uri: "glimmer-v0.9.1-keyed/dist"}),
6464
f("gruu-v1.7.3-non-keyed", false),
6565
f("halogen-v2.1.0-non-keyed", false),
6666
f("hyperapp-v0.16.0-non-keyed", false),

0 commit comments

Comments
 (0)