remove manual bags from FSPs, test system.js bundling

DevExpress · Dec 5, 2024 · 6d26889 · 6d26889
1 parent d461be9
commit 6d26889
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 31 deletions.
diff --git 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
@@ -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
diff --git 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