Move bundles out of js folder (#31681)

Author: anna-shakhova

packages/devextreme-themebuilder/src/metadata/dependency-collector.ts

@@ -98,8 +98,12 @@ export default class DependencyCollector {
         es6: { mixedImports: true },
         ts: { skipTypeImports : true }
       });
+      const isBundleFile = filePath.includes('bundle-templates');
 
-      const deps = result.map((relativeDependency: string): string => {
+      const deps = result.map((dependency: string): string => {
+        const relativeDependency = isBundleFile
+          ? dependency.replace(/^((?:\.\.\/)+)(?!bundles)/, '$1../js/')
+          : dependency;
         let absDepPath = relativeDependency
 
         if (relativeDependency.startsWith('.')) {
@@ -176,7 +180,7 @@ export default class DependencyCollector {
   }
 
   collect(): void {
-    const fullDependencyTree = this.getFullDependencyTree(path.resolve(__dirname, '../../../devextreme/js/bundles/dx.all.js'));
+    const fullDependencyTree = this.getFullDependencyTree(path.resolve(__dirname, '../../../devextreme/build/bundle-templates/dx.all.js'));
 
     this.treeProcessor(fullDependencyTree);
     this.validate();

packages/devextreme-themebuilder/tests/metadata/dependency-collector.test.ts

@@ -105,7 +105,9 @@ const filesContent: { [key: string]: string } = {
   [path.resolve(__dirname, '../../../devextreme-scss/scss/widgets/lesstheme/_index.scss')]: '// public widgets\n@use "./toolbar";',
 
   // collect test
-  [path.resolve(__dirname, '../../../devextreme/js/bundles/dx.all.js')]: 'import t from \'./toolbar\';import b from \'./button\';',
+  [path.resolve(__dirname, '../../../devextreme/build/bundle-templates/dx.all.js')]: 'import t from \'../toolbar\';import b from \'../button\';',
+  '../../js/toolbar.js': 'import m from \'./menu\';import u from \'./utils\';\n// STYLE toolbar',
+  '../../js/button.js': 'import u from \'./utils\';\n// STYLE button',
   [path.resolve(__dirname, '../../../devextreme-scss/scss/widgets/generic/_index.scss')]: '// public widgets\n@use "./toolbar";@use "./button";@use "./icon";@use "./menu";',
   [path.resolve(__dirname, '../../../devextreme-scss/scss/widgets/material/_index.scss')]: '// public widgets\n@use "./toolbar";@use "./button";@use "./icon";@use "./menu";',
 };
@@ -133,7 +135,7 @@ jest.mock('fs', () => ({
 jest.mock('filing-cabinet', () => ({
   __esModule: true,
   default: (options: cabinet.Options): string => {
-    const normalizedPartial = options.partial.replace('./', '');
+    const normalizedPartial = options.partial.replace(/^\.\//, '');
     return `${normalizedPartial}.${tsFilesSet.has(normalizedPartial) ? 'ts' : 'js'}`;
   },
 }));
@@ -293,3 +295,4 @@ describe('Integration test', () => {
     expect(builtDependenciesCopy).toEqual(idealDependenciesCopy);
   });
 });
+