Skip to content

Commit 401d73a

Browse files
authored
Merge pull request #33 from Bajix/can3
Upgrade deps & fix appState test
2 parents ede6eb6 + c95fe70 commit 401d73a

File tree

2 files changed

+31
-26
lines changed

2 files changed

+31
-26
lines changed

package.json

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -23,17 +23,17 @@
2323
"url": "https://github.com/donejs/autorender/issues"
2424
},
2525
"devDependencies": {
26-
"can-component": "^3.0.0-pre.7",
27-
"can-list": "^3.0.0-pre.3",
28-
"can-map": "^3.0.0-pre.3",
29-
"can-map-define": "^3.0.0-pre.2",
30-
"can-route": "^3.0.0-pre.4",
31-
"funcunit": "^3.0.0",
32-
"lodash.template": "^3.6.2",
33-
"steal": "^0.16.0",
34-
"steal-qunit": "0.0.4",
35-
"steal-tools": "^0.16.0",
36-
"testee": "^0.2.0"
26+
"can-component": "^3.0.3",
27+
"can-list": "^3.0.1",
28+
"can-map": "^3.0.3",
29+
"can-map-define": "^3.0.1",
30+
"can-route": "^3.0.5",
31+
"funcunit": "^3.1.0",
32+
"lodash.template": "^4.4.0",
33+
"steal": "^0.16.43",
34+
"steal-qunit": "0.1.4",
35+
"steal-tools": "^0.16.8",
36+
"testee": "^0.3.0"
3737
},
3838
"homepage": "https://github.com/donejs/autorender",
3939
"system": {
@@ -43,12 +43,12 @@
4343
}
4444
},
4545
"dependencies": {
46-
"can-route": "^3.0.0-pre.4",
47-
"can-stache": "^3.0.0-pre.5",
48-
"can-util": "^3.0.0-pre.21",
49-
"can-view-import": "^3.0.0-pre.2",
50-
"can-view-model": "^3.0.0-pre.2",
51-
"can-zone": "^0.5.0",
52-
"steal-stache": "^3.0.0-pre.1"
46+
"can-route": "^3.0.5",
47+
"can-stache": "^3.0.13",
48+
"can-util": "^3.0.13",
49+
"can-view-import": "^3.0.3",
50+
"can-view-model": "^3.1.2",
51+
"can-zone": "^0.6.0",
52+
"steal-stache": "^3.0.3"
5353
}
5454
}

test/basics/test.html

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,23 @@
88
window.QUnit = window.parent.QUnit;
99
window.removeMyself = window.parent.removeMyself;
1010
</script>
11-
<script src="../../node_modules/steal/steal.js" main="test/basics/index.stache!done-autorender">
11+
<script src="../../node_modules/steal/steal.js">
1212
var AppViewModel = require("test/basics/state");
1313
var canViewModel = require("can-view-model");
14+
var Zone = require("can-zone");
1415

15-
var vm = canViewModel(document.documentElement);
16+
new Zone().run(function() {
17+
return System.import('test/basics/index.stache!done-autorender');
18+
}).then(function() {
19+
var vm = canViewModel(document.documentElement);
1620

17-
if(window.QUnit) {
18-
QUnit.ok(vm instanceof AppViewModel, "got the appstate");
19-
removeMyself();
20-
} else {
21-
console.log("Got viewModel", vm);
22-
}
21+
if(window.QUnit) {
22+
QUnit.ok(vm instanceof AppViewModel, "got the appstate");
23+
removeMyself();
24+
} else {
25+
console.log("Got viewModel", vm);
26+
}
27+
});
2328
</script>
2429
</body>
2530
</html>

0 commit comments

Comments
 (0)