Zengtudor/Nuxt
1
0
Fork 0
mirror of https://github.com/nuxt/nuxt.git synced 2024-11-27 08:02:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

remove temporary fix for html-webpack-plugin

Browse Source 
It has been fixed in: vue-loader #8626739c
This commit is contained in:
Clark Du 2018-04-04 16:37:26 +08:00
parent 97cc10230d
commit 80126228b2
3 changed files with 2 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/builder/webpack/base.js
View File

@ -255,10 +255,6 @@ export default class WebpackBaseConfig {
modules: webpackModulesDir
},
resolveLoader: {
alias: {
// TODO: Move to an external package?
lodash: path.resolve(this.options.nuxtDir, 'lib/builder/webpack/utils/lodash-loader.js')
},
modules: webpackModulesDir
},
module: {

4
lib/builder/webpack/client.js
View File

@ -31,7 +31,7 @@ export default class WebpackClientConfig extends WebpackBaseConfig {
plugins.push(
new HTMLPlugin({
filename: 'index.ssr.html',
template: 'lodash!' + this.options.appTemplatePath,
template: this.options.appTemplatePath,
inject: false // Resources will be injected using bundleRenderer
})
)
@ -40,7 +40,7 @@ export default class WebpackClientConfig extends WebpackBaseConfig {
plugins.push(
new HTMLPlugin({
filename: 'index.spa.html',
template: 'lodash!' + this.options.appTemplatePath,
template: this.options.appTemplatePath,
inject: true,
chunksSortMode: 'dependency'
}),

36
lib/builder/webpack/utils/lodash-loader.js
View File

@ -1,36 +0,0 @@
const _ = require('lodash')
const loaderUtils = require('loader-utils')
module.exports = function (source) {
if (this.cacheable) {
this.cacheable()
}
// The following part renders the tempalte with lodash as aminimalistic loader
//
// Get templating options
const options = this.query !== '' ? loaderUtils.parseQuery(this.query) : {}
// Webpack 2 does not allow with() statements, which lodash templates use to unwrap
// the parameters passed to the compiled template inside the scope. We therefore
// need to unwrap them ourselves here. This is essentially what lodash does internally
// To tell lodash it should not use with we set a variable
const template = _.template(source, _.defaults(options, { variable: 'data' }))
// All templateVariables which should be available
// @see HtmlWebpackPlugin.prototype.executeTemplate
const templateVariables = [
'compilation',
'webpack',
'webpackConfig',
'htmlWebpackPlugin'
]
return 'var _ = require(' + loaderUtils.stringifyRequest(this, require.resolve('lodash')) + ');' +
'module.exports = function (templateParams) {' +
// Declare the template variables in the outer scope of the
// lodash template to unwrap them
templateVariables.map(function (variableName) {
return 'var ' + variableName + ' = templateParams.' + variableName
}).join(';') + ';' +
// Execute the lodash template
'return (' + template.source + ')();' +
'}'
}