feat: refine 'resolvePlugin' and 'resolveScopePackage' and update test

Author: ulivz

__mocks__/@org/vuepress-plugin-a.js

@@ -0,0 +1 @@
+module.exports = '@org/vuepress-plugin-a'

__mocks__/@org/vuepress-plugin-b.js

@@ -0,0 +1 @@
+module.exports = '@org/vuepress-plugin-b'

__mocks__/vuepress-plugin-a.js

@@ -0,0 +1 @@
+module.exports = 'vuepress-plugin-a'

__mocks__/vuepress-plugin-b.js

@@ -0,0 +1 @@
+module.exports = 'vuepress-plugin-b'

packages/@vuepress/core/__test__/plugin-api/Plugin.spec.js

@@ -0,0 +1,42 @@
+jest.mock('vuepress-plugin-a')
+jest.mock('@org/vuepress-plugin-a')
+
+const {
+  resolvePlugin,
+  resolveScopePackage
+} = require('../../lib/plugin-api/util')
+
+// const Plugin = require('../../lib/plugin-api/index')
+
+describe('resolvePlugin', () => {
+  test('should resolve scope packages correctly', () => {
+    const pkg1 = resolveScopePackage('@vuepress/plugin-a')
+    expect(pkg1.org).toBe('vuepress')
+    expect(pkg1.name).toBe('plugin-a')
+    const pkg2 = resolveScopePackage('vuepress/plugin-a')
+    expect(pkg2).toBe(null)
+    const pkg3 = resolveScopePackage('vuepress-plugin-a')
+    expect(pkg3).toBe(null)
+  })
+
+  test('shoould return raw when function or object is given', () => {
+    const plugin1 = () => {}
+    const plugin2 = {}
+    expect(resolvePlugin(plugin1)).toBe(plugin1)
+    expect(resolvePlugin(plugin2)).toBe(plugin2)
+  })
+
+  // https://jestjs.io/docs/en/manual-mocks#mocking-node-modules
+  test('shoould resolve fullname correctly', () => {
+    expect(resolvePlugin('vuepress-plugin-a')).toBe('vuepress-plugin-a')
+    expect(resolvePlugin('@org/vuepress-plugin-a')).toBe('@org/vuepress-plugin-a')
+  })
+
+  // https://jestjs.io/docs/en/manual-mocks#mocking-node-modules
+  test('shoould resolve shortcut correctly', () => {
+    expect(resolvePlugin('a')).toBe('vuepress-plugin-a')
+    expect(resolvePlugin('@org/a')).toBe('@org/vuepress-plugin-a')
+    // special shortcut for vuepress
+    expect(resolvePlugin('@vuepress/a')).toBe('@vuepress/plugin-a')
+  })
+})

packages/@vuepress/core/lib/plugin-api/util.js

@@ -1,22 +1,37 @@
 const logger = require('../util/logger')
 const chalk = require('chalk')
 
+const SCOPE_PACKAGE_RE = /^@(.*)\/(.*)/
+
+exports.resolveScopePackage = function (name) {
+  if (SCOPE_PACKAGE_RE.test(name)) {
+    return {
+      org: RegExp.$1,
+      name: RegExp.$2
+    }
+  }
+  return null
+}
+
 exports.resolvePlugin = function (pluginRaw) {
   if (typeof pluginRaw === 'function' || typeof pluginRaw === 'object') {
     return pluginRaw
   }
   if (typeof pluginRaw === 'string') {
     try {
-      return require(pluginRaw.startsWith('vuepress-plugin-')
-        ? pluginRaw
-        : `vuepress-plugin-${pluginRaw}`
-      )
+      return require(pluginRaw.startsWith('vuepress-plugin-') ? pluginRaw : `vuepress-plugin-${pluginRaw}`)
     } catch (err) {
+      const pkg = exports.resolveScopePackage(pluginRaw)
       try {
-        return require(pluginRaw.startsWith('@vuepress/plugin-')
-          ? pluginRaw
-          : `@vuepress/plugin-${pluginRaw}`
-        )
+        if (pkg) {
+          if (pkg.org === 'vuepress') {
+            return require(pkg.name.startsWith('plugin-') ? pluginRaw : `@vuepress/plugin-${pkg.name}`)
+          } else {
+            return require(pkg.name.startsWith('vuepress-plugin-') ? pluginRaw : `@${pkg.org}/vuepress-plugin-${pkg.name}`)
+          }
+        } else {
+          throw new Error(`[vuepress] Cannot resolve ${pluginRaw}.`)
+        }
       } catch (err2) {
         console.error(chalk.red(logger.error(`\n[vuepress] Cannot resolve plugin: ${pluginRaw}\n`, false)))
         throw new Error(err2)