clean code

GoodDayForSurf · GoodDayForSurf · commit 0c0e9736a094 · 2024-11-18T11:33:15.000+04:00
diff --git a/packages/devextreme-cli/src/templates/react/application/devextreme.json b/packages/devextreme-cli/src/templates/react/application/devextreme.json
@@ -9,55 +9,55 @@
                   "outputFile": "src/themes/generated/theme.base.css"
               }
           },
-        {
-          "command": "build-theme",
-          "options": {
-            "inputFile": "src/themes/metadata.base.dark.json",
-            "outputFile": "src/themes/generated/theme.base.dark.css"
-          }
-        },
+          {
+            "command": "build-theme",
+            "options": {
+              "inputFile": "src/themes/metadata.base.dark.json",
+              "outputFile": "src/themes/generated/theme.base.dark.css"
+            }
+          },
           {
               "command": "build-theme",
               "options": {
                   "inputFile": "src/themes/metadata.additional.json",
                   "outputFile": "src/themes/generated/theme.additional.css"
               }
           },
-        {
-          "command": "build-theme",
-          "options": {
-            "inputFile": "src/themes/metadata.additional.dark.json",
-            "outputFile": "src/themes/generated/theme.additional.dark.css"
-          }
-        },
+          {
+            "command": "build-theme",
+            "options": {
+              "inputFile": "src/themes/metadata.additional.dark.json",
+              "outputFile": "src/themes/generated/theme.additional.dark.css"
+            }
+          },
           {
               "command": "export-theme-vars",
               "options": {
                   "inputFile": "src/themes/metadata.base.json",
                   "outputFile": "src/themes/generated/variables.base.scss"
               }
           },
-        {
-          "command": "export-theme-vars",
-          "options": {
-            "inputFile": "src/themes/metadata.base.dark.json",
-            "outputFile": "src/themes/generated/variables.base.dark.scss"
-          }
-        },
+          {
+            "command": "export-theme-vars",
+            "options": {
+              "inputFile": "src/themes/metadata.base.dark.json",
+              "outputFile": "src/themes/generated/variables.base.dark.scss"
+            }
+          },
           {
               "command": "export-theme-vars",
               "options": {
                   "inputFile": "src/themes/metadata.additional.json",
                   "outputFile": "src/themes/generated/variables.additional.scss"
               }
           },
-        {
-          "command": "export-theme-vars",
-          "options": {
-            "inputFile": "src/themes/metadata.additional.dark.json",
-            "outputFile": "src/themes/generated/variables.additional.dark.scss"
+          {
+            "command": "export-theme-vars",
+            "options": {
+              "inputFile": "src/themes/metadata.additional.dark.json",
+              "outputFile": "src/themes/generated/variables.additional.dark.scss"
+            }
           }
-        }
       ]
   }
 }
diff --git a/packages/devextreme-cli/src/templates/react/application/src/components/theme-switcher/ThemeSwitcher.tsx b/packages/devextreme-cli/src/templates/react/application/src/components/theme-switcher/ThemeSwitcher.tsx
@@ -10,11 +10,11 @@ export const ThemeSwitcher = () => {
   }, []);
 
   return <div>
-    <Button
-      className='theme-button'
-      stylingMode='text'
-      icon={`${themeContext?.theme === 'dark' ? 'sun' : 'moon'}`}
-      onClick={onButtonClick}
-    />
-  </div>;
+            <Button
+              className='theme-button'
+              stylingMode='text'
+              icon={`${themeContext?.theme === 'dark' ? 'sun' : 'moon'}`}
+              onClick={onButtonClick}
+            />
+        </div>;
 };
diff --git a/packages/devextreme-cli/src/templates/vue-v3/application/src/components/user-panel.vue b/packages/devextreme-cli/src/templates/vue-v3/application/src/components/user-panel.vue
@@ -1,25 +1,26 @@
 <template>
   <div class="user-panel">
     <dx-drop-down-button
-      v-if="menuMode !== 'list'"
-      stylingMode="text"
-      :icon="'https://js.devexpress.com/Demos/WidgetsGallery/JSDemos/images/employees/06.png'"
-      :showArrowIcon="false"
-      :items="menuItems"
-      displayExpr="text"
-      keyExpr="id"
-      :elementAttr="{
+        v-if="menuMode !== 'list'"
+        stylingMode="text"
+        :icon="'https://js.devexpress.com/Demos/WidgetsGallery/JSDemos/images/employees/06.png'"
+        :showArrowIcon="false"
+        :items="menuItems"
+        displayExpr="text"
+        keyExpr="id"
+        :elementAttr="{
       class: 'user-button'
     }"
-      :dropDownOptions="{
+        :dropDownOptions="{
       width: '150px'
     }"
     />
-    <dx-list v-if="menuMode === 'list'"
-             :items="menuItems"
-             displayExpr="text"
-             keyExpr="id"
-             width="130"
+    <dx-list
+        v-if="menuMode === 'list'"
+        :items="menuItems"
+        displayExpr="text"
+        keyExpr="id"
+        width="130"
     />
   </div>
 </template>
diff --git a/packages/devextreme-cli/src/templates/vue-v3/application/src/theme-service.js b/packages/devextreme-cli/src/templates/vue-v3/application/src/theme-service.js
@@ -11,7 +11,6 @@ class ThemeService {
       this.currentTheme.value = this.themes[0];
 
       document.body.classList.add(this.themeClassNamePrefix + this.currentTheme.value);
-
     }
   }
 
@@ -36,7 +35,6 @@ class ThemeService {
 
     this.isDark.value = this.currentTheme.value === 'dark';
   }
-
 }
 
 export const themeService = new ThemeService();
