@@ -3,11 +3,11 @@ const path = require('path')
3
3
const execa = require ( 'execa' )
4
4
const chalk = require ( 'chalk' )
5
5
const globby = require ( 'globby' )
6
- const resolve = require ( 'resolve' )
7
6
const inquirer = require ( 'inquirer' )
8
7
const Generator = require ( './Generator' )
9
8
const { loadOptions } = require ( './options' )
10
9
const { installDeps } = require ( './util/installDeps' )
10
+ const { loadModule } = require ( './util/module' )
11
11
const {
12
12
log,
13
13
error,
@@ -18,16 +18,6 @@ const {
18
18
resolvePluginId
19
19
} = require ( '@vue/cli-shared-utils' )
20
20
21
- function load ( request , context ) {
22
- let resolvedPath
23
- try {
24
- resolvedPath = resolve . sync ( request , { basedir : context } )
25
- } catch ( e ) { }
26
- if ( resolvedPath ) {
27
- return require ( resolvedPath )
28
- }
29
- }
30
-
31
21
async function readFiles ( context ) {
32
22
const files = await globby ( [ '**' ] , {
33
23
cwd : context ,
@@ -75,15 +65,15 @@ async function invoke (pluginName, options = {}, context = process.cwd()) {
75
65
)
76
66
}
77
67
78
- const pluginGenerator = load ( `${ id } /generator` , context )
68
+ const pluginGenerator = loadModule ( `${ id } /generator` , context )
79
69
if ( ! pluginGenerator ) {
80
70
throw new Error ( `Plugin ${ id } does not have a generator.` )
81
71
}
82
72
83
73
// resolve options if no command line options are passed, and the plugin
84
74
// contains a prompt module.
85
75
if ( ! Object . keys ( options ) . length ) {
86
- const pluginPrompts = load ( `${ id } /prompts` , context )
76
+ const pluginPrompts = loadModule ( `${ id } /prompts` , context )
87
77
if ( pluginPrompts ) {
88
78
options = await inquirer . prompt ( pluginPrompts )
89
79
}
0 commit comments