fix: move plugin data extraction into GeneratorAPI

vuejs · Feb 4, 2018 · 4f2f6f0 · 4f2f6f0
1 parent 0f9a44a
commit 4f2f6f0
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 32 deletions.
diff --git a/packages/@vue/cli-service/generator/index.js b/packages/@vue/cli-service/generator/index.js
@@ -1,28 +1,5 @@
-// get link for a 3rd party plugin.
-function getLink (id) {
-  const pkg = require(`${id}/package.json`)
-  return (
-    pkg.homepage ||
-    (pkg.repository && pkg.repository.url) ||
-    `https://www.npmjs.com/package/${id.replace(`/`, `%2F`)}`
-  )
-}
-
 module.exports = (api, options) => {
-  api.render('./template', {
-    plugins: api.generator.plugins
-      .filter(({ id }) => id !== `@vue/cli-service`)
-      .map(({ id }) => {
-        const name = id.replace(/^(@vue|vue-)\/cli-plugin-/, '')
-        const isOfficial = /^@vue/.test(id)
-        return {
-          name: name,
-          link: isOfficial
-            ? `https://github.com/vuejs/vue-cli/tree/dev/packages/%40vue/cli-plugin-${name}`
-            : getLink(id)
-        }
-      })
-  })
+  api.render('./template')
 
   api.extendPackage({
     scripts: {

diff --git a/packages/@vue/cli/lib/GeneratorAPI.js b/packages/@vue/cli/lib/GeneratorAPI.js
@@ -9,12 +9,46 @@ const isString = val => typeof val === 'string'
 const isFunction = val => typeof val === 'function'
 const isObject = val => val && typeof val === 'object'
 
+// get link for a 3rd party plugin.
+function getLink (id) {
+  let pkg = {}
+  try {
+    pkg = require(`${id}/package.json`)
+  } catch (e) {}
+  return (
+    pkg.homepage ||
+    (pkg.repository && pkg.repository.url) ||
+    `https://www.npmjs.com/package/${id.replace(`/`, `%2F`)}`
+  )
+}
+
 module.exports = class GeneratorAPI {
   constructor (id, generator, options, rootOptions) {
     this.id = id
     this.generator = generator
     this.options = options
     this.rootOptions = rootOptions
+
+    this.pluginsData = generator.plugins
+      .filter(({ id }) => id !== `@vue/cli-service`)
+      .map(({ id }) => {
+        const name = id.replace(/^(@vue|vue-)\/cli-plugin-/, '')
+        const isOfficial = /^@vue/.test(id)
+        return {
+          name: name,
+          link: isOfficial
+            ? `https://github.com/vuejs/vue-cli/tree/dev/packages/%40vue/cli-plugin-${name}`
+            : getLink(id)
+        }
+      })
+  }
+
+  _resolveData (additionalData) {
+    return Object.assign({
+      options: this.options,
+      rootOptions: this.rootOptions,
+      plugins: this.pluginsData
+    }, additionalData)
   }
 
   injectFileMiddleware (middleware) {
@@ -52,10 +86,7 @@ module.exports = class GeneratorAPI {
     if (isString(fileDir)) {
       fileDir = path.resolve(baseDir, fileDir)
       this.injectFileMiddleware(async (files) => {
-        const data = Object.assign({
-          options: this.options,
-          rootOptions: this.rootOptions
-        }, additionalData)
+        const data = this._resolveData(additionalData)
         const _files = await globby(['**/*'], { cwd: fileDir })
         for (const rawPath of _files) {
           let filename = path.basename(rawPath)
@@ -75,10 +106,7 @@ module.exports = class GeneratorAPI {
       })
     } else if (isObject(fileDir)) {
       this.injectFileMiddleware(files => {
-        const data = Object.assign({
-          options: this.options,
-          rootOptions: this.rootOptions
-        }, additionalData)
+        const data = this._resolveData(additionalData)
         for (const targetPath in fileDir) {
           const sourcePath = path.resolve(baseDir, fileDir[targetPath])
           const content = renderFile(sourcePath, data, ejsOptions)