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
11 changes: 7 additions & 4 deletions index.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,14 @@ var fs = require('fs'),
path = require('path'),
gutil = require('gulp-util'),
_ = require('lodash'),
Stream = require('stream');
Stream = require('stream'),
DAG = require('dag');

var PLUGIN_NAME = 'gulp-resolve-dependencies';

function resolveDependencies(config) {
var stream,
dag = new DAG(),
fileCache = [],
filesReturned = [],
getFiles = function(targetFile) {
Expand All @@ -34,9 +36,10 @@ function resolveDependencies(config) {
while (match = pattern.exec(content)) {
filePath = path.join(path.dirname(targetFile.path), match[1]);

// Skip if already added to dependencies
if (_.indexOf(fileCache, filePath) !== -1) {
continue;
try {
dag.addEdge(targetFile.path, filePath);
} catch (ex) {
stream.emit('error', new Error('circular file 1: ' + targetFile.path + ' file 2: ' + filePath));
}

// Check existence
Expand Down
11 changes: 7 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "gulp-resolve-dependencies",
"version": "1.0.3",
"version": "1.1.0",
"description": "Resolve dependency directives in assets (e.g. \"@requires\" or \"//= require\" in JavaScript)",
"license": "MIT",
"repository": "backflip/gulp-resolve-dependencies",
Expand All @@ -9,7 +9,8 @@
"node": ">=0.10.0"
},
"scripts": {
"test": "mocha"
"pretest": "npm i",
"test": "./node_modules/mocha/bin/mocha"
},
"main": "./index.js",
"keywords": [
Expand All @@ -25,12 +26,14 @@
"sprockets"
],
"dependencies": {
"dag": "0.0.1",
"gulp-util": "~3.0.1",
"lodash": "~2.4.1"
},
"devDependencies": {
"mocha": "~2.0.1",
"event-stream": "~3.1.7",
"gulp": "~3.8.10"
"gulp": "~3.8.10",
"gulp-concat": "^2.4.3",
"mocha": "~2.0.1"
}
}
5 changes: 5 additions & 0 deletions test/circular/a.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
/**
* @requires ../circular/b.js
* @requires ../circular/c.js
*/
module.exports = 'A';
4 changes: 4 additions & 0 deletions test/circular/b.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
/**
* @requires ../circular/c.js
*/
module.exports = 'B';
4 changes: 4 additions & 0 deletions test/circular/c.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
/**
* @requires ../circular/b.js
*/
module.exports = 'C';
8 changes: 8 additions & 0 deletions test/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,12 @@ describe('gulp-resolve-dependencies', function() {
done();
}));
});

it('should throw error if hit circular dependency', function(done) {
gulp.src(__dirname + '/circular/a.js')
.pipe(resolveDependencies())
.on('error', function () {
done();
});
});
});