From 6d2688970335d5d0550b3a050d2980e2832c454f Mon Sep 17 00:00:00 2001
From: Vasily Strelyaev <Vasily.Strelyaev@devexpress.com>
Date: Thu, 5 Dec 2024 11:19:06 +0200
Subject: [PATCH] remove manual bags from FSPs, test system.js bundling

---
 apps/demos/utils/bundle/index.js            |  7 -------
 packages/devextreme-react/gulpfile.js       |  2 +-
 packages/devextreme-react/src/common/bag.ts | 11 -----------
 packages/devextreme-vue/gulpfile.js         |  2 +-
 packages/devextreme-vue/src/common/bag.ts   | 11 -----------
 5 files changed, 2 insertions(+), 31 deletions(-)
 delete mode 100644 packages/devextreme-react/src/common/bag.ts
 delete mode 100644 packages/devextreme-vue/src/common/bag.ts

diff --git a/apps/demos/utils/bundle/index.js b/apps/demos/utils/bundle/index.js
index 58ad9d4cbffe..8bc6eaedc6fb 100644
--- a/apps/demos/utils/bundle/index.js
+++ b/apps/demos/utils/bundle/index.js
@@ -109,7 +109,6 @@ const prepareConfigs = (framework)=> {
   let modulesMap = {};
 
   let main = `devextreme-${framework}/index.js`;
-  let common = `devextreme-${framework}/common/bag`;
   let minify = true;
 
   if (framework === 'angular') {
@@ -135,8 +134,6 @@ const prepareConfigs = (framework)=> {
 
       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)
@@ -200,10 +197,6 @@ 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 1eec6ef40eec..af9177637252 100644
--- a/packages/devextreme-react/gulpfile.js
+++ b/packages/devextreme-react/gulpfile.js
@@ -112,7 +112,7 @@ gulp.task(NPM_PREPARE_MODULES, (done) => {
     return ['', [moduleFileName], moduleFilePath];
   });
 
-  [...packParamsForFolders, ...packParamsForModules].forEach(
+  [ ...packParamsForModules, ...packParamsForFolders].forEach(
     ([folder, moduleFileNames, moduleFilePath]) =>
       makeModule(folder, moduleFileNames, moduleFilePath)
   );
diff --git a/packages/devextreme-react/src/common/bag.ts b/packages/devextreme-react/src/common/bag.ts
deleted file mode 100644
index 296419866fb4..000000000000
--- a/packages/devextreme-react/src/common/bag.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-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 localization from './core/localization';
-export * as charts from './charts';
-export * as data from './data';
-export * as customStore from './data/custom-store';
-export * as pdfExport from './export/pdf';
-export * as excelExport from './export/excel';
-export * as grids from './grids';
diff --git a/packages/devextreme-vue/gulpfile.js b/packages/devextreme-vue/gulpfile.js
index e0a1f8ce05eb..74126acf46df 100644
--- a/packages/devextreme-vue/gulpfile.js
+++ b/packages/devextreme-vue/gulpfile.js
@@ -117,7 +117,7 @@ gulp.task(NPM_PREPARE_MODULES, (done) => {
     return ['', [moduleFileName], moduleFilePath];
   });
 
-  [...packParamsForFolders, ...packParamsForModules].forEach(
+  [ ...packParamsForModules, ...packParamsForFolders].forEach(
     ([folder, moduleFileNames, moduleFilePath]) =>
       makeModule(folder, moduleFileNames, moduleFilePath)
   );
diff --git a/packages/devextreme-vue/src/common/bag.ts b/packages/devextreme-vue/src/common/bag.ts
deleted file mode 100644
index 296419866fb4..000000000000
--- a/packages/devextreme-vue/src/common/bag.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-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 localization from './core/localization';
-export * as charts from './charts';
-export * as data from './data';
-export * as customStore from './data/custom-store';
-export * as pdfExport from './export/pdf';
-export * as excelExport from './export/excel';
-export * as grids from './grids';