Skip to content

Commit c17f3eb

Browse files
committed
remote NODE_PATH=. in favor of links under node_modules
1 parent 5592232 commit c17f3eb

117 files changed

Lines changed: 607 additions & 540 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.gitignore

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
.settings
1818
.tmproj
1919
.nvmrc
20-
nbproject
2120
Thumbs.db
2221

2322
# NPM packages folder.
@@ -26,9 +25,12 @@ node_modules/
2625
# TMP folder (anything)
2726
tmp/
2827

28+
# contains v8 executable for linux-tick-processor (run from project root)
29+
out/*
30+
2931
# Generated content
3032
www/*
31-
app/stylesheets/sprite/*
33+
app/stylesheets/sprites/*
3234

3335
# Bower stuff.
3436
bower_components/

app.js

Lines changed: 0 additions & 45 deletions
This file was deleted.

app/stylesheets/base.styl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@require "sprite/*"
1+
@require "sprites/*"
22
@require "blocks/block_facebook/facebook"
33

44
@require "blocks/variables/variables"

app/stylesheets/sprite/.gitkeep

Whitespace-only changes.

app/stylesheets/sprite/facebook.styl

Lines changed: 0 additions & 4 deletions
This file was deleted.

app/stylesheets/sprite/home.styl

Lines changed: 0 additions & 4 deletions
This file was deleted.

bin/www

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
#!/usr/bin/env node
22
'use strict';
33

4-
const log = require('js-log')();;
4+
const log = require('js-log')();
55
const config = require('config');
6-
const mongoose = require('lib/mongoose');
6+
const mongoose = require('config/mongoose');
77
const app = require('app');
88

99
mongoose.waitConnect(function(err) {

config/base.js

Lines changed: 0 additions & 42 deletions
This file was deleted.

gulpfile.js

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
const gulp = require('gulp');
2+
const fs = require('fs');
23
const fse = require('fs-extra');
34
const spawn = require('child_process').spawn;
45
const gp = require('gulp-load-plugins')();
56
const debug = require('gulp-debug');
67
const path = require('path');
78
const source = require('vinyl-source-stream');
9+
const linkModules = require('./tasks/linkModules');
810
const watchify = require('watchify');
911
//const browserifyTask = require('tasks/browserify');
1012

@@ -64,8 +66,8 @@ gulp.task('clean-compiled-css', function() {
6466

6567

6668
gulp.task('import', function(callback) {
67-
const mongoose = require('lib/mongoose');
68-
const taskImport = require('./tasks/import');
69+
const mongoose = require('config/mongoose');
70+
const taskImport = require('tutorial/tasks/import');
6971

7072
taskImport({
7173
root: path.join(path.dirname(__dirname), 'javascript-tutorial'),
@@ -77,20 +79,11 @@ gulp.task('import', function(callback) {
7779
});
7880
});
7981

80-
/*
81-
gulp.task('flo', function() {
82-
var node = spawn('node', ['flo.js'], { stdio: 'inherit' });
83-
node.on('close', function(code) {
84-
if (code === 8) {
85-
gulp.log('Error detected, turning off fb-flo...');
86-
}
87-
});
88-
});
89-
*/
82+
gulp.task('link-modules', linkModules(['modules/*', 'hmvc/*']));
9083

9184
gulp.task('sprite', gp.stylusSprite({
9285
spritesSearchFsRoot: 'app',
9386
spritesWebRoot: '/img',
9487
spritesFsDir: 'www/img',
95-
styleFsDir: 'app/stylesheets/sprite'
88+
styleFsDir: 'app/stylesheets/sprites'
9689
}));
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,5 +53,5 @@ schema.path('email').validate(function(value) {
5353
// all references using mongoose.model for safe recreation
5454
// when I recreate model (for tests) => I can reload it from mongoose.model (single source of truth)
5555
// exports are less convenient to update
56-
mongoose.model('User', schema);
56+
module.exports = mongoose.model('User', schema);
5757

0 commit comments

Comments
 (0)