Merge branch '24_1' of https://github.com/DevExpress/DevExtreme into …

…24_1-Tileview-fix-alignment
DevExpress · Jun 18, 2024 · f89e33c · f89e33c
2 parents 0301d8a + 4f88396
commit f89e33c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/apps/demos/Demos/TabPanel/Overview/Vue/TabPanelItem.vue b/apps/demos/Demos/TabPanel/Overview/Vue/TabPanelItem.vue
@@ -1,10 +1,12 @@
 <template>
-  <div class="tabpanel-item">
-    <TaskItem
-      v-for="(task, index) in tasks"
-      :key="index"
-      :task="task"
-    />
+  <div>
+    <div class="tabpanel-item">
+      <TaskItem
+        v-for="(task, index) in tasks"
+        :key="index"
+        :task="task"
+      />
+    </div>
   </div>
 </template>
 

diff --git a/apps/demos/utils/bundle/index.js b/apps/demos/utils/bundle/index.js
@@ -9,6 +9,7 @@ const url = require('url');
 // https://stackoverflow.com/questions/42412965/how-to-load-named-exports-with-systemjs/47108328
 const prepareModulesToNamedImport = () => {
   const modules = [
+    'time_zone_utils.js',
     'localization.js',
     'viz/export.js',
     'viz/core/export.js',
@@ -22,9 +23,8 @@ const prepareModulesToNamedImport = () => {
   ];
 
   const paths = [
-    '../npm-scripts/npm-devextreme/cjs', // un-used / legacy?
-    'node_modules/devextreme/cjs',       // 24.1+ migrated from devextreme-demos, kept as is / likely un-used, but works ok in mono repo
-    '../../node_modules/devextreme/cjs', // 24.1+ wg / individual em modules are not discovered
+    '../npm-scripts/npm-devextreme/cjs',
+    'node_modules/devextreme/cjs',
   ];
 
   const esModuleExport = 'exports.__esModule = true;';