load .server._ templates only on the server

developmentseed · Sep 19, 2011 · f8bcc10 · f8bcc10
1 parent 88bb2e8
commit f8bcc10
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/server/plugin.js b/server/plugin.js
@@ -53,7 +53,7 @@ require.extensions['._'] = function(module, filename) {
     }
 
     module.exports.register = function(app) {
-        if (app.assets) {
+        if (app.assets && !(/\.server\._$/.test(filename))) {
             app.assets.templates.push({
                 filename: filename,
                 content: 'template = ' + module.exports + ';'

diff --git a/test/assets.test.js b/test/assets.test.js
@@ -109,3 +109,21 @@ exports['/assets/bones/views.js'] = function() {
                   res.body.indexOf('// ---- start test/fixture/views/App.bones ----'));
     });
 };
+
+exports['/assets/bones/templates.js'] = function() {
+    assert.response(server, {
+        url: '/assets/bones/templates.js',
+        method: 'GET'
+    }, { status: 200 }, function(res) {
+        assert.ok(res.body.indexOf(require('bones/test/fixture/templates/Error._').toString()) >= 0);
+        assert.ok(res.body.indexOf(require('bones/test/fixture/node_modules/othermodule/templates/Other._').toString()) >= 0);
+
+        // Doesn't include server files.
+        assert.ok(res.body.indexOf(require('bones/test/fixture/templates/ServerSide.server._').toString()) < 0);
+
+        // Correct order.
+        assert.ok(res.body.indexOf('// ---- start test/fixture/templates/Error._ ----') >= 0);
+        assert.ok(res.body.indexOf('// ---- start test/fixture/templates/Error._ ----') >
+                  res.body.indexOf('// ---- start test/fixture/node_modules/othermodule/templates/Other._ ----'));
+    });
+};