Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,9 @@ module.exports = function(grunt) {
common: {
src: ['common/**/*.js']
},
server: {
src: ['server/**/*.js']
}
// TODO tests don't pass yet
// test: {
// src: ['test/**/*.js']
Expand All @@ -44,7 +47,8 @@ module.exports = function(grunt) {
jscs: {
gruntfile: 'Gruntfile.js',
lib: ['lib/**/*.js'],
common: ['common/**/*.js']
common: ['common/**/*.js'],
server: ['server/**/*.js']
// TODO(bajtos) - test/**/*.js
},
watch: {
Expand Down
7 changes: 5 additions & 2 deletions lib/loopback.js
Original file line number Diff line number Diff line change
Expand Up @@ -120,13 +120,16 @@ if (loopback.isServer) {

if (loopback.isServer) {
fs
.readdirSync(path.join(__dirname, 'middleware'))
.readdirSync(path.join(__dirname, '..', 'server', 'middleware'))
.filter(function(file) {
return file.match(/\.js$/);
})
.forEach(function(m) {
loopback[m.replace(/\.js$/, '')] = require('./middleware/' + m);
loopback[m.replace(/\.js$/, '')] = require('../server/middleware/' + m);
});

loopback.urlNotFound = loopback['url-not-found'];
delete loopback['url-not-found'];
}

/*
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
var loopback = require('../loopback');
var loopback = require('../../lib/loopback');
var juggler = require('loopback-datasource-juggler');
var remoting = require('strong-remoting');
var cls = require('continuation-local-storage');
Expand Down
2 changes: 1 addition & 1 deletion lib/middleware/rest.js → server/middleware/rest.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* Module dependencies.
*/

var loopback = require('../loopback');
var loopback = require('../../lib/loopback');
var async = require('async');

/*!
Expand Down
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion lib/middleware/token.js → server/middleware/token.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* Module dependencies.
*/

var loopback = require('../loopback');
var loopback = require('../../lib/loopback');
var assert = require('assert');

/*!
Expand Down
File renamed without changes.