Commitc5cfefb

authored

Better handling ofpublicPath: 'auto' (#7005)

1 parent75826d6 commitc5cfefbCopy full SHA for c5cfefb

File tree

-3

lines changed

-3

lines changed

Lines changed: 4 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@ const {`
`5`	`5`	`hasProjectPnpm,`
`6`	`6`	`IpcMessenger`
`7`	`7`	`}=require('@vue/cli-shared-utils')`
	`8`	`+constgetBaseUrl=require('../util/getBaseUrl')`
`8`	`9`
`9`	`10`	`constdefaults={`
`10`	`11`	`host:'0.0.0.0',`
`@@ -14,6 +15,7 @@ const defaults = {`
`14`	`15`
`15`	`16`	`/*@type {import('@vue/cli-service').ServicePlugin} /`
`16`	`17`	`module.exports=(api,options)=>{`
	`18`	`+constbaseUrl=getBaseUrl(options)`
`17`	`19`	`api.registerCommand('serve',{`
`18`	`20`	`description:'start development server',`
`19`	`21`	`usage:'vue-cli-service serve [options] [entry]',`
`@@ -116,7 +118,7 @@ module.exports = (api, options) => {`
`116`	`118`	`protocol,`
`117`	`119`	`host,`
`118`	`120`	`port,`
`119`		`-isAbsoluteUrl(options.publicPath) ?'/' :options.publicPath`
	`121`	`+isAbsoluteUrl(baseUrl) ?'/' :baseUrl`
`120`	`122`	`)`
`121`	`123`	`constlocalUrlForBrowser=publicUrl\|\|urls.localUrlForBrowser`
`122`	`124`
`@@ -187,7 +189,7 @@ module.exports = (api, options) => {`
`187`	`189`	`'text/html',`
`188`	`190`	`'application/xhtml+xml'`
`189`	`191`	`],`
`190`		`-rewrites:genHistoryApiFallbackRewrites(options.publicPath,options.pages)`
	`192`	`+rewrites:genHistoryApiFallbackRewrites(baseUrl,options.pages)`
`191`	`193`	`},`
`192`	`194`	`hot:!isProduction`
`193`	`195`	`},projectDevServerOptions,{`

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+module.exports=functiongetBaseUrl(options){`
	`2`	`+returnoptions.publicPath==='auto' ?'' :options.publicPath`
	`3`	`+}`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+constgetBaseUrl=require('./getBaseUrl')`
`1`	`2`	`constprefixRE=/^VUE_APP_/`
`2`	`3`
`3`	`4`	`module.exports=functionresolveClientEnv(options,raw){`
`@@ -7,7 +8,7 @@ module.exports = function resolveClientEnv (options, raw) {`
`7`	`8`	`env[key]=process.env[key]`
`8`	`9`	`}`
`9`	`10`	`})`
`10`		`-env.BASE_URL=options.publicPath`
	`11`	`+env.BASE_URL=getBaseUrl(options)`
`11`	`12`
`12`	`13`	`if(raw){`
`13`	`14`	`returnenv`

Comments

(0)