Navigation Menu

Skip to content

Commit

Permalink
Make the server example work without a global install
Browse files Browse the repository at this point in the history
  • Loading branch information
marcuswestin committed Jun 20, 2011
1 parent c471e94 commit 9d9faf6
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion example/client.js
@@ -1,4 +1,4 @@
var dependency = require('./shared/dependency')

var el = document.body.appendChild(document.createElement('div'))
el.innerHTML = 'shared dependency:' + dependency
el.innerHTML = 'shared dependency:' + JSON.stringify(dependency)
2 changes: 1 addition & 1 deletion example/server.js
@@ -1,7 +1,7 @@
var http = require('http'),
fs = require('fs'),
dependency = require('./shared/dependency'),
requireServer = require('require/server')
requireServer = require('../server') // this would be require('require/server') in most applications

var base = __dirname + '/',
root = 'require'
Expand Down
4 changes: 2 additions & 2 deletions server.js
Expand Up @@ -79,7 +79,7 @@ function _handleMainModuleRequest(reqPath, res) {
try { var deps = util.getDependencyList(modulePath) }
catch(err) { return _sendError(res, err) }

res.setHeader('Content-Type', 'text/javascript')
res.writeHead(200, { 'Content-Type':'text/javascript' })
res.write('var require = {}\n')
each(deps, function(dependency) {
res.write('document.write(\'<script src="'+ _getBase() + '/' + dependency +'"></script>\')\n')
Expand All @@ -103,7 +103,7 @@ function _handleModuleRequest(reqPath, res) {
code = code.replace(requireStmnt, 'require["'+depPath+'"]')
})

res.setHeader('Content-Type', 'text/javascript')
res.writeHead(200, { 'Content-Type':'text/javascript' })
res.write(_closureStart + _moduleDef)
res.write(code)
res.write('\nrequire["'+reqPath+'"]=module.exports')
Expand Down

0 comments on commit 9d9faf6

Please sign in to comment.