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

Merge pull request #135 from curbengh/dependabot/npm_and_yarn/svgo-3.0.0 

chore(deps): bump svgo from 2.8.0 to 3.0.0
This commit is contained in:
Ming Di Leom 2022-11-06 15:55:40 +10:30 committed by GitHub
parent 4b4d3cb342 a6f434ff8d
commit b0575e6fdc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -133,7 +133,7 @@ minify:
# Retain comments # Retain comments
removeComments: false removeComments: false
# Do not remove unused ID attributes # Do not remove unused ID attributes
cleanupIDs: false cleanupIds: false
``` ```
- For more options, see [svgo](https://github.com/svg/svgo). - For more options, see [svgo](https://github.com/svg/svgo).
- **globOptions** - See [globbing](#globbing) section. - **globOptions** - See [globbing](#globbing) section.

8
lib/filter.js
View File

@ -152,12 +152,12 @@ function minifySvg () {
assetPath.on('data', (chunk) => (assetTxt += chunk)) assetPath.on('data', (chunk) => (assetTxt += chunk))
assetPath.on('end', async () => { assetPath.on('end', async () => {
if (assetTxt.length) { if (assetTxt.length) {
const { data, error } = svgOptimize(assetTxt, { ...options, plugins }) try {
if (data) { const { data } = svgOptimize(assetTxt, { ...options, plugins })
if (verbose) logFn.call(this, assetTxt, data, path, 'svg') if (verbose) logFn.call(this, assetTxt, data, path, 'svg')
resolve(route.set(path, data)) resolve(route.set(path, data))
} else if (error) { } catch (err) {
reject(new Error(`Path: ${path}\n${error}`)) reject(new Error(`Path: ${path}\n${err}`))
} }
} }
resolve() resolve()

2
package.json
View File

@ -27,7 +27,7 @@
"html-minifier": "^4.0.0", "html-minifier": "^4.0.0",
"micromatch": "^4.0.2", "micromatch": "^4.0.2",
"minify-xml": "^3.2.0", "minify-xml": "^3.2.0",
"svgo": "^2.4.0", "svgo": "^3.0.0",
"terser": "^5.3.0" "terser": "^5.3.0"
}, },
"devDependencies": { "devDependencies": {

14
test/svg.test.js
View File

@ -71,7 +71,7 @@ describe('svg', () => {
test('option', async () => { test('option', async () => {
const customOpt = { const customOpt = {
cleanupIDs: false cleanupIds: false
} }
hexo.config.minify.svg.plugins = customOpt hexo.config.minify.svg.plugins = customOpt
plugins = [{ plugins = [{
@ -117,10 +117,14 @@ describe('svg', () => {
const input = '{}' const input = '{}'
hexo.route.set(path, input) hexo.route.set(path, input)
const { error } = svgOptimize(input, { plugins }) let expected
try {
expect(error).toBeDefined() svgOptimize(input, { plugins })
await expect(s()).rejects.toThrow(`Path: ${path}\n${error}`) } catch (err) {
expected = err
}
expect(expected).toBeDefined()
await expect(s()).rejects.toThrow(`Path: ${path}\n${expected}`)
}) })
test('include - exclude *.min.svg by default', async () => { test('include - exclude *.min.svg by default', async () => {