fix: allow relative baseUrl other than ./ (vuejs#2168)

elevatebart · yyx990803 · commit d14d4e693c52 · 2018-08-13T12:14:18.000-04:00
diff --git a/packages/@vue/cli-service/__tests__/Service.spec.js b/packages/@vue/cli-service/__tests__/Service.spec.js
@@ -94,6 +94,26 @@ test('handle option baseUrl and outputDir correctly', () => {
   expect(service.projectOptions.outputDir).toBe('/public')
 })
 
+test('normalize baseUrl when relative', () => {
+  mockPkg({
+    vue: {
+      baseUrl: './foo/bar'
+    }
+  })
+  const service = createMockService()
+  expect(service.projectOptions.baseUrl).toBe('foo/bar/')
+})
+
+test('keep baseUrl when empty', () => {
+  mockPkg({
+    vue: {
+      baseUrl: ''
+    }
+  })
+  const service = createMockService()
+  expect(service.projectOptions.baseUrl).toBe('')
+})
+
 test('load project options from vue.config.js', () => {
   process.env.VUE_CLI_SERVICE_CONFIG_PATH = `/vue.config.js`
   fs.writeFileSync('/vue.config.js', `module.exports = { lintOnSave: false }`)
diff --git a/packages/@vue/cli-service/lib/Service.js b/packages/@vue/cli-service/lib/Service.js
@@ -298,10 +298,10 @@ module.exports = class Service {
     }
 
     // normalize some options
+    ensureSlash(resolved, 'baseUrl')
     if (typeof resolved.baseUrl === 'string') {
       resolved.baseUrl = resolved.baseUrl.replace(/^\.\//, '')
     }
-    ensureSlash(resolved, 'baseUrl')
     removeSlash(resolved, 'outputDir')
 
     // deprecation warning

Original file line number	Diff line number	Diff line change
`@@ -298,10 +298,10 @@ module.exports = class Service {`
`298`	`298`	`}`
`299`	`299`
`300`	`300`	`// normalize some options`
	`301`	`+ ensureSlash(resolved, 'baseUrl')`
`301`	`302`	`if (typeof resolved.baseUrl === 'string') {`
`302`	`303`	`resolved.baseUrl = resolved.baseUrl.replace(/^\.\//, '')`
`303`	`304`	`}`
`304`		`- ensureSlash(resolved, 'baseUrl')`
`305`	`305`	`removeSlash(resolved, 'outputDir')`
`306`	`306`
`307`	`307`	`// deprecation warning`