Skip to content

Commit

Permalink
purely experimental: propagate new paths to system.js
Browse files Browse the repository at this point in the history
  • Loading branch information
VasilyStrelyaev committed Nov 26, 2024
1 parent aa636a7 commit 4d5201f
Show file tree
Hide file tree
Showing 30 changed files with 171 additions and 28 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
4 changes: 2 additions & 2 deletions apps/demos/Demos/Localization/UsingGlobalize/React/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
4 changes: 2 additions & 2 deletions apps/demos/Demos/Localization/UsingGlobalize/ReactJs/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
4 changes: 2 additions & 2 deletions apps/demos/Demos/Localization/UsingGlobalize/Vue/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)) {
Expand Down
4 changes: 2 additions & 2 deletions apps/demos/Demos/Localization/UsingIntl/React/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
4 changes: 2 additions & 2 deletions apps/demos/Demos/Localization/UsingIntl/ReactJs/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down
4 changes: 2 additions & 2 deletions apps/demos/Demos/Localization/UsingIntl/Vue/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
15 changes: 14 additions & 1 deletion apps/demos/configs/Angular/config.bundle.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ const bundleConfig = {
'devextreme/data/*',
'devextreme/data/odata/*',
'devextreme/animation/*',
'devextreme/common/*',
'devextreme/core/*',
'devextreme/core/utils/*',
'devextreme/data/*',
Expand All @@ -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/*',
Expand Down
14 changes: 12 additions & 2 deletions apps/demos/configs/React/config.bundle.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ const bundleConfig = {
'devextreme/data/*',
'devextreme/data/odata/*',
'devextreme/animation/*',
'devextreme/common/*',
'devextreme/core/*',
'devextreme/core/utils/*',
'devextreme/data/*',
Expand All @@ -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/*',
Expand All @@ -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': {
Expand Down
2 changes: 1 addition & 1 deletion apps/demos/configs/React/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ window.config = {
'devextreme/events/utils': {
main: 'index',
},
'devextreme/localization/messages': {
'devextreme/common/core/localization/messages': {
format: 'json',
defaultExtension: 'json',
},
Expand Down
13 changes: 12 additions & 1 deletion apps/demos/configs/ReactJs/config.bundle.js
Original file line number Diff line number Diff line change
Expand Up @@ -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/*',
Expand All @@ -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': {
Expand Down
2 changes: 1 addition & 1 deletion apps/demos/configs/ReactJs/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ window.config = {
'devextreme/events/utils': {
main: 'index',
},
'devextreme/localization/messages': {
'devextreme/common/core/localization/messages': {
format: 'json',
defaultExtension: '',
},
Expand Down
15 changes: 14 additions & 1 deletion apps/demos/configs/Vue/config.bundle.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ const bundleConfig = {
'devextreme/data/*',
'devextreme/data/odata/*',
'devextreme/animation/*',
'devextreme/common/*',
'devextreme/core/*',
'devextreme/core/utils/*',
'devextreme/data/*',
Expand All @@ -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',
],
Expand Down
9 changes: 6 additions & 3 deletions apps/demos/rollup.devextreme-angular.umd.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
10 changes: 9 additions & 1 deletion apps/demos/utils/bundle/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -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') {
Expand All @@ -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)
Expand Down Expand Up @@ -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 = [
Expand All @@ -196,6 +200,10 @@ const prepareConfigs = (framework)=> {
main,
);

if (common) {
packages.push(common);
}

return {
builderConfig,
packages: packages.join(' + '),
Expand Down
2 changes: 2 additions & 0 deletions packages/devextreme-react/gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
14 changes: 14 additions & 0 deletions packages/devextreme-react/src/common/bag.ts
Original file line number Diff line number Diff line change
@@ -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';
14 changes: 14 additions & 0 deletions packages/devextreme-vue/src/common/bag.ts
Original file line number Diff line number Diff line change
@@ -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';
27 changes: 27 additions & 0 deletions packages/devextreme/js/bundles/modules/core.legacy.js
Original file line number Diff line number Diff line change
@@ -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');
14 changes: 14 additions & 0 deletions packages/devextreme/js/bundles/modules/data.legacy.js
Original file line number Diff line number Diff line change
@@ -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');
6 changes: 6 additions & 0 deletions packages/devextreme/js/bundles/modules/data.odata.legacy.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
/* eslint-disable import/no-commonjs */
require('./data');

require('../../data/odata/store');
require('../../data/odata/context');
require('../../data/odata/utils');
1 change: 1 addition & 0 deletions packages/devextreme/js/bundles/modules/parts/core.js
Original file line number Diff line number Diff line change
Expand Up @@ -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) */

Expand Down
2 changes: 2 additions & 0 deletions packages/devextreme/js/bundles/modules/parts/data.js
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Loading

0 comments on commit 4d5201f

Please sign in to comment.