Skip to content

Commit 6af4619

Browse files
matthewpmatthewp
authored
Merge pull request #55 from donejs/major
Merge major into master for 2.0 release
2 parents 6994f0a + 1f0dff6 commit 6af4619

File tree

10 files changed

+84
-97
lines changed

10 files changed

+84
-97
lines changed

‎.gitignore‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
node_modules/
2-
test/tests/dist/
2+
test/tests/dist/
3+
package-lock.json

‎.travis.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
language: node_js
22
script: npm test
33
node_js:
4-
- "6"
5-
- "7"
4+
- "8"
5+
- "9"

‎package.json‎

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "done-ssr-middleware",
3-
"version": "1.2.0",
3+
"version": "2.0.0-pre.0",
44
"description": "Express/Connect middleware for DoneJS applications",
55
"main": "lib/index.js",
66
"directories": {
@@ -30,15 +30,16 @@
3030
"url": "https://github.com/donejs/done-ssr-middleware/issues"
3131
},
3232
"homepage": "https://github.com/donejs/done-ssr-middleware#readme",
33+
"dependencies": {
34+
"done-ssr": "^2.0.0-pre.0"
35+
},
3336
"devDependencies": {
34-
"can-component": "^3.0.4",
35-
"can-fixture": "^1.0.11",
36-
"can-list": "^3.0.2",
37-
"can-map": "^3.0.4",
38-
"can-map-define": "^3.0.2",
39-
"can-route": "^3.0.6",
40-
"can-route-pushstate": "^3.0.1",
41-
"done-autorender": "^1.4.0",
37+
"can-component": "^4.0.0-pre.0",
38+
"can-define": "^2.0.0-pre.20",
39+
"can-fixture": "^2.0.0-pre.0",
40+
"can-route": "^4.0.0-pre.0",
41+
"can-route-pushstate": "^4.0.0-pre.0",
42+
"done-autorender": "^2.0.0-pre.2",
4243
"done-css": "^3.0.0",
4344
"express": "^4.13.4",
4445
"jquery": "2.x - 3.x",
@@ -48,8 +49,5 @@
4849
"request": "^2.69.0",
4950
"spawn-mochas": "^1.1.0",
5051
"steal-tools": "^1.0.3"
51-
},
52-
"dependencies": {
53-
"done-ssr": "^1.3.0"
5452
}
5553
}

‎test/tests/fixtures/appstate.js‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
1-
var List = require("can-list");
2-
var Map = require("can-map");
3-
require("can-map-define");
1+
var DefineMap = require("can-define/map/map");
42

