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
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
.DS_Store
node_modules
test/results
npm-debug.log
npm-debug.log
package-lock.json
4 changes: 3 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
language: node_js
node_js:
- 0.10
- 6
- 8
- 10

script:
- npm test
20 changes: 11 additions & 9 deletions index.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,10 @@ var fs = require('fs'),
Vinyl = require('vinyl'),
Log = require('fancy-log'),
AnsiColors = require('ansi-colors'),
_ = require('lodash'),
merge = require('lodash.merge'),
Stream = require('stream'),
DAG = require('dag');
DAG = require('dag'),
cloneRegexp = require('clone-regexp');

var PLUGIN_NAME = 'gulp-resolve-dependencies';

Expand All @@ -25,24 +26,25 @@ function resolveDependencies(config) {
fileCache = [],
filesReturned = [],
getFiles = function(targetFile) {
var pattern = _.clone(config, true).pattern,
var pattern = cloneRegexp(config.pattern, {
lastIndex: 0
}),
files = [],
content,
match,
relFilePath,
filePath,
file,
dependencies;

// Skip if already added to dependencies
if (_.indexOf(fileCache, targetFile.path) !== -1) {
if (fileCache.includes(targetFile.path)) {
return false;
} else {
fileCache.push(targetFile.path);
}

content = targetFile.contents.toString('utf8');

while (match = pattern.exec(content)) {
filePath = config.resolvePath(match[1], targetFile);

Expand Down Expand Up @@ -86,7 +88,7 @@ function resolveDependencies(config) {
};

// Set default values
config = _.merge(defaults, config);
config = merge(defaults, config);

// Happy streaming
stream = Stream.Transform({
Expand All @@ -109,9 +111,9 @@ function resolveDependencies(config) {
}

// Add dependencies and file itself to stream
files.forEach(_.bind(function(file) {
files.forEach(function(file) {
this.push(file);
}, this));
}.bind(this));

if (config.log) {
filesReturned = filesReturned.concat(files.map(function(file) {
Expand Down
19 changes: 10 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "gulp-resolve-dependencies",
"version": "2.2.0",
"version": "3.0.0",
"description": "Resolve dependency directives in assets (e.g. \"@requires\" or \"//= require\" in JavaScript)",
"license": "MIT",
"repository": "backflip/gulp-resolve-dependencies",
Expand All @@ -26,18 +26,19 @@
"sprockets"
],
"dependencies": {
"ansi-colors": "^2.0.2",
"dag": "0.0.1",
"ansi-colors": "^3.2.3",
"clone-regexp": "^2.1.0",
"dag": "^0.0.1",
"fancy-log": "^1.3.0",
"lodash": "^3.1.0",
"lodash.merge": "^4.6.1",
"vinyl": "^2.2.0"
},
"devDependencies": {
"event-stream": "^3.2.2",
"gulp": "^3.8.10",
"event-stream": "3.3.4",
"gulp": "^4.0.0",
"gulp-concat": "^2.4.3",
"gulp-file": "^0.3.0",
"gulp-tap": "^0.1.3",
"mocha": "^2.1.0"
"gulp-file": "^0.4.0",
"gulp-tap": "^1.0.1",
"mocha": "^5.2.0"
}
}
2 changes: 1 addition & 1 deletion test/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ describe('gulp-resolve-dependencies', function() {
file.stat.mtime
);
}))
.on('end', function() {
.on('finish', function() {
done();
});
});
Expand Down