Browse Source

fix

pull/165/head
tangjinzhou 7 years ago
parent
commit
f88294b982
  1. 3
      components/_util/props-util.js
  2. 1
      webpack.site.config.js

3
components/_util/props-util.js

@ -217,8 +217,7 @@ export function mergeProps () {
}
function isValidElement (element) {
const name = element.constructor.name
return element.tag && (name === 'VNode' || name === 'VueComponent')
return element && element.context && element.context._isVue
}
export {

1
webpack.site.config.js

@ -12,7 +12,6 @@ const modulePlugin = new ExtractTextPlugin({
})
module.exports = merge(baseWebpackConfig, {
devtool: '#source-map',
output: {
path: path.resolve(__dirname, './dist'),
publicPath: './',

Loading…
Cancel
Save