From a57770b48b83b247e87e7b420db5905da4ebb982 Mon Sep 17 00:00:00 2001 From: DX Robot Date: Tue, 11 Jul 2023 08:38:28 +0000 Subject: [PATCH 1/2] Update devextreme submodule to 379832b2c12d0ae973957ed756f39a6ec3702619. Update generated code. --- devextreme | 2 +- package-lock.json | 6 +++--- packages/devextreme-vue/src/common/data/custom-store.ts | 8 ++++++++ packages/vue2-strategy/src/common/data/custom-store.ts | 8 ++++++++ 4 files changed, 20 insertions(+), 4 deletions(-) create mode 100644 packages/devextreme-vue/src/common/data/custom-store.ts create mode 100644 packages/vue2-strategy/src/common/data/custom-store.ts diff --git a/devextreme b/devextreme index 379832b2..403fca5d 160000 --- a/devextreme +++ b/devextreme @@ -1 +1 @@ -Subproject commit 379832b2c12d0ae973957ed756f39a6ec3702619 +Subproject commit 403fca5d00c8075262e536135b24ef1e70a22990 diff --git a/package-lock.json b/package-lock.json index cc4e7c8a..bb674450 100644 --- a/package-lock.json +++ b/package-lock.json @@ -17322,7 +17322,7 @@ "@vue/compiler-sfc": "^3.0.0", "@vue/test-utils": "2.0.0-beta.7", "del": "^3.0.0", - "devextreme-vue-generator": "^3.0.1", + "devextreme-vue-generator": "^3.0.3", "devextreme-vue2-strategy": "~23.2.0", "gulp": "^4.0.2", "gulp-header": "^2.0.9", @@ -17341,7 +17341,7 @@ } }, "packages/devextreme-vue-generator": { - "version": "3.0.2", + "version": "3.0.3", "license": "MIT", "dependencies": { "dasherize": "^2.0.0", @@ -22569,7 +22569,7 @@ "@vue/compiler-sfc": "^3.0.0", "@vue/test-utils": "2.0.0-beta.7", "del": "^3.0.0", - "devextreme-vue-generator": "^3.0.1", + "devextreme-vue-generator": "^3.0.3", "devextreme-vue2-strategy": "~23.2.0", "gulp": "^4.0.2", "gulp-header": "^2.0.9", diff --git a/packages/devextreme-vue/src/common/data/custom-store.ts b/packages/devextreme-vue/src/common/data/custom-store.ts new file mode 100644 index 00000000..32904df9 --- /dev/null +++ b/packages/devextreme-vue/src/common/data/custom-store.ts @@ -0,0 +1,8 @@ +export { + GroupItem, + isGroupItemsArray, + isItemsArray, + isSummary, + LoadedSummary, + LoadResult, +} from "devextreme/common/data/custom-store"; diff --git a/packages/vue2-strategy/src/common/data/custom-store.ts b/packages/vue2-strategy/src/common/data/custom-store.ts new file mode 100644 index 00000000..32904df9 --- /dev/null +++ b/packages/vue2-strategy/src/common/data/custom-store.ts @@ -0,0 +1,8 @@ +export { + GroupItem, + isGroupItemsArray, + isItemsArray, + isSummary, + LoadedSummary, + LoadResult, +} from "devextreme/common/data/custom-store"; From be96724fd539b4d4c5aff3848dd4d4e9572912c5 Mon Sep 17 00:00:00 2001 From: DX Robot Date: Wed, 12 Jul 2023 10:16:37 +0000 Subject: [PATCH 2/2] Update devextreme submodule to 403fca5d00c8075262e536135b24ef1e70a22990. Update generated code. --- devextreme | 2 +- packages/devextreme-vue/src/common/data/custom-store.ts | 4 ++-- packages/vue2-strategy/src/common/data/custom-store.ts | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/devextreme b/devextreme index 403fca5d..0667736b 160000 --- a/devextreme +++ b/devextreme @@ -1 +1 @@ -Subproject commit 403fca5d00c8075262e536135b24ef1e70a22990 +Subproject commit 0667736bbf26cd0d5a8a8f8f5a18d7628fb27454 diff --git a/packages/devextreme-vue/src/common/data/custom-store.ts b/packages/devextreme-vue/src/common/data/custom-store.ts index 32904df9..8b01da88 100644 --- a/packages/devextreme-vue/src/common/data/custom-store.ts +++ b/packages/devextreme-vue/src/common/data/custom-store.ts @@ -2,7 +2,7 @@ export { GroupItem, isGroupItemsArray, isItemsArray, - isSummary, - LoadedSummary, + isLoadResultObject, LoadResult, + LoadResultObject, } from "devextreme/common/data/custom-store"; diff --git a/packages/vue2-strategy/src/common/data/custom-store.ts b/packages/vue2-strategy/src/common/data/custom-store.ts index 32904df9..8b01da88 100644 --- a/packages/vue2-strategy/src/common/data/custom-store.ts +++ b/packages/vue2-strategy/src/common/data/custom-store.ts @@ -2,7 +2,7 @@ export { GroupItem, isGroupItemsArray, isItemsArray, - isSummary, - LoadedSummary, + isLoadResultObject, LoadResult, + LoadResultObject, } from "devextreme/common/data/custom-store";