Skip to content

Commit 8a9481f

Browse files
GoodDayForSurfGoodDayForSurf
authored
Merge branch '26_1' into gulp/remove-gulp-from-app-demos
2 parents b764a53 + 7cded76 commit 8a9481f

366 files changed

Lines changed: 12686 additions & 7549 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/CODEOWNERS‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -917,7 +917,7 @@
917917
/packages/devextreme/js/ui/select_box.d.ts @DevExpress/devextreme-editors
918918
/packages/devextreme/js/ui/select_box_types.d.ts @DevExpress/devextreme-editors
919919

920-
/packages/devextreme/js/__internal/ui/m_select_box.ts @DevExpress/devextreme-editors
920+
/packages/devextreme/js/__internal/ui/select_box.ts @DevExpress/devextreme-editors
921921

922922
/e2e/testcafe-devextreme/tests/accessibility/selectBox/** @DevExpress/devextreme-editors
923923

@@ -958,7 +958,7 @@
958958
/packages/devextreme/js/ui/tag_box.d.ts @DevExpress/devextreme-editors
959959
/packages/devextreme/js/ui/tag_box_types.d.ts @DevExpress/devextreme-editors
960960

961-
/packages/devextreme/js/__internal/ui/m_tag_box.ts @DevExpress/devextreme-editors
961+
/packages/devextreme/js/__internal/ui/tag_box.ts @DevExpress/devextreme-editors
962962

963963
/packages/devextreme-scss/scss/widgets/base/_tagBox.scss @DevExpress/devextreme-editors
964964
/packages/devextreme-scss/scss/widgets/**/tagBox/** @DevExpress/devextreme-editors

‎.github/renovate.json‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -80,12 +80,6 @@
8080
],
8181
"enabled": false
8282
},
83-
{
84-
"enabled": false,
85-
"matchPackageNames": [
86-
"/^@devextreme-generator//"
87-
]
88-
},
8983
{
9084
"matchPackageNames": [
9185
"devexpress-gantt",
@@ -113,10 +107,7 @@
113107
],
114108
"dependencyDashboardApproval": true,
115109
"matchPackageNames": [
116-
"*",
117-
"!cldr-{/,}**",
118-
"!chrome{/,}**",
119-
"!firefox{/,}**"
110+
"*"
120111
]
121112
},
122113
{

‎.github/workflows/build_all.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ on:
1515
type: boolean
1616

1717
env:
18-
NX_CLOUD_ACCESS_TOKEN: ${{ github.ref_name == github.event.repository.default_branch && secrets.NX_CLOUD_ACCESS_TOKEN || '' }}
1918
NX_SKIP_NX_CACHE: ${{ contains(github.event.pull_request.labels.*.name, 'skip-cache') && 'true' || 'false' }}
2019

2120
jobs:

‎.github/workflows/playgrounds_tests.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ jobs:
8888
- name: Setup Chrome
8989
uses: ./.github/actions/setup-chrome
9090
with:
91-
chrome-version: '145.0.7632.67'
91+
chrome-version: '149.0.7827.114'
9292

9393
- name: Use Node.js
9494
uses: actions/setup-node@v6

‎.github/workflows/pr-storybook-cleanup.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Storybook PR Preview Cleanup
1+
name: PR Storybook - Preview Cleanup
22

33
on:
44
schedule:
@@ -10,7 +10,7 @@ permissions:
1010

1111
jobs:
1212
cleanup:
13-
name: Delete stale PR preview folders
13+
name: Delete stale PR storybook folders
1414
runs-on: ubuntu-latest
1515
timeout-minutes: 10
1616

@@ -21,13 +21,13 @@ jobs:
2121
ref: gh-pages
2222
fetch-depth: 0
2323

24-
- name: Delete preview folders older than 7 days
24+
- name: Delete storybook folders older than 7 days
2525
id: cleanup
2626
run: |
2727
DELETED=0
2828
CUTOFF=$(date -d '7 days ago' +%s)
2929
30-
for dir in preview/pr-*/; do
30+
for dir in storybook/pr-*/; do
3131
[ -d "$dir" ] || continue
3232
3333
LAST_COMMIT_TS=$(git log -1 --format="%ct" -- "$dir")
@@ -56,5 +56,5 @@ jobs:
5656
run: |
5757
git config --global user.email "DXGitHubRobot@devexpress.com"
5858
git config --global user.name "DX Robot"
59-
git commit -m "chore: remove ${{ steps.cleanup.outputs.deleted }} stale PR preview(s) [skip ci]"
59+
git commit -m "chore: remove ${{ steps.cleanup.outputs.deleted }} stale PR storybook(s) [skip ci]"
6060
git push origin gh-pages

‎.github/workflows/pr-storybook-deploy-manual.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Storybook PR Preview (manual)
1+
name: PR Storybook - Preview (manual)
22

33
on:
44
workflow_dispatch:
@@ -21,7 +21,7 @@ permissions:
2121
pull-requests: write
2222

2323
concurrency:
24-
group: storybook-preview-${{ inputs.pr_number }}
24+
group: storybook-${{ inputs.pr_number }}
2525
cancel-in-progress: true
2626

2727
env:
@@ -33,7 +33,7 @@ jobs:
3333
name: ${{ inputs.action }} Storybook preview for PR
3434
runs-on: ubuntu-latest
3535
timeout-minutes: 30
36-
environment: github-pages
36+
environment: storybook-manual
3737

3838
steps:
3939
- name: Checkout PR head commit
@@ -92,6 +92,6 @@ jobs:
9292
pr-number: ${{ inputs.pr_number }}
9393
source-dir: ${{ env.SOURCE_DIR }}
9494
preview-branch: gh-pages
95-
umbrella-dir: preview
95+
umbrella-dir: storybook
9696
comment: false
9797
wait-for-pages-deployment: true

