From 4d5201fe9fa18c7764af2a571b0b076a082d24a9 Mon Sep 17 00:00:00 2001 From: Vasily Strelyaev Date: Fri, 22 Nov 2024 18:32:13 +0400 Subject: [PATCH] purely experimental: propagate new paths to system.js --- .../Angular/app/app.component.ts | 4 +-- .../Localization/UsingGlobalize/React/App.tsx | 4 +-- .../UsingGlobalize/ReactJs/App.js | 4 +-- .../Localization/UsingGlobalize/Vue/App.vue | 4 +-- .../UsingIntl/Angular/app/app.component.ts | 4 +-- .../Localization/UsingIntl/React/App.tsx | 4 +-- .../Localization/UsingIntl/ReactJs/App.js | 4 +-- .../Demos/Localization/UsingIntl/Vue/App.vue | 4 +-- apps/demos/configs/Angular/config.bundle.js | 15 ++++++++++- apps/demos/configs/React/config.bundle.js | 14 ++++++++-- apps/demos/configs/React/config.js | 2 +- apps/demos/configs/ReactJs/config.bundle.js | 13 ++++++++- apps/demos/configs/ReactJs/config.js | 2 +- apps/demos/configs/Vue/config.bundle.js | 15 ++++++++++- .../rollup.devextreme-angular.umd.config.mjs | 9 ++++--- apps/demos/utils/bundle/index.js | 10 ++++++- packages/devextreme-react/gulpfile.js | 2 ++ packages/devextreme-react/src/common/bag.ts | 14 ++++++++++ packages/devextreme-vue/src/common/bag.ts | 14 ++++++++++ .../js/bundles/modules/core.legacy.js | 27 +++++++++++++++++++ .../js/bundles/modules/data.legacy.js | 14 ++++++++++ .../js/bundles/modules/data.odata.legacy.js | 6 +++++ .../js/bundles/modules/parts/core.js | 1 + .../js/bundles/modules/parts/data.js | 2 ++ packages/devextreme/js/data/utils.js | 2 +- .../js/localization/globalize/core.js | 1 + .../js/localization/globalize/currency.js | 1 + .../js/localization/globalize/date.js | 1 + .../js/localization/globalize/message.js | 1 + .../js/localization/globalize/number.js | 1 + 30 files changed, 171 insertions(+), 28 deletions(-) create mode 100644 packages/devextreme-react/src/common/bag.ts create mode 100644 packages/devextreme-vue/src/common/bag.ts create mode 100644 packages/devextreme/js/bundles/modules/core.legacy.js create mode 100644 packages/devextreme/js/bundles/modules/data.legacy.js create mode 100644 packages/devextreme/js/bundles/modules/data.odata.legacy.js create mode 100644 packages/devextreme/js/localization/globalize/core.js create mode 100644 packages/devextreme/js/localization/globalize/currency.js create mode 100644 packages/devextreme/js/localization/globalize/date.js create mode 100644 packages/devextreme/js/localization/globalize/message.js create mode 100644 packages/devextreme/js/localization/globalize/number.js diff --git a/apps/demos/Demos/Localization/UsingGlobalize/Angular/app/app.component.ts b/apps/demos/Demos/Localization/UsingGlobalize/Angular/app/app.component.ts index ecce89fabec9..8e3d25d17e7d 100644 --- a/apps/demos/Demos/Localization/UsingGlobalize/Angular/app/app.component.ts +++ b/apps/demos/Demos/Localization/UsingGlobalize/Angular/app/app.component.ts @@ -8,8 +8,8 @@ import 'devextreme/localization/globalize/date'; import 'devextreme/localization/globalize/currency'; import 'devextreme/localization/globalize/message'; -import deMessages from 'npm:devextreme/localization/messages/de.json!json'; -import ruMessages from 'npm:devextreme/localization/messages/ru.json!json'; +import deMessages from 'npm:devextreme/common/core/localization/messages/de.json!json'; +import ruMessages from 'npm:devextreme/common/core/localization/messages/ru.json!json'; import deCldrData from 'npm:devextreme-cldr-data/de.json!json'; import ruCldrData from 'npm:devextreme-cldr-data/ru.json!json'; diff --git a/apps/demos/Demos/Localization/UsingGlobalize/React/App.tsx b/apps/demos/Demos/Localization/UsingGlobalize/React/App.tsx index b8c231be96b3..724a2794ad7d 100644 --- a/apps/demos/Demos/Localization/UsingGlobalize/React/App.tsx +++ b/apps/demos/Demos/Localization/UsingGlobalize/React/App.tsx @@ -9,8 +9,8 @@ import 'devextreme/localization/globalize/date'; import 'devextreme/localization/globalize/currency'; import 'devextreme/localization/globalize/message'; -import deMessages from 'devextreme/localization/messages/de.json'; -import ruMessages from 'devextreme/localization/messages/ru.json'; +import deMessages from 'devextreme/common/core/localization/messages/de.json'; +import ruMessages from 'devextreme/common/core/localization/messages/ru.json'; import deCldrData from 'devextreme-cldr-data/de.json'; import ruCldrData from 'devextreme-cldr-data/ru.json'; diff --git a/apps/demos/Demos/Localization/UsingGlobalize/ReactJs/App.js b/apps/demos/Demos/Localization/UsingGlobalize/ReactJs/App.js index 2ebd1e15d128..79660350cfd1 100644 --- a/apps/demos/Demos/Localization/UsingGlobalize/ReactJs/App.js +++ b/apps/demos/Demos/Localization/UsingGlobalize/ReactJs/App.js @@ -7,8 +7,8 @@ import 'devextreme/localization/globalize/number'; import 'devextreme/localization/globalize/date'; import 'devextreme/localization/globalize/currency'; import 'devextreme/localization/globalize/message'; -import deMessages from 'devextreme/localization/messages/de.json'; -import ruMessages from 'devextreme/localization/messages/ru.json'; +import deMessages from 'devextreme/common/core/localization/messages/de.json'; +import ruMessages from 'devextreme/common/core/localization/messages/ru.json'; import deCldrData from 'devextreme-cldr-data/de.json'; import ruCldrData from 'devextreme-cldr-data/ru.json'; import supplementalCldrData from 'devextreme-cldr-data/supplemental.json'; diff --git a/apps/demos/Demos/Localization/UsingGlobalize/Vue/App.vue b/apps/demos/Demos/Localization/UsingGlobalize/Vue/App.vue index cb5add991431..7361909f8c1d 100644 --- a/apps/demos/Demos/Localization/UsingGlobalize/Vue/App.vue +++ b/apps/demos/Demos/Localization/UsingGlobalize/Vue/App.vue @@ -69,8 +69,8 @@ import 'devextreme/localization/globalize/currency'; import 'devextreme/localization/globalize/message'; /* eslint-disable import/no-unresolved */ /* eslint-disable import/no-webpack-loader-syntax */ -import * as deMessages from 'npm:devextreme/localization/messages/de.json!json'; -import * as ruMessages from 'npm:devextreme/localization/messages/ru.json!json'; +import * as deMessages from 'npm:devextreme/common/core/localization/messages/de.json!json'; +import * as ruMessages from 'npm:devextreme/common/core/localization/messages/ru.json!json'; import * as deCldrData from 'npm:devextreme-cldr-data/de.json!json'; import * as ruCldrData from 'npm:devextreme-cldr-data/ru.json!json'; import * as supplementalCldrData from 'npm:devextreme-cldr-data/supplemental.json!json'; diff --git a/apps/demos/Demos/Localization/UsingIntl/Angular/app/app.component.ts b/apps/demos/Demos/Localization/UsingIntl/Angular/app/app.component.ts index cc7aa5448a6d..f90ed845c760 100644 --- a/apps/demos/Demos/Localization/UsingIntl/Angular/app/app.component.ts +++ b/apps/demos/Demos/Localization/UsingIntl/Angular/app/app.component.ts @@ -5,8 +5,8 @@ import { DxSelectBoxModule, DxDataGridModule } from 'devextreme-angular'; import { locale, loadMessages, formatMessage } from 'devextreme/localization'; -import deMessages from 'npm:devextreme/localization/messages/de.json!json'; -import ruMessages from 'npm:devextreme/localization/messages/ru.json!json'; +import deMessages from 'npm:devextreme/common/core/localization/messages/de.json!json'; +import ruMessages from 'npm:devextreme/common/core/localization/messages/ru.json!json'; import { Locale, Payment, Service } from './app.service'; if (!/localhost/.test(document.location.host)) { diff --git a/apps/demos/Demos/Localization/UsingIntl/React/App.tsx b/apps/demos/Demos/Localization/UsingIntl/React/App.tsx index c3033eafd311..db018e87c73b 100644 --- a/apps/demos/Demos/Localization/UsingIntl/React/App.tsx +++ b/apps/demos/Demos/Localization/UsingIntl/React/App.tsx @@ -4,8 +4,8 @@ import React, { useState } from 'react'; import DataGrid, { Column, Editing, FilterRow } from 'devextreme-react/data-grid'; import SelectBox, { SelectBoxTypes } from 'devextreme-react/select-box'; -import deMessages from 'devextreme/localization/messages/de.json'; -import ruMessages from 'devextreme/localization/messages/ru.json'; +import deMessages from 'devextreme/common/core/localization/messages/de.json'; +import ruMessages from 'devextreme/common/core/localization/messages/ru.json'; import { locale, loadMessages, formatMessage } from 'devextreme/localization'; import service from './data.ts'; diff --git a/apps/demos/Demos/Localization/UsingIntl/ReactJs/App.js b/apps/demos/Demos/Localization/UsingIntl/ReactJs/App.js index 7e8d2f742bce..15a5a303cf11 100644 --- a/apps/demos/Demos/Localization/UsingIntl/ReactJs/App.js +++ b/apps/demos/Demos/Localization/UsingIntl/ReactJs/App.js @@ -3,8 +3,8 @@ import React, { useState } from 'react'; import DataGrid, { Column, Editing, FilterRow } from 'devextreme-react/data-grid'; import SelectBox from 'devextreme-react/select-box'; -import deMessages from 'devextreme/localization/messages/de.json'; -import ruMessages from 'devextreme/localization/messages/ru.json'; +import deMessages from 'devextreme/common/core/localization/messages/de.json'; +import ruMessages from 'devextreme/common/core/localization/messages/ru.json'; import { locale, loadMessages, formatMessage } from 'devextreme/localization'; import service from './data.js'; diff --git a/apps/demos/Demos/Localization/UsingIntl/Vue/App.vue b/apps/demos/Demos/Localization/UsingIntl/Vue/App.vue index bb1cfb9efc0a..dbd7d9b810ed 100644 --- a/apps/demos/Demos/Localization/UsingIntl/Vue/App.vue +++ b/apps/demos/Demos/Localization/UsingIntl/Vue/App.vue @@ -65,8 +65,8 @@ import { import DxSelectBox, { DxSelectBoxTypes } from 'devextreme-vue/select-box'; /* eslint-disable import/no-unresolved */ /* eslint-disable import/no-webpack-loader-syntax */ -import * as deMessages from 'npm:devextreme/localization/messages/de.json!json'; -import * as ruMessages from 'npm:devextreme/localization/messages/ru.json!json'; +import * as deMessages from 'npm:devextreme/common/core/localization/messages/de.json!json'; +import * as ruMessages from 'npm:devextreme/common/core/localization/messages/ru.json!json'; import { locale as dxLocale, loadMessages, formatMessage as dxFormatMessage } from 'devextreme/localization'; import service from './data.ts'; diff --git a/apps/demos/configs/Angular/config.bundle.js b/apps/demos/configs/Angular/config.bundle.js index acb581dc5427..519e54b69265 100644 --- a/apps/demos/configs/Angular/config.bundle.js +++ b/apps/demos/configs/Angular/config.bundle.js @@ -5,7 +5,6 @@ const bundleConfig = { 'devextreme/data/*', 'devextreme/data/odata/*', 'devextreme/animation/*', - 'devextreme/common/*', 'devextreme/core/*', 'devextreme/core/utils/*', 'devextreme/data/*', @@ -25,8 +24,22 @@ const bundleConfig = { 'devextreme/ui/toast/*', 'devextreme/viz/*', 'devextreme/viz/vector_map/*', + 'devextreme/common/*', + 'devextreme/common/data/*', + 'devextreme/common/data/odata/*', + 'devextreme/common/export/*', + 'devextreme/common/file_management/*', + 'devextreme/common/core/*', + 'devextreme/common/core/animation/*', + 'devextreme/common/core/environment/*', + 'devextreme/common/core/events/*', + 'devextreme/common/core/localization/*', 'devextreme-angular', 'devextreme-angular/*', + 'devextreme-angular/core/*', + 'devextreme-angular/common/*', + 'devextreme-angular/common/core/*', + 'devextreme-angular/common/export/*', 'devexpress-gantt', 'devexpress-diagram', 'rxjs/*', diff --git a/apps/demos/configs/React/config.bundle.js b/apps/demos/configs/React/config.bundle.js index dc6c4bf95e33..c69cce02c73b 100644 --- a/apps/demos/configs/React/config.bundle.js +++ b/apps/demos/configs/React/config.bundle.js @@ -5,7 +5,6 @@ const bundleConfig = { 'devextreme/data/*', 'devextreme/data/odata/*', 'devextreme/animation/*', - 'devextreme/common/*', 'devextreme/core/*', 'devextreme/core/utils/*', 'devextreme/data/*', @@ -25,6 +24,17 @@ const bundleConfig = { 'devextreme/ui/toast/*', 'devextreme/viz/*', 'devextreme/viz/vector_map/*', + 'devextreme/common/*', + 'devextreme/common/data/*', + 'devextreme/common/data/odata/*', + 'devextreme/common/export/*', + 'devextreme/common/file_management/*', + 'devextreme/common/core/*', + 'devextreme/common/core/animation/*', + 'devextreme/common/core/environment/*', + 'devextreme/common/core/events/*', + 'devextreme/common/core/localization/*', + 'devextreme/common/core/localization/globalize/*', 'devextreme-react/*', 'devextreme-react/core/*', 'devextreme-react/common/*', @@ -38,7 +48,7 @@ const bundleConfig = { }, map: { 'devextreme.react.systemjs.js': '../../../../bundles/devextreme.react.systemjs.js', - 'devextreme/localization/messages': 'npm:devextreme/localization/messages', + 'devextreme/common/core/localization/messages': 'npm:devextreme/common/core/localization/messages', }, packages: { 'react': { diff --git a/apps/demos/configs/React/config.js b/apps/demos/configs/React/config.js index 927e7b83aaf9..03dee90a0155 100644 --- a/apps/demos/configs/React/config.js +++ b/apps/demos/configs/React/config.js @@ -158,7 +158,7 @@ window.config = { 'devextreme/events/utils': { main: 'index', }, - 'devextreme/localization/messages': { + 'devextreme/common/core/localization/messages': { format: 'json', defaultExtension: 'json', }, diff --git a/apps/demos/configs/ReactJs/config.bundle.js b/apps/demos/configs/ReactJs/config.bundle.js index 6c0580093cf5..625d30c76b41 100644 --- a/apps/demos/configs/ReactJs/config.bundle.js +++ b/apps/demos/configs/ReactJs/config.bundle.js @@ -19,6 +19,17 @@ const bundleConfig = { 'devextreme/ui/pivot_grid/*', 'devextreme/viz/*', 'devextreme/viz/vector_map/*', + 'devextreme/common/*', + 'devextreme/common/data/*', + 'devextreme/common/data/odata/*', + 'devextreme/common/export/*', + 'devextreme/common/file_management/*', + 'devextreme/common/core/*', + 'devextreme/common/core/animation/*', + 'devextreme/common/core/environment/*', + 'devextreme/common/core/events/*', + 'devextreme/common/core/localization/*', + 'devextreme/common/core/localization/globalize/*', 'devextreme-react/*', 'devextreme-react/core/*', 'devextreme-react/common/*', @@ -32,7 +43,7 @@ const bundleConfig = { }, map: { 'devextreme.react.systemjs.js': '../../../../../bundles/devextreme.react.systemjs.js', - 'devextreme/localization/messages': 'npm:devextreme/localization/messages', + 'devextreme/common/core/localization/messages': 'npm:devextreme/common/core/localization/messages', }, packages: { 'react': { diff --git a/apps/demos/configs/ReactJs/config.js b/apps/demos/configs/ReactJs/config.js index e8cc9c706853..30f0b5b6b868 100644 --- a/apps/demos/configs/ReactJs/config.js +++ b/apps/demos/configs/ReactJs/config.js @@ -159,7 +159,7 @@ window.config = { 'devextreme/events/utils': { main: 'index', }, - 'devextreme/localization/messages': { + 'devextreme/common/core/localization/messages': { format: 'json', defaultExtension: '', }, diff --git a/apps/demos/configs/Vue/config.bundle.js b/apps/demos/configs/Vue/config.bundle.js index 0886088cdf20..408e9840cda0 100644 --- a/apps/demos/configs/Vue/config.bundle.js +++ b/apps/demos/configs/Vue/config.bundle.js @@ -5,7 +5,6 @@ const bundleConfig = { 'devextreme/data/*', 'devextreme/data/odata/*', 'devextreme/animation/*', - 'devextreme/common/*', 'devextreme/core/*', 'devextreme/core/utils/*', 'devextreme/data/*', @@ -25,7 +24,21 @@ const bundleConfig = { 'devextreme/ui/toast/*', 'devextreme/viz/*', 'devextreme/viz/vector_map/*', + 'devextreme/common/*', + 'devextreme/common/data/*', + 'devextreme/common/data/odata/*', + 'devextreme/common/export/*', + 'devextreme/common/file_management/*', + 'devextreme/common/core/*', + 'devextreme/common/core/animation/*', + 'devextreme/common/core/environment/*', + 'devextreme/common/core/events/*', + 'devextreme/common/core/localization/*', 'devextreme-vue/*', + 'devextreme-vue/core/*', + 'devextreme-vue/common/*', + 'devextreme-vue/common/core/*', + 'devextreme-vue/common/export/*', 'devexpress-gantt', 'devexpress-diagram', ], diff --git a/apps/demos/rollup.devextreme-angular.umd.config.mjs b/apps/demos/rollup.devextreme-angular.umd.config.mjs index f15ea55bbc80..7c78bf2f10cb 100644 --- a/apps/demos/rollup.devextreme-angular.umd.config.mjs +++ b/apps/demos/rollup.devextreme-angular.umd.config.mjs @@ -4,16 +4,19 @@ import babel from '@rollup/plugin-babel'; import fs from 'fs-extra'; const baseDir = './node_modules/devextreme-angular/fesm2022/'; -const componentNames = fs.readdirSync(baseDir) +const fileNames = fs.readdirSync(baseDir) .filter((fileName) => fileName.indexOf('mjs.map') !== -1) - .filter((fileName) => fileName.indexOf('devextreme-angular-ui') === 0) + .filter((fileName) => + fileName.indexOf('devextreme-angular-ui') === 0 + || fileName.indexOf('devextreme-angular-common') === 0 + ) .map((fileName) => fileName.replace('.mjs.map', '')); const inputs = { 'devextreme-angular': `${baseDir}devextreme-angular.mjs`, 'devextreme-angular-core': `${baseDir}devextreme-angular-core.mjs`, 'devextreme-angular-http': `${baseDir}devextreme-angular-http.mjs`, - ...componentNames.reduce((acc, name) => { + ...fileNames.reduce((acc, name) => { acc[name] = `${baseDir}${name}.mjs`; return acc; diff --git a/apps/demos/utils/bundle/index.js b/apps/demos/utils/bundle/index.js index beef028630e9..58ad9d4cbffe 100644 --- a/apps/demos/utils/bundle/index.js +++ b/apps/demos/utils/bundle/index.js @@ -109,6 +109,7 @@ const prepareConfigs = (framework)=> { let modulesMap = {}; let main = `devextreme-${framework}/index.js`; + let common = `devextreme-${framework}/common/bag`; let minify = true; if (framework === 'angular') { @@ -133,6 +134,9 @@ const prepareConfigs = (framework)=> { prepareDevextremexAngularFiles(); const bundlesRoot = 'node_modules/devextreme-angular/bundles'; + + common = `${bundlesRoot}/devextreme-angular-common.umd.js`; + const componentNames = fs.readdirSync(bundlesRoot) .filter((fileName) => fileName.indexOf('umd.js') !== -1) .filter((fileName) => fileName.indexOf('devextreme-angular-ui') === 0) @@ -175,7 +179,7 @@ const prepareConfigs = (framework)=> { }]; additionPaths = { - 'devextreme/localization/messages/*': 'node_modules/devextreme/localization/messages/*', + 'devextreme/common/core/localization/messages/*': 'node_modules/devextreme/common/core/localization/messages/*', }; packages = [ @@ -196,6 +200,10 @@ const prepareConfigs = (framework)=> { main, ); + if (common) { + packages.push(common); + } + return { builderConfig, packages: packages.join(' + '), diff --git a/packages/devextreme-react/gulpfile.js b/packages/devextreme-react/gulpfile.js index 6f07c3dfc1c6..bc943fea85a3 100644 --- a/packages/devextreme-react/gulpfile.js +++ b/packages/devextreme-react/gulpfile.js @@ -97,6 +97,8 @@ gulp.task(NPM_PREPARE_MODULES, (done) => { ['common'], ['core', ['template', 'config', 'nested-option', 'component', 'extension-component']], ['common/core'], + ['common/data'], + ['common/export'], ['common/core/events'], ]; const modulesImportsFromIndex = fs.readFileSync( diff --git a/packages/devextreme-react/src/common/bag.ts b/packages/devextreme-react/src/common/bag.ts new file mode 100644 index 000000000000..938761a40388 --- /dev/null +++ b/packages/devextreme-react/src/common/bag.ts @@ -0,0 +1,14 @@ +export * as common from './index'; +export * as animation from './core/animation'; +export * as environment from './core/environment'; +export * as events from './core/events'; +export * as eventsIndex from './core/events/index'; +export * as localization from './core/localization'; +export * as charts from './charts'; +export * as data from './data'; +export * as customStore from './data/custom-store'; +export * as export from './export'; +export * as pdfExport from './export/pdf'; +export * as excelExport from './export/excel'; +export * as file_management from './file_management'; +export * as grids from './grids'; diff --git a/packages/devextreme-vue/src/common/bag.ts b/packages/devextreme-vue/src/common/bag.ts new file mode 100644 index 000000000000..938761a40388 --- /dev/null +++ b/packages/devextreme-vue/src/common/bag.ts @@ -0,0 +1,14 @@ +export * as common from './index'; +export * as animation from './core/animation'; +export * as environment from './core/environment'; +export * as events from './core/events'; +export * as eventsIndex from './core/events/index'; +export * as localization from './core/localization'; +export * as charts from './charts'; +export * as data from './data'; +export * as customStore from './data/custom-store'; +export * as export from './export'; +export * as pdfExport from './export/pdf'; +export * as excelExport from './export/excel'; +export * as file_management from './file_management'; +export * as grids from './grids'; diff --git a/packages/devextreme/js/bundles/modules/core.legacy.js b/packages/devextreme/js/bundles/modules/core.legacy.js new file mode 100644 index 000000000000..456e1705f9aa --- /dev/null +++ b/packages/devextreme/js/bundles/modules/core.legacy.js @@ -0,0 +1,27 @@ +/* eslint-disable import/no-commonjs */ +require('../../excel_exporter'); +require('../../pdf_exporter'); +require('../../mobile/hide_top_overlay'); +require('../../mobile/init_mobile_viewport'); +require('../../file_management/custom_provider'); +require('../../file_management/error'); +require('../../file_management/file_system_item'); +require('../../file_management/object_provider'); +require('../../file_management/provider_base'); +require('../../file_management/remote_provider'); +require('../../events/index'); +require('../../time_zone_utils'); +require('../../core/config'); +require('../../core/devices'); +require('../../core/set_template_engine'); +require('../../core/templates/template'); +require('../../animation/frame'); +require('../../animation/fx'); +require('../../animation/presets'); +require('../../animation/transition_executor'); + +require('../../localization/globalize/core'); +require('../../localization/globalize/message'); +require('../../localization/globalize/number'); +require('../../localization/globalize/date'); +require('../../localization/globalize/currency'); diff --git a/packages/devextreme/js/bundles/modules/data.legacy.js b/packages/devextreme/js/bundles/modules/data.legacy.js new file mode 100644 index 000000000000..383b6263db96 --- /dev/null +++ b/packages/devextreme/js/bundles/modules/data.legacy.js @@ -0,0 +1,14 @@ +/* eslint-disable import/no-commonjs */ +require('../../data/errors'); +require('../../data/data_source'); +require('../../data/query'); +require('../../data/abstract_store'); +require('../../data/array_store'); +require('../../data/custom_store'); +require('../../data/local_store'); +require('../../data/utils'); +require('../../data/apply_changes'); +require('../../core/guid'); +require('../../core/utils/data'); +require('../../data/endpoint_selector'); +require('../../data/utils'); diff --git a/packages/devextreme/js/bundles/modules/data.odata.legacy.js b/packages/devextreme/js/bundles/modules/data.odata.legacy.js new file mode 100644 index 000000000000..fb8f1be0f52d --- /dev/null +++ b/packages/devextreme/js/bundles/modules/data.odata.legacy.js @@ -0,0 +1,6 @@ +/* eslint-disable import/no-commonjs */ +require('./data'); + +require('../../data/odata/store'); +require('../../data/odata/context'); +require('../../data/odata/utils'); diff --git a/packages/devextreme/js/bundles/modules/parts/core.js b/packages/devextreme/js/bundles/modules/parts/core.js index 7a14d9d9ee5f..42cf4ea853d3 100644 --- a/packages/devextreme/js/bundles/modules/parts/core.js +++ b/packages/devextreme/js/bundles/modules/parts/core.js @@ -3,6 +3,7 @@ /* Core (dx.module-core.js) */ /* eslint-disable import/no-commonjs */ const DevExpress = require('../../../bundles/modules/core'); +require('../../../bundles/modules/core.legacy'); /* Integrations (dx.module-core.js) */ diff --git a/packages/devextreme/js/bundles/modules/parts/data.js b/packages/devextreme/js/bundles/modules/parts/data.js index 76699046df9e..28eb725c9fdf 100644 --- a/packages/devextreme/js/bundles/modules/parts/data.js +++ b/packages/devextreme/js/bundles/modules/parts/data.js @@ -5,8 +5,10 @@ const DevExpress = require('./core'); /* Data (dx.module-core.js) */ const data = DevExpress.data = require('../../../bundles/modules/data'); +require('../../../bundles/modules/data.legacy'); data.odata = require('../../../bundles/modules/data.odata'); +require('../../../bundles/modules/data.odata.legacy'); /// BUNDLER_PARTS_END module.exports = data; diff --git a/packages/devextreme/js/data/utils.js b/packages/devextreme/js/data/utils.js index 28c16d2b39ff..09f625a3571f 100644 --- a/packages/devextreme/js/data/utils.js +++ b/packages/devextreme/js/data/utils.js @@ -1 +1 @@ -export { base64_encode } from '../common/data'; +export * from '../common/data/utils'; diff --git a/packages/devextreme/js/localization/globalize/core.js b/packages/devextreme/js/localization/globalize/core.js new file mode 100644 index 000000000000..fc36b71d45a6 --- /dev/null +++ b/packages/devextreme/js/localization/globalize/core.js @@ -0,0 +1 @@ +import '../../common/core/localization/globalize/core'; diff --git a/packages/devextreme/js/localization/globalize/currency.js b/packages/devextreme/js/localization/globalize/currency.js new file mode 100644 index 000000000000..bf9568470ff3 --- /dev/null +++ b/packages/devextreme/js/localization/globalize/currency.js @@ -0,0 +1 @@ +import '../../common/core/localization/globalize/currency'; diff --git a/packages/devextreme/js/localization/globalize/date.js b/packages/devextreme/js/localization/globalize/date.js new file mode 100644 index 000000000000..5c7855d46282 --- /dev/null +++ b/packages/devextreme/js/localization/globalize/date.js @@ -0,0 +1 @@ +import '../../common/core/localization/globalize/date'; diff --git a/packages/devextreme/js/localization/globalize/message.js b/packages/devextreme/js/localization/globalize/message.js new file mode 100644 index 000000000000..19b1d397369e --- /dev/null +++ b/packages/devextreme/js/localization/globalize/message.js @@ -0,0 +1 @@ +import '../../common/core/localization/globalize/message'; diff --git a/packages/devextreme/js/localization/globalize/number.js b/packages/devextreme/js/localization/globalize/number.js new file mode 100644 index 000000000000..67e44eca5ca9 --- /dev/null +++ b/packages/devextreme/js/localization/globalize/number.js @@ -0,0 +1 @@ +import '../../common/core/localization/globalize/number';