Skip to content
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.

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

Small refactoring #106

Closed
wants to merge 1 commit into from
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
23 changes: 13 additions & 10 deletions index.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,15 @@ const fs = require('fs').promises
const { compileTemplate } = require('vue/compiler-sfc')
const { optimize: optimizeSvg } = require('svgo')

module.exports = function svgLoader (options = {}) {
module.exports = function svgLoader(options = {}) {
const { svgoConfig, svgo, defaultImport } = options

const svgRegex = /\.svg(\?(raw|component|skipsvgo))?$/

return {
name: 'svg-loader',
enforce: 'pre',

async load (id) {
if (!id.match(svgRegex)) {
async load(id) {
if (!id.endsWith('.svg')) {
return
}

Expand All @@ -29,7 +27,10 @@ module.exports = function svgLoader (options = {}) {
try {
svg = await fs.readFile(path, 'utf-8')
} catch (ex) {
console.warn('\n', `${id} couldn't be loaded by vite-svg-loader, fallback to default loader`)
console.warn(
'\n',
`${id} couldn't be loaded by vite-svg-loader, fallback to default loader`
)
return
}

Expand All @@ -40,22 +41,24 @@ module.exports = function svgLoader (options = {}) {
if (svgo !== false && query !== 'skipsvgo') {
svg = optimizeSvg(svg, {
...svgoConfig,
path
path,
}).data
}

// To prevent compileTemplate from removing the style tag
svg = svg.replace(/<style/g, '<component is="style"').replace(/<\/style/g, '</component')
svg = svg
.replace(/<style/g, '<component is="style"')
.replace(/<\/style/g, '</component')

const { code } = compileTemplate({
id: JSON.stringify(id),
source: svg,
filename: path,
transformAssetUrls: false
transformAssetUrls: false,
})

return `${code}\nexport default { render: render }`
}
},
}
}

Expand Down