Release 0.7.3

.gitmodules

@@ -1,12 +1,12 @@
-[submodule "support/oo"]
-	path = support/oo
+[submodule "lib/support/oo"]
+	path = lib/support/oo
 	url = git://github.com/visionmedia/js-oo.git
-[submodule "support/ext"]
-	path = support/ext
+[submodule "lib/support/ext"]
+	path = lib/support/ext
 	url = git://github.com/visionmedia/ext.js.git
-[submodule "support/sass"]
-	path = support/sass
+[submodule "lib/support/sass"]
+	path = lib/support/sass
 	url = git://github.com/visionmedia/sass.js.git
-[submodule "support/haml"]
-	path = support/haml
+[submodule "lib/support/haml"]
+	path = lib/support/haml
 	url = git://github.com/creationix/haml-js.git

History.md

@@ -1,4 +1,15 @@
 
+0.7.3 / 2010-03-16
+==================
+
+  * Added package.json
+  * Fixed requiring of haml / sass due to kiwi removal
+
+0.7.2 / 2010-03-16
+==================
+
+  * Fixed GIT submodules (HAH!)
+
 0.7.1 / 2010-03-16
 ==================
 

Readme.md

@@ -33,7 +33,7 @@ or
 
   Install via git clone:
   
-      $ git://github.com/visionmedia/express.git && cd express && git submodule update
+      $ git://github.com/visionmedia/express.git && cd express && git submodule update --init
 
 ## Performance
 

examples/chat/app.js

@@ -4,12 +4,9 @@ require('express')
 require('express/plugins')
 
 var messages = [],
-    utils = require('express/utils'),
-    kiwi = require('kiwi')
-
+    utils = require('express/utils')
+    
 configure(function(){
-  kiwi.seed('haml')
-  kiwi.seed('sass')
   use(MethodOverride)
   use(ContentLength)
   use(Cookie)

examples/upload/app.js

@@ -3,11 +3,7 @@ require.paths.unshift('lib')
 require('express')
 require('express/plugins')
 
-var kiwi = require('kiwi')
-
 configure(function(){
-  kiwi.seed('haml')
-  kiwi.seed('sass')
   use(MethodOverride)
   use(ContentLength)
   use(Cookie)

lib/express.js

@@ -1,7 +1,7 @@
 
 require.paths.unshift(__dirname + '/support/ext/lib')
+require.paths.unshift(__dirname + '/support/haml/lib')
+require.paths.unshift(__dirname + '/support/sass/lib')
 require('ext')
 require('support/oo/lib/oo')
-require('support/haml/lib/haml')
-require('support/sass/lib/sass')
 require('express/core')

lib/express/core.js

@@ -314,7 +314,7 @@ Server = Class({
 // --- Express
 
 Express = { 
-  version: '0.7.1',
+  version: '0.7.3',
   config: [],
   routes: [],
   plugins: [],

package.json

@@ -0,0 +1,14 @@
+{
+  "name": "Express",
+  "description": "Sinatra inspired web development framework",
+  "version": "0.7.3",
+  "keywords": ["framework", "sinatra", "web", "rest", "restful"],
+  "directories": {
+    "lib": "lib"
+  },
+  "scripts": {
+    "install": "git submodule update --init",
+    "test": "make test"
+  },
+  "engines": { "node": ">= 0.1.30" }
+}

seed.yml

@@ -1,4 +1,4 @@
 ---
   name: Express
   description: Sinatra inspired web development framework
-  version: 0.7.1
+  version: 0.7.3