Skip to content

fix(cli-service): add inline loader support for html-webpack-plugin #5991

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

Closed
wants to merge 4 commits into from
Closed

fix(cli-service): add inline loader support for html-webpack-plugin #5991

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e25dcb0
fix(cli-service): add inline loader support for html-webpack-plugin. …
Oct 22, 2020
66ee731
fix(cli-service): ignore public copy when using inline loader
Oct 22, 2020
1e82a7f
ci(cli-service): confict fixed
Oct 22, 2020
61a5eb1
Merge branch 'dev' into issue-2697
ylc395 Oct 22, 2020
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
9 changes: 7 additions & 2 deletions packages/@vue/cli-service/lib/config/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,15 +214,20 @@ module.exports = (api, options) => {
const entries = Array.isArray(entry) ? entry : [entry]
webpackConfig.entry(name).merge(entries.map(e => api.resolve(e)))

// test whether use inline loader
// * See https://github.com/jantimon/html-webpack-plugin/blob/master/docs/template-option.md#2-setting-a-loader-directly-for-the-template
const inlineLoaderReg = /[-!]?!.+!/
const isWithInlineLoader = /^[-!]?!/.test(template)

// resolve page index template
const hasDedicatedTemplate = fs.existsSync(api.resolve(template))
const hasDedicatedTemplate = fs.existsSync(api.resolve(isWithInlineLoader ? template.replace(inlineLoaderReg, '') : template))
const templatePath = hasDedicatedTemplate
? template
: fs.existsSync(htmlPath)
? htmlPath
: defaultHtmlPath

publicCopyIgnore.push(api.resolve(templatePath).replace(/\\/g, '/'))
publicCopyIgnore.push(api.resolve(templatePath).replace(/\\/g, '/').replace(inlineLoaderReg, ''))

// inject html plugin for the page
const pageHtmlOptions = Object.assign(
Expand Down