diff --git a/packages/devextreme-cli/src/utility/latest-versions.js b/packages/devextreme-cli/src/utility/latest-versions.js
@@ -1,8 +1,8 @@
 const packageJson = require('../../package.json');
 module.exports = {
-    'devextreme': '~24.1.7',
-    'devextreme-react': '~24.1.7',
-    'devextreme-vue': '~24.1.7',
+    'devextreme': '24.2-next',
+    'devextreme-react': '24.2-next',
+    'devextreme-vue': '24.2-next',
     'devextreme-cli': packageJson.version,
     'devextreme-schematics': 'latest'
 };
diff --git a/packages/devextreme-cli/testing/dev-server.js b/packages/devextreme-cli/testing/dev-server.js
@@ -29,7 +29,6 @@ module.exports = class DevServer {
                 env: Object.assign(process.env, { CI: false })
             });
         } catch(e) {
-            console.log('----EXCEPTION------>', e);
             throw new Error(e);
         }
     }
diff --git a/packages/devextreme-schematics/src/add-app-template/schema.json b/packages/devextreme-schematics/src/add-app-template/schema.json
@@ -39,7 +39,7 @@
     "dxversion": {
       "type": "string",
       "description": "The DevExtreme version",
-      "default": "~24.1.7"
+      "default": "24.2-next"
     },
     "globalNgCliVersion": {
       "type":"string",
diff --git a/packages/devextreme-schematics/src/add-layout/files/src/app/shared/components/theme-switcher/theme-switcher.component.ts b/packages/devextreme-schematics/src/add-layout/files/src/app/shared/components/theme-switcher/theme-switcher.component.ts
@@ -13,8 +13,7 @@ import { ThemeService } from '../../services/theme.service';
       stylingMode="text"
       [icon]="themeService.currentTheme === 'dark' ? 'sun' : 'moon'"
       (onClick)="onButtonClick()"
-    ></dx-button>
-`,
+    ></dx-button>`,
   styleUrls: [],
 })
 export class ThemeSwitcherComponent {
diff --git a/packages/devextreme-schematics/src/add-layout/files/src/app/shared/components/user-panel/user-panel.component.html b/packages/devextreme-schematics/src/add-layout/files/src/app/shared/components/user-panel/user-panel.component.html
@@ -1,24 +1,20 @@
 <div class="user-panel">
-  <dx-drop-down-button *ngIf="menuMode !== 'list'"
-                       stylingMode="text"
-                       [icon]="'https://js.devexpress.com/Demos/WidgetsGallery/JSDemos/images/employees/06.png'"
-                       [showArrowIcon]="false"
-                       [items]="menuItems"
-                       displayExpr="text"
-                       keyExpr="id"
-                       [elementAttr]="{
-      class: 'user-button'
-    }"
-                       [dropDownOptions]="{
-      width: '150px'
-    }"
-  >
+  <dx-drop-down-button
+    *ngIf="menuMode !== 'list'"
+    stylingMode="text"
+    [icon]="'https://js.devexpress.com/Demos/WidgetsGallery/JSDemos/images/employees/06.png'"
+    [showArrowIcon]="false"
+    [items]="menuItems"
+    displayExpr="text"
+    keyExpr="id"
+    [elementAttr]="{class: 'user-button'}"
+    [dropDownOptions]="{width: '150px'}">
   </dx-drop-down-button>
-  <dx-list *ngIf="menuMode === 'list'"
-           displayExpr="text"
-           keyExpr="id"
-           width="130"
-           [items]="menuItems">
-
+  <dx-list
+    *ngIf="menuMode === 'list'"
+    displayExpr="text"
+    keyExpr="id"
+    width="130"
+    [items]="menuItems">
   </dx-list>
 </div>
diff --git a/packages/devextreme-schematics/src/install/schema.json b/packages/devextreme-schematics/src/install/schema.json
@@ -7,7 +7,7 @@
     "dxversion": {
       "type": "string",
       "description": "The DevExtreme version",
-      "default": "~24.1.7"
+      "default": "24.2-next"
     },
     "project": {
       "type": "string",
diff --git a/packages/devextreme-schematics/src/utility/latest-versions.ts b/packages/devextreme-schematics/src/utility/latest-versions.ts
@@ -1,6 +1,6 @@
 // TODO: implement
 export const latestVersions = {
-  'devextreme': '~24.1.7',
-  'devextreme-angular': '~24.1.7',
+  'devextreme': '24.2-next',
+  'devextreme-angular': '24.2-next',
   'devextreme-cli': 'latest'
 };
diff --git a/templates-generator/react-config.js b/templates-generator/react-config.js
@@ -151,7 +151,7 @@ module.exports = {
         {
             glob: 'src/app-routes.tsx',
             definitions: [
-                    ', NewPagePage'
+                ', NewPagePage'
             ]
         },
         {

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,6 @@ class ThemeService {`
`11`	`11`	`this.currentTheme.value = this.themes[0];`
`12`	`12`
`13`	`13`	`document.body.classList.add(this.themeClassNamePrefix + this.currentTheme.value);`
`14`		`-`
`15`	`14`	`}`
`16`	`15`	`}`
`17`	`16`
`@@ -36,7 +35,6 @@ class ThemeService {`
`36`	`35`
`37`	`36`	`this.isDark.value = this.currentTheme.value === 'dark';`
`38`	`37`	`}`
`39`		`-`
`40`	`38`	`}`
`41`	`39`
`42`	`40`	`export const themeService = new ThemeService();`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,6 @@ module.exports = class DevServer {`
`29`	`29`	`env: Object.assign(process.env, { CI: false })`
`30`	`30`	`});`
`31`	`31`	`} catch(e) {`
`32`		`- console.log('----EXCEPTION------>', e);`
`33`	`32`	`throw new Error(e);`
`34`	`33`	`}`
`35`	`34`	`}`