fix: plugin file serve issue

Guillaume Chau · Guillaume Chau · commit 51afe592fa11 · 2018-07-15T20:43:19.000+02:00
diff --git a/packages/@vue/cli-ui/apollo-server/connectors/plugins.js b/packages/@vue/cli-ui/apollo-server/connectors/plugins.js
@@ -516,18 +516,22 @@ function serveFile ({ pluginId, projectId = null, file }, res) {
     }
   }
 
-  const basePath = pluginId === '.' ? baseFile : dependencies.getPath({ id: decodeURIComponent(pluginId), file: baseFile })
-  if (basePath) {
-    res.sendFile(path.join(basePath, file), { maxAge: 0 })
-    return
+  if (pluginId) {
+    const basePath = pluginId === '.' ? baseFile : dependencies.getPath({ id: decodeURIComponent(pluginId), file: baseFile })
+    if (basePath) {
+      res.sendFile(path.join(basePath, file))
+      return
+    }
+  } else {
+    console.log('serve issue', 'pluginId:', pluginId, 'projectId:', projectId, 'file:', file)
   }
 
   res.status(404)
   res.send(`Addon ${pluginId} not found in loaded addons. Try opening a vue-cli project first?`)
 }
 
 function serve (req, res) {
-  const { pluginId, 0: file } = req.params
+  const { id: pluginId, 0: file } = req.params
   serveFile({ pluginId, file: path.join('ui-public', file) }, res)
 }
 

Original file line number	Diff line number	Diff line change
`@@ -516,18 +516,22 @@ function serveFile ({ pluginId, projectId = null, file }, res) {`
`516`	`516`	`}`
`517`	`517`	`}`
`518`	`518`
`519`		`- const basePath = pluginId === '.' ? baseFile : dependencies.getPath({ id: decodeURIComponent(pluginId), file: baseFile })`
`520`		`- if (basePath) {`
`521`		`- res.sendFile(path.join(basePath, file), { maxAge: 0 })`
`522`		`- return`
	`519`	`+ if (pluginId) {`
	`520`	`+ const basePath = pluginId === '.' ? baseFile : dependencies.getPath({ id: decodeURIComponent(pluginId), file: baseFile })`
	`521`	`+ if (basePath) {`
	`522`	`+ res.sendFile(path.join(basePath, file))`
	`523`	`+ return`
	`524`	`+ }`
	`525`	`+ } else {`
	`526`	`+ console.log('serve issue', 'pluginId:', pluginId, 'projectId:', projectId, 'file:', file)`
`523`	`527`	`}`
`524`	`528`
`525`	`529`	`res.status(404)`
`526`	`530`	res.send(`Addon ${pluginId} not found in loaded addons. Try opening a vue-cli project first?`)
`527`	`531`	`}`
`528`	`532`
`529`	`533`	`function serve (req, res) {`
`530`		`- const { pluginId, 0: file } = req.params`
	`534`	`+ const { id: pluginId, 0: file } = req.params`
`531`	`535`	`serveFile({ pluginId, file: path.join('ui-public', file) }, res)`
`532`	`536`	`}`
`533`	`537`