diff --git a/lib/generate.js b/lib/generate.js index 63f429cb71..743b33a63b 100644 --- a/lib/generate.js +++ b/lib/generate.js @@ -3,7 +3,7 @@ var Handlebars = require('handlebars') var async = require('async') var render = require('consolidate').handlebars.render var path = require('path') -var match = require('minimatch') +var multimatch = require('multimatch') var getOptions = require('./options') var ask = require('./ask') var filter = require('./filter') @@ -91,12 +91,17 @@ function filterFiles (filters) { */ function renderTemplateFiles (skipInterpolation) { + skipInterpolation = typeof skipInterpolation === 'string' + ? [skipInterpolation] + : skipInterpolation + console.log(skipInterpolation) return function (files, metalsmith, done) { var keys = Object.keys(files) var metalsmithMetadata = metalsmith.metadata() + skipInterpolation async.each(keys, function (file, next) { // skipping files with skipInterpolation option - if (skipInterpolation && match(file, skipInterpolation, { dot: true })) { + if (skipInterpolation && multimatch([file], skipInterpolation, { dot: true }).length) { return next() } var str = files[file].contents.toString() diff --git a/package.json b/package.json index 1f0b4306f8..97813cfb28 100644 --- a/package.json +++ b/package.json @@ -39,6 +39,7 @@ "inquirer": "^0.12.0", "metalsmith": "^2.1.0", "minimatch": "^3.0.0", + "multimatch": "^2.1.0", "ora": "^0.2.1", "read-metadata": "^1.0.0", "request": "^2.67.0",