Skip to content

Commit 26467b2

Browse files
Regenerate wrappers. Use explicit type exports and remake reexports (DevExpress#33046)
1 parent a93c4a9 commit 26467b2

43 files changed

Lines changed: 1022 additions & 127 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

apps/demos/utils/bundle/index.js

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ const prepareModulesToNamedImport = () => {
2121
'time_zone_utils.js',
2222
'devextreme/ui/dialog.js',
2323
'common/charts.js',
24+
'common/data.js',
2425
];
2526

2627
const paths = [
@@ -187,6 +188,28 @@ const prepareConfigs = (framework) => {
187188
];
188189
}
189190

191+
if (['react', 'vue'].includes(framework)) {
192+
const commonDir = path.join(process.cwd(), 'node_modules', `devextreme-${framework}`, 'cjs', 'common');
193+
194+
if (fs.existsSync(commonDir)) {
195+
const collectJsExceptIndex = (dir, prefix = '') => {
196+
const names = fs.readdirSync(dir, { withFileTypes: true });
197+
198+
for (const ent of names) {
199+
const rel = prefix ? `${prefix}/${ent.name}` : ent.name;
200+
201+
if (ent.isDirectory()) {
202+
collectJsExceptIndex(path.join(dir, ent.name), rel);
203+
} else if (ent.isFile() && ent.name.endsWith('.js') && ent.name !== 'index.js') {
204+
packages.push(`devextreme-${framework}/common/${rel}`);
205+
}
206+
}
207+
};
208+
209+
collectJsExceptIndex(commonDir);
210+
}
211+
}
212+
190213
const builderConfig = getDefaultBuilderConfig(framework, additionPaths, modulesMap);
191214

192215
additionPackage.forEach((p) => {

packages/devextreme-angular/src/common/ai-integration/index.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
export {
22
AIIntegration,
3+
} from 'devextreme/common/ai-integration';
4+
export type {
35
AIIntegrationOptions,
46
AIProvider,
57
AIResponse,

packages/devextreme-angular/src/common/charts/index.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
11
export {
2+
registerGradient,
3+
registerPattern,
4+
} from 'devextreme/common/charts';
5+
export type {
26
AnimationEaseMode,
37
AnnotationType,
48
ArgumentAxisHoverMode,
@@ -22,8 +26,6 @@ export {
2226
PaletteExtensionMode,
2327
PointInteractionMode,
2428
PointSymbol,
25-
registerGradient,
26-
registerPattern,
2729
RelativePosition,
2830
ScaleBreak,
2931
ScaleBreakLineStyle,
Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
export {
2-
AnimationConfig,
32
animationPresets,
4-
AnimationState,
53
cancelAnimationFrame,
6-
CollisionResolution,
7-
CollisionResolutionCombination,
84
fx,
9-
PositionConfig,
105
requestAnimationFrame,
116
TransitionExecutor,
127
} from 'devextreme/common/core/animation';
8+
export type {
9+
AnimationConfig,
10+
AnimationState,
11+
CollisionResolution,
12+
CollisionResolutionCombination,
13+
PositionConfig,
14+
} from 'devextreme/common/core/animation';
Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
export {
2-
Device,
32
getTimeZones,
43
hideTopOverlay,
54
initMobileViewport,
5+
} from 'devextreme/common/core/environment';
6+
export type {
7+
Device,
68
SchedulerTimeZone,
79
} from 'devextreme/common/core/environment';
Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,10 @@
11
export {
2+
off,
3+
on,
4+
one,
5+
trigger,
6+
} from 'devextreme/common/core/events';
7+
export type {
28
AsyncCancelable,
39
Cancelable,
410
ChangedOptionInfo,
@@ -7,8 +13,4 @@ export {
713
InitializedEventInfo,
814
ItemInfo,
915
NativeEventInfo,
10-
off,
11-
on,
12-
one,
13-
trigger,
1416
} from 'devextreme/common/core/events';

packages/devextreme-angular/src/common/core/index.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@ export * as Animation from './animation';
22
export * as Environment from './environment';
33
export * as Events from './events';
44
export * as Localization from './localization';
5+
Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
export {
2-
Format,
32
formatDate,
43
formatMessage,
54
formatNumber,
@@ -8,3 +7,6 @@ export {
87
parseDate,
98
parseNumber,
109
} from 'devextreme/common/core/localization';
10+
export type {
11+
Format,
12+
} from 'devextreme/common/core/localization';

packages/devextreme-angular/src/common/data/index.ts

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,43 @@
11
export {
22
applyChanges,
33
ArrayStore,
4-
ArrayStoreOptions,
54
base64_encode,
65
compileGetter,
76
compileSetter,
87
CustomStore,
9-
CustomStoreOptions,
108
DataSource,
11-
DataSourceOptions,
129
EdmLiteral,
1310
EndpointSelector,
1411
errorHandler,
15-
FilterDescriptor,
16-
GroupDescriptor,
17-
GroupingInterval,
18-
GroupItem,
1912
isGroupItemsArray,
2013
isItemsArray,
2114
isLoadResultObject,
2215
keyConverters,
16+
LocalStore,
17+
ODataContext,
18+
ODataStore,
19+
query,
20+
setErrorHandler,
21+
} from 'devextreme/common/data';
22+
export type {
23+
ArrayStoreOptions,
24+
CustomStoreOptions,
25+
DataSourceOptions,
26+
FilterDescriptor,
27+
GroupDescriptor,
28+
GroupingInterval,
29+
GroupItem,
2330
LangParams,
2431
LoadOptions,
2532
LoadResult,
2633
LoadResultObject,
27-
LocalStore,
2834
LocalStoreOptions,
29-
ODataContext,
3035
ODataContextOptions,
31-
ODataStore,
3236
ODataStoreOptions,
33-
query,
3437
Query,
3538
ResolvedData,
3639
SearchOperation,
3740
SelectDescriptor,
38-
setErrorHandler,
3941
SortDescriptor,
4042
Store,
4143
StoreOptions,
Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
export {
2+
exportDataGrid,
3+
exportPivotGrid,
4+
} from 'devextreme/common/export/excel';
5+
export type {
26
CellAddress,
37
CellRange,
48
DataGridCell,
59
DataGridExportOptions,
6-
exportDataGrid,
7-
exportPivotGrid,
810
PivotGridCell,
911
PivotGridExportOptions,
1012
} from 'devextreme/common/export/excel';

0 commit comments

Comments
 (0)