curben
/
hexo-yam
mirror of https://github.com/curbengh/hexo-yam
1
0
Fork 0
Code Issues Releases Wiki Activity

feat: disable basename globbing when pattern contains slash

This commit is contained in:
curbengh 2019-08-06 11:26:11 +09:30
parent 43a316d149
commit a6f59a9704
No known key found for this signature in database
GPG Key ID: 21EA847C35D6E034
1 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
lib/filter.js
View File

@ -26,6 +26,10 @@ function logicHtml (str, data) {
const exclude = options.exclude const exclude = options.exclude
const globOptions = options.globOptions const globOptions = options.globOptions
let excludeString = exclude
if (Array.isArray(exclude)) excludeString = exclude.join('')
if (excludeString.includes('/')) globOptions.basename = false
// Return if a path matches exclusion pattern // Return if a path matches exclusion pattern
if (isMatch(path, exclude, globOptions)) return str if (isMatch(path, exclude, globOptions)) return str
@ -47,6 +51,10 @@ function logicCss (str, data) {
const exclude = options.exclude const exclude = options.exclude
const globOptions = options.globOptions const globOptions = options.globOptions
let excludeString = exclude
if (exclude && Array.isArray(exclude)) excludeString = exclude.join('')
if (excludeString && excludeString.includes('/')) globOptions.basename = false
if (isMatch(path, exclude, globOptions)) return str if (isMatch(path, exclude, globOptions)) return str
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
@ -71,6 +79,10 @@ function logicJs (str, data) {
const exclude = options.exclude const exclude = options.exclude
const globOptions = options.globOptions const globOptions = options.globOptions
let excludeString = exclude
if (exclude && Array.isArray(exclude)) excludeString = exclude.join('')
if (excludeString && excludeString.includes('/')) globOptions.basename = false
if (isMatch(path, exclude, globOptions)) return str if (isMatch(path, exclude, globOptions)) return str
// Terser doesn't like unsupported options // Terser doesn't like unsupported options
@ -100,6 +112,10 @@ function logicSvg () {
let include = options.include let include = options.include
const globOptions = options.globOptions const globOptions = options.globOptions
let includeString = include
if (include && Array.isArray(include)) includeString = include.join('')
if (includeString && includeString.includes('/')) globOptions.basename = false
return Promise.all((micromatch(routeList, include, globOptions)).map(path => { return Promise.all((micromatch(routeList, include, globOptions)).map(path => {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
// Grab all assets using hexo router // Grab all assets using hexo router
@ -138,6 +154,10 @@ function logicGzip () {
let include = options.include let include = options.include
const globOptions = options.globOptions const globOptions = options.globOptions
let includeString = include
if (include && Array.isArray(include)) includeString = include.join('')
if (includeString && includeString.includes('/')) globOptions.basename = false
return Promise.all((micromatch(routeList, include, globOptions)).map(path => { return Promise.all((micromatch(routeList, include, globOptions)).map(path => {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
// Grab all assets using hexo router // Grab all assets using hexo router
@ -180,6 +200,10 @@ function logicBrotli () {
let include = options.include let include = options.include
const globOptions = options.globOptions const globOptions = options.globOptions
let includeString = include
if (include && Array.isArray(include)) includeString = include.join('')
if (includeString && includeString.includes('/')) globOptions.basename = false
return Promise.all((micromatch(routeList, include, globOptions)).map(path => { return Promise.all((micromatch(routeList, include, globOptions)).map(path => {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
// Grab all assets using hexo router // Grab all assets using hexo router