5-
module.exports = Map.extend({
6-
define: {
7-
things: {
8-
Value: List,
9-
get: function(list){
3+
module.exports = DefineMap.extend({
4+
thingsPromise: {
5+
get: function(){
6+
return new Promise(function(resolve){
107
var xhr = new XMLHttpRequest();
118
xhr.open("GET", "http://www.example.org/stuff");
129
xhr.addEventListener("load", function(){
1310
var json = xhr.responseText;
1411
var data = JSON.parse(json);
15-
list.replace(data);
12+
resolve(data);
1613
});
1714
xhr.send();
18-
19-
return list;
20-
}
15+
})
16+
}
17+
},
18+
things: {
19+
get: function(last, resolve){
20+
this.thingsPromise.then(resolve);
2121
}
2222
}
2323
});

‎test/tests/fixtures/index.stache‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
</head>
55
<body>
66
<can-import from="./fixtures/routes"/>
7-
<can-import from="fixtures/appstate" as="viewModel" />
7+
<can-import from="fixtures/appstate" export-as="viewModel" />
88
<can-import from="fixtures/fixtures"/>
99

1010
{{#things}}

‎test/tests/package.json‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,13 @@
33
"version": "0.0.1",
44
"main": "progressive/index.stache!done-autorender",
55
"dependencies": {
6-
"can-component": "^3.0.4",
7-
"can-fixture": "^1.0.11",
8-
"can-list": "^3.0.2",
9-
"can-map": "^3.0.4",
10-
"can-map-define": "^3.0.2",
11-
"can-route": "^3.0.6",
12-
"can-route-pushstate": "^3.0.1",
13-
"done-autorender": "^1.0.0-alpha.0",
14-
"done-css": "^3.0.0-alpha.2"
6+
"can-component": "^4.0.0-pre.0",
7+
"can-fixture": "^2.0.0-pre.0",
8+
"can-define": "^2.0.0-pre.20",
9+
"can-route": "^4.0.0-pre.0",
10+
"can-route-pushstate": "^4.0.0-pre.0",
11+
"done-autorender": "^2.0.0-alpha.2",
12+
"done-css": "^3.0.0"
1513
},
1614
"steal": {
1715
"envs": {

‎test/tests/progressive/appstate.js‎

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,11 @@
11
var loader = require("@loader");
2-
var Map = require("can-map");
3-
require("can-map-define");
2+
var DefineMap = require("can-define/map/map");
43

5-
debugger;
6-
7-
module.exports = Map.extend({
8-
define: {
9-
loader: {
10-
serialize: false,
11-
value: loader
12-
}
4+
module.exports = DefineMap.extend({
5+
statusMessage: "string",
6+
loader: {
7+
serialize: false,
8+
value: () => loader
139
},
1410
throwError: function() {
1511
throw Error('Something went wrong');

‎test/tests/progressive/index.stache‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,35 +3,35 @@
33
<title>test page</title>
44
</head>
55
<body>
6-
<can-import from="progressive/routes"/>
7-
<can-import from="progressive/appstate" as="viewModel" />
8-
<can-import from="progressive/main.css!"/>
6+
<can-import from="progressive/routes" />
7+
<can-import from="progressive/appstate" export-as="viewModel" />
8+
<can-import from="progressive/main.css" />
99

10-
{{#eq page "home"}}
10+
{{#eq(page, "home")}}
1111
<div id="home">You are {{page}}</div>
1212
{{/eq}}
1313

14-
{{#eq page "orders"}}
14+
{{#eq(page, "orders")}}
1515
<can-import from="progressive/orders/">
16-
{{#eq state "resolved"}}
16+
{{#eq(state, "resolved")}}
1717
<order-history></order-history>
1818
{{/eq}}
1919
</can-import>
2020
{{/eq}}
2121

22-
{{^eq statusCode 200}}
22+
{{^eq(statusCode, 200)}}
2323
<div>Error: {{statusMessage}}</div>
2424
{{/eq}}
2525

26-
{{#if param}} {{param}} {{/if}}
26+
{{#if(param)}} {{param}} {{/if}}
2727

28-
{{#if err}} {{throwError}} {{/if}}
28+
{{#if(err)}} {{throwError()}} {{/if}}
2929

30-
{{#if request}}
30+
{{#if(request)}}
3131
<div>Showing: {{request.url}}</div>
3232
{{/if}}
3333

34-
{{#if loader}}
34+
{{#if(loader)}}
3535
<div>Main: {{loader.main}}</div>
3636
{{/if}}
3737
</body>

‎test/tests/progressive/orders/orders.js‎

Lines changed: 30 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,43 @@
11
var Component = require("can-component");
2-
var List = require("can-list");
3-
var Map = require("can-map");
4-
var template = require("./orders.stache!");
5-
require("./orders.css!");
6-
require("can-map-define");
2+
var DefineMap = require("can-define/map/map");
3+
var view = require("./orders.stache!");
4+
require("./orders.css");
75

8-
var ViewModel = Map.extend({
9-
define: {
10-
orders: {
11-
Value: List,
12-
get: function(list){
13-
var id = "foo";
14-
15-
var promise = new Promise(function(resolve){
16-
resolve([ { a: "a", v: 2 }, { b: "b", v: 5 } ]);
17-
});
18-
19-
list.replace(promise);
20-
21-
return list;
22-
}
23-
},
24-
totals: {
25-
get: function(){
26-
var orders = this.attr("orders");
27-
var totals = 0;
28-
orders.each(function(order){
29-
totals += order.v;
30-
});
31-
return totals;
32-
}
33-
},
34-
showTotals: {
35-
value: false
6+
var ViewModel = DefineMap.extend({
7+
ordersPromise: {
8+
get: function(){
9+
return new Promise(function(resolve){
10+
resolve([ { a: "a", v: 2 }, { b: "b", v: 5 } ]);
11+
});
12+
}
13+
},
14+
orders: {
15+
get: function(last, resolve){
16+
this.ordersPromise.then(resolve);
17+
}
18+
},
19+
totals: {
20+
get: function(){
21+
var orders = this.orders;
22+
var totals = 0;
23+
orders.forEach(function(order){
24+
totals += order.v;
25+
});
26+
return totals;
3627
}
28+
},
29+
showTotals: {
30+
value: false
3731
}
3832
});
3933

4034
Component.extend({
4135
tag: "order-history",
42-
template: template,
43-
viewModel: ViewModel,
36+
view: view,
37+
ViewModel: ViewModel,
4438
events: {
4539
inserted: function(){
46-
this.viewModel.attr("showTotals", true);
40+
this.viewModel.showTotals = true;
4741
}
4842
}
4943
});

‎test/tests/progressive/orders/orders.stache‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<div id="orders">
2-
{{#each orders}}
3-
<div>order {{%index}}</div>
2+
{{#each(orders)}}
3+
<div>order {{scope.index}}</div>
44
{{/each}}
55
</div>
66

77
{{#if showTotals}}
8-
<div id='totals'>{{totals}}</div>
8+
<div id="totals">{{totals}}</div>
99
{{/if}}

0 commit comments

Comments
 (0)