Merge pull request #66 from donejs/major

Merge to master for 3.0 release

Author: matthewp

package.json

@@ -1,6 +1,6 @@
 {
   "name": "done-ssr-middleware",
-  "version": "2.0.0",
+  "version": "3.0.0-pre.0",
   "description": "Express/Connect middleware for DoneJS applications",
   "main": "lib/index.js",
   "directories": {
@@ -31,15 +31,15 @@
   },
   "homepage": "https://github.com/donejs/done-ssr-middleware#readme",
   "dependencies": {
-    "done-ssr": "^2.0.0"
+    "done-ssr": "^3.0.0-pre.0"
   },
   "devDependencies": {
     "can-component": "^4.0.0",
     "can-define": "^2.0.0",
-    "can-fixture": "^2.0.0",
+    "can-fixture": "^3.0.0",
     "can-route": "^4.0.0",
-    "can-route-pushstate": "^4.0.0",
-    "done-autorender": "^2.0.0",
+    "can-route-pushstate": "^5.0.0",
+    "done-autorender": "^2.5.0",
     "done-css": "^3.0.0",
     "express": "^4.13.4",
     "jquery": "2.x - 3.x",

test/basics.js

@@ -14,6 +14,8 @@ describe("done-ssr middleware", function() {
 			.use('/', express.static(root))
 			.use('/', ssr({
 				config: path.join(root, 'package.json') + '!npm'
+			}, {
+				strategy: "seo"
 			}));
 
 		var server = app.listen(5500);

test/tests/package.json

@@ -3,12 +3,12 @@
   "version": "0.0.1",
   "main": "progressive/index.stache!done-autorender",
   "dependencies": {
-    "can-component": "^4.0.0-pre.0",
-    "can-fixture": "^2.0.0-pre.0",
-    "can-define": "^2.0.0-pre.20",
-    "can-route": "^4.0.0-pre.0",
-    "can-route-pushstate": "^4.0.0-pre.0",
-    "done-autorender": "^2.0.0-alpha.2",
+    "can-component": "^4.0.0",
+    "can-fixture": "^3.0.4",
+    "can-define": "^2.7.0",
+    "can-route": "^4.4.5",
+    "can-route-pushstate": "^5.0.0",
+    "done-autorender": "^2.4.3",
     "done-css": "^3.0.0"
   },
   "steal": {

test/tests/progressive/appstate.js

@@ -3,9 +3,10 @@ var DefineMap = require("can-define/map/map");
 
 module.exports = DefineMap.extend({
 	statusMessage: "string",
+	request: "any",
 	loader: {
 		serialize: false,
-		value: () => loader
+		default: () => loader
 	},
 	throwError: function() {
 		throw Error('Something went wrong');

test/tests/progressive/index.stache

@@ -28,7 +28,7 @@
 		{{#if(err)}} {{throwError()}} {{/if}}
 
 		{{#if(request)}}
-			<div>Showing: {{request.url}}</div>
+			<div>Showing: {{request[":path"]}}</div>
 		{{/if}}
 
 		{{#if(loader)}}