From fd474580ce7edee986092a2e59fe82596c7592e7 Mon Sep 17 00:00:00 2001 From: curbengh <43627182+curbengh@users.noreply.github.com> Date: Tue, 24 Sep 2019 23:55:07 +0100 Subject: [PATCH] refactor: destructure object --- lib/filter.js | 36 +++++++++++++++--------------------- 1 file changed, 15 insertions(+), 21 deletions(-) diff --git a/lib/filter.js b/lib/filter.js index fc1530a..d0a1c89 100644 --- a/lib/filter.js +++ b/lib/filter.js @@ -28,9 +28,8 @@ function minifyHtml (str, data) { // Return if disabled. if (options.enable === false) return - const path = data.path - const exclude = options.exclude - const globOptions = options.globOptions + const { path } = data + const { exclude, globOptions } = options let excludeString = exclude || '' if (Array.isArray(exclude)) excludeString = exclude.join('') @@ -50,9 +49,8 @@ function minifyCss (str, data) { const options = hexo.config.minify.css if (options.enable === false) return - const path = data.path - const exclude = options.exclude - const globOptions = options.globOptions + const { path } = data + const { exclude, globOptions } = options let excludeString = exclude || '' if (exclude && Array.isArray(exclude)) excludeString = exclude.join('') @@ -74,9 +72,8 @@ function minifyJs (str, data) { const options = hexo.config.minify.js if (options.enable === false) return - const path = data.path - const exclude = options.exclude - const globOptions = options.globOptions + const { path } = data + const { exclude, globOptions } = options let excludeString = exclude || '' if (exclude && Array.isArray(exclude)) excludeString = exclude.join('') @@ -103,16 +100,15 @@ function minifySvg () { // Return if disabled. if (options.enable === false) return - const route = hexo.route + const { route } = hexo const routeList = route.list() - const include = options.include - const globOptions = options.globOptions + const { globOptions, include } = options 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) => { // Grab all assets using hexo router const assetPath = route.get(path) @@ -142,16 +138,15 @@ function gzipFn () { // Return if disabled. if (options.enable === false) return - const route = hexo.route + const { route } = hexo const routeList = route.list() - const include = options.include - const globOptions = options.globOptions + const { globOptions, include } = options 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) => { // Grab all assets using hexo router const assetPath = route.get(path) @@ -185,16 +180,15 @@ function brotliFn () { // Return if disabled. if (options.enable === false) return - const route = hexo.route + const { route } = hexo const routeList = route.list() - const include = options.include - const globOptions = options.globOptions + const { globOptions, include } = options 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) => { // Grab all assets using hexo router const assetPath = route.get(path)