Skip to content

Commit 92f6562

Browse files
authored
Add lint target to the default workflow (#31147)
1 parent 91d53e7 commit 92f6562

File tree

5 files changed

+29
-136
lines changed

5 files changed

+29
-136
lines changed

.github/workflows/default_workflow.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656
- name: Run targets
5757
run: >
5858
pnpx nx run-many
59-
-t test
59+
-t lint,test
6060
--exclude
6161
devextreme
6262
devextreme-themebuilder

.github/workflows/lint.yml

Lines changed: 1 addition & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -157,45 +157,6 @@ jobs:
157157
working-directory: ./packages/devextreme
158158
run: pnpx nx lint-texts
159159

160-
CSS:
161-
runs-on: devextreme-shr2
162-
timeout-minutes: 60
163-
steps:
164-
- name: Get sources
165-
uses: actions/checkout@v4
166-
167-
- name: Use Node.js
168-
uses: actions/setup-node@v4
169-
with:
170-
node-version: '20'
171-
172-
- uses: pnpm/action-setup@v3
173-
with:
174-
version: 9
175-
run_install: false
176-
177-
- name: Get pnpm store directory
178-
shell: bash
179-
run: |
180-
echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
181-
182-
- uses: actions/cache@v4
183-
name: Setup pnpm cache
184-
with:
185-
path: |
186-
${{ env.STORE_PATH }}
187-
.nx/cache
188-
key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
189-
restore-keys: |
190-
${{ runner.os }}-pnpm-store
191-
192-
- name: Install dependencies
193-
run: pnpm install
194-
195-
- name: Lint CSS
196-
working-directory: ./packages/devextreme-scss
197-
run: pnpx nx lint
198-
199160
pnpm_lock:
200161
runs-on: devextreme-shr2
201162
timeout-minutes: 10
@@ -335,7 +296,7 @@ jobs:
335296
notify:
336297
runs-on: devextreme-shr2
337298
name: Send notifications
338-
needs: [TS, JS, CSS, texts, pnpm_lock, component_exports]
299+
needs: [TS, JS, texts, pnpm_lock, component_exports]
339300
if: github.event_name != 'pull_request' && contains(needs.*.result, 'failure')
340301

341302
steps:

packages/devextreme-metadata/aspnet/enums.ts

Lines changed: 23 additions & 92 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,7 @@ export const enums = {
1212
],
1313
},
1414
EdmType: {
15-
items: [
16-
'Guid',
17-
'Int32',
18-
'Int64',
19-
'String',
20-
'Boolean',
21-
'Single',
22-
'Decimal',
23-
],
15+
items: ['Guid', 'Int32', 'Int64', 'String', 'Boolean', 'Single', 'Decimal'],
2416
},
2517
FilterOperations: {
2618
items: [
@@ -49,17 +41,10 @@ export const enums = {
4941
'triangleNeedle',
5042
'twoColorNeedle',
5143
],
52-
options: [
53-
'GaugeIndicator.type',
54-
],
44+
options: ['GaugeIndicator.type'],
5545
},
5646
GeoMapProvider: {
57-
items: [
58-
'bing',
59-
'google',
60-
'googleStatic',
61-
'azure',
62-
],
47+
items: ['bing', 'google', 'googleStatic', 'azure'],
6348
},
6449
SchedulerViewType: {
6550
items: [
@@ -73,109 +58,53 @@ export const enums = {
7358
'week',
7459
'workWeek',
7560
],
76-
options: [
77-
'dxScheduler.views',
78-
],
61+
options: ['dxScheduler.views'],
7962
},
8063
ShowScrollbarMode: {
81-
items: [
82-
'always',
83-
'never',
84-
'onHover',
85-
'onScroll',
86-
],
87-
options: [
88-
'dxScrollView.showScrollbar',
89-
],
64+
items: ['always', 'never', 'onHover', 'onScroll'],
65+
options: ['dxScrollView.showScrollbar'],
9066
},
9167
TextEditorButtonWidget: {
92-
items: [
93-
'dxButton',
94-
],
68+
items: ['dxButton'],
9569
},
9670
DiagramDataLayoutOrientation: {
97-
items: [
98-
'vertical',
99-
'horizontal',
100-
],
71+
items: ['vertical', 'horizontal'],
10172
},
10273
GanttSortingMode: {
103-
items: [
104-
'multiple',
105-
'none',
106-
'single',
107-
],
74+
items: ['multiple', 'none', 'single'],
10875
},
10976
GridSortingMode: {
110-
items: [
111-
'multiple',
112-
'none',
113-
'single',
114-
],
77+
items: ['multiple', 'none', 'single'],
11578
},
11679
PieChartLegendHoverMode: {
117-
items: [
118-
'none',
119-
'allArgumentPoints',
120-
],
80+
items: ['none', 'allArgumentPoints'],
12181
},
12282
PolarChartOverlappingBehavior: {
123-
items: [
124-
'none',
125-
'hide',
126-
],
83+
items: ['none', 'hide'],
12784
},
12885
SelectionMode: {
129-
items: [
130-
'multiple',
131-
'none',
132-
'single',
133-
],
86+
items: ['multiple', 'none', 'single'],
13487
},
13588
PolarChartResolveLabelOverlapping: {
136-
items: [
137-
'hide',
138-
'none',
139-
],
89+
items: ['hide', 'none'],
14090
},
14191
ButtonGroupSelectionMode: {
142-
items: [
143-
'multiple',
144-
'single',
145-
'none',
146-
],
92+
items: ['multiple', 'single', 'none'],
14793
},
14894
ChartElementSelectionMode: {
149-
items: [
150-
'multiple',
151-
'single',
152-
],
95+
items: ['multiple', 'single'],
15396
},
15497
FileManagerSelectionMode: {
155-
items: [
156-
'multiple',
157-
'single',
158-
],
98+
items: ['multiple', 'single'],
15999
},
160100
ListSelectionMode: {
161-
items: [
162-
'all',
163-
'multiple',
164-
'none',
165-
'single',
166-
],
101+
items: ['all', 'multiple', 'none', 'single'],
167102
},
168103
MenuSelectionMode: {
169-
items: [
170-
'none',
171-
'single',
172-
],
104+
items: ['none', 'single'],
173105
},
174106
NavSelectionMode: {
175-
items: [
176-
'multiple',
177-
'single',
178-
],
107+
items: ['multiple', 'single'],
179108
},
180109
};
181110

@@ -321,7 +250,9 @@ export const enumAliases = {
321250
'SingleMultipleOrNone': 'GridSortingMode',
322251
},
323252

324-
'(dxDataGrid|dxTreeList)(.*)\\.columnRenderingMode': { 'DataRenderMode': 'GridColumnRenderingMode' },
253+
'(dxDataGrid|dxTreeList)(.*)\\.columnRenderingMode': {
254+
'DataRenderMode': 'GridColumnRenderingMode',
255+
},
325256

326257
'(dxDataGrid|dxTreeList)(.*)\\.rowRenderingMode': { 'DataRenderMode': 'GridRowRenderingMode' },
327258

packages/devextreme-metadata/make-aspnet-metadata.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { AspNet, Mutation } from 'devextreme-internal-tools/metadata';
22
import { addMember, cleanArtifacts, removeMembers, types } from './common';
33
import { commonSmdCollectionItems } from './common/smd';
4-
import { enums, enumAliases, enumItemRenamings } from './aspnet/enums'
4+
import { enums, enumAliases, enumItemRenamings } from './aspnet/enums';
55
import { PATHS } from './common/paths';
66

77
cleanArtifacts('StrongMetaData.json', 'StrongMetaDataGenerator.cfg.json');
@@ -61,7 +61,7 @@ AspNet.makeMetadata({
6161
collectionItems: [...commonSmdCollectionItems],
6262
enums,
6363
enumAliases,
64-
enumItemRenamings
64+
enumItemRenamings,
6565
},
6666
});
6767

packages/devextreme-metadata/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
"private": true,
55
"scripts": {
66
"format:check": "prettier --check .",
7-
"format": "prettier --write ."
7+
"format": "prettier --write .",
8+
"lint": "pnpm run format:check"
89
},
910
"devDependencies": {
1011
"@types/node": "catalog:tools",

0 commit comments

Comments
 (0)