Skip to content

Commit 9468fc1

Browse files
lmiller1990lmiller1990
authored
Merge pull request #141 from cexbrayat/chore/vue-beta-15
chore: bump to Vue 3.0.0-beta.15
2 parents d26d367 + 9af9de2 commit 9468fc1

File tree

4 files changed

+79
-30
lines changed

4 files changed

+79
-30
lines changed

‎package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
"ts-jest": "^25.0.0",
4141
"tsd": "0.11.0",
4242
"typescript": "^3.7.5",
43-
"vue": "^3.0.0-beta.12",
43+
"vue": "^3.0.0-beta.15",
4444
"vue-jest": "vuejs/vue-jest#next",
4545
"vuex": "^4.0.0-beta.1"
4646
},

‎src/mount.ts

+29-3
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@ import {
1414
ExtractPropTypes,
1515
Component,
1616
WritableComputedOptions,
17-
SetupContext,
18-
RenderFunction,
17+
ComponentOptionsBase,
1918
ComponentPropsOptions,
2019
AppConfig,
2120
VNodeProps
@@ -35,14 +34,29 @@ import {
3534
} from './constants'
3635
import { stubComponents } from './stubs'
3736

37+
// TODO remove when https://github.com/vuejs/vue-next/pull/1361 is merged
38+
type ComponentOptionsMixin = ComponentOptionsBase<
39+
any,
40+
any,
41+
any,
42+
any,
43+
any,
44+
any,
45+
any,
46+
any
47+
>
3848
type Slot = VNode | string | { render: Function } | Function
3949

4050
type SlotDictionary = {
4151
[key: string]: Slot
4252
}
4353

4454
interface MountingOptions<Props, Data = {}> {
45-
data?: () => Data extends object ? Partial<Data> : never
55+
data?: () => {} extends Data
56+
? never
57+
: Data extends object
58+
? Partial<Data>
59+
: never
4660
props?: Props
4761
attrs?: Record<string, unknown>
4862
slots?: SlotDictionary & {
@@ -86,6 +100,8 @@ export function mount<
86100
C extends ComputedOptions = {},
87101
M extends Record<string, Function> = {},
88102
E extends EmitsOptions = Record<string, any>,
103+
Mixin extends ComponentOptionsMixin = ComponentOptionsMixin,
104+
Extends extends ComponentOptionsMixin = ComponentOptionsMixin,
89105
EE extends string = string
90106
>(
91107
componentOptions: ComponentOptionsWithoutProps<
@@ -95,6 +111,8 @@ export function mount<
95111
C,
96112
M,
97113
E,
114+
Mixin,
115+
Extends,
98116
EE
99117
>,
100118
options?: MountingOptions<never, D>
@@ -110,6 +128,8 @@ export function mount<
110128
C extends ComputedOptions = {},
111129
M extends Record<string, Function> = {},
112130
E extends EmitsOptions = Record<string, any>,
131+
Mixin extends ComponentOptionsMixin = ComponentOptionsMixin,
132+
Extends extends ComponentOptionsMixin = ComponentOptionsMixin,
113133
EE extends string = string,
114134
Props extends Readonly<{ [key in PropNames]?: any }> = Readonly<
115135
{ [key in PropNames]?: any }
@@ -122,6 +142,8 @@ export function mount<
122142
C,
123143
M,
124144
E,
145+
Mixin,
146+
Extends,
125147
EE,
126148
Props
127149
>,
@@ -138,6 +160,8 @@ export function mount<
138160
C extends ComputedOptions = {},
139161
M extends Record<string, Function> = {},
140162
E extends EmitsOptions = Record<string, any>,
163+
Mixin extends ComponentOptionsMixin = ComponentOptionsMixin,
164+
Extends extends ComponentOptionsMixin = ComponentOptionsMixin,
141165
EE extends string = string
142166
>(
143167
componentOptions: ComponentOptionsWithObjectProps<
@@ -147,6 +171,8 @@ export function mount<
147171
C,
148172
M,
149173
E,
174+
Mixin,
175+
Extends,
150176
EE
151177
>,
152178
options?: MountingOptions<ExtractPropTypes<PropsOptions>, D>

‎src/stubs.ts

+1-2
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,7 @@ const createStub = ({ name, props }: StubOptions): ComponentOptions => {
2727
const tag = name ? `${hyphenate(name)}-stub` : anonName
2828

2929
const render = (ctx: ComponentPublicInstance) => {
30-
// TS is not happy with this signature, so we cast the Slots as any
31-
return h(tag, {}, getSlots(ctx) as any)
30+
return h(tag, {}, getSlots(ctx))
3231
}
3332

3433
return defineComponent({ name: name || anonName, render, props })

‎yarn.lock

+48-24
Original file line numberDiff line numberDiff line change
@@ -1199,6 +1199,17 @@
11991199
estree-walker "^0.8.1"
12001200
source-map "^0.6.1"
12011201

1202+
"@vue/[email protected]":
1203+
version "3.0.0-beta.15"
1204+
resolved "https://registry.yarnpkg.com/@vue/compiler-core/-/compiler-core-3.0.0-beta.15.tgz#8710a8e3ba15ba1a8b62bd17609d26bd27fdcc45"
1205+
integrity sha512-NLNW7tAMHl8ybRgTPTIWLsi8aXHbFngY2x95eEHAdxhNasTY5NsgmQBBH9TBAUQEn6Wo8ybmuvQoNzgcw979Zg==
1206+
dependencies:
1207+
"@babel/parser" "^7.8.6"
1208+
"@babel/types" "^7.8.6"
1209+
"@vue/shared" "3.0.0-beta.15"
1210+
estree-walker "^0.8.1"
1211+
source-map "^0.6.1"
1212+
12021213
"@vue/[email protected]", "@vue/compiler-dom@^3.0.0-beta.12":
12031214
version "3.0.0-beta.12"
12041215
resolved "https://registry.yarnpkg.com/@vue/compiler-dom/-/compiler-dom-3.0.0-beta.12.tgz#f455898b96d421d71c808ca35b8349504a2f7ffd"
@@ -1207,6 +1218,14 @@
12071218
"@vue/compiler-core" "3.0.0-beta.12"
12081219
"@vue/shared" "3.0.0-beta.12"
12091220

1221+
"@vue/[email protected]":
1222+
version "3.0.0-beta.15"
1223+
resolved "https://registry.yarnpkg.com/@vue/compiler-dom/-/compiler-dom-3.0.0-beta.15.tgz#ee6dc9ae1dabb5c5c257d7cc20c5f3e95d5e5f4f"
1224+
integrity sha512-0qVaCosZ6XrkmlSOndGlNh33JQ2oao82uWxC/qw4QWBGm6a1DcKkZFIZFYLQWg5ZIcSrEQrR1VzUidBaZw9AIg==
1225+
dependencies:
1226+
"@vue/compiler-core" "3.0.0-beta.15"
1227+
"@vue/shared" "3.0.0-beta.15"
1228+
12101229
"@vue/compiler-sfc@^3.0.0-beta.12":
12111230
version "3.0.0-beta.12"
12121231
resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-3.0.0-beta.12.tgz#ed93aa0f07d5d099cea7582118e05fbb7c77b1c6"
@@ -1233,35 +1252,40 @@
12331252
"@vue/compiler-dom" "3.0.0-beta.12"
12341253
"@vue/shared" "3.0.0-beta.12"
12351254

1236-
"@vue/[email protected].12":
1237-
version "3.0.0-beta.12"
1238-
resolved "https://registry.yarnpkg.com/@vue/reactivity/-/reactivity-3.0.0-beta.12.tgz#33e8c3845dc663967c85217316f831a0153c40dc"
1239-
integrity sha512-ZgqLVADzwgFvm+Jf12bfzesvV3wcZXfM6JmryZ2BrWvkGS+Xo0A4oOcnsB4Tmqw5lemdYYkoleup02ChzvRlMg==
1255+
"@vue/[email protected].15":
1256+
version "3.0.0-beta.15"
1257+
resolved "https://registry.yarnpkg.com/@vue/reactivity/-/reactivity-3.0.0-beta.15.tgz#4ee0942783d7ff09acab5b8755706597ba6234f6"
1258+
integrity sha512-Xa0LG8RTNlPYsuqOBhhV03xKhMmuSU0vtKXoIi1yxp9gGU7ga/TMmnhELb66AiupiXdLJwRcdv00KhPF/2y0dA==
12401259
dependencies:
1241-
"@vue/shared" "3.0.0-beta.12"
1260+
"@vue/shared" "3.0.0-beta.15"
12421261

1243-
"@vue/[email protected].12":
1244-
version "3.0.0-beta.12"
1245-
resolved "https://registry.yarnpkg.com/@vue/runtime-core/-/runtime-core-3.0.0-beta.12.tgz#f35fa386c319e13da682e58f171e25c2376ec865"
1246-
integrity sha512-qcgfp5VJCuObGIYPoust7l3hZONHfgJfVeVYPjaKi+asjlYwdmjTRExUahhjuHvkLdSGRY+qckS3Adga7kyMjg==
1262+
"@vue/[email protected].15":
1263+
version "3.0.0-beta.15"
1264+
resolved "https://registry.yarnpkg.com/@vue/runtime-core/-/runtime-core-3.0.0-beta.15.tgz#35c2ef61dadf07dfe9129dbea6fb8c1b88cc5bd6"
1265+
integrity sha512-jDkqSs1hsS9fRCgzah7VINafxWj7bYoDyweVuBqm6KPcHRfGkRZZxl2NltbbVaLH76Qvm4PPSnqGgEx7QtFSgg==
12471266
dependencies:
1248-
"@vue/reactivity" "3.0.0-beta.12"
1249-
"@vue/shared" "3.0.0-beta.12"
1267+
"@vue/reactivity" "3.0.0-beta.15"
1268+
"@vue/shared" "3.0.0-beta.15"
12501269

1251-
"@vue/[email protected].12":
1252-
version "3.0.0-beta.12"
1253-
resolved "https://registry.yarnpkg.com/@vue/runtime-dom/-/runtime-dom-3.0.0-beta.12.tgz#f9c0f02fb2152727ec0746517ae5ab08513d00e8"
1254-
integrity sha512-1fyDeKKX2KMZbMmxn9a/QzwYSlbzZlGz3Iy9iss/WbFFK9hNtAEWY6x4iwtw7/vJ00EE8OOMgHX3ki9fNNqSqw==
1270+
"@vue/[email protected].15":
1271+
version "3.0.0-beta.15"
1272+
resolved "https://registry.yarnpkg.com/@vue/runtime-dom/-/runtime-dom-3.0.0-beta.15.tgz#e3ce740c5e3766020719b174686bd65c75975c7e"
1273+
integrity sha512-161rUw1sWfbv51Ua8gKXaPc+seRJQcV+MLokTJtqYtNCajya0Mx6vdXJajBWqjDT8/Udx0sb7Wm/K/0DfGBUTw==
12551274
dependencies:
1256-
"@vue/runtime-core" "3.0.0-beta.12"
1257-
"@vue/shared" "3.0.0-beta.12"
1275+
"@vue/runtime-core" "3.0.0-beta.15"
1276+
"@vue/shared" "3.0.0-beta.15"
12581277
csstype "^2.6.8"
12591278

12601279
"@vue/[email protected]":
12611280
version "3.0.0-beta.12"
12621281
resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.0.0-beta.12.tgz#cb7a2bb047919d2c944bf822032b0a8aa869ba1d"
12631282
integrity sha512-cA0DD3VFGYI76lbM90fAYXNJ9EmDNsm1tthO4FIY18DwziZKJWCfQBhEfHQd2skHcTE4OqH5eBxgsKEdn/LuGQ==
12641283

1284+
"@vue/[email protected]":
1285+
version "3.0.0-beta.15"
1286+
resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.0.0-beta.15.tgz#77444ab234e229c3fdcc9f394678e167a55757af"
1287+
integrity sha512-wViILT5GgxMtnXVQ1xupj43wvnZ41g3NLWaBObs7l+eTxz5vq5yx72qH6HRpsfhR2Mg39jE0cfNLFEpC4lJIUQ==
1288+
12651289
abab@^2.0.0, abab@^2.0.3:
12661290
version "2.0.3"
12671291
resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.3.tgz#623e2075e02eb2d3f2475e49f99c91846467907a"
@@ -5983,14 +6007,14 @@ vue-jest@vuejs/vue-jest#next:
59836007
extract-from-css "^0.4.4"
59846008
ts-jest "^24.0.0"
59856009

5986-
vue@^3.0.0-beta.12:
5987-
version "3.0.0-beta.12"
5988-
resolved "https://registry.yarnpkg.com/vue/-/vue-3.0.0-beta.12.tgz#e72d1baeede285768d2df0f2b52dc79427f49419"
5989-
integrity sha512-4Y8LPplndYp48q1P8CSbG3Et/bPcMQB11edusA6SuIGmgrLdS4Ntdwpjtc9kglYHaY9/E/VTVjl4jAGqpAFR1w==
6010+
vue@^3.0.0-beta.15:
6011+
version "3.0.0-beta.15"
6012+
resolved "https://registry.yarnpkg.com/vue/-/vue-3.0.0-beta.15.tgz#99f107534755d3a237b51fc1279c43af2fefde6e"
6013+
integrity sha512-KTmvfNpkvD6mao8vloqjUMjrHEivS1HZvHmYeHPRHqU2HRvNcrZuwXYvETt3dGOTu0Oj7zAWQXP+uZ34CW75sw==
59906014
dependencies:
5991-
"@vue/compiler-dom" "3.0.0-beta.12"
5992-
"@vue/runtime-dom" "3.0.0-beta.12"
5993-
"@vue/shared" "3.0.0-beta.12"
6015+
"@vue/compiler-dom" "3.0.0-beta.15"
6016+
"@vue/runtime-dom" "3.0.0-beta.15"
6017+
"@vue/shared" "3.0.0-beta.15"
59946018

59956019
vuex@^4.0.0-beta.1:
59966020
version "4.0.0-beta.1"

0 commit comments

Comments
 (0)