‎.github/workflows/pr-storybook-deploy.yml‎

Lines changed: 116 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,116 @@
1+
name: PR Storybook - Preview
2+
run-name: "PR #${{ github.event.pull_request.number }}: ${{ github.event.pull_request.title }}"
3+
4+
on:
5+
pull_request:
6+
branches:
7+
- 26_1
8+
types:
9+
- opened
10+
- reopened
11+
- synchronize
12+
- labeled
13+
- unlabeled
14+
- closed
15+
16+
permissions:
17+
contents: write
18+
19+
concurrency:
20+
group: storybook-${{ github.event.pull_request.number }}
21+
cancel-in-progress: true
22+
23+
env:
24+
SOURCE_DIR: ./apps/react-storybook/storybook-static
25+
26+
jobs:
27+
deploy:
28+
name: Build & Deploy
29+
runs-on: ubuntu-latest
30+
timeout-minutes: 20
31+
if: >-
32+
github.event.pull_request.head.repo.full_name == github.repository &&
33+
(
34+
(github.event.action == 'labeled' && github.event.label.name == 'storybook') ||
35+
(github.event.action != 'labeled' && github.event.action != 'closed' && contains(github.event.pull_request.labels.*.name, 'storybook'))
36+
)
37+
environment:
38+
name: storybook
39+
url: https://devexpress.github.io/DevExtreme/storybook/pr-${{ github.event.pull_request.number }}
40+
41+
steps:
42+
- name: Checkout repository
43+
uses: actions/checkout@v6
44+
with:
45+
submodules: true
46+
fetch-depth: 1
47+
48+
- name: Use Node.js
49+
uses: actions/setup-node@v6
50+
with:
51+
node-version-file: '.node-version'
52+
53+
- name: Setup pnpm
54+
uses: pnpm/action-setup@v6
55+
with:
56+
run_install: false
57+
58+
- name: Get pnpm store directory
59+
shell: bash
60+
run: |
61+
echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
62+
63+
- name: Setup pnpm + nx cache
64+
uses: actions/cache@v5
65+
with:
66+
path: |
67+
${{ env.STORE_PATH }}
68+
.nx/cache
69+
key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
70+
restore-keys: |
71+
${{ runner.os }}-pnpm-store
72+
73+
- name: Install dependencies
74+
run: pnpm install --frozen-lockfile
75+
76+
- name: Build Storybook preview (static)
77+
run: pnpm nx build devextreme-react-storybook
78+
79+
- name: Deploy PR preview
80+
uses: rossjrw/pr-preview-action@ffa7509e91a3ec8dfc2e5536c4d5c1acdf7a6de9 # v1.8.1
81+
with:
82+
action: deploy
83+
pr-number: ${{ github.event.pull_request.number }}
84+
source-dir: ${{ env.SOURCE_DIR }}
85+
preview-branch: gh-pages
86+
umbrella-dir: storybook
87+
comment: false
88+
token: ${{ github.token }}
89+
wait-for-pages-deployment: true
90+
91+
remove:
92+
name: Remove storybook
93+
runs-on: ubuntu-latest
94+
timeout-minutes: 10
95+
if: >-
96+
github.event.pull_request.head.repo.full_name == github.repository &&
97+
(
98+
(github.event.action == 'closed' && contains(github.event.pull_request.labels.*.name, 'storybook')) ||
99+
(github.event.action == 'unlabeled' && github.event.label.name == 'storybook')
100+
)
101+
102+
steps:
103+
- name: Checkout repository
104+
uses: actions/checkout@v6
105+
106+
- name: Remove PR preview
107+
uses: rossjrw/pr-preview-action@ffa7509e91a3ec8dfc2e5536c4d5c1acdf7a6de9 # v1.8.1
108+
with:
109+
action: remove
110+
pr-number: ${{ github.event.pull_request.number }}
111+
source-dir: ${{ env.SOURCE_DIR }}
112+
preview-branch: gh-pages
113+
umbrella-dir: storybook
114+
comment: false
115+
token: ${{ github.token }}
116+
wait-for-pages-deployment: true

‎.github/workflows/renovation.yml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Renovation
1+
name: Jest tests
22

33
concurrency:
44
group: wf-${{github.event.pull_request.number || github.sha}}-${{github.workflow}}
@@ -51,6 +51,9 @@ jobs:
5151
working-directory: ./packages/devextreme
5252
run: pnpm exec gulp localization
5353

54+
- name: Check test types
55+
run: pnpm exec nx check-types devextreme
56+
5457
- name: Jest tests
5558
run: pnpm exec nx test-jest devextreme
5659

‎.github/workflows/run-testcafe-on-gh-pages.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ jobs:
5454
- name: Setup Chrome
5555
uses: ./devextreme/.github/actions/setup-chrome
5656
with:
57-
chrome-version: '145.0.7632.67'
57+
chrome-version: '149.0.7827.114'
5858

5959
- uses: pnpm/action-setup@v6
6060
with:

‎.github/workflows/testcafe_tests.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -152,10 +152,10 @@ jobs:
152152
working-directory: ./packages/devextreme
153153
run: 7z x artifacts.zip -aoa
154154

155-
# - name: Setup Chrome
156-
# uses: ./.github/actions/setup-chrome
157-
# with:
158-
# chrome-version: '145.0.7632.67'
155+
- name: Setup Chrome
156+
uses: ./.github/actions/setup-chrome
157+
with:
158+
chrome-version: '149.0.7827.114'
159159

160160
- name: Use Node.js
161161
uses: actions/setup-node@v6

0 commit comments

Comments
 (0)