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

Jump to bottom

Better handling of publicPath: 'auto' #7005

Merged
merged 7 commits into from
Mar 22, 2022
Merged

Better handling of publicPath: 'auto' #7005

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
64933b2
Fix bug for configureWebpack.output = 'auto'
AndreiSoroka Feb 21, 2022
139e693
fixed prepareURLs
AndreiSoroka Feb 25, 2022
970ade9
Revert "Fix bug for configureWebpack.output = 'auto'"
AndreiSoroka Feb 25, 2022
4e876b8
updated serve.js
AndreiSoroka Feb 25, 2022
de71144
Merge remote-tracking branch 'origin/dev' into patch-1
AndreiSoroka Mar 18, 2022
e2cf91a
support publicPath auto
AndreiSoroka Mar 18, 2022
e9c4080
fix: eslint
AndreiSoroka Mar 18, 2022
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: 4 additions & 2 deletions packages/@vue/cli-service/lib/commands/serve.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ const {
hasProjectPnpm,
IpcMessenger
} = require('@vue/cli-shared-utils')
const getBaseUrl = require('../util/getBaseUrl')

const defaults = {
host: '0.0.0.0',
Expand All @@ -14,6 +15,7 @@ const defaults = {

/** @type {import('@vue/cli-service').ServicePlugin} */
module.exports = (api, options) => {
const baseUrl = getBaseUrl(options)
api.registerCommand('serve', {
description: 'start development server',
usage: 'vue-cli-service serve [options] [entry]',
Expand Down Expand Up @@ -116,7 +118,7 @@ module.exports = (api, options) => {
protocol,
host,
port,
isAbsoluteUrl(options.publicPath) ? '/' : options.publicPath
isAbsoluteUrl(baseUrl) ? '/' : baseUrl
)
const localUrlForBrowser = publicUrl || urls.localUrlForBrowser

Expand Down Expand Up @@ -187,7 +189,7 @@ module.exports = (api, options) => {
'text/html',
'application/xhtml+xml'
],
rewrites: genHistoryApiFallbackRewrites(options.publicPath, options.pages)
rewrites: genHistoryApiFallbackRewrites(baseUrl, options.pages)
},
hot: !isProduction
}, projectDevServerOptions, {
Expand Down
3 changes: 3 additions & 0 deletions packages/@vue/cli-service/lib/util/getBaseUrl.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
module.exports = function getBaseUrl (options) {
return options.publicPath === 'auto' ? '' : options.publicPath
}
3 changes: 2 additions & 1 deletion packages/@vue/cli-service/lib/util/resolveClientEnv.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
const getBaseUrl = require('./getBaseUrl')
const prefixRE = /^VUE_APP_/

module.exports = function resolveClientEnv (options, raw) {
Expand All @@ -7,7 +8,7 @@ module.exports = function resolveClientEnv (options, raw) {
env[key] = process.env[key]
}
})
env.BASE_URL = options.publicPath
env.BASE_URL = getBaseUrl(options)

if (raw) {
return env
Expand Down