@@ -3,11 +3,11 @@ const path = require('path')
33const execa = require ( 'execa' )
44const chalk = require ( 'chalk' )
55const globby = require ( 'globby' )
6- const resolve = require ( 'resolve' )
76const inquirer = require ( 'inquirer' )
87const Generator = require ( './Generator' )
98const { loadOptions } = require ( './options' )
109const { installDeps } = require ( './util/installDeps' )
10+ const { loadModule } = require ( './util/module' )
1111const {
1212 log,
1313 error,
@@ -18,16 +18,6 @@ const {
1818 resolvePluginId
1919} = require ( '@vue/cli-shared-utils' )
2020
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-
3121async function readFiles ( context ) {
3222 const files = await globby ( [ '**' ] , {
3323 cwd : context ,
@@ -75,15 +65,15 @@ async function invoke (pluginName, options = {}, context = process.cwd()) {
7565 )
7666 }
7767
78- const pluginGenerator = load ( `${ id } /generator` , context )
68+ const pluginGenerator = loadModule ( `${ id } /generator` , context )
7969 if ( ! pluginGenerator ) {
8070 throw new Error ( `Plugin ${ id } does not have a generator.` )
8171 }
8272
8373 // resolve options if no command line options are passed, and the plugin
8474 // contains a prompt module.
8575 if ( ! Object . keys ( options ) . length ) {
86- const pluginPrompts = load ( `${ id } /prompts` , context )
76+ const pluginPrompts = loadModule ( `${ id } /prompts` , context )
8777 if ( pluginPrompts ) {
8878 options = await inquirer . prompt ( pluginPrompts )
8979 }
0 commit comments