feat(standalonify) add base opt to set seajs's base for standalonify, Fix #26

Author: sorrycc

lib/express.js

@@ -3,6 +3,7 @@
 var path = require('path');
 var mime = require('mime');
 var debug = require('debug')('serve-spm:express');
+var urlparse = require('url').parse;
 
 var parse = require('./parse');
 var util = require('./util');
@@ -14,14 +15,18 @@ module.exports = function(root, opts) {
   var ignore = Array.isArray(opts.ignore) ? opts.ignore : [];
 
   return function(req, res, next) {
-    next = req.headers['servespmexit'] ? notFound : (next || notFound);
-
     if (Array.isArray(opts.paths)) {
       opts.paths.forEach(function(p) {
         req.url = req.url.replace(p[0], p[1]);
       });
     }
 
+    if (opts.base) {
+      var basepath = urlparse(opts.base).pathname;
+      basepath = basepath.replace(/\/$/, '');
+      req.url = req.url.replace(basepath, '');
+    }
+
     debug('parse url %s', req.url);
     var pkg = util.getPackage(root);
     var rootPkg = pkg;
@@ -64,7 +69,8 @@ module.exports = function(root, opts) {
 
     var opt = {
       pkg: pkg,
-      ignore: ignore
+      ignore: ignore,
+      base: opts.base
     };
     debug('return transported file %s', file.path);
     transport(file, opt, function(err, file) {

lib/koa.js

@@ -23,6 +23,12 @@ module.exports = function(root, opts) {
       }.bind(this));
     }
 
+    if (opts.base) {
+      var basepath = urlparse(opts.base).pathname;
+      basepath = basepath.replace(/\/$/, '');
+      this.url = this.url.replace(basepath, '');
+    }
+
     debug('parse url %s', this.url);
     var pkg = util.getPackage(root);
     var rootPkg = pkg;
@@ -84,7 +90,8 @@ module.exports = function(root, opts) {
       debug('return transported file %s', file.path);
       file = yield transportThunk(file, {
         pkg: pkg,
-        ignore: ignore
+        ignore: ignore,
+        base: opts.base
       });
       data = file.contents;
       ext = path.extname(file.path);

lib/parser/standalonify.js

@@ -4,17 +4,18 @@ var join = require('path').join;
 var fs = require('fs');
 var through = require('through2');
 
-module.exports = function(url) {
+module.exports = function(opts) {
   return through.obj(function(file) {
-    this.push(parser(file, url));
+    this.push(parser(file, opts));
   });
 };
 
-function parser(file, url) {
+function parser(file, opts) {
   var code = String(file.contents);
   var sea = fs.readFileSync(join(__dirname, '../../sea.js'), 'utf-8');
-  var seaconfig = '\n/* Config Base */\nseajs.config({base:\'/\'});\n\n';
-  var init = '\n\n/*! Init */\ng_spm_init(\''+url+'\');\n';
+  var base = opts.base || '/';
+  var seaconfig = '\n/* Config Base */\nseajs.config({base:\''+base+'\'});\n\n';
+  var init = '\n\n/*! Init */\ng_spm_init(\''+opts.url+'\');\n';
 
   // code = sea + seaconfig + code + init;
   code = sea + seaconfig + code + init;

lib/transport.js

@@ -34,7 +34,7 @@ module.exports = function transport(file, opt, cb) {
     gulpif(/\.tpl$/, tplParser()),
     gulpif(/\.json$/, jsonParser()),
     gulpif(/\.handlebars$/, handlebarsParser({pkg: pkg})),
-    gulpif(useStandalone, standalonify(file.url.pathname))
+    gulpif(useStandalone, standalonify({url:file.url.pathname,base:opt.base}))
   ).once('data', function(file) {
     cb(null, file);
   });

test/index.js

@@ -365,6 +365,34 @@ function wrap(server, middleware) {
     });
   });
 
+  describe('standalone with base', function() {
+
+    before(function() {
+      app = server();
+      app.use(middleware(join(fixtures, 'standalone'), {
+        base: 'http://a.com/b/c'
+      }));
+    });
+
+    it('with standalone', function(done) {
+      request(app.listen())
+        .get('/index.js')
+        .expect(/seajs\.config\(\{base:'http:\/\/a\.com\/b\/c'\}\);/)
+        .expect(/\ndefine\(\'index\', function\(require, exports, module\)\{\nmodule.exports = function\(\) \{\n  require\(\".\/noentry\.js\"\);\n  console.log\(\'standalone\'\);\n\};\n\n\}\);\n/)
+        .expect(/\/\*\! Init \*\/\ng_spm_init\(\'\/index.js\'\);\n$/)
+        .expect(200, done);
+    });
+
+    it('with standalone and base path', function(done) {
+      request(app.listen())
+        .get('/b/c/index.js')
+        .expect(/seajs\.config\(\{base:'http:\/\/a\.com\/b\/c'\}\);/)
+        .expect(/\ndefine\(\'index\', function\(require, exports, module\)\{\nmodule.exports = function\(\) \{\n  require\(\".\/noentry\.js\"\);\n  console.log\(\'standalone\'\);\n\};\n\n\}\);\n/)
+        .expect(/\/\*\! Init \*\/\ng_spm_init\(\'\/index.js\'\);\n$/)
+        .expect(200, done);
+    });
+  });
+
   it('isModified disable', function(done) {
     app = server();
     app.use(middleware(join(fixtures, 'parser')));

test/standalonify.js

@@ -10,7 +10,25 @@ describe('standalonify', function() {
     var sea = fs.readFileSync(join(__dirname, '../sea.js'), 'utf-8');
     var expected = sea + '\n/* Config Base */\nseajs.config({base:\'/\'});\n\nalert(1);\n\n/*! Init */\ng_spm_init(\'/a\');\n';
 
-    var stream = standalonifyParser('/a');
+    var stream = standalonifyParser({url:'/a'});
+    stream.on('data', function(newFile) {
+      String(newFile.contents).should.be.equal(expected);
+      done();
+    });
+    stream.write({
+      url: {pathname: ''},
+      contents: new Buffer(origin)
+    });
+    stream.end();
+  });
+
+  it('base', function(done) {
+
+    var origin = 'alert(1);';
+    var sea = fs.readFileSync(join(__dirname, '../sea.js'), 'utf-8');
+    var expected = sea + '\n/* Config Base */\nseajs.config({base:\'http://a.com/b/c/\'});\n\nalert(1);\n\n/*! Init */\ng_spm_init(\'/a\');\n';
+
+    var stream = standalonifyParser({url:'/a',base:'http://a.com/b/c/'});
     stream.on('data', function(newFile) {
       String(newFile.contents).should.be.equal(expected);
       done();