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.

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

feat: Webpack 5 Support #5611

Closed
wants to merge 1 commit into from
Closed

feat: Webpack 5 Support #5611

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 12 additions & 4 deletions packages/@vue/cli-service/lib/config/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
// config that are specific to --target app
const fs = require('fs')
const path = require('path')
const isWP5 = parseInt(require('webpack').version, 10) === 5

// ensure the filename passed to html-webpack-plugin is a relative path
// because it cannot correctly handle absolute paths
Expand Down Expand Up @@ -130,8 +131,11 @@ module.exports = (api, options) => {
})

// keep chunk ids stable so async chunks have consistent hash (#1916)
webpackConfig
.plugin('named-chunks')
if (isWP5) {
webpackConfig.optimization.namedChunks = true
} else {
webpackConfig
.plugin('named-chunks')
.use(require('webpack/lib/NamedChunksPlugin'), [chunk => {
if (chunk.name) {
return chunk.name
Expand All @@ -143,11 +147,15 @@ module.exports = (api, options) => {
)
return `chunk-` + joinedHash
}])
}
}

// resolve HTML file(s)
const HTMLPlugin = require('html-webpack-plugin')
const PreloadPlugin = require('@vue/preload-webpack-plugin')
let PreloadPlugin
if (!isWP5) {
PreloadPlugin = require('@vue/preload-webpack-plugin')
}
const multiPageConfig = options.pages
const htmlPath = api.resolve('public/index.html')
const defaultHtmlPath = path.resolve(__dirname, 'index-default.html')
Expand All @@ -168,7 +176,7 @@ module.exports = (api, options) => {
.plugin('html')
.use(HTMLPlugin, [htmlOptions])

if (!isLegacyBundle) {
if (!isLegacyBundle && !isWP5) {
// inject preload/prefetch to HTML
webpackConfig
.plugin('preload')
Expand Down
8 changes: 6 additions & 2 deletions packages/@vue/cli-service/lib/config/base.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
const isWP5 = parseInt(require('webpack').version, 10) === 5

module.exports = (api, options) => {
api.chainWebpack(webpackConfig => {
const isLegacyBundle = process.env.VUE_CLI_MODERN_MODE && !process.env.VUE_CLI_MODERN_BUILD
Expand Down Expand Up @@ -171,8 +173,10 @@ module.exports = (api, options) => {
.end()

// shims
if (isWP5) {

webpackConfig.node
} else {
webpackConfig.node
.merge({
// prevent webpack from injecting useless setImmediate polyfill because Vue
// source contains it (although only uses it if it's native).
Expand All @@ -188,7 +192,7 @@ module.exports = (api, options) => {
tls: 'empty',
child_process: 'empty'
})

}
const resolveClientEnv = require('../util/resolveClientEnv')
webpackConfig
.plugin('define')
Expand Down
10 changes: 8 additions & 2 deletions packages/@vue/cli-service/lib/config/prod.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
const isWP5 = parseInt(require('webpack').version, 10) === 5

module.exports = (api, options) => {
api.chainWebpack(webpackConfig => {
if (process.env.NODE_ENV === 'production') {
Expand All @@ -6,11 +8,15 @@ module.exports = (api, options) => {
.devtool(options.productionSourceMap ? 'source-map' : false)

// keep module.id stable when vendor modules does not change
webpackConfig
.plugin('hash-module-ids')
if (isWP5) {
webpackConfig.optimization.moduleIds = 'hashed'
} else {
webpackConfig
.plugin('hash-module-ids')
.use(require('webpack/lib/HashedModuleIdsPlugin'), [{
hashDigest: 'hex'
}])
}

// disable optimization during tests to speed things up
if (process.env.VUE_CLI_TEST) {
Expand Down