Skip to content

修复相对路径资源无法正常引入的bug #19

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

Merged
merged 2 commits into from
May 17, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 5 additions & 1 deletion lib/template-compiler/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,11 @@ module.exports = function (html) {
var vueOptions = this.options.__vueOptions__ || {}
var options = loaderUtils.getOptions(this) || {}

var defaultModules = [transformRequire(options.transformToRequire)]
var defaultModules = [transformRequire(options.transformToRequire, {
outputPath: this.options.output.path,
resourcePath: this.resourcePath
})]

var userModules = vueOptions.compilerModules || options.compilerModules
// for HappyPack cross-process use cases
if (typeof userModules === 'string') {
Expand Down
49 changes: 29 additions & 20 deletions lib/template-compiler/modules/transform-require.js
Original file line number Diff line number Diff line change
@@ -1,50 +1,59 @@
// vue compiler module for transforming `<tag>:<attribute>` to `require`

var fs = require('fs')
var path = require('path')
var mkdirp = require('mkdirp')

var defaultOptions = {
img: 'src',
image: 'xlink:href'
}

module.exports = userOptions => {
module.exports = (userOptions, fileOptions) => {
var options = userOptions
? Object.assign({}, defaultOptions, userOptions)
: defaultOptions

return {
postTransformNode: node => {
transform(node, options)
transform(node, options, fileOptions)
}
}
}

function transform (node, options) {
function transform (node, options, fileOptions) {
for (var tag in options) {
if (node.tag === tag && node.attrs) {
var attributes = options[tag]
if (typeof attributes === 'string') {
node.attrs.some(attr => rewrite(attr, attributes))
rewrite(node.attrsMap, attributes, fileOptions)
} else if (Array.isArray(attributes)) {
attributes.forEach(item => node.attrs.some(attr => rewrite(attr, item)))
attributes.forEach(item => rewrite(node.attrsMap, item, fileOptions))
}
}
}
}

function rewrite (attr, name) {
if (attr.name === name) {
var value = attr.value
var isStatic = value.charAt(0) === '"' && value.charAt(value.length - 1) === '"'
if (!isStatic) {
return
}
var firstChar = value.charAt(1)
if (firstChar === '.' || firstChar === '~') {
if (firstChar === '~') {
var secondChar = value.charAt(2)
value = '"' + value.slice(secondChar === '/' ? 3 : 2)
}
attr.value = `require(${value})`
function rewrite (attrsMap, name, fileOptions) {
var value = attrsMap[name]
if (value) {
var firstChar = value.charAt(0)
if (firstChar === '.') {
// 资源路径
var assetPath = path.resolve(path.dirname(fileOptions.resourcePath), value)
// 重写路径,为了避免重名,在webpack输出目录下新建copy-asset目录,资源保存到这里
var assetOutputPath = path.join('copy-asset', path.relative(process.cwd(), assetPath).replace(/^src/, ''))
attrsMap[name] = `/${assetOutputPath.split(path.sep).join('/')}`
copyAsset(assetPath, path.resolve(fileOptions.outputPath, assetOutputPath))
}
return true
}
}

function copyAsset (from, to) {
var readStream = fs.createReadStream(from)
mkdirp(path.dirname(to), err => {
if (err) console.error(err)
var writeStream = fs.createWriteStream(to)
readStream.pipe(writeStream)
})
}
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@
"js-beautify": "^1.6.14",
"loader-utils": "^1.1.0",
"lru-cache": "^4.1.1",
"mkdirp": "^0.5.1",
"postcss": "^6.0.6",
"postcss-load-config": "^1.1.0",
"postcss-selector-parser": "^2.0.0",
Expand Down Expand Up @@ -90,9 +91,8 @@
"lint-staged": "^4.0.2",
"marked": "^0.3.6",
"memory-fs": "^0.4.1",
"mkdirp": "^0.5.1",
"mpvue-template-compiler": "^1.0.7",
"mocha": "^3.4.2",
"mpvue-template-compiler": "^1.0.7",
"node-libs-browser": "^2.0.0",
"normalize-newline": "^3.0.0",
"null-loader": "^0.1.1",
Expand Down