Skip to content

Commit d23d311

Browse files
committed
Fixes more things
1 parent be03fb9 commit d23d311

File tree

2 files changed

+14
-3
lines changed

2 files changed

+14
-3
lines changed

packages/@vue/babel-preset-app/package.json

+3
Original file line numberDiff line numberDiff line change
@@ -36,5 +36,8 @@
3636
"babel-plugin-module-resolver": "^3.2.0",
3737
"core-js": "^3.1.2",
3838
"core-js-compat": "^3.1.2"
39+
},
40+
"peerDependencies": {
41+
"@babel/core": "*"
3942
}
4043
}

packages/@vue/cli-service/lib/config/base.js

+11-3
Original file line numberDiff line numberDiff line change
@@ -130,21 +130,29 @@ module.exports = (api, options) => {
130130

131131
// Other common pre-processors ---------------------------------------------
132132

133+
const maybeResolve = name => {
134+
try {
135+
return require.resolve(name)
136+
} catch (error) {
137+
return name
138+
}
139+
}
140+
133141
webpackConfig.module
134142
.rule('pug')
135143
.test(/\.pug$/)
136144
.oneOf('pug-vue')
137145
.resourceQuery(/vue/)
138146
.use('pug-plain-loader')
139-
.loader(require.resolve('pug-plain-loader'))
147+
.loader(maybeResolve('pug-plain-loader'))
140148
.end()
141149
.end()
142150
.oneOf('pug-template')
143151
.use('raw')
144-
.loader(require.resolve('raw-loader'))
152+
.loader(maybeResolve('raw-loader'))
145153
.end()
146154
.use('pug-plain-loader')
147-
.loader(require.resolve('pug-plain-loader'))
155+
.loader(maybeResolve('pug-plain-loader'))
148156
.end()
149157
.end()
150158

0 commit comments

Comments
 (0)