fix(ui): webpack logo

vuejs · Jun 30, 2018 · c2c5e37 · c2c5e37
1 parent c8224de
commit c2c5e37
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/packages/@vue/cli-ui-addon-webpack/vue.config.js b/packages/@vue/cli-ui-addon-webpack/vue.config.js
@@ -2,7 +2,7 @@ const { clientAddonConfig } = require('@vue/cli-ui')
 
 module.exports = {
  ...clientAddonConfig({
- id: 'vue-webpack'
+ id: 'org.vue.webpack.client-addon'
  // port: 8042
  })
 }
diff --git a/packages/@vue/cli-ui/apollo-server/connectors/client-addons.js b/packages/@vue/cli-ui/apollo-server/connectors/client-addons.js
@@ -53,15 +53,18 @@ function serve (req, res) {
  const { id, 0: file } = req.params
  const addon = findOne(decodeURIComponent(id))
  if (addon && addon.path) {
- const basePath = resolveModuleRoot(require.resolve(addon.path))
+ const resolvedPath = require.resolve(addon.path)
+ const basePath = resolveModuleRoot(resolvedPath)
  if (basePath) {
  res.sendFile(path.join(basePath, file))
- return
+ } else {
+ res.status(404)
+ res.send(`File not found (resolved: ${resolvedPath}`)
  }
+ } else {
+ res.status(404)
+ res.send(`Addon ${id} not found in loaded addons. Try opening a vue-cli project first?`)
  }
-
- res.status(404)
- res.send(`Addon ${id} not found in loaded addons. Try opening a vue-cli project first?`)
 }
 
 module.exports = {