Skip to content
8 changes: 4 additions & 4 deletions apps/demos/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"@angular/platform-browser-dynamic": "^22.2.1",
"@aspnet/signalr": "1.0.27",
"@preact/signals-core": "^1.8.0",
"@vue/compiler-sfc": "3.4.27",
"@vue/compiler-sfc": "~3.5.45",
"canvg": "4.0.3",
"cldr-numbers-full": "40.0.0",
"cldrjs": "0.5.5",
Expand All @@ -37,7 +37,7 @@
"devextreme-exceljs-fork": "catalog:",
"devextreme-quill": "catalog:",
"esbuild": "0.28.1",
"esbuild-plugin-vue3": "0.3.2",
"esbuild-plugin-vue3": "0.5.1",
"file-saver-es": "2.0.5",
"fs-extra": "11.1.1",
"globalize": "1.7.1",
Expand Down Expand Up @@ -69,7 +69,7 @@
"signalr": "2.4.3",
"typescript": "~6.0.0",
"unified": "10.1.2",
"vue": "^3.3.4",
"vue": "^3.5.45",
"vuex": "4.0.0-beta.4",
"whatwg-fetch": "2.0.4",
"zod": "catalog:",
Expand Down Expand Up @@ -124,7 +124,7 @@
"testcafe-reporter-spec-time": "4.0.0",
"ts-node": "10.9.2",
"vue-eslint-parser": "catalog:",
"vue-tsc": "3.0.8"
"vue-tsc": "3.3.14"
},
"scripts": {
"test": "jest --coverage --runInBand",
Expand Down
2 changes: 1 addition & 1 deletion apps/vue/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"dependencies": {
"devextreme": "workspace:*",
"devextreme-vue": "workspace:*",
"vue": "3.2.47"
"vue": "^3.5.45"
},
"devDependencies": {
"@types/node": "20.11.17",
Expand Down
2 changes: 1 addition & 1 deletion e2e/wrappers/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
"rrule": "2.6.4",
"rxjs": "~7.8.0",
"tslib": "^2.3.0",
"vue": "^3.5.13",
"vue": "^3.5.45",
"vue-router": "^4.3.0",
"zod": "catalog:",
"zone.js": "~0.15.0"
Expand Down
14 changes: 7 additions & 7 deletions packages/devextreme-vue/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -60,21 +60,21 @@
"license": "MIT",
"peerDependencies": {
"devextreme": "workspace:*",
"vue": "^3.0.0"
"vue": "^3.5.0"
},
"devDependencies": {
"@vue/compiler-sfc": "3.3.4",
"@vue/test-utils": "2.0.0-beta.7",
"@vue/compiler-sfc": "3.5.45",
"@vue/test-utils": "2.5.1",
"devextreme-metadata": "workspace:*",
"eslint-config-devextreme": "catalog:",
"eslint-plugin-spellcheck": "0.0.20",
"jest-environment-jsdom": "30.4.1",
"ts-jest": "29.4.12",
"typescript": "catalog:tools",
"typescript-min": "npm:typescript@4.9.5",
"vue": "3.2.47",
"@vue/shared": "3.4.26",
"vue-router": "4.2.5",
"typescript-min": "npm:typescript@5.4.5",
"vue": "3.5.45",
"@vue/shared": "3.5.45",
"vue-router": "4.6.4",
"eslint": "catalog:",
"@stylistic/eslint-plugin": "catalog:",
"eslint-plugin-i18n": "catalog:",
Expand Down
42 changes: 21 additions & 21 deletions packages/devextreme-vue/src/core/__tests__/component.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { mount } from '@vue/test-utils';
import * as events from 'devextreme/events';
import config from 'devextreme/core/config';
import {
App, defineComponent, nextTick, ref, createVNode, Fragment
App, ComponentOptions, ComponentPublicInstance, defineComponent, nextTick, ref, createVNode, Fragment
} from 'vue';
import { createRouter, createWebHistory } from 'vue-router';

Expand Down Expand Up @@ -37,7 +37,7 @@ function createConfigurationComponent(config) {
return defineComponent(config);
}

function createExtensionComponent(config) {
function createExtensionComponent(config: ComponentOptions) {
prepareExtensionComponentConfig(config);

return defineComponent(config);
Expand Down Expand Up @@ -323,7 +323,7 @@ describe('component rendering', () => {
});

const wrapper = mount(vm);
const component = wrapper.getComponent('#component');
const component = wrapper.getComponent<ComponentPublicInstance>('#component');

expect(WidgetClass.mock.calls[0][0]).toBe(component.vm.$el);

Expand All @@ -347,7 +347,7 @@ describe('component rendering', () => {
});

const wrapper = mount(vm);
const component = wrapper.getComponent('#component');
const component = wrapper.getComponent<ComponentPublicInstance>('#component');

expect(WidgetClass.mock.calls[0][0]).toBe(component.vm.$el);

Expand Down Expand Up @@ -484,7 +484,7 @@ describe('component rendering', () => {

const wrapper = mount(vm);

const config = (wrapper.getComponent('#component').vm as any as IConfigurable).$_config;
const config = (wrapper.getComponent<ComponentPublicInstance>('#component').vm as any as IConfigurable).$_config;
expect(config.nested).toHaveLength(1);
expect(config.nested[0].name).toBe('nestedOption');
expect(config.nested[0].options).toEqual(['prop1', 'prop2', 'sampleProp']);
Expand All @@ -510,7 +510,7 @@ describe('component rendering', () => {

const wrapper = mount(vm);

const config = (wrapper.getComponent('#component').vm as any as IConfigurable).$_config;
const config = (wrapper.getComponent<ComponentPublicInstance>('#component').vm as any as IConfigurable).$_config;
expect(config.nested).toHaveLength(1);
expect(config.nested[0].name).toBe('nestedOption');
expect(config.nested[0].options).toEqual(['prop1', 'prop2', 'sampleProp']);
Expand Down Expand Up @@ -539,7 +539,7 @@ describe('component rendering', () => {

const wrapper = mount(vm);

const config = (wrapper.getComponent('#component').vm as any as IConfigurable).$_config;
const config = (wrapper.getComponent<ComponentPublicInstance>('#component').vm as any as IConfigurable).$_config;
expect(config.nested).toHaveLength(3);

expect(config.nested[0].name).toBe('nestedOption');
Expand Down Expand Up @@ -584,7 +584,7 @@ describe('component rendering', () => {

const wrapper = mount(vm);

const config = (wrapper.getComponent('#component').vm as any as IConfigurable).$_config;
const config = (wrapper.getComponent<ComponentPublicInstance>('#component').vm as any as IConfigurable).$_config;
expect(config.nested).toHaveLength(3);

expect(config.nested[0].name).toBe('nestedOption');
Expand Down Expand Up @@ -629,7 +629,7 @@ describe('component rendering', () => {

const wrapper = mount(vm);

const component = wrapper.getComponent('#component').vm;
const component = wrapper.getComponent<ComponentPublicInstance>('#component').vm;
expect(component.$.subTree.children).toHaveLength(3);
});

Expand Down Expand Up @@ -661,7 +661,7 @@ describe('component rendering', () => {

const wrapper = mount(vm);

const component = wrapper.getComponent('#component').vm;
const component = wrapper.getComponent<ComponentPublicInstance>('#component').vm;
expect(component.$.subTree.children).toHaveLength(3);
});

Expand All @@ -686,7 +686,7 @@ describe('component rendering', () => {

const wrapper = mount(vm);

const config = (wrapper.getComponent('#component').vm as any as IConfigurable).$_config;
const config = (wrapper.getComponent<ComponentPublicInstance>('#component').vm as any as IConfigurable).$_config;
const initialValues = config.getNestedOptionValues();
expect(initialValues).toHaveProperty('nestedOption');
expect(initialValues!.nestedOption).toHaveProperty('predefinedProp');
Expand All @@ -713,7 +713,7 @@ describe('component rendering', () => {

const wrapper = mount(vm);

const config = (wrapper.getComponent('#component').vm as any as IConfigurable).$_config;
const config = (wrapper.getComponent<ComponentPublicInstance>('#component').vm as any as IConfigurable).$_config;
expect(config.nested).toHaveLength(1);

const nestedConfig = config.nested[0];
Expand Down Expand Up @@ -746,7 +746,7 @@ describe('component rendering', () => {

const wrapper = mount(vm);

const config = (wrapper.getComponent('#component').vm as any as IConfigurable).$_config;
const config = (wrapper.getComponent<ComponentPublicInstance>('#component').vm as any as IConfigurable).$_config;
expect(config.nested).toHaveLength(1);

const nestedConfig = config.nested[0];
Expand Down Expand Up @@ -782,7 +782,7 @@ describe('component rendering', () => {

const wrapper = mount(vm);

const config = (wrapper.getComponent('#component').vm as any as IConfigurable).$_config;
const config = (wrapper.getComponent<ComponentPublicInstance>('#component').vm as any as IConfigurable).$_config;
expect(config.nested).toHaveLength(1);

const nestedConfig = config.nested[0];
Expand Down Expand Up @@ -842,7 +842,7 @@ describe('component rendering', () => {

const wrapper = mount(vm);

const widgetConfig = (wrapper.getComponent('#component').vm as any as IConfigurable).$_config;
const widgetConfig = (wrapper.getComponent<ComponentPublicInstance>('#component').vm as any as IConfigurable).$_config;
expect(widgetConfig.nested[0].expectedChildren).toBe(expected);
});
});
Expand All @@ -865,7 +865,7 @@ describe('component rendering', () => {
});

const wrapper = mount(vm);
const component = wrapper.getComponent('#component');
const component = wrapper.getComponent<ComponentPublicInstance>('#component');

expect(WidgetClass.mock.calls[0][0]).toBe(component.vm.$el);

Expand Down Expand Up @@ -1236,7 +1236,7 @@ describe('component rendering', () => {
renderTemplate(
'tmpl',
{},
wrapper.getComponent('#component').vm.$el.querySelector('.template-container'),
wrapper.getComponent<ComponentPublicInstance>('#component').vm.$el.querySelector('.template-container'),
);

expect(mountedInDom).toBeTruthy();
Expand Down Expand Up @@ -1549,7 +1549,7 @@ describe('component rendering', () => {
events.triggerHandler(container.children[0], 'dxremove');
renderItemTemplate({ text: 'with data' }, container);

const subscriptions = (wrapper.getComponent('#component').vm as any).eventBus._list;
const subscriptions = (wrapper.getComponent<ComponentPublicInstance>('#component').vm as any).eventBus._list;
expect(subscriptions.length).toBe(1);

done();
Expand Down Expand Up @@ -1913,7 +1913,7 @@ describe('component rendering', () => {

const wrapper = mount(vm);

const expectedElement = wrapper.getComponent('#component').vm.$el;
const expectedElement = wrapper.getComponent<ComponentPublicInstance>('#component').vm.$el;
const actualElement = ExtensionWidgetClass.mock.calls[0][0];

expect(ExtensionWidgetClass).toHaveBeenCalledTimes(1);
Expand Down Expand Up @@ -1976,8 +1976,8 @@ describe('component rendering', () => {
});

const wrapper = mount(vm);
const component1 = wrapper.getComponent('#component1');
const component2 = wrapper.getComponent('#component2');
const component1 = wrapper.getComponent<ComponentPublicInstance>('#component1');
const component2 = wrapper.getComponent<ComponentPublicInstance>('#component2');

expect((component1.vm as any).$_config._initialValues.prop[0]).toEqual({ type: 'required' });
expect((component2.vm as any).$_config._initialValues.prop[0]).toEqual({ type: 'email' });
Expand Down
4 changes: 2 additions & 2 deletions packages/devextreme-vue/src/core/__tests__/data-grid.test.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { mount } from '@vue/test-utils';
import { defineComponent, nextTick } from 'vue';
import { ComponentPublicInstance, defineComponent, nextTick } from 'vue';

import { DxColumn, DxDataGrid } from '../../data-grid';

Expand Down Expand Up @@ -49,7 +49,7 @@ describe('data grid', () => {
});

const wrapper = mount(vm);
const instance = (wrapper.getComponent('#grid').vm as any).$_instance;
const instance = (wrapper.getComponent<ComponentPublicInstance>('#grid').vm as any).$_instance;
instance.option('columns[0].visible', false);

await nextTick(() => {
Expand Down
4 changes: 2 additions & 2 deletions packages/devextreme-vue/src/core/__tests__/form.test.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { mount } from '@vue/test-utils';
import { defineComponent, nextTick } from 'vue';
import { ComponentPublicInstance, defineComponent, nextTick } from 'vue';

import { DxForm, DxItem } from '../../form';

Expand Down Expand Up @@ -52,7 +52,7 @@ describe('form', () => {
});

await nextTick(() => {
expect(wrapper.getComponent('#form').vm.$el
expect(wrapper.getComponent<ComponentPublicInstance>('#form').vm.$el
.getElementsByClassName('dx-field-item-label-text')).toHaveLength(2);
});
});
Expand Down
4 changes: 2 additions & 2 deletions packages/devextreme-vue/src/core/__tests__/selectbox.test.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { mount } from '@vue/test-utils';
import { defineComponent } from 'vue';
import { ComponentPublicInstance, defineComponent } from 'vue';

import DxSelectBox from '../../select-box';
import DxTextBox from '../../text-box';
Expand Down Expand Up @@ -29,6 +29,6 @@ describe('template rendering', () => {
},
});
const wrapper = mount(vm);
expect(wrapper.getComponent('#component').vm.$el.children).toHaveLength(1);
expect(wrapper.getComponent<ComponentPublicInstance>('#component').vm.$el.children).toHaveLength(1);
});
});
14 changes: 7 additions & 7 deletions packages/devextreme-vue/src/core/__tests__/textbox.test.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { mount } from '@vue/test-utils';
import { defineComponent, nextTick } from 'vue';
import { ComponentPublicInstance, defineComponent, nextTick } from 'vue';

import { IConfigurable } from '../configuration-component';

Expand Down Expand Up @@ -28,9 +28,9 @@ describe('two-way binding', () => {
},
});
const wrapper = mount(vm);
const component = wrapper.getComponent('#component2').vm as any as IConfigurable;
const component = wrapper.getComponent<ComponentPublicInstance>('#component2').vm as any as IConfigurable;
component.$_config.updateValue = jest.fn();
wrapper.getComponent('#component1').vm.$emit('update:modelValue', 'newValue');
wrapper.getComponent<ComponentPublicInstance>('#component1').vm.$emit('update:modelValue', 'newValue');
await nextTick(() => {
expect(component.$_config.updateValue).toHaveBeenCalled();
});
Expand All @@ -51,7 +51,7 @@ describe('two-way binding', () => {
},
});
const wrapper = mount(vm);
const component = wrapper.getComponent('#component2').vm as any as IConfigurable;
const component = wrapper.getComponent<ComponentPublicInstance>('#component2').vm as any as IConfigurable;
component.$_config.updateValue = jest.fn();
await wrapper.setProps({ testValue: 'test' });
await nextTick(() => {
Expand All @@ -76,7 +76,7 @@ describe('two-way binding', () => {
},
});
const wrapper = mount(vm);
const component = wrapper.getComponent('#component');
const component = wrapper.getComponent<ComponentPublicInstance>('#component');
await wrapper.setProps({ customClass: 'custom2' });
await nextTick(() => {
expect(component.element.classList.toString()).toBe('custom2 dx-show-invalid-badge dx-textbox dx-texteditor dx-editor-outlined dx-texteditor-empty dx-widget');
Expand All @@ -94,13 +94,13 @@ describe('two-way binding', () => {
},
props: {
customClass: {
type: String,
type: Boolean,
default: true,
},
},
});
const wrapper = mount(vm);
const component = wrapper.getComponent('#component');
const component = wrapper.getComponent<ComponentPublicInstance>('#component');
await wrapper.setProps({ customClass: false });
await nextTick(() => {
expect(component.element.classList.toString()).toBe('dx-show-invalid-badge dx-textbox dx-texteditor dx-editor-outlined dx-texteditor-empty dx-widget');
Expand Down
5 changes: 3 additions & 2 deletions packages/devextreme-vue/src/core/__tests__/toolbar.test.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { mount } from '@vue/test-utils';
import { defineComponent } from 'vue';
import { defineComponent, nextTick } from 'vue';

import DxButton from '../../button';
import DxToolbar, { DxItem } from '../../toolbar';
Expand All @@ -10,7 +10,7 @@ beforeEach(() => {
});

describe('template rendering', () => {
it('should render a default template only for a configuration component where it is declared', () => {
it('should render a default template only for a configuration component where it is declared', async () => {
const vm = defineComponent({
template:
`<dx-toolbar id="component">
Expand All @@ -28,6 +28,7 @@ describe('template rendering', () => {
},
});
const wrapper = mount(vm);
await nextTick();
expect(wrapper.vm.$el.getElementsByClassName('dx-button')).toHaveLength(1);
});
});
Loading