File tree Expand file tree Collapse file tree 1 file changed +7
-6
lines changed Expand file tree Collapse file tree 1 file changed +7
-6
lines changed Original file line number Diff line number Diff line change 1
1
import { GlobalMountOptions } from './types'
2
-
3
- const isString = ( val : unknown ) : val is string => typeof val === 'string'
4
-
5
- function mergeStubs ( target , source ) {
2
+ import { AppConfig } from 'vue'
3
+ function mergeStubs ( target : Record < string , any > , source : GlobalMountOptions ) {
6
4
if ( source . stubs ) {
7
5
if ( Array . isArray ( source . stubs ) ) {
8
6
source . stubs . forEach ( ( x ) => ( target [ x ] = true ) )
@@ -30,9 +28,12 @@ function mergeGlobalProperties(
30
28
components : { ...configGlobal . components , ...mountGlobal . components } ,
31
29
provide : { ...configGlobal . provide , ...mountGlobal . provide } ,
32
30
mocks : { ...configGlobal . mocks , ...mountGlobal . mocks } ,
33
- config : { ...configGlobal . config , ...mountGlobal . config } ,
31
+ config : { ...configGlobal . config , ...mountGlobal . config } as Omit <
32
+ AppConfig ,
33
+ 'isNativeTag'
34
+ > ,
34
35
directives : { ...configGlobal . directives , ...mountGlobal . directives }
35
36
}
36
37
}
37
38
38
- export { isString , mergeGlobalProperties }
39
+ export { mergeGlobalProperties }
You can’t perform that action at this time.
0 commit comments