Skip to content

Commit 89f5cc3

Browse files
committed
fix: resolve template extend source from the template location (fix #943)
1 parent 41fee59 commit 89f5cc3

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

Diff for: packages/@vue/cli/lib/GeneratorAPI.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ const fs = require('fs')
22
const ejs = require('ejs')
33
const path = require('path')
44
const globby = require('globby')
5+
const resolve = require('resolve')
56
const isBinary = require('isbinaryfile')
67
const yaml = require('yaml-front-matter')
78
const mergeDeps = require('./util/mergeDeps')
@@ -223,7 +224,7 @@ function renderFile (name, data, ejsOptions) {
223224
if (parsed.extend) {
224225
const extendPath = path.isAbsolute(parsed.extend)
225226
? parsed.extend
226-
: require.resolve(parsed.extend)
227+
: resolve.sync(parsed.extend, { basedir: path.dirname(name) })
227228
finalTemplate = fs.readFileSync(extendPath, 'utf-8')
228229
if (parsed.replace) {
229230
if (Array.isArray(parsed.replace)) {

0 commit comments

Comments
 (0)