Skip to content

Fix webpack module concatenation support for v15 #1230

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 3 commits into from
Apr 9, 2018
Merged
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
5 changes: 2 additions & 3 deletions lib/loaders/pitcher.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,7 @@ module.exports.pitch = function (remainingRequest) {
...beforeLoaders
])
// console.log(request)
// use cjs to ensure exports from (vue-)style-loader/css-loader are intact
return `module.exports = require(${request})`
return `import mod from ${request}; export default mod; export * from ${request}`
}
}

Expand Down Expand Up @@ -66,5 +65,5 @@ module.exports.pitch = function (remainingRequest) {
// both that rule and the cloned rule will match, resulting in duplicated
// loaders. Therefore it is necessary to perform a dedupe here.
const request = genRequest(loaders.map(toLoaderString))
return `module.exports = require(${request})`
return `import mod from ${request}; export default mod; export * from ${request}`
}