Skip to content

improve node.name parsing, fix silent errors #28

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
hhsnopek wants to merge 2 commits into
base: master
Choose a base branch
from
Open

improve node.name parsing, fix silent errors #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c492c03
improve node.name parsing, fix silent errors
hhsnopek Nov 29, 2017
e2a801a
use a Promise to resolve minifyCss
hhsnopek Nov 30, 2017
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
48 changes: 29 additions & 19 deletions lib/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,29 +2,39 @@ const util = require('reshape-plugin-util')
const path = require('path')
const modules = require('indx')(path.join(__dirname, 'modules'))

module.exports = function reshapeMinify (opts = {}) {
opts = Object.assign({
collapseWhitespace: true,
conservativeCollapse: false,
aggressiveCollapse: false,
removeComments: true,
minifyCss: true,
minifyJs: true,
minifyJson: true,
minifySvg: true
}, opts)

module.exports = function reshapeMinify ({
collapseWhitespace = true,
conservativeCollapse = false,
aggressiveCollapse = false,
removeComments = true,
minifyCss = true,
minifyJs = true,
minifyJson = true,
minifySvg = true
} = {}) {
return function minifyPlugin (tree, ctx) {
return util.modifyNodes(tree, () => true, (node) => {
node = modules.collapseWhitespace(node, opts)
return util.modifyNodes(tree, () => true, node => {
node = modules.collapseWhitespace(node, { conservativeCollapse, aggressiveCollapse })
node = modules.booleanAttributes(node)
node = modules.emptyAttrs(node)
node = modules.redundantAttrs(node)
if (opts.minifyCss) node = modules.minifyCss(node)
if (opts.minifyJs) node = modules.minifyJs(node)
if (opts.minifyJson) node = modules.minifyJson(node)
if (opts.minifySvg) node = modules.minifySvg(node, ctx)
if (opts.removeComments) node = modules.removeComments(node)

if (removeComments) node = modules.removeComments(node)
switch (node.name) {
case 'style':
if (minifyCss) node = modules.minifyCss(node)
break
case 'script':
if (minifyJs) node = modules.minifyJs(node)
if (minifyJson) node = modules.minifyJson(node)
break
case 'svg':
if (minifySvg) node = modules.minifySvg(node, ctx)
break
default:
break
}

return node
})
}
Expand Down
19 changes: 12 additions & 7 deletions lib/modules/minifyCss.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,14 @@
const cssnano = require('cssnano')

module.exports = (node) => {
if (node.name !== 'style') return node
if (!node.content || !node.content.length) return node
return cssnano
.process(node.content[0].content)
.then((res) => { node.content[0].content = res.css; return node })
}
module.exports = node =>
new Promise((resolve, reject) => {
if (!node.content || !node.content.length) resolve(node)

cssnano
.process(node.content[0].content)
.then(({ css }) => {
node.content[0].content = css
resolve(node)
})
.catch(reject)
})
1 change: 0 additions & 1 deletion lib/modules/minifyJs.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ const uglify = require('uglify-js')

module.exports = (node) => {
// get rid of anything that's not a script
if (node.name !== 'script') return node
if (!node.content || !node.content.length) return node
if (node.attrs && node.attrs.type && !node.attrs.type[0].content.match(/.*\/javascript/)) {
return node
Expand Down
1 change: 0 additions & 1 deletion lib/modules/minifyJson.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
module.exports = (node) => {
if (node.name !== 'script') return node
if (!node.attrs) return node
if (!node.attrs.type) return node
if (!node.attrs.type[0].content.match(/(\/|\+)json/)) return node
Expand Down
6 changes: 3 additions & 3 deletions lib/modules/minifySvg.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ const SVGO = require('svgo')
const svgo = new SVGO()

module.exports = (node, ctx) => {
if (node.name !== 'svg') return node
return new Promise((resolve, reject) => {
const rendered = ctx.generator([node])()
svgo.optimize(rendered, (res) => {
resolve(reshapeParser(res.data, ctx))
svgo.optimize(rendered, ({ error, data }) => {
if (error) reject(new Error(error))
resolve(reshapeParser(data, ctx))
})
})
}