Merge pull request #36 from donejs/feature/upgrade-steal

Feature/upgrade steal
donejs · Dec 16, 2016 · 4d44e06 · 4d44e06
2 parents 401d73a + 4e6de00
commit 4d44e06
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 16 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,8 @@
 language: node_js
 node_js: 5.8
 script: npm test
+addons:
+  firefox: "48.0"
 before_install:
   - "export DISPLAY=:99.0"
   - "sh -e /etc/init.d/xvfb start"
diff --git a/package.json b/package.json
@@ -26,29 +26,29 @@
     "can-component": "^3.0.3",
     "can-list": "^3.0.1",
     "can-map": "^3.0.3",
-    "can-map-define": "^3.0.1",
+    "can-map-define": "^3.0.2",
     "can-route": "^3.0.5",
     "funcunit": "^3.1.0",
     "lodash.template": "^4.4.0",
-    "steal": "^0.16.43",
-    "steal-qunit": "0.1.4",
-    "steal-tools": "^0.16.8",
+    "steal": "^1.0.3",
+    "steal-qunit": "1.0.0",
+    "steal-tools": "^1.0.1",
     "testee": "^0.3.0"
   },
   "homepage": "https://github.com/donejs/autorender",
-  "system": {
+  "steal": {
     "npmAlgorithm": "flat",
     "directories": {
       "lib": "src"
     }
   },
   "dependencies": {
     "can-route": "^3.0.5",
-    "can-stache": "^3.0.13",
-    "can-util": "^3.0.13",
+    "can-stache": "^3.0.15",
+    "can-util": "^3.1.0",
     "can-view-import": "^3.0.3",
     "can-view-model": "^3.1.2",
     "can-zone": "^0.6.0",
-    "steal-stache": "^3.0.3"
+    "steal-stache": "^3.0.4"
   }
 }
diff --git a/src/template.js b/src/template.js
diff --git a/src/template.txt b/src/template.txt
@@ -50,11 +50,10 @@ define(<%= imports %>, function(<%= args %>){
 				plugins: [xhrZone, systemImportZone]
 			}).run(function(){
 				var state = autorender.state = new autorender.viewModel;
-
 				var docEl = document.documentElement;
 				domData.set.call(docEl, "viewModel", state);
 
-				route.map(state);
+				route.data = state;
 				route.ready();
 
 				autorender.rerender();

diff --git a/test/autorender_test.js b/test/autorender_test.js
@@ -1,7 +1,7 @@
 var QUnit = require("steal-qunit");
 var F = require("funcunit");
 
-require("./unit");
+//require("./unit");
 
 F.attach(QUnit);
 

diff --git a/test/basics/test.html b/test/basics/test.html
@@ -5,6 +5,8 @@
 </head>
 <body>
 	<script>
+		window.Testee = {};
+
 		window.QUnit = window.parent.QUnit;
 		window.removeMyself = window.parent.removeMyself;
 	</script>
@@ -13,9 +15,15 @@
 		var canViewModel = require("can-view-model");
 		var Zone = require("can-zone");
 
-		new Zone().run(function() {
-			return System.import('test/basics/index.stache!done-autorender');
-		}).then(function() {
+		System.import('test/basics/index.stache!done-autorender')
+		.then(function(){
+			return new Promise(function(resolve, reject){
+				setTimeout(function(){
+					resolve();
+				}, 500);
+			});
+		})
+		.then(function() {
 			var vm = canViewModel(document.documentElement);
 
 			if(window.QUnit) {

diff --git a/test/build.js b/test/build.js
@@ -3,7 +3,7 @@ var stealTools = require("steal-tools");
 stealTools.build({
 	config: __dirname + "/../package.json!npm",
 	main: "test/basics/index.stache!done-autorender",
-	bundlesPath: "test/basics/dist/bundles"
 }, {
+	dest: "test/basics/dist",
 	quiet: true